开源软件构建与测试

Changes of Revision 8

_service:tar_scm:gnupg2.spec Changed

@@ -1,6 +1,6 @@
 Name: gnupg2
-Version: 2.3.6
-Release: 4
+Version: 2.4.3
+Release: 1
 Summary: Utility for secure communication and data storage
 
 License: GPLv3+
@@ -11,26 +11,25 @@
 Patch0: gnupg-2.1.10-secmem.patch
 Patch1: gnupg-2.1.1-fips-algo.patch
 Patch2: gnupg-2.2.23-large-rsa.patch
-Patch3: gnupg-2.2.16-ocsp-keyusage.patch
 Patch4: gnupg-2.2.18-gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
 Patch5: gnupg-2.2.18-gpg-allow-import-of-previously-known-keys-even-without-UI.patch
 Patch6: gnupg-2.2.18-tests-add-test-cases-for-import-without-uid.patch
 Patch7: gnupg-2.2.20-file-is-digest.patch
 Patch8: gnupg-2.2.21-coverity.patch
-Patch9: backport-CVE-2022-34903.patch
-Patch10: backport-common-Protect-against-a-theoretical-integer-overflow.patch
+Patch9: gnupg2-revert-rfc4880bis.patch
+Patch10: backport-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch
 
 BuildRequires: gcc
 BuildRequires: zlib-devel, npth-devel, texinfo
-BuildRequires: libgpg-error-devel >= 1.41
+BuildRequires: libgpg-error-devel >= 1.46
 BuildRequires: libgcrypt-devel >= 1.9.4
-BuildRequires: libksba-devel >= 1.3.0
-BuildRequires: libassuan-devel >= 2.1.0
+BuildRequires: libksba-devel >= 1.6.3
+BuildRequires: libassuan-devel >= 2.5.0
 # compile dirmngr module, need gnutls
 BuildRequires: gnutls-devel
 
 Requires: libgcrypt >= 1.9.4
-Requires: libgpg-error >= 1.41
+Requires: libgpg-error >= 1.46
 
 Recommends: pinentry
 Recommends: gnupg2-smime
@@ -38,11 +37,11 @@
 Provides: gpg = %{version}-%{release}
 Provides: gnupg = %{version}-%{release}
 Provides: dirmngr = %{version}-%{release}
-Provides: gnupg2-smime
+Provides: gnupg2-smime = %{version}-%{release}
 
 Obsoletes: gnupg <= 1.4.24
 Obsoletes: dirmngr < 1.2.0-1
-Obsoletes: gnupg2-smime
+Obsoletes: gnupg2-smime < %{version}-%{release}
 
 %description
 GnuPG is a complete and free implementation of the OpenPGP standard
@@ -121,6 +120,9 @@
 
 
 %changelog
+* Mon Jul 17 2023 yixiangzhike <yixiangzhike007@163.com> - 2.4.3-1
+- update to 2.4.3
+
 * Wed Jun 14 2023 yixiangzhike <yixiangzhike007@163.com> - 2.3.6-4
 - backport upstream patch

_service:tar_scm:backport-CVE-2022-34903.patch Deleted

@@ -1,50 +0,0 @@
-From 34c649b3601383cd11dbc76221747ec16fd68e1b Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Tue, 14 Jun 2022 11:33:27 +0200
-Subject: PATCH g10: Fix garbled status messages in NOTATION_DATA
-
-* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
---
-
-Depending on the escaping and line wrapping the computed remaining
-buffer length could be wrong. Fixed by always using a break to
-terminate the escape detection loop. Might have happened for all
-status lines which may wrap.
-
-GnuPG-bug-id: T6027
----
- g10/cpr.c | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/g10/cpr.c b/g10/cpr.c
-index 9bfdd3c34..fa8005d6f 100644
---- a/g10/cpr.c
-+++ b/g10/cpr.c
-@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string,
- }
- first = 0;
- }
-- for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
-+ for (esc=0, s=buffer, n=len; n; s++, n--)
- {
- if (*s == '%' || *(const byte*)s <= lower_limit
- || *(const byte*)s == 127 )
- esc = 1;
- if (wrap && ++count > wrap)
-- {
-- dowrap=1;
-- break;
-- }
-- }
-- if (esc)
-- {
-- s--; n++;
-+ dowrap=1;
-+ if (esc || dowrap)
-+ break;
- }
- if (s != buffer)
- es_fwrite (buffer, s-buffer, 1, statusfp);
--- 
-2.27.0
-

_service:tar_scm:backport-common-Protect-against-a-theoretical-integer-overflow.patch Deleted

@@ -1,34 +0,0 @@
-From c300253181cfc591cbcae9251eda5296ed29591b Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Fri, 7 Oct 2022 14:12:33 +0200
-Subject: PATCH common: Protect against a theoretical integer overflow in
- tlv.c
-
-* common/tlv.c (parse_ber_header): Protect agains integer overflow.
---
-
-Although there is no concrete case where we use the (nhdr + length),
-it is better to protect against this already here.
----
- common/tlv.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/common/tlv.c b/common/tlv.c
-index abef83a37..9618d04cb 100644
---- a/common/tlv.c
-+++ b/common/tlv.c
-@@ -222,6 +222,11 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
- *r_length = len;
- }
- 
-+ if (*r_length > *r_nhdr && (*r_nhdr + *r_length) < *r_length)
-+ {
-+ return gpg_err_make (default_errsource, GPG_ERR_EOVERFLOW);
-+ }
-+
- /* Without this kludge some example certs can't be parsed. */
- if (*r_class == CLASS_UNIVERSAL && !*r_tag)
- *r_length = 0;
--- 
-2.27.0
-

_service:tar_scm:backport-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch Added

_service:tar_scm:gnupg-2.2.16-ocsp-keyusage.patch Deleted

_service:tar_scm:gnupg-2.2.18-gpg-allow-import-of-previously-known-keys-even-without-UI.patch Changed

@@ -1,3 +1,4 @@
+From c9485d59f735dbf7509a0136a896fe76f9cc915a Mon Sep 17 00:00:00 2001
 From: Vincent Breitmoser <look@my.amazin.horse>
 Date: Thu, 13 Jun 2019 21:27:42 +0200
 Subject: gpg: allow import of previously known keys, even without UIDs
@@ -13,14 +14,14 @@
 GnuPG-Bug-id: 4393
 Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 ---
- g10/import.c | 44 +++++++++++---------------------------------
- 1 file changed, 11 insertions(+), 33 deletions(-)
+ g10/import.c | 45 +++++++++++----------------------------------
+ 1 file changed, 11 insertions(+), 34 deletions(-)
 
 diff --git a/g10/import.c b/g10/import.c
-index 5d3162c..f9acf95 100644
+index 9fab46ca6..c70a6221c 100644
 --- a/g10/import.c
 +++ b/g10/import.c
-@@ -1788,7 +1788,6 @@ import_one_real (ctrl_t ctrl,
+@@ -1954,7 +1954,6 @@ import_one_real (ctrl_t ctrl,
 size_t an;
 char pkstrbufPUBKEY_STRING_SIZE;
 int merge_keys_done = 0;
@@ -28,7 +29,7 @@
 KEYDB_HANDLE hd = NULL;
 
 if (r_valid)
-@@ -1825,14 +1824,6 @@ import_one_real (ctrl_t ctrl,
+@@ -1991,14 +1990,6 @@ import_one_real (ctrl_t ctrl,
 log_printf ("\n");
 }
 
@@ -43,12 +44,12 @@
 if (screener && screener (keyblock, screener_arg))
 {
 log_error (_("key %s: %s\n"), keystr_from_pk (pk),
-@@ -1907,18 +1898,10 @@ import_one_real (ctrl_t ctrl,
+@@ -2078,18 +2069,10 @@ import_one_real (ctrl_t ctrl,
 	 }
 }
 
 - /* Delete invalid parts and bail out if there are no user ids left. */
-- if (!delete_inv_parts (ctrl, keyblock, keyid, options))
+- if (!delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs))
 - {
 - if (!silent)
 - {
@@ -62,11 +63,11 @@
 + /* Delete invalid parts, and note if we have any valid ones left.
 + * We will later abort import if this key is new but contains
 + * no valid uids. */
-+ delete_inv_parts (ctrl, keyblock, keyid, options);
++ delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs);
 
 /* Get rid of deleted nodes. */
 commit_kbnode (&keyblock);
-@@ -1927,24 +1911,11 @@ import_one_real (ctrl_t ctrl,
+@@ -2099,24 +2082,11 @@ import_one_real (ctrl_t ctrl,
 {
 apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid);
 commit_kbnode (&keyblock);
@@ -91,7 +92,7 @@
 }
 
 /* The keyblock is valid and ready for real import. */
-@@ -2002,6 +1973,13 @@ import_one_real (ctrl_t ctrl,
+@@ -2174,6 +2144,13 @@ import_one_real (ctrl_t ctrl,
 err = 0;
 stats->skipped_new_keys++;
 }

_service:tar_scm:gnupg-2.2.20-file-is-digest.patch Changed

@@ -1,7 +1,19 @@
-diff -up gnupg-2.2.20/g10/gpg.c.file-is-digest gnupg-2.2.20/g10/gpg.c
---- gnupg-2.2.20/g10/gpg.c.file-is-digest	2020-04-14 16:33:42.630269318 +0200
-+++ gnupg-2.2.20/g10/gpg.c	2020-04-14 16:34:46.455100086 +0200
-@@ -380,6 +380,7 @@ enum cmd_and_opt_values
+From cdd5082a9e3bdfc8de4aee4835dbdd607b4510be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= <tmraz@fedoraproject.org>
+Date: Tue, 5 Aug 2014 17:04:08 +0200
+Subject: PATCH gnupg add --file-is-digest option needed for copr
+
+---
+ g10/gpg.c | 4 +++
+ g10/options.h | 1 +
+ g10/sign.c | 93 ++++++++++++++++++++++++++++++++++++++++++++-------
+ 3 files changed, 85 insertions(+), 13 deletions(-)
+
+diff --git a/g10/gpg.c b/g10/gpg.c
+index f9bc8395f..dcab0a11a 100644
+--- a/g10/gpg.c
++++ b/g10/gpg.c
+@@ -395,6 +395,7 @@ enum cmd_and_opt_values
 oTTYtype,
 oLCctype,
 oLCmessages,
@@ -9,7 +21,7 @@
 oXauthority,
 oGroup,
 oUnGroup,
-@@ -831,6 +832,7 @@ static ARGPARSE_OPTS opts = {
+@@ -656,6 +657,7 @@ static gpgrt_opt_t opts = {
 ARGPARSE_s_s (oTempDir, "temp-directory", "@"),
 ARGPARSE_s_s (oExecPath, "exec-path", "@"),
 ARGPARSE_s_n (oExpert, "expert", "@"),
@@ -17,7 +29,7 @@
 ARGPARSE_s_n (oNoExpert, "no-expert", "@"),
 ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
 ARGPARSE_s_n (oRequireSecmem, "require-secmem", "@"),
-@@ -2419,6 +2421,7 @@ main (int argc, char **argv)
+@@ -2484,6 +2486,7 @@ main (int argc, char **argv)
 opt.keyid_format = KF_NONE;
 opt.def_sig_expire = "0";
 opt.def_cert_expire = "0";
@@ -25,7 +37,7 @@
 opt.passphrase_repeat = 1;
 opt.emit_version = 0;
 opt.weak_digests = NULL;
-@@ -2997,6 +3000,7 @@ main (int argc, char **argv)
+@@ -3111,6 +3114,7 @@ main (int argc, char **argv)
 	 case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
 
 	 case oForceAEAD: opt.force_aead = 1; break;
@@ -33,10 +45,11 @@
 
 case oDisableSignerUID: opt.flags.disable_signer_uid = 1; break;
 case oIncludeKeyBlock: opt.flags.include_key_block = 1; break;
-diff -up gnupg-2.2.20/g10/options.h.file-is-digest gnupg-2.2.20/g10/options.h
---- gnupg-2.2.20/g10/options.h.file-is-digest	2020-03-14 19:54:05.000000000 +0100
-+++ gnupg-2.2.20/g10/options.h	2020-04-14 16:33:42.634269245 +0200
-@@ -202,6 +202,7 @@ struct
+diff --git a/g10/options.h b/g10/options.h
+index 9015e321f..10852046c 100644
+--- a/g10/options.h
++++ b/g10/options.h
+@@ -219,6 +219,7 @@ struct
 int no_auto_check_trustdb;
 int preserve_permissions;
 int no_homedir_creation;
@@ -44,9 +57,10 @@
 struct groupitem *grouplist;
 int mangle_dos_filenames;
 int enable_progress_filter;
-diff -up gnupg-2.2.20/g10/sign.c.file-is-digest gnupg-2.2.20/g10/sign.c
---- gnupg-2.2.20/g10/sign.c.file-is-digest	2020-03-14 19:35:46.000000000 +0100
-+++ gnupg-2.2.20/g10/sign.c	2020-04-14 16:36:54.661751422 +0200
+diff --git a/g10/sign.c b/g10/sign.c
+index b5e9d422d..7ad143649 100644
+--- a/g10/sign.c
++++ b/g10/sign.c
 @@ -40,6 +40,7 @@
 #include "pkglue.h"
 #include "../common/sysutils.h"
@@ -55,7 +69,7 @@
 #include "../common/mbox-util.h"
 #include "../common/compliance.h"
 
-@@ -834,6 +835,8 @@ write_signature_packets (ctrl_t ctrl,
+@@ -945,6 +946,8 @@ write_signature_packets (ctrl_t ctrl,
 
 if (pk->version >= 5)
 sig->version = 5; /* Required for v5 keys. */
@@ -64,11 +78,11 @@
 else
 sig->version = 4; /* Required. */
 
-@@ -860,14 +863,22 @@ write_signature_packets (ctrl_t ctrl,
+@@ -962,14 +965,22 @@ write_signature_packets (ctrl_t ctrl,
 if (gcry_md_copy (&md, hash))
 BUG ();
 
-- build_sig_subpkt_from_sig (sig, pk);
+- build_sig_subpkt_from_sig (sig, pk, 0);
 - mk_notation_policy_etc (ctrl, sig, NULL, pk);
 - if (opt.flags.include_key_block && IS_SIG (sig))
 - err = mk_sig_subpkt_key_block (ctrl, sig, pk);
@@ -78,7 +92,7 @@
 - gcry_md_final (md);
 + if (!opt.file_is_digest)
 + {
-+ build_sig_subpkt_from_sig (sig, pk);
++ build_sig_subpkt_from_sig (sig, pk, 0);
 + mk_notation_policy_etc (ctrl, sig, NULL, pk);
 + if (opt.flags.include_key_block && IS_SIG (sig))
 + err = mk_sig_subpkt_key_block (ctrl, sig, pk);
@@ -95,16 +109,16 @@
 
 if (!err)
 err = do_sign (ctrl, pk, sig, md, hash_for (pk), cache_nonce, 0);
-@@ -924,6 +930,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
+@@ -1034,6 +1045,8 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 SK_LIST sk_rover = NULL;
 int multifile = 0;
 u32 duration=0;
 + int sigclass = 0x00;
 + u32 timestamp = 0;
 pt_extra_hash_data_t extrahash = NULL;
- 
- pfx = new_progress_context ();
-@@ -941,7 +949,16 @@ sign_file (ctrl_t ctrl, strlist_t filena
+ char peekbuf32;
+ int peekbuflen = 0;
+@@ -1056,7 +1069,16 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 fname = NULL;
 
 if (fname && filenames->next && (!detached || encryptflag))
@@ -122,7 +136,7 @@
 
 if (encryptflag == 2
 && (rc = setup_symkey (&efx.symkey_s2k, &efx.symkey_dek)))
-@@ -962,7 +979,7 @@ sign_file (ctrl_t ctrl, strlist_t filena
+@@ -1077,7 +1099,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 goto leave;
 
 /* Prepare iobufs. */
@@ -131,7 +145,7 @@
 inp = NULL; /* we do it later */
 else
 {
-@@ -1100,7 +1117,7 @@ sign_file (ctrl_t ctrl, strlist_t filena
+@@ -1240,7 +1262,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 for (sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next)
 gcry_md_enable (mfx.md, hash_for (sk_rover->pk));
 
@@ -140,7 +154,7 @@
 iobuf_push_filter (inp, md_filter, &mfx);
 
 if (detached && !encryptflag)
-@@ -1155,6 +1172,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
+@@ -1306,6 +1328,8 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 
 write_status_begin_signing (mfx.md);
 
@@ -149,47 +163,47 @@
 /* Setup the inner packet. */
 if (detached)
 {
-@@ -1195,6 +1214,49 @@ sign_file (ctrl_t ctrl, strlist_t filena
+@@ -1353,6 +1377,49 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 if (opt.verbose)
 log_printf ("\n");
 	}
 + else if (opt.file_is_digest)
 + {
-+ byte *mdb, ts5;
++ byte *mdb, ts5 = {0};
 + size_t mdlen;
 + const char *fp;
 + int c, d;
-+ 
++
 + gcry_md_final(mfx.md);
 + /* this assumes gcry_md_read returns the same buffer */
 + mdb = gcry_md_read(mfx.md, opt.def_digest_algo);
 + mdlen = gcry_md_get_algo_dlen(opt.def_digest_algo);
 + if (strlen(fname) != mdlen * 2 + 11)
-+ log_bug("digests must be %zu + @ + 5 bytes\n", mdlen);
++ log_bug("digests must be %zu + '@' + 5 bytes\n", mdlen);
 + d = -1;
 + for (fp = fname ; *fp; )
 + {
-+ 	 c = *fp++;
-+ 	 if (c >= '0' && c <= '9')
-+ 	 c -= '0';
-+ 	 else if (c >= 'a' && c <= 'f')
-+ 	 c -= 'a' - 10;
-+ 	 else if (c >= 'A' && c <= 'F')
-+ 	 c -= 'A' - 10;
-+ 	 else
-+ 	 log_bug("filename is not hex\n");
-+ 	 if (d >= 0)
++ c = *fp++;
++ if (c >= '0' && c <= '9')
++ c -= '0';
++ else if (c >= 'a' && c <= 'f')
++ c -= 'a' - 10;
++ else if (c >= 'A' && c <= 'F')
++ c -= 'A' - 10;
++ else
++ log_bug("filename is not hex\n");
++ if (d >= 0)
 + {
-+ 	 *mdb++ = d << 4 | c;
-+ 	 c = -1;
-+ 	 if (--mdlen == 0)
++ *mdb++ = d << 4 | c;
++ c = -1;
++ if (--mdlen == 0)
 + {
-+ 	 mdb = ts;
-+ 	 if (*fp++ != '@')
-+ 	 log_bug("missing time separator\n");
-+ 	 }
-+ 	 }
-+ 	 d = c;
++ mdb = ts;
++ if (*fp++ != '@')
++ log_bug("missing time separator\n");
++ }
++ }
++ d = c;
 + }
 + sigclass = ts0;
 + if (sigclass != 0x00 && sigclass != 0x01)
@@ -199,7 +213,7 @@
 else
 {
 /* Read, so that the filter can calculate the digest. */
-@@ -1213,8 +1271,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
+@@ -1374,8 +1441,8 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 
 /* Write the signatures. */
 rc = write_signature_packets (ctrl, sk_list, out, mfx.md, extrahash,

_service:tar_scm:gnupg2-revert-rfc4880bis.patch Added

@@ -0,0 +1,200 @@
+From 1e4f1550996334d2a631a5d769e937d29ace47bb Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen@redhat.com>
+Date: Thu, 9 Feb 2023 16:38:58 +0100
+Subject: PATCH gnupg Revert the introduction of the RFC4880bis draft into
+ defaults
+
+This reverts commit 4583f4fe2 (gpg: Merge --rfc4880bis features into
+--gnupg, 2022-10-31).
+---
+ g10/gpg.c | 35 ++++++++++++++++++++++++++++++++---
+ g10/keygen.c | 30 ++++++++++++++++++------------
+ 2 files changed, 50 insertions(+), 15 deletions(-)
+
+diff --git a/g10/gpg.c b/g10/gpg.c
+index dcab0a11a..796888013 100644
+--- a/g10/gpg.c
++++ b/g10/gpg.c
+@@ -247,6 +247,7 @@ enum cmd_and_opt_values
+ oGnuPG,
+ oRFC2440,
+ oRFC4880,
++ oRFC4880bis,
+ oOpenPGP,
+ oPGP7,
+ oPGP8,
+@@ -636,6 +637,7 @@ static gpgrt_opt_t opts = {
+ ARGPARSE_s_n (oGnuPG, "no-pgp8", "@"),
+ ARGPARSE_s_n (oRFC2440, "rfc2440", "@"),
+ ARGPARSE_s_n (oRFC4880, "rfc4880", "@"),
++ ARGPARSE_s_n (oRFC4880bis, "rfc4880bis", "@"),
+ ARGPARSE_s_n (oOpenPGP, "openpgp", N_("use strict OpenPGP behavior")),
+ ARGPARSE_s_n (oPGP7, "pgp6", "@"),
+ ARGPARSE_s_n (oPGP7, "pgp7", "@"),
+@@ -978,7 +980,6 @@ static gpgrt_opt_t opts = {
+ ARGPARSE_s_n (oNoop, "no-allow-multiple-messages", "@"),
+ ARGPARSE_s_s (oNoop, "aead-algo", "@"),
+ ARGPARSE_s_s (oNoop, "personal-aead-preferences","@"),
+- ARGPARSE_s_n (oNoop, "rfc4880bis", "@"),
+ ARGPARSE_s_n (oNoop, "override-compliance-check", "@"),
+ 
+ 
+@@ -2227,7 +2228,7 @@ static struct gnupg_compliance_option compliance_options =
+ {
+ { "gnupg", oGnuPG },
+ { "openpgp", oOpenPGP },
+- { "rfc4880bis", oGnuPG },
++ { "rfc4880bis", oRFC4880bis },
+ { "rfc4880", oRFC4880 },
+ { "rfc2440", oRFC2440 },
+ { "pgp6", oPGP7 },
+@@ -2243,8 +2244,28 @@ static struct gnupg_compliance_option compliance_options =
+ static void
+ set_compliance_option (enum cmd_and_opt_values option)
+ {
++ opt.flags.rfc4880bis = 0; /* Clear because it is initially set. */
++
+ switch (option)
+ {
++ case oRFC4880bis:
++ opt.flags.rfc4880bis = 1;
++ opt.compliance = CO_RFC4880;
++ opt.flags.dsa2 = 1;
++ opt.flags.require_cross_cert = 1;
++ opt.rfc2440_text = 0;
++ opt.allow_non_selfsigned_uid = 1;
++ opt.allow_freeform_uid = 1;
++ opt.escape_from = 1;
++ opt.not_dash_escaped = 0;
++ opt.def_cipher_algo = 0;
++ opt.def_digest_algo = 0;
++ opt.cert_digest_algo = 0;
++ opt.compress_algo = -1;
++ opt.s2k_mode = 3; /* iterated+salted */
++ opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
++ opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
++ break;
+ case oOpenPGP:
+ case oRFC4880:
+ /* This is effectively the same as RFC2440, but with
+@@ -2288,6 +2309,7 @@ set_compliance_option (enum cmd_and_opt_values option)
+ case oPGP8: opt.compliance = CO_PGP8; break;
+ case oGnuPG:
+ opt.compliance = CO_GNUPG;
++ opt.flags.rfc4880bis = 1;
+ break;
+ 
+ case oDE_VS:
+@@ -2491,6 +2513,7 @@ main (int argc, char **argv)
+ opt.emit_version = 0;
+ opt.weak_digests = NULL;
+ opt.compliance = CO_GNUPG;
++ opt.flags.rfc4880bis = 1;
+ 
+ /* Check special options given on the command line. */
+ orig_argc = argc;
+@@ -3033,6 +3056,7 @@ main (int argc, char **argv)
+ case oOpenPGP:
+ case oRFC2440:
+ case oRFC4880:
++ case oRFC4880bis:
+ case oPGP7:
+ case oPGP8:
+ case oGnuPG:
+@@ -3862,6 +3886,11 @@ main (int argc, char **argv)
+ if( may_coredump && !opt.quiet )
+ 	log_info(_("WARNING: program may create a core file!\n"));
+ 
++ if (!opt.flags.rfc4880bis)
++ {
++ opt.mimemode = 0; /* This will use text mode instead. */
++ }
++
+ if (eyes_only) {
+ if (opt.set_filename)
+ 	 log_info(_("WARNING: %s overrides %s\n"),
+@@ -4078,7 +4107,7 @@ main (int argc, char **argv)
+ /* Check our chosen algorithms against the list of legal
+ algorithms. */
+ 
+- if(!GNUPG)
++ if(!GNUPG && !opt.flags.rfc4880bis)
+ {
+ 	const char *badalg=NULL;
+ 	preftype_t badtype=PREFTYPE_NONE;
+diff --git a/g10/keygen.c b/g10/keygen.c
+index a2cfe3ccf..2a1dd1f81 100644
+--- a/g10/keygen.c
++++ b/g10/keygen.c
+@@ -404,7 +404,7 @@ keygen_set_std_prefs (const char *string,int personal)
+ 	 strcat(dummy_string,"S7 ");
+ 	 strcat(dummy_string,"S2 "); /* 3DES */
+ 
+- if (!openpgp_aead_test_algo (AEAD_ALGO_OCB))
++ if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_OCB))
+ 	 strcat(dummy_string,"A2 ");
+ 
+ if (personal)
+@@ -889,7 +889,7 @@ keygen_upd_std_prefs (PKT_signature *sig, void *opaque)
+ /* Make sure that the MDC feature flag is set if needed. */
+ add_feature_mdc (sig,mdc_available);
+ add_feature_aead (sig, aead_available);
+- add_feature_v5 (sig, 1);
++ add_feature_v5 (sig, opt.flags.rfc4880bis);
+ add_keyserver_modify (sig,ks_modify);
+ keygen_add_keyserver_url(sig,NULL);
+ 
+@@ -3382,7 +3382,10 @@ parse_key_parameter_part (ctrl_t ctrl,
+ }
+ }
+ else if (!ascii_strcasecmp (s, "v5"))
+- keyversion = 5;
++ {
++ if (opt.flags.rfc4880bis)
++ keyversion = 5;
++ }
+ else if (!ascii_strcasecmp (s, "v4"))
+ keyversion = 4;
+ else
+@@ -3641,7 +3644,7 @@ parse_key_parameter_part (ctrl_t ctrl,
+ * ecdsa := Use algorithm ECDSA.
+ * eddsa := Use algorithm EdDSA.
+ * ecdh := Use algorithm ECDH.
+- * v5 := Create version 5 key
++ * v5 := Create version 5 key (requires option --rfc4880bis)
+ *
+ * There are several defaults and fallbacks depending on the
+ * algorithm. PART can be used to select which part of STRING is
+@@ -4513,9 +4516,9 @@ read_parameter_file (ctrl_t ctrl, const char *fname )
+ 	 }
+ 	}
+ 
+- if ((keywordsi.key == pVERSION
+- || keywordsi.key == pSUBVERSION))
+- ; /* Ignore version. */
++ if (!opt.flags.rfc4880bis && (keywordsi.key == pVERSION
++ || keywordsi.key == pSUBVERSION))
++ ; /* Ignore version unless --rfc4880bis is active. */
+ else
+ {
+ r = xmalloc_clear( sizeof *r + strlen( value ) );
+@@ -4610,11 +4613,14 @@ quickgen_set_para (struct para_data_s *para, int for_subkey,
+ para = r;
+ }
+ 
+- r = xmalloc_clear (sizeof *r + 20);
+- r->key = for_subkey? pSUBVERSION : pVERSION;
+- snprintf (r->u.value, 20, "%d", version);
+- r->next = para;
+- para = r;
++ if (opt.flags.rfc4880bis)
++ {
++ r = xmalloc_clear (sizeof *r + 20);
++ r->key = for_subkey? pSUBVERSION : pVERSION;
++ snprintf (r->u.value, 20, "%d", version);
++ r->next = para;
++ para = r;
++ }
+ 
+ if (keytime)
+ {

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/exechelp-w32ce.c Deleted

@@ -1,887 +0,0 @@
-/* exechelp-w32.c - Fork and exec helpers for W32CE.
- * Copyright (C) 2004, 2007-2009, 2010 Free Software Foundation, Inc.
- * Copyright (C) 2010-2012, 2014-2016 g10 Code GmbH
- *
- * This file is part of GnuPG.
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of either
- *
- * - the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * or
- *
- * - the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * or both in parallel, as here.
- *
- * This file 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/>.
- * SPDX-License-Identifier: (LGPL-3.0+ OR GPL-2.0+)
- */
-
-#include <config.h>
-
-#if !defined(HAVE_W32_SYSTEM) && !defined (HAVE_W32CE_SYSTEM)
-#error This code is only used on W32CE.
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-#include <unistd.h>
-#include <fcntl.h>
-
-#ifdef WITHOUT_NPTH /* Give the Makefile a chance to build without Pth. */
-#undef HAVE_NPTH
-#undef USE_NPTH
-#endif
-
-#ifdef HAVE_NPTH
-#include <npth.h>
-#endif
-
-#ifdef HAVE_STAT
-# include <sys/stat.h>
-#endif
-
-#include <assuan.h>
-
-#include "util.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "exechelp.h"
-
-
-/* It seems Vista doesn't grok X_OK and so fails access() tests.
- Previous versions interpreted X_OK as F_OK anyway, so we'll just
- use F_OK directly. */
-#undef X_OK
-#define X_OK F_OK
-
-
-/* We assume that a HANDLE can be represented by an int which should
- be true for all i386 systems (HANDLE is defined as void *) and
- these are the only systems for which Windows is available. Further
- we assume that -1 denotes an invalid handle. */
-#define fd_to_handle(a) ((HANDLE)(a))
-#define handle_to_fd(a) ((int)(a))
-#define pid_to_handle(a) ((HANDLE)(a))
-#define handle_to_pid(a) ((int)(a))
-
-&#xc;
-#ifdef USE_NPTH
-/* The data passed to the feeder_thread. */
-struct feeder_thread_parms
-{
- estream_t stream;
- volatile int stream_valid;
- HANDLE hd;
- int direction;
-};
-
-
-/* The thread started by start_feede3. */
-static void *
-feeder_thread (void *arg)
-{
- struct feeder_thread_parms *parm = arg;
- char buffer4096;
- int rc;
-
- if (parm->direction)
- {
- size_t nread = 0;
- DWORD nwritten;
-
- log_debug ("feeder_thread estream->pipe: stream=%p pipe=%p\n",
- parm->stream, parm->hd);
- while (parm->stream_valid
- && !es_read (parm->stream, buffer, sizeof buffer, &nread))
- {
- do
- {
- pth_enter ();
- rc = WriteFile (parm->hd, buffer, nread, &nwritten, NULL);
- pth_leave ();
- if (!rc)
- {
- log_debug ("feeder(%p): WriteFile error: rc=%d\n",
- parm->hd, (int)GetLastError ());
- goto leave;
- }
- nread -= nwritten;
- }
- while (nread);
- }
- if (!parm->stream_valid)
- log_debug ("feeder(%p): closed by other thread\n", parm->hd);
- else if (nread)
- log_debug ("feeder(%p): es_read error: %s\n",
- parm->hd, strerror (errno));
- }
- else
- {
- DWORD nread = 0;
- size_t nwritten;
-
- log_debug ("feeder_thread pipe->estream: stream=%p pipe=%p\n",
- parm->stream, parm->hd);
- while ( (pth_enter (),
- (rc = ReadFile (parm->hd, buffer, sizeof buffer, &nread, NULL)),
- pth_leave (),
- rc) && nread)
- {
- log_debug ("feeder_thread pipe->estream: read %d bytes\n",
- (int)nread);
- do
- {
- if (parm->stream_valid
- && es_write (parm->stream, buffer, nread, &nwritten))
- {
- log_debug ("feeder(%p): es_write error: %s\n",
- parm->hd, strerror (errno));
- goto leave;
- }
- log_debug ("feeder_thread pipe->estream: es_wrote %d bytes\n",
- (int)nwritten);
- nread -= nwritten;
- }
- while (nread && parm->stream_valid);
- }
- if (!parm->stream_valid)
- log_debug ("feeder(%p): closed by other thread\n", parm->hd);
- else if (nread)
- log_debug ("feeder(%p): ReadFile error: rc=%d\n",
- parm->hd, (int)GetLastError ());
- else
- log_debug ("feeder(%p): eof\n", parm->hd);
- }
-
-leave:
- log_debug ("feeder(%p): waiting for es_fclose\n", parm->hd);
- while (parm->stream_valid)
- pth_yield (NULL);
- log_debug ("feeder(%p): about to close the pipe handle\n", parm->hd);
- CloseHandle (parm->hd);
- log_debug ("feeder(%p): pipe handle closed\n", parm->hd);
- xfree (parm);
- return NULL;
-}
-#endif /*USE_NPTH*/
-
-#ifdef USE_NPTH
-static void
-feeder_onclose_notification (estream_t stream, void *opaque)
-{
- struct feeder_thread_parms *parm = opaque;
- (void)stream;
- log_debug ("feeder(%p): received onclose note\n", parm->hd);
- parm->stream_valid = 0;
-}
-#endif /*USE_NPTH*/
-
-/* Fire up a thread to copy data between STREAM and a pipe's
- descriptor FD. With DIRECTION set to true the copy takes place
- from the stream to the pipe, otherwise from the pipe to the
- stream. */
-static gpg_error_t
-start_feeder (estream_t stream, HANDLE hd, int direction)
-{
-#ifdef USE_NPTH
- gpg_error_t err;
- struct feeder_thread_parms *parm;
- pth_attr_t tattr;
-
- parm = xtrymalloc (sizeof *parm);
- if (!parm)
- return gpg_error_from_syserror ();
- parm->stream = stream;
- parm->stream_valid = 1;
- parm->hd = hd;
- parm->direction = direction;
-
- if (es_onclose (stream, 1, feeder_onclose_notification, parm))
- {
- err = gpg_error_from_syserror ();
- xfree (parm);
- return err;
- }
-
- tattr = pth_attr_new ();
- pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0);
- pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 64*1024);
- pth_attr_set (tattr, PTH_ATTR_NAME, "exec-feeder");
-
- log_debug ("spawning new feeder(%p, %p, %d)\n", stream, hd, direction);
- if(!pth_spawn (tattr, feeder_thread, parm))
- {
- err = gpg_error_from_syserror ();
- es_onclose (stream, 0, feeder_onclose_notification, parm);
- xfree (parm);
- }
- else
- err = 0;
- pth_attr_destroy (tattr);
-
- return err;
-#else
- (void)stream;
- (void)hd;
- (void)direction;
- return gpg_error (GPG_ERR_NOT_IMPLEMENTED); /* No Pth. */
-#endif
-}
-
-
-&#xc;
-/* Return the maximum number of currently allowed open file
- descriptors. Only useful on POSIX systems but returns a value on
- other systems too. */
-int
-get_max_fds (void)
-{
- int max_fds = -1;
-
-#ifdef OPEN_MAX
- if (max_fds == -1)
- max_fds = OPEN_MAX;
-#endif
-
- if (max_fds == -1)
- max_fds = 256; /* Arbitrary limit. */
-
- return max_fds;
-}
-
-
-/* Under Windows this is a dummy function. */
-void
-close_all_fds (int first, int *except)
-{
- (void)first;
- (void)except;
-}
-
-
-/* Returns an array with all currently open file descriptors. The end
- of the array is marked by -1. The caller needs to release this
- array using the *standard free* and not with xfree. This allow the
- use of this function right at startup even before libgcrypt has
- been initialized. Returns NULL on error and sets ERRNO
- accordingly. */
-int *
-get_all_open_fds (void)
-{
- int *array;
- size_t narray;
- int fd, max_fd, idx;
-#ifndef HAVE_STAT
- array = calloc (1, sizeof *array);
- if (array)
- array0 = -1;
-#else /*HAVE_STAT*/
- struct stat statbuf;
-
- max_fd = get_max_fds ();
- narray = 32; /* If you change this change also t-exechelp.c. */
- array = calloc (narray, sizeof *array);
- if (!array)
- return NULL;
-
- /* Note: The list we return is ordered. */
- for (idx=0, fd=0; fd < max_fd; fd++)
- if (!(fstat (fd, &statbuf) == -1 && errno == EBADF))
- {
- if (idx+1 >= narray)
- {
- int *tmp;
-
- narray += (narray < 256)? 32:256;
- tmp = realloc (array, narray * sizeof *array);
- if (!tmp)
- {
- free (array);
- return NULL;
- }
- array = tmp;
- }
- arrayidx++ = fd;
- }
- arrayidx = -1;
-#endif /*HAVE_STAT*/
- return array;
-}
-
-
-
-static char *
-copy_quoted (char *p, const char *string)
-{
- const char *s;
-
- if (!*string) /* Empty string. */
- p = stpcpy (p, "\"\"");
- else if (strpbrk (string, " \t\n\v\f\"")) /* Need quotes. */
- {
- p = stpcpy (p, "\"");
- for (s = string; *s; s++)
- {
- *p++ = *s;
- if (*s == '\"')
- *p++ = *s;
- }
- *p++ = '\"';
- *p = 0;
- }
- else /* Copy verbatim. */
- p = stpcpy (p, string);
-
- return p;
-}
-
-
-/* Build a command line for use with W32's CreateProcess. On success
- CMDLINE gets the address of a newly allocated string. */
-static int
-build_w32_commandline (const char * const *argv,
-		 int rvid0, int rvid1, int rvid2,
- char **cmdline)
-{
- int i, n;
- const char *s;
- char *buf, *p;
- char fdbuf3*30;
-
- p = fdbuf;
- *p = 0;
-
- if (rvid0)
- snprintf (p, 25, "-&S0=%d ", rvid0);
- else
- strcpy (p, "-&S0=null ");
- p += strlen (p);
-
- if (rvid1)
- snprintf (p, 25, "-&S1=%d ", rvid1);
- else
- strcpy (p, "-&S1=null ");
- p += strlen (p);
-
- if (rvid2)
- snprintf (p, 25, "-&S2=%d ", rvid2);
- else
- strcpy (p, "-&S2=null ");
- p += strlen (p);
-
- *cmdline = NULL;
- n = strlen (fdbuf);
- for (i=0; (s = argvi); i++)
- {
- n += strlen (s) + 1 + 2; /* (1 space, 2 quoting) */
- for (; *s; s++)
- if (*s == '\"')
- n++; /* Need to double inner quotes. */
- }
- n++;
-
- buf = p = xtrymalloc (n);
- if (! buf)
- return -1;
-
- p = stpcpy (p, fdbuf);
- for (i = 0; argvi; i++)
- {
- *p++ = ' ';
- p = copy_quoted (p, argvi);
- }
-
- *cmdline = buf;
- return 0;
-}
-
-
-/* Create pipe where one end is inheritable: With an INHERIT_IDX of 0
- the read end is inheritable, with 1 the write end is inheritable.
- Note that the inheritable ends are rendezvous ids and no file
- descriptors or handles. */
-static gpg_error_t
-create_inheritable_pipe (int filedes2, int inherit_idx)
-{
- HANDLE hd;
- int rvid;
-
- filedes0 = filedes1 = -1;
- hd = _assuan_w32ce_prepare_pipe (&rvid, !inherit_idx);
- if (hd == INVALID_HANDLE_VALUE)
- {
- log_error ("_assuan_w32ce_prepare_pipe failed: %s\n", w32_strerror (-1));
- gpg_err_set_errno (EIO);
- return gpg_error_from_syserror ();
- }
-
- if (inherit_idx)
- {
- filedes0 = handle_to_fd (hd);
- filedes1 = rvid;
- }
- else
- {
- filedes0 = rvid;
- filedes1 = handle_to_fd (hd);
- }
- return 0;
-}
-
-
-/* Portable function to create a pipe. Under Windows the write end is
- inheritable (i.e. an rendezvous id). */
-gpg_error_t
-gnupg_create_inbound_pipe (int filedes2, estream_t *r_fp, int nonblock)
-{
- if (r_fp)
- return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
- else
- return create_inheritable_pipe (filedes, 1);
-}
-
-
-/* Portable function to create a pipe. Under Windows the read end is
- inheritable (i.e. an rendezvous id). */
-gpg_error_t
-gnupg_create_outbound_pipe (int filedes2, estream_t *r_fp, int nonblock)
-{
- if (r_fp)
- return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
- else
- return create_inheritable_pipe (filedes, 0);
-}
-
-
-/* Portable function to create a pipe. Under Windows both ends are
- inheritable. */
-gpg_error_t
-gnupg_create_pipe (int filedes2)
-{
- return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-}
-
-
-static int
-create_process (const char *pgmname, const char *cmdline,
- PROCESS_INFORMATION *pi)
-{
- int res;
- wchar_t *wpgmname, *wcmdline;
-
- wpgmname = utf8_to_wchar (pgmname);
- if (!wpgmname)
- return 0;
- wcmdline = utf8_to_wchar (cmdline);
- if (!wcmdline)
- {
- xfree (wpgmname);
- return 0;
- }
- res = CreateProcess (wpgmname, /* Program to start. */
- wcmdline, /* Command line arguments. */
- NULL, /* Process security attributes. */
- NULL, /* Thread security attributes. */
- FALSE, /* Inherit handles. */
- CREATE_SUSPENDED, /* Creation flags. */
- NULL, /* Environment. */
- NULL, /* Use current drive/directory. */
- NULL, /* Startup information. */
- pi); /* Returns process information. */
- xfree (wcmdline);
- xfree (wpgmname);
- return res;
-}
-
-
-/* Fork and exec the PGMNAME, see exechelp.h for details. */
-gpg_error_t
-gnupg_spawn_process (const char *pgmname, const char *argv,
- int *except, void (*preexec)(void), unsigned int flags,
- estream_t *r_infp,
- estream_t *r_outfp,
- estream_t *r_errfp,
- pid_t *pid)
-{
- gpg_error_t err;
- PROCESS_INFORMATION pi = {NULL };
- char *cmdline;
- es_syshd_t syshd;
- struct {
- HANDLE hd;
- int rvid;
- } inpipe = {INVALID_HANDLE_VALUE, 0};
- struct {
- HANDLE hd;
- int rvid;
- } outpipe = {INVALID_HANDLE_VALUE, 0};
- struct {
- HANDLE hd;
- int rvid;
- } errpipe = {INVALID_HANDLE_VALUE, 0};
- estream_t outfp = NULL;
- estream_t errfp = NULL;
- gpg_err_source_t errsource = default_errsource;
-
- (void)except; /* Not yet used. */
- (void)preexec;
- (void)flags;
-
- /* Setup return values. */
- if (r_outfp)
- *r_outfp = NULL;
- if (r_errfp)
- *r_errfp = NULL;
- *pid = (pid_t)(-1); /* Always required. */
-
- log_debug ("%s: enter\n", __func__);
- if (infp)
- {
- es_fflush (infp);
- es_rewind (infp);
-
- /* Create a pipe to copy our infile to the stdin of the child
- process. On success inpipe.hd is owned by the feeder. */
- inpipe.hd = _assuan_w32ce_prepare_pipe (&inpipe.rvid, 1);
- if (inpipe.hd == INVALID_HANDLE_VALUE)
- {
- log_error ("_assuan_w32ce_prepare_pipe failed: %s\n",
- w32_strerror (-1));
- gpg_err_set_errno (EIO);
- return gpg_error_from_syserror ();
- }
- log_debug ("%s: inpipe %p created; hd=%p rvid=%d\n", __func__,
- infp, inpipe.hd, inpipe.rvid);
- err = start_feeder (infp, inpipe.hd, 1);
- if (err)
- {
- log_error ("error spawning feeder: %s\n", gpg_strerror (err));
- CloseHandle (inpipe.hd);
- return err;
- }
- inpipe.hd = INVALID_HANDLE_VALUE; /* Now owned by the feeder. */
- log_debug ("%s: inpipe %p created; feeder started\n", __func__,
- infp);
- }
-
- if (r_outfp)
- {
- /* Create a pipe to make the stdout of the child process
- available as a stream. */
- outpipe.hd = _assuan_w32ce_prepare_pipe (&outpipe.rvid, 0);
- if (outpipe.hd == INVALID_HANDLE_VALUE)
- {
- log_error ("_assuan_w32ce_prepare_pipe failed: %s\n",
- w32_strerror (-1));
- gpg_err_set_errno (EIO);
- /* Fixme release other stuff/kill feeder. */
- return gpg_error_from_syserror ();
- }
- syshd.type = ES_SYSHD_HANDLE;
- syshd.u.handle = outpipe.hd;
- err = 0;
- outfp = es_sysopen (&syshd, "r");
- if (!outfp)
- {
- err = gpg_err_make (errsource, gpg_err_code_from_syserror ());
- log_error ("error opening pipe stream: %s\n", gpg_strerror (err));
- CloseHandle (outpipe.hd);
- return err;
- }
- log_debug ("%s: outpipe %p created; hd=%p rvid=%d\n", __func__,
- outfp, outpipe.hd, outpipe.rvid);
- outpipe.hd = INVALID_HANDLE_VALUE; /* Now owned by the OUTFP. */
- }
-
- if (r_errfp)
- {
- /* Create a pipe to make the stderr of the child process
- available as a stream. */
- errpipe.hd = _assuan_w32ce_prepare_pipe (&errpipe.rvid, 0);
- if (errpipe.hd == INVALID_HANDLE_VALUE)
- {
- log_error ("_assuan_w32ce_prepare_pipe failed: %s\n",
- w32_strerror (-1));
- gpg_err_set_errno (EIO);
- /* Fixme release other stuff/kill feeder. */
- return gpg_error_from_syserror ();
- }
- syshd.type = ES_SYSHD_HANDLE;
- syshd.u.handle = errpipe.hd;
- err = 0;
- errfp = es_sysopen (&syshd, "r");
- if (!errfp)
- {
- err = gpg_err_make (errsource, gpg_err_code_from_syserror ());
- log_error ("error opening pipe stream: %s\n", gpg_strerror (err));
- CloseHandle (errpipe.hd);
- return err;
- }
- log_debug ("%s: errpipe %p created; hd=%p rvid=%d\n", __func__,
- errfp, errpipe.hd, errpipe.rvid);
- errpipe.hd = INVALID_HANDLE_VALUE; /* Now owned by the ERRFP. */
- }
-
-
-
- /* Build the command line. */
- err = build_w32_commandline (argv, inpipe.rvid, outpipe.rvid, errpipe.rvid,
- &cmdline);
- if (err)
- {
- /* Fixme release other stuff/kill feeder. */
- CloseHandle (errpipe.hd);
- return err;
- }
-
- log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
- if (!create_process (pgmname, cmdline, &pi))
- {
- log_error ("CreateProcess failed: %s\n", w32_strerror (-1));
- xfree (cmdline);
- /* Fixme release other stuff/kill feeder. */
- CloseHandle (errpipe.hd);
- return gpg_error (GPG_ERR_GENERAL);
- }
- xfree (cmdline);
- cmdline = NULL;
-
- /* Note: The other end of the pipe is a rendezvous id and thus there
- is no need for a close. */
-
- log_debug ("CreateProcess ready: hProcess=%p hThread=%p"
- " dwProcessID=%d dwThreadId=%d\n",
- pi.hProcess, pi.hThread,
- (int) pi.dwProcessId, (int) pi.dwThreadId);
-
-
- /* Process has been created suspended; resume it now. */
- ResumeThread (pi.hThread);
- CloseHandle (pi.hThread);
-
- if (r_outfp)
- *r_outfp = outfp;
- if (r_errfp)
- *r_errfp = errfp;
- *pid = handle_to_pid (pi.hProcess);
- return 0;
-}
-
-
-
-/* Simplified version of gnupg_spawn_process. This function forks and
- then execs PGMNAME, while connecting INFD to stdin, OUTFD to stdout
- and ERRFD to stderr (any of them may be -1 to connect them to
- /dev/null). The arguments for the process are expected in the NULL
- terminated array ARGV. The program name itself should not be
- included there. Calling gnupg_wait_process is required.
-
- Returns 0 on success or an error code. */
-gpg_error_t
-gnupg_spawn_process_fd (const char *pgmname, const char *argv,
- int infd, int outfd, int errfd, pid_t *pid)
-{
- gpg_error_t err;
- PROCESS_INFORMATION pi = {NULL};
- char *cmdline;
-
- /* Setup return values. */
- *pid = (pid_t)(-1);
-
- if (infd != -1 || outfd != -1 || errfd != -1)
- return gpg_error (GPG_ERR_NOT_SUPPORTED);
-
- /* Build the command line. */
- err = build_w32_commandline (argv, 0, 0, 0, &cmdline);
- if (err)
- return err;
-
- log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
- if (!create_process (pgmname, cmdline, &pi))
- {
- log_error ("CreateProcess(fd) failed: %s\n", w32_strerror (-1));
- xfree (cmdline);
- return gpg_error (GPG_ERR_GENERAL);
- }
- xfree (cmdline);
- cmdline = NULL;
-
- log_debug ("CreateProcess(fd) ready: hProcess=%p hThread=%p"
- " dwProcessID=%d dwThreadId=%d\n",
- pi.hProcess, pi.hThread,
- (int) pi.dwProcessId, (int) pi.dwThreadId);
-
- /* Process has been created suspended; resume it now. */
- ResumeThread (pi.hThread);
- CloseHandle (pi.hThread);
-
- *pid = handle_to_pid (pi.hProcess);
- return 0;
-}
-
-
-/* See exechelp.h for a description. */
-gpg_error_t
-gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *exitcode)
-{
- gpg_err_code_t ec;
- HANDLE proc = fd_to_handle (pid);
- int code;
- DWORD exc;
-
- if (exitcode)
- *exitcode = -1;
-
- if (pid == (pid_t)(-1))
- return gpg_error (GPG_ERR_INV_VALUE);
-
- /* FIXME: We should do a pth_waitpid here. However this has not yet
- been implemented. A special W32 pth system call would even be
- better. */
- code = WaitForSingleObject (proc, hang? INFINITE : 0);
- switch (code)
- {
- case WAIT_TIMEOUT:
- ec = GPG_ERR_TIMEOUT;
- break;
-
- case WAIT_FAILED:
- log_error (_("waiting for process %d to terminate failed: %s\n"),
- (int)pid, w32_strerror (-1));
- ec = GPG_ERR_GENERAL;
- break;
-
- case WAIT_OBJECT_0:
- if (!GetExitCodeProcess (proc, &exc))
- {
- log_error (_("error getting exit code of process %d: %s\n"),
- (int)pid, w32_strerror (-1) );
- ec = GPG_ERR_GENERAL;
- }
- else if (exc)
- {
- log_error (_("error running '%s': exit status %d\n"),
- pgmname, (int)exc );
- if (exitcode)
- *exitcode = (int)exc;
- ec = GPG_ERR_GENERAL;
- }
- else
- {
- if (exitcode)
- *exitcode = 0;
- ec = 0;
- }
- break;
-
- default:
- log_error ("WaitForSingleObject returned unexpected "
- "code %d for pid %d\n", code, (int)pid );
- ec = GPG_ERR_GENERAL;
- break;
- }
-
- return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec);
-}
-
-
-/* See exechelp.h for a description. */
-gpg_error_t
-gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
- int hang, int *r_exitcodes)
-{
- return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-}
-
-
-void
-gnupg_release_process (pid_t pid)
-{
- if (pid != (pid_t)INVALID_HANDLE_VALUE)
- {
- HANDLE process = (HANDLE)pid;
-
- CloseHandle (process);
- }
-}
-
-
-/* Spawn a new process and immediately detach from it. The name of
- the program to exec is PGMNAME and its arguments are in ARGV (the
- programname is automatically passed as first argument).
- Environment strings in ENVP are set. An error is returned if
- pgmname is not executable; to make this work it is necessary to
- provide an absolute file name. All standard file descriptors are
- connected to /dev/null. */
-gpg_error_t
-gnupg_spawn_process_detached (const char *pgmname, const char *argv,
- const char *envp )
-{
- gpg_error_t err;
- char *cmdline;
- PROCESS_INFORMATION pi = {NULL };
-
- (void)envp;
-
- /* Build the command line. */
- err = build_w32_commandline (argv, 0, 0, 0, &cmdline);
- if (err)
- return err;
-
- /* Note: There is no detached flag under CE. */
- log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
- if (!create_process (pgmname, cmdline, &pi))
- {
- log_error ("CreateProcess(detached) failed: %s\n", w32_strerror (-1));
- xfree (cmdline);
- return gpg_error (GPG_ERR_GENERAL);
- }
- xfree (cmdline);
- cmdline = NULL;
-
- log_debug ("CreateProcess(detached) ready: hProcess=%p hThread=%p"
- " dwProcessID=%d dwThreadId=%d\n",
- pi.hProcess, pi.hThread,
- (int) pi.dwProcessId, (int) pi.dwThreadId);
-
- /* Process has been created suspended; resume it now. */
- ResumeThread (pi.hThread);
- CloseHandle (pi.hThread);
-
- return 0;
-}
-
-
-/* Kill a process; that is send an appropriate signal to the process.
- gnupg_wait_process must be called to actually remove the process
- from the system. An invalid PID is ignored. */
-void
-gnupg_kill_process (pid_t pid)
-{
- if (pid != (pid_t) INVALID_HANDLE_VALUE)
- {
- HANDLE process = (HANDLE) pid;
-
- /* Arbitrary error code. */
- TerminateProcess (process, 1);
- }
-}

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/Automatic.prf Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/VS-NfD.prf Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/debug.prf Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user/README Deleted

@@ -1,66 +0,0 @@
-Socket-activated dirmngr and gpg-agent with systemd
-===================================================
-
-When used on a GNU/Linux system supervised by systemd, you can ensure
-that the GnuPG daemons dirmngr and gpg-agent are launched
-automatically the first time they're needed, and shut down cleanly at
-session logout.  This is done by enabling user services via
-socket-activation.
-
-System distributors
--------------------
-
-The *.service and *.socket files (from this directory) should be
-placed in /usr/lib/systemd/user/ alongside other user-session services
-and sockets.
-
-To enable socket-activated dirmngr for all accounts on the system,
-use:
-
-    systemctl --user --global enable dirmngr.socket
-
-To enable socket-activated gpg-agent for all accounts on the system,
-use:
-
-    systemctl --user --global enable gpg-agent.socket
-
-Additionally, you can enable socket-activated gpg-agent ssh-agent
-emulation for all accounts on the system with:
-
-    systemctl --user --global enable gpg-agent-ssh.socket
-
-You can also enable restricted ("--extra-socket"-style) gpg-agent
-sockets for all accounts on the system with:
-
-    systemctl --user --global enable gpg-agent-extra.socket
-
-Individual users
-----------------
-
-A user on a system with systemd where this has not been installed
-system-wide can place these files in ~/.config/systemd/user/ to make
-them available.
-
-If a given service isn't installed system-wide, or if it's installed
-system-wide but not globally enabled, individual users will still need
-to enable them.  For example, to enable socket-activated dirmngr for
-all future sessions:
-
-    systemctl --user enable dirmngr.socket
-
-To enable socket-activated gpg-agent with ssh support, do:
-
-    systemctl --user enable gpg-agent.socket gpg-agent-ssh.socket
-
-These changes won't take effect until your next login after you've
-fully logged out (be sure to terminate any running daemons before
-logging out).
-
-If you'd rather try a socket-activated GnuPG daemon in an
-already-running session without logging out (with or without enabling
-it for all future sessions), kill any existing daemon and start the
-user socket directly.  For example, to set up socket-activated dirmgnr
-in the current session:
-
-    gpgconf --kill dirmngr
-    systemctl --user start dirmngr.socket

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user/dirmngr.service Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user/dirmngr.socket Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user/gpg-agent-browser.socket Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user/gpg-agent-extra.socket Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user/gpg-agent-ssh.socket Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user/gpg-agent.service Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/systemd-user/gpg-agent.socket Deleted

_service:tar_scm:gnupg-2.3.6.tar.bz2.sig -> _service:tar_scm:gnupg-2.4.3.tar.bz2.sig Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/AUTHORS -> _service:tar_scm:gnupg-2.4.3.tar.bz2/AUTHORS Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/ChangeLog -> _service:tar_scm:gnupg-2.4.3.tar.bz2/ChangeLog Changed

@@ -1,38877 +1,3 @@
-2022-04-25 Werner Koch <wk@gnupg.org>
-
-	Release 2.3.6.
-	+ commit 3a8164e69c3e753cf671a5c86305715232cc9c95
-
-
-	gpg: Avoid NULL ptr access due to corrupted packets.
-	+ commit f6caf5b17366efa93f806f22e7441eb27f4d382c
-	* g10/parse-packet.c (parse_signature): Do not create an opaque MPI
-	with NULL and length > 0
-	(parse_key): Ditto.
-
-2022-04-25 Todd Zullinger <tmz@pobox.com>
-
-	sm: Use gpg_err_code() instead of -1.
-	+ commit beb79f2705ad24665f54c9ea2042a73b1f16f6bc
-	* sm/verify.c (gpgsm_verify): use gpg_err_code instead of 'rc == -1'
-	comparison.
-
-2022-04-25 Werner Koch <wk@gnupg.org>
-
-	Deprecate the --supervised options.
-	+ commit ca5d5142c6d6eaba4572a086f8473e4aebdd3f9e
-	* agent/gpg-agent.c (main): Mark --supervised as deprecated.
-	* dirmngr/dirmngr.c (main): Ditto.
-
-	gpg: Emit an ERROR status as hint for a bad passphrase.
-	+ commit 0f8623d518d49541c1d54676d400916546ff38f4
-	* g10/mainproc.c (proc_symkey_enc): Issue new error code.
-	(proc_encrypted): Ditto.
-
-2022-04-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	common:iobuf: Exclude cases with IOBUF_INPUT_TEMP/IOBUF_OUTPUT_TEMP.
-	+ commit 2fc91e15c6bebb203162cc8445e68ee4ff934885
-	* common/iobuf.c (iobuf_read): Handle a case with IOBUF_INPUT_TEMP.
-	(iobuf_write): Handle a case with IOBUF_OUTPUT_TEMP.
-
-	scd: Fix hard-coded constant for RSA auth.
-	+ commit 2848fe4c84e5ee20ccd90f0ef4c9f78c6801e1f6
-	* scd/app-openpgp.c (do_auth): Allow larger data for RSA-4096.
-
-2022-04-22 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	gpg: Fix line end in error message.
-	+ commit 8b3a24e5176f64b101d2b073f2901852d8ecc691
-	* g10/keyedit.c (menu_adduid): Move linefeed character to the format
-	string.
-
-2022-04-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Not writing password into file.
-	+ commit e529c54fe3a83c1108347363a793c1cb9b790175
-	* agent/genkey.c (do_check_passphrase_pattern): Use stream to invoke
-	pattern check program.
-
-	scd: Don't inhibit SSH authentication for larger data if it can.
-	+ commit e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da
-	* scd/app-openpgp.c (do_auth): Use command chaining if available.
-
-2022-04-21 Werner Koch <wk@gnupg.org>
-
-	Release 2.3.5.
-	+ commit a4b25bcfe1f9f740fe1451efc07c32959a2f8d86
-
-
-2022-04-20 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Changes to the linking order.
-	+ commit 89dc9f1e6916ebd123852534b8cada2fc3555688
-	* dirmngr/Makefile.am: Tweak library order.
-
-	w32: Do no use Registry item DefaultLogFile for the main tools.
-	+ commit 22fef189b1113581994972c06ecb216a888f3d74
-	* g10/gpg.c (main): Set LOG_NO_REGISTRY.
-	* sm/gpgsm.c (main): Ditto.
-	* tools/gpg-connect-agent.c (main): Ditto.
-	* tools/gpgconf.c (main): Ditto.
-	(show_other_registry_entries): Print "DefaultLogFile".
-
-2022-04-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Replace an assert by a log_fatal.
-	+ commit 41fb46007e65be76cffbe2a19135facc3db912c5
-	* g10/build-packet.c (do_signature): Use log_fatal.
-
-	ssh: Returned faked response for the new session-bind extension.
-	+ commit 46d62d80a2b8b1ba4fc8b8698de7495f79a417cf
-	* agent/command-ssh.c (SSH_OPT_CONSTRAIN_MAXSIGN): New.
-	(SSH_OPT_CONSTRAIN_EXTENSION): New.
-	(ssh_handler_add_identity): Ignore them.
-	(ssh_handler_extension): Take success for session-bind.
-
-	scd: Renamed a constant in ccid-driver.c.
-	+ commit dd727ec968af8e80d26087ee1eacdb192a21322d
-	* scd/ccid-driver.c (MAX_DEVICE): Rename to CCID_MAX_DEVICE.
-
-	scd: Minor code reorganization.
-	+ commit 6294ae282da1a504e7e28e759560814ed9c0b0b7
-	* scd/ccid-driver.c: Move struct defines to the top.
-
-	scd: Fix memory leak in ccid-driver.
-	+ commit 8ac92f0e807a3dfb6da46fdea1f9f2c89cc5ebc2
-	* scd/ccid-driver.c (ccid_dev_scan): Use loop var and not the count.
-
-	tests: Fix warning in common/t-ssh-utils.c.
-	+ commit 61038be8134c01300af0b2ec7d7a351ce45585af
-	* common/t-ssh-utils.c (main): Remove continue.
-
-2022-04-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests: Fix common/t-ssh-utils.
-	+ commit 5e508ffcab185eb8149e2fb2833ce15820140368
-	* common/t-ssh-utils.c (main): Accept an error with MD5 in_fips_mode.
-
-2022-04-14 Jakub Jelen <jjelen@redhat.com>
-
-	tests: Honor FIPS mode.
-	+ commit 1f0651dbfbabb80adf5685da0049f15da97f6175
-	* common/t-ssh-utils.c (FLAGS_NOFIPS): New.
-	 (sample_keys): Add flags member.
-	 (main): Detect if libgcrypt is in FIPS mode, try SHA256 fingerprints
-	 first and expect the MD5 ones will fail.
-
-2022-04-13 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Improve the PIN prompt for Genua cards.
-	+ commit 618aa8689a9b0b295d21130e472ed6aa739a52e5
-	* scd/app-p15.c (CARD_PRODUCT_GENUA): New.
-	(cardproduct2str): Add it.
-	(read_p15_info): Detect and set GENUA
-	(make_pin_prompt): Take holder string from the AODF.
-
-2022-04-11 Werner Koch <wk@gnupg.org>
-
-	sm: Print diagnostic about CRL problems due to Tor mode.
-	+ commit 137e59a6a5c5cd89091471811bf7c7c67de5890d
-	* dirmngr/crlfetch.c (crl_fetch, crl_fetch_default)
-	(ca_cert_fetch, start_cert_fetch): Factor Tor error out to ...
-	(no_crl_due_to_tor): new. Print status note.
-
-	* dirmngr/ks-engine-ldap.c (ks_ldap_get)
-	(ks_ldap_search, ks_ldap_put): Factor Tor error out to ...
-	(no_ldap_due_to_tor): new. Print status note.
-
-	* dirmngr/ocsp.c (do_ocsp_request): Print status note.
-	* sm/misc.c (gpgsm_print_further_info): New.
-	* sm/call-dirmngr.c (warning_and_note_printer): New.
-	(isvalid_status_cb): Call it.
-	(lookup_status_cb): Ditto.
-	(run_command_status_cb): Ditto.
-
-	* common/asshelp2.c (vprint_assuan_status): Strip a possible trailing
-	LF.
-
-	scd: Support for GeNUA cards.
-	+ commit 0dcc24985235668caf218a58f593c348f6f6fb4f
-	* scd/app-p15.c (read_p15_info): Disable extended mode for Genua
-	cards.
-
-2022-04-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove restrictions for the name part of a user-id.
-	+ commit 8945f1aedfd703661c300f326e70c1bf132bc656
-	* g10/keygen.c (ask_user_id): Allow for the name to start with a
-	digit. Allow names shorter than 5.
-
-2022-04-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix for possible support of Cygwin OpenSSH.
-	+ commit 90000819641c9011b0c0c19f5404a88bf8c34acc
-	* agent/command-ssh.c (start_command_handler_ssh): Use es_sysopen.
-
-2022-04-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	w32: Exclude tests with HOME.
-	+ commit b47a23f5fac551727d24f65765e21485ed2bb02c
-	* common/t-session-env.c HAVE_W32_SYSTEM (test_all): HOME is not
-	defined, so, exclude the tests.
-
-	w32: Fix for make check.
-	+ commit 39d478f5ba5d74cdd1d2e40311ff120c932bac37
-	* common/Makefile.am (module_tests): Exclude t-exechelp and
-	t-exectool.
-	* common/t-stringhelp.c (mygetcwd): Convert '\' to '/'.
-	* tests/cms/Makefile.am: Add $(EXEEXT).
-	* tests/gpgme/Makefile.am: Likewise.
-	* tests/migrations/Makefile.am: Likewise.
-	* tests/openpgp/Makefile.am: Likewise.
-
-2022-04-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent:w32: Fix for use of socket.
-	+ commit 48ee11722dd060dacac55ae56ee699c0f5271bda
-	* agent/command-ssh.c (get_client_info): Use type gnupg_fd_t for
-	socket, until call of socket API.
-	(start_command_handler_ssh): Don't convert here.
-
-2022-03-31 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd,tpm2d: Fix for consistent use of socket FD.
-	+ commit f584ad95048279b244083fee330c5741be2b9da7
-	* scd/command.c (scd_command_handler): Use gnupg_fd_t for the argument
-	but no INT2FD to listen. Use GNUPG_INVALID_FD.
-	* tpm2d/command.c (tpm2d_command_handler): Likewise.
-	* scd/scdaemon.c (start_connection_thread): Follow the change.
-	* tpm2d/tpm2daemon.c (start_connection_thread): Likewise.
-	* scd/scdaemon.h (scd_command_handler): Use gnupg_fd_t.
-	* tpm2d/tpm2daemon.h (tpm2d_command_handler): Likewise.
-
-2022-03-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix for SOCK.
-	+ commit 01ade6945d6c0cbc81e5169f74e3627fe5427be2
-	* dirmngr/http.c (connect_with_timeout): Use FD2INT to unwrap SOCK.
-
-	tpm2d: Fix socket resource leak on Windows.
-	+ commit 18eff31496a34156d58d757a2a110bcfde6c9908
-	* tpm2d/tpm2daemon.c (main): Use gnupg_fd_t for socket, and use
-	assuan_sock_close for the socket allocated by assuan_sock_new.
-	(handle_connections): Use gnupg_fd_t for listen_fd.
-	Use assuan_sock_close for the socket by npth_accept.
-
-	common,w32: Fix handle_to_fd to match use of _open_osfhandle.
-	+ commit 2189b4bb638cd56fbb941353ecbfc373cb4cf90b
-	* common/exechelp-w32.c (handle_to_fd): Use intptr_t.
-	(gnupg_wait_processes): Fix to use pid_to_handle.
-
-2022-03-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Clean up for not supporting WindowsCE.
-	+ commit d05221065fafd5a4694f14910e16afe90e3cd0dd
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Remove w32-ldap-help.h.
-	* dirmngr/cdblib.c (cdb_init): Remove for __MINGW32CE__.
-	* dirmngr/w32-ldap-help.h: Remove.
-
-	gpg,tools: Remove use of repo only zlib-riscos.h.
-	+ commit 2cebba72749c7e564e62a997dd87f912962098c9
-	* g10/compress.c: Don't use zlib-riscos.h.
-	* tools/gpgsplit.c: Likewise.
-
-	scd,w32: Fix socket resource leak.
-	+ commit a67a09be30f5ad4e3fbce5162c98eab5ba06a56f
-	* scd/scdaemon.c (main): Use gnupg_fd_t for socket, and use
-	assuan_sock_close for the socket allocated by assuan_sock_new.
-	(handle_connections): Use gnupg_fd_t for listen_fd.
-	Use assuan_sock_close for the socket by npth_accept.
-
-2022-03-28 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Escape more characters in WKD requests.
-	+ commit 435861b9fb8c221eee4bf50b2c25d59de1f1755c
-	* dirmngr/server.c (proc_wkd_get): Also escape '#' and '+'
-
-	gpg: Remove EAX from the preference list.
-	+ commit 253fcb97775b268d0a9ac47c71076b3577fcba55
-	* g10/gpg.c (main): Remove note about rfc4880bis.
-	* g10/keygen.c (keygen_set_std_prefs): Use only OCB in the AEAD
-	preference list.
-
-2022-03-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: KEYTOCARD prefers to specified time.
-	+ commit f0a1c79f60ce22b99ec75c2fd0de579fe976b48f
-	* agent/command.c (cmd_keytocard): Timestamp at "Created:" field is
-	only used when time is not specified.
-
-2022-03-25 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Workaround for a certain broken LDAP URL.
-	+ commit 90caa7ad598be123707f4d4651f9a64a74347626
-	* dirmngr/ldap.c (url_fetch_ldap): Detect and replace.
-
-	common,w32: Fix early home dir creation.
-	+ commit 0f03bdcd2e611adc8d49d997d3c0b8064d143a0c
-	* common/homedir.c (w32_try_mkdir): Remove.
-	(standard_homedir): Call gnupg_mkdir directly.
-	(_gnupg_socketdir_internal): Ditto.
-
-2022-03-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	tools:gpgconf: Fix gc_component table.
-	+ commit caba9df7266539f944d8a8c7c03da3fc2addbe90
-	* tools/gpgconf-comp.c !BUILD_WITH_TPM2D (gc_component): Add a dummy
-	entry.
-
-	agent: Use "Created:" field for creation time.
-	+ commit c795be79c14fac01b984bdc2e2041d2141f27612
-	* agent/agent.h (agent_key_from_file): Change the declaration.
-	* agent/findkey.c (agent_key_from_file): Return timestamp.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Follow the change.
-	* agent/pksign.c (agent_pkdecrypt): Likewise.
-	* agent/command.c (cmd_passwd, cmd_export_key): Likewise.
-	(cmd_keytocard): Use timestamp in private key file in "Created:".
-
-	dirmngr: Suppress error message on trial reading as PEM format.
-	+ commit 25d37a0a6a9c42326777c2949054a8bd6f276f8a
-	* dirmngr/dirmngr-client.c (read_pem_certificate): Add NO_ERRMSG
-	argument to suppress the error message.
-	(read_certificate, squid_loop_body): Follow the change.
-
-2022-03-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Clear the error count to try certificate as binary.
-	+ commit 4d19759ce5fb4962b22a8bc04c3a54e3f47d2f17
-	* dirmngr/dirmngr-client.c (read_certificate): Call
-	log_get_errorcount.
-
-	kbx: Fix searching for FPR20 in version 2 blob.
-	+ commit 01329da8a778d3b0d121c83bfb61d99a39cccac4
-	* kbx/keybox-search.c (blob_cmp_fpr_part): Don't change FPROFF, since
-	it's caller which tweaks the offset.
-	(has_short_kid, has_long_kid): Examine the key flags to determine if
-	fingerprint 32 or 20.
-
-2022-03-22 Werner Koch <wk@gnupg.org>
-
-	gpgtar: New option --with-log.
-	+ commit ed53d41b4c463072bac30b0e4c73f8bf445bd22d
-	* tools/gpgtar.c: New option --with-log.
-	* tools/gpgtar.h (opt): Add field with_log.
-	* tools/gpgtar-extract.c (gpgtar_extract): Move directory string
-	building up. Add option --log-file if needed.
-	* tools/gpgtar-create.c (gpgtar_create): Make tmpbuf static becuase it
-	is used outside of its scope.
-	* tools/gpgtar-list.c (gpgtar_list): Ditto.
-
-2022-03-21 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Make WKD_GET work even for servers not handling SRV RRs.
-	+ commit 92c8ae720e69216a2f51d2c7d3cd72340b782fb3
-	* dirmngr/server.c (proc_wkd_get): Take care of DNS server failures
-
-	gpgtar: Finally use a pipe for decryption.
-	+ commit e5ef5e3b914d5c8f0b841b078b164500ea157804
-	* tools/gpgtar.h (opt): Add new flags.
-	* tools/gpgtar.c: new options --batch, --yes, --no, --status-fd, and
-	--require-compliance.
-	(main): Init signals.
-	* tools/gpgtar-create.c: Add new header files.
-	(gpgtar_create): Rework to use a pipe for encryption and signing.
-	* tools/gpgtar-list.c: Add new header files.
-	(gpgtar_list): Rework to use a pipe for decryption.
-	* tools/gpgtar-extract.c: Add new header files.
-	(gpgtar_extract): Rework to use a pipe for decryption.
-
-2022-03-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix another race condition, and address the other one.
-	+ commit 2f1afc1296621624f34aa6a9db03ef29c741ba6c
-	* common/dotlock.c (dotlock_take_unix): Do same when same PID
-	process detects stale lockfile. Add comment.
-
-	gpg: Always use version >= 4 to generate signature.
-	+ commit 0ba69e5581914f23f7efdd4d38b890f6def8967a
-	* g10/sign.c (update_keysig_packet): Make sure sig->version >= 4.
-
-2022-03-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Print info about the used AEAD algorithm in the compliance msg.
-	+ commit 06b70daa505d3679985be47b6834f8ed7b64d6a9
-	* g10/misc.c (openpgp_cipher_algo_mode_name): New.
-	* g10/decrypt-data.c (decrypt_data): Use function here.
-
-	common: New function map_static_strings.
-	+ commit 449d2fbcde630974628285d3405feb6ab2a812f9
-	* common/mapstrings.c (struct intmapping_s): New.
-	(map_static_strings): New.
-	* common/stringhelp.c (do_strconcat): Rename to ...
-	(vstrconcat): this and make global.
-
-	* common/t-mapstrings.c (test_map_static_strings): New test.
-
-	gpg: Allow decryption of symencr even for non-compliant cipher.
-	+ commit 8631d4cfe251f9936d6cbc11b4c4623397b1aeb6
-	* g10/decrypt-data.c (decrypt_data): Add arg compliance_error. Adjust
-	all callers. Fail on compliance error only in --require-compliance
-	mode. Make sure to return an error if the buffer is missing; actually
-	that should be an assert.
-	* g10/mainproc.c (proc_encrypted): Delay printing of the compliance
-	mode status. Consult the compliance error now returned by
-	decrypt_data.
-
-	common: New flags for gnupg_spawn_process.
-	+ commit 6d6438a361d25f3b269f702e017f5e39fd1f5c38
-	* common/exechelp.h (GNUPG_SPAWN_KEEP_STDIN): New.
-	(GNUPG_SPAWN_KEEP_STDOUT): New.
-	(GNUPG_SPAWN_KEEP_STDERR): New.
-	* common/exechelp-posix.c (do_exec): Add arg flags and implement new
-	flags.
-	* common/exechelp-w32.c (gnupg_spawn_process): Implement new flags.
-
-2022-03-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix a race condition removing stale lockfile.
-	+ commit d94b411f129f572aace005f38cd78515d810135a
-	* common/dotlock.c (read_lockfile): Return the file descriptor when
-	R_FD is available.
-	(dotlock_take_unix): Check the case the lockfile was already removed.
-
-	common: More heavy test condition for t-dotlock.c.
-	+ commit a30359cecb5b8ac73906264ded617a35794a0b0a
-	* common/t-dotlock.c (lock_and_unlock): Use usleep and faster.
-	Loop at least once. Use getrandom for random time.
-	(main): Add new option --one-shot to run lock/unlock once.
-
-2022-03-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix DEVINFO with no --watch.
-	+ commit c6dd9ff9290427504faef120bd5c1ebb78990ca0
-	* scd/app.c (app_send_devinfo): Fix for outputing once.
-	* scd/command.c (hlp_devinfo): Fix comment.
-
-2022-03-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Enhance PASSWD command to accept KEYGRIP optionally.
-	+ commit 934864d399bb6091d55a15811eee7ed6e5391fb6
-	* scd/command.c (cmd_passwd): Handle KEYGRIP optionally.
-
-	scd: Use same idiom for same work.
-	+ commit d577ed29563768221b1aedb1fb4aebe64b23f3bf
-	* scd/command.c (cmd_serialno, cmd_getattr): Use 'while' instead of
-	'for'.
-
-2022-03-09 Jakub Jelen <jjelen@redhat.com>
-
-	sign: Construct valid AEAD packets.
-	+ commit eadf12a52c2e230174e076a0dcae68132094cefe
-	* g10/sign.c (sign_symencrypt_file): Insert correct version and AEAD
-	 information into symkey packet.
-
-2022-03-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	sm: Fix parsing encrypted data.
-	+ commit 6c50834c0905b55ee2da18728194dd4c93c377bf
-	* sm/minip12.c (cram_octet_string): Finish when N==0.
-	(parse_bag_encrypted_data): Support constructed data with multiple
-	octet strings.
-
-2022-03-08 Werner Koch <wk@gnupg.org>
-
-	gpgsm: New option --require-compliance.
-	+ commit f8075257afad4c7a41cd4409e334670a0097b5b8
-	* sm/gpgsm.c (oRequireCompliance): New.
-	(opts): Add --require-compliance.
-	(main): Set option.
-	* sm/gpgsm.h (opt): Add field require_compliance.
-	(gpgsm_errors_seen): Declare.
-	* sm/verify.c (gpgsm_verify): Emit error if non de-vs compliant.
-	* sm/encrypt.c (gpgsm_encrypt): Ditto.
-	* sm/decrypt.c (gpgsm_decrypt): Ditto.
-
-	gpg: New option --require-compliance.
-	+ commit ee013c5350ce6a5b3d4089753cb99a44802fdfa8
-	* g10/options.h (opt): Add field flags.require_compliance.
-	* g10/gpg.c (oRequireCompliance): New.
-	(opts): Add --require-compliance.
-	(main): Set option.
-	* g10/mainproc.c (proc_encrypted): Emit error if non de-vs compliant.
-	(check_sig_and_print): Ditto.
-	* g10/encrypt.c (encrypt_crypt): Ditto.
-
-2022-03-08 Jussi Kivilinna <jussi.kivilinna@iki.fi>
-
-	gpg: fix --enarmor with zero length source file.
-	+ commit 49c6e583945263497064109697237701977689c3
-	* common/iobuf.c (filter_flush): Remove "src_len == 0" check.
-	* g10/compress-bz2.c (do_compress): Exit early if flush not
-	forced and input length is zero.
-	* g10/compress.c (do_compress): Likewise.
-
-	iobuf: add zerocopy optimization for iobuf_write.
-	+ commit b96eb6f08d1df86fc8578133e0a16566c988e37d
-	* common/iobuf.c (filter_flush): Use 'iobuf->e_d' if configured.
-	(iobuf_write): Configure 'iobuf->e_d' for 'filter_flush' if
-	'iobuf->d.buf' is empty and external buffer is larger than threshold.
-
-	iobuf: add zerocopy optimization for iobuf_read.
-	+ commit 15df88d135ba08797c2aaf1023c6c606aed49943
-	* common/iobuf.h (iobuf_struct): Add 'e_d' substructure and members.
-	* common/iobuf.c (IOBUF_ZEROCOPY_THRESHOLD): New.
-	(iobuf_alloc): Clear 'iobuf->e_d'.
-	(underflow_target): Use 'iobuf->e_d' when configured to bypass copying
-	through 'iobuf->d.buf'.
-	(iobuf_read): Configure 'iobuf->e_d' for 'underflow' if 'iobuf->d.buf'
-	is empty and external buffer is larger than threshold.
-
-	g10/cipher-aead: add fast path for avoid memcpy when AEAD encrypting.
-	+ commit 99e2c178c73cb6b82836b056ac658d8964fa7bc9
-	* g10/cipher-aead.c (do_hash): Add faster path for encrypting directly
-	from input buffer instead of memcpying then encrypting inplace.
-
-	g10/decrypt-data: disable output estream buffering to reduce overhead.
-	+ commit 6c95d52a22a75d0585ff6598e3ca539e21253c82
-	* g10/decrypt-data.c (decrypt_data): Disable estream buffering for
-	output file.
-
-	g10/plaintext: disable estream buffering in binary mode.
-	+ commit 583b664a07b41ba6991f87a811ab933990457063
-	* g10/plaintext.c (handle_plaintext): Disable estream buffering in
-	binary modes.
-
-	Use iobuf buffer size for temporary buffer size.
-	+ commit f2322ff942fabd55de0a1272b1fcca534e623bd1
-	* common/iobuf.c (iobuf_copy): Use iobuf buffer size for temporary
-	buffers.
-	* g10/plaintext.c (handle_plaintext, do_hash): Likewise.
-	* g10/sign.c (sign_file): Likewise.
-
-2022-03-08 Werner Koch <wk@gnupg.org>
-
-	gpgtar,w32: Support file names longer than MAX_PATH.
-	+ commit 70b738f93f1ae6b606af701f6def55a6f0f3d04b
-	* tools/gpgtar.c: Replace assert by log_assert.
-	* tools/gpgtar-extract.c: Ditto.
-	(extract_regular): Create files with sysopen flag.
-	* tools/gpgtar-create.c (scan_directory): Use gpgrt_fname_to_wchar.
-
-	common,w32: Support file names longer than MAX_PATH in iobuf.
-	+ commit 6afedbcd47d9a7d433cebf68bccabd47ba776e0f
-	* common/iobuf.c (direct_open): Use gpgrt_fname_to_wchar.
-	(any8bitchar): Remove.
-
-2022-03-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix confusion of get_pk_algo_from_key.
-	+ commit 14e13fb7123ec20dcdf2180584908e3fdfcef94d
-	* common/ssh-utils.c (ssh_public_key_in_base64): Fix the constants.
-
-	scd: Fix PK_AUTH with --challenge-response option.
-	+ commit 58e6990eaabb7302cc8cc979378e6fffe36459b7
-	* scd/app.c (app_auth): It's only APPTYPE_OPENPGP which supports
-	the challenge response interaction.
-	* scd/command.c (cmd_pkauth): It only wants if it works or not.
-
-2022-03-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Add --challenge-response option to PK_AUTH for OpenPGP card.
-	+ commit 44621120a269ba67408fe1ea067af8cbd1cbb35e
-	* scd/app-openpgp.c (rmd160_prefix, sha1_prefix, sha224_prefix)
-	(sha256_prefix, sha384_prefix, sha512_prefix): Move the scope up.
-	(gen_challenge): New.
-	(do_auth): Support challenge-response check if it signs correctly.
-	* scd/app.c (app_auth): Remove the check INDATA and INDATALEN.
-	* scd/command.c (cmd_pkauth): Support --challenge-response option.
-
-2022-03-02 Jussi Kivilinna <jussi.kivilinna@iki.fi>
-
-	g10/encrypt: use iobuf_copy instead of manual iobuf_read/iobuf_write.
-	+ commit 756c0bd5d89bd0a773f844fbc2ec508c1a36c63d
-	* g10/encrypt.c (encrypt_simple): Use 'iobuf_copy' for no-literal case.
-
-	g10/dearmor: use iobuf_copy.
-	+ commit 9c313321a849ad5794fd90f6d5b84fee3674543c
-	* g10/dearmor.c (dearmor_file, enarmor_file): Use 'iobuf_copy'.
-
-2022-03-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Let READKEY support --format=ssh option.
-	+ commit 8e650dbd48fa5fde6d8f08154e6a892d495e9227
-	* scd/command.c (do_readkey): Support --format=ssh option.
-	* common/ssh-utils.c (ssh_public_key_in_base64): New.
-	* common/ssh-utils.h (ssh_public_key_in_base64): New declaration.
-
-2022-02-27 Jussi Kivilinna <jussi.kivilinna@iki.fi>
-
-	g10/sign: sign_file: use iobuf_read for higher detached signing speed.
-	+ commit f8943ce098f6f193da791faf43fff823568697d9
-	* g10/sign.c (sign_file): Use iobuf_read instead of iobuf_get for
-	reading data from detached file.
-
-	g10/plaintext: do_hash: use iobuf_read for higher performance.
-	+ commit 4e27b9defc608f1fa31ca50f1ed1d5761b73b480
-	* g10/plaintext.c (do_hash): Use iobuf_read instead of iobuf_get for
-	reading data; Use gcry_md_write instead of gcry_md_putc for hash data.
-
-2022-02-27 Werner Koch <wk@gnupg.org>
-
-	agent: Print the correct daemon name in presence of a --foo-program.
-	+ commit f03c871c9e407d2aeff7b971f67a68b929f17b99
-	* agent/call-daemon.c (wait_child_thread): Print the correct name.
-
-	agent: New flag "qual" for the trustlist.txt.
-	+ commit 7c8c6060616ab91f5490e91a0fb9efc9aee9f58e
-	* agent/trustlist.c (struct trustitem_s): Add flag "qual".
-	(read_one_trustfile): Rename arg "allow_include" to "systrust" and
-	change callers. Parse new flag "qual".
-	(istrusted_internal): Print all flags.
-	* sm/call-agent.c (istrusted_status_cb): Detect the "qual" flag.
-	* sm/gpgsm.h (struct rootca_flags_s): Add flag "qualified".
-	* sm/certchain.c (do_validate_chain): Take care of the qualified flag.
-
-	dimngr: Do not check the self-signature of a root CA cert.
-	+ commit b901e63b4d8cd5214eb97acfcce0fac532ea5300
-	* dirmngr/validate.c (validate_cert_chain): Comment out that code.
-
-	dirmngr: Support ECDSA for CRLs.
-	+ commit de87c8e1ead72ea67789ffa4375f9dd3e4f9e2fa
-	* dirmngr/crlcache.c (finish_sig_check): Support ECDSA.
-	* dirmngr/validate.c (check_cert_sig): Ditto. Remove the never
-	used support for DSA.
-
-	dirmngr: Support ECDSA for OCSP.
-	+ commit 890e9849b58e91fb7e0ad8d3b11d19363fca2d8a
-	* dirmngr/validate.c (pk_algo_from_sexp): Make public. Support ECC.
-	* dirmngr/ocsp.c (check_signature): Remove hash preparation out to ...
-	(check_signature_core): here. This changes the arg s_hash to md.
-	Support ECDSA.
-
-2022-02-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Clarify a call of ask_for_detached_datafile.
-	+ commit 335805e1d48258dc96d360f72aa92db32f3d82d3
-	* g10/mainproc.c (proc_tree): Call ask_for_detached_datafile
-	with MD2=NULL.
-
-2022-02-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix generating AEAD packet.
-	+ commit 903c5fe369bc4948718a7d2a0e19b1acdb2406c4
-	* g10/cipher-aead.c (do_free): Fix the condition of the last chunk.
-
-2022-02-21 Werner Koch <wk@gnupg.org>
-
-	scd,w32: Print code pages with --show-configs.
-	+ commit cff68fe35918bf944a752008feb68713b198f05e
-	* tools/gpgconf.c (show_configs): Do it.
-
-	scd:p15: Used extended mode already for RSA 2048.
-	+ commit 597253ca171a8ae9f0456323eb3aceb47fd4fde6
-	* scd/app-p15.c (do_sign, do_decipher): Replace GT by GE.
-
-2022-02-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	sm: Fix use of value NONE in gnupg_isotime_t type.
-	+ commit 05fdaa1737523fad72b6ffb9e7a90d5344ff64a5
-	* common/gettime.h (GNUPG_ISOTIME_NONE): New.
-	* sm/call-dirmngr.c (gpgsm_dirmngr_isvalid): Use it.
-	* sm/certlist.c (gpgsm_add_to_certlist): Likewise.
-	* sm/import.c (check_and_store): Likewise.
-	* sm/keylist.c (list_cert_colon, list_cert_raw): Likewise.
-	(list_cert_std): Likewise.
-	* sm/sign.c (gpgsm_sign): Likewise.
-
-2022-02-08 Jussi Kivilinna <jussi.kivilinna@iki.fi>
-
-	g10/mainproc: avoid extra hash contexts when decrypting MDC input.
-	+ commit ab177eed514f7f3432d78e7e6521ad24cc0f4762
-	* g10/mainproc.c (mainproc_context): New member
-	'seen_pkt_encrypted_mdc'.
-	(release_list): Clear 'seen_pkt_encrypted_mdc'.
-	(proc_encrypted): Set 'seen_pkt_encrypted_mdc'.
-	(have_seen_pkt_encrypted_aead): Rename to...
-	(have_seen_pkt_encrypted_aead_or_mdc): ...this and add check for
-	'seen_pkt_encrypted_mdc'.
-	(proc_plaintext): Do not enable extra hash contexts when decrypting
-	MDC input.
-
-2022-02-03 Werner Koch <wk@gnupg.org>
-
-	sm: New option --ignore-cert-with-oid.
-	+ commit e23dc755fa725877ce96eb5a6a6f5788457267f4
-	* sm/gpgsm.c (oIgnoreCertWithOID): New.
-	(opts): Add option.
-	(main): Store its value.
-	* sm/call-agent.c (learn_cb): Test against that list.
-
-2022-02-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix for -Wformat when using uint64_t.
-	+ commit b2cedc108d5cabb07f496c31c11c9cba6f328f76
-	* g10/cipher-aead.c (do_flush): Use PRIu64.
-	* g10/decrypt-data.c (aead_underflow): Likewise.
-
-2022-02-01 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Avoid initial delay on the first keyserver access.
-	+ commit 57d546674d081b9a4cd5d9281ea34cb5c85d2830
-	* dirmngr/dirmngr.c (dirmngr_never_use_tor_p): New.
-	* dirmngr/server.c (ensure_keyserver): Don't even test for the Tor
-	proxy in never-use-tor Mode.
-
-	* tools/gpgtar-create.c: Include unistd.h to avoid a warning on
-	Windows.
-
-	sm: Partly revert last commit.
-	+ commit 623a427b0cb6fc2334e86b7c6f6133b296b0807b
-	* sm/gpgsm.c (set_debug): Remove doubled code.
-
-	gpg,sm: Set --verbose and clear --quiet in debug mode.
-	+ commit 51edea995d352a7b557fb0315fa5091dc42065cb
-	* g10/gpg.c (set_debug): Tweak options.
-	* sm/gpgsm.c (set_debug): Ditto.
-
-2022-01-28 Werner Koch <wk@gnupg.org>
-
-	ssh: Fix adding an ed25519 key with a zero length comment.
-	+ commit 934a60de6b8892ea990c77f8bef8b2872e31a0f2
-	* agent/command-ssh.c (sexp_key_construct): Do not put an empty string
-	into an S-expression.
-	(stream_read_string): Do not not try to a read a zero length block.
-
-	gpg: Allow --dearmor to decode all kinds of armor files.
-	+ commit 34ea19aff99f473bbf076a60e1f306b677339093
-	* g10/filter.h (armor_filter_context_t): New fields dearmor_mode and
-	dearmor_state.
-	* g10/dearmor.c (dearmor_file): Set dearmor_mode.
-	* g10/armor.c (is_armor_header): Magic to switch to generic dearmor
-	mode.
-	(parse_header_line): Treat non OpenPGP armor in a special way.
-	(check_input): Ditto.
-	(radix64_read): Detect non OpenPGP armor END lines.
-
-2022-01-27 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Retire the new --ldapserver.
-	+ commit f2d1187fcde3290ee8133fed256a711cb0b0715c
-	* sm/gpgsm.c (oKeyServer_deprecated): New.
-	(opts): Assign "ldapserver" to the new option and mark it as obsolete.
-
-	gpgconf: Teach --show-config the legacy gpgconf.conf.
-	+ commit ed798a97f54fd8b5a48d662b0fc9ae517d938efe
-	* tools/gpgconf.c (show_configs): Print gpgconf.conf and a warning.
-
-	gpgconf: Return again "keyserver" for gpgsm.
-	+ commit 977b61ddab0ceb5de48645a5550434441f5eeba3
-	* tools/gpgconf-comp.c (known_options_gpgsm): Change "ldapserver" back
-	to "keyserver".
-
-2022-01-26 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Fix --list-options for forced options.
-	+ commit 8fb23094c2f520e346170fe64d8b9b2e27e8dd64
-	* tools/gpgconf-comp.c (retrieve_options_from_program): Ignore to to
-	ignored options. Add failsafe code to avoid calling percent_escape
-	with NULL.
-
-2022-01-25 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Return --ldapserver and --keyserver from dirmngr.
-	+ commit 0b4fdbd5f41e1b93a67a65617c7c382c65dfb7c6
-	* dirmngr/dirmngr.c: Reorder two option groups.
-	* tools/gpgconf-comp.c (known_options_gpgsm): Rename "keyserver" to
-	"ldapserver" and set level to invisible.
-	(known_options_dirmngr): Add "ldapserver" at the basic level.
-	* sm/gpgsm.c (opts): No more help text for "ldapserver".
-
-2022-01-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Print Yubikey version correctly.
-	+ commit 38e100acb7201010d46a50e6a371603373b2a30e
-	* g10/call-agent.c (learn_status_cb): Parse APPVERSION.
-	* g10/call-agent.h (struct agent_card_info_s): Add field appversion.
-	* g10/card-util.c (print_a_version): New.
-	(current_card_status): Print version from appversion.
-
-2022-01-12 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Add command aliases -L -K -R.
-	+ commit ec4a1cffb865a724f36fbf9ad2de984d003fd650
-	* tools/gpgconf.c (enum cmd_and_opt_values): Assign shortcuts.
-
-2022-01-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix adding the list of ultimate trusted keys.
-	+ commit 4aeeaa65ad09fa72ee21c5597b1ce6255ec7dfa8
-	* g10/keygen.c (do_generate_keypair): Remove another call to
-	update_ownertrust.
-	* g10/trust.c (update_ownertrust): Add call to tdb_update_utk.
-	* g10/trustdb.c (tdb_update_utk): New.
-	* g10/trustdb.h (tdb_update_utk): New.
-
-2022-01-11 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	gpg: Report failed generation of subkey pair via status interface.
-	+ commit b66854ac93d843cc8c0ade28684302a99339273d
-	* g10/keygen.c (generate_subkeypair): On error, write error and
-	"key not created" message to status interface.
-
-	gpg: Request keygrip of key to add via command interface.
-	+ commit 19b1a28621c614b81f596e363b1ce49dd9fae115
-	* g10/keygen.c (ask_algo): Request keygrip via cpr_get.
-	* doc/help.txt (gpg.keygen.keygrip): New help text.
-
-2022-01-10 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Map all gnupg.net addresses to the Ubuntu keyserver.
-	+ commit d445e193652617a85a09289689a61111b889728f
-	* dirmngr/server.c (make_keyserver_item): Change mapping.
-
-2022-01-09 Werner Koch <wk@gnupg.org>
-
-	gpgtar: List and extract using extended headers.
-	+ commit 99a8b1f13831c9d7ebd925abf2bc34e4c86f5404
-	* tools/gpgtar.h (TF_EXTHDR, TF_GEXTHDR): New.
-	* tools/gpgtar-list.c (parse_header): Set the new type flags.
-	(parse_extended_header): New.
-	(read_header): Add arg r_extheader and parse extended header.
-	(print_header): Consult the extended header.
-	(gpgtar_list): Pass an extended header object.
-	(gpgtar_read_header): Ditto.
-	(gpgtar_print_header): Ditto.
-	* tools/gpgtar-extract.c (extract): New arg exthdr and factor name
-	checking out to ...
-	(check_suspicious_name): new.
-	(extract_regular): Add arg exthdr and consult it.
-	(extract_directory): Likewise.
-	(gpgtar_extract): Provide extheader object.
-
-	gpgtar: Create extended header for long file names.
-	+ commit 3a1c556b2c3a45afb5b0113d74cd58a7c4cad19e
-	* tools/gpgtar-create.c (global_header_count): new.
-	(myreadlink): New.
-	(build_header): New arg r_exthdr. Detect and store long file and link
-	names. Factor checkum computation out to ...
-	(compute_checksum): new.
-	(add_extended_header_record): New.
-	(write_extended_header): New.
-	(write_file): Write extended header.
-
-2022-01-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd,pcsc: Fix error handling for a reader with reader-port.
-	+ commit f9c9938b28b68bb5b433c2de981b9f26af64c6a9
-	* scd/apdu.c (apdu_open_reader): Make sure dl->idx is always
-	incremented to handle error from open_pcsc_reader correctly.
-
-2021-12-30 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Do not list ignored options and mark forced options as r/o.
-	+ commit 42785d7c8a524129d9fe1a5afae553ff73f8e25b
-	* tools/gpgconf-comp.c (list_one_option): Skip ignored options and set
-	the no_change flag for forced options.
-	(retrieve_options_from_program): Put the attributes into the option
-	table.
-
-2021-12-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Remove unused old m4 files.
-	+ commit 85db1b1a3b16730ede231acdf83e076af99e8aa7
-	* m4/glibc2.m4, m4/glibc21.m4: Remove.
-	* m4/intl.m4, m4/intldir.m4, m4/lock.m4: Remove.
-	* m4/intdiv0.m4, m4/intmax.m4, m4/inttypes-pri.m4: Remove.
-	* m4/inttypes.m4, m4/inttypes_h.m4, m4/longdouble.m4: Remove.
-	* m4/printf-posix.m4, m4/signed.m4, m4/size_max.m4: Remove.
-	* m4/stdint_h.m4, m4/sys_socket_h.m4, m4/uintmax_t.m4: Remove.
-	* m4/visibility.m4, m4/wchar_t.m4, m4/wint_t.m4, m4/xsize.m4: Remove.
-
-	build: Update for newer autoconf.
-	+ commit 6b4441a7de9d7090bb3b1570a12e1e8bce0554cb
-	* configure.ac (AC_PREREQ): Use >= 2.69.
-	(AC_CONFIG_HEADERS): Use it, instead of AC_CONFIG_HEADER.
-	(AC_HEADER_STDC, AC_HEADER_TIME): Remove obsolete macros.
-	(sys/time.h): Add the check of the header.
-	(time_t): Don't use TIME_WITH_SYS_TIME.
-	* acinclude.m4 (AC_HEADER_TIME): Don't require.
-	Don't use TIME_WITH_SYS_TIME.
-	* dirmngr/dns.c: Don't use TIME_WITH_SYS_TIME.
-
-2021-12-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix comment for .po generation.
-	+ commit c3db27fa85200a6d03df8f8b96ffc848a2ec0301
-	* agent/call-pinentry.c (setup_formatted_passphrase): Move comment to
-	inside.
-
-2021-12-20 Werner Koch <wk@gnupg.org>
-
-	Release 2.3.4.
-	+ commit f74c65fd9bbb97a24b1a3bfe73706c6fcf95ad2a
-
-
-	gpg: Correctly set the ownertrust for a new key.
-	+ commit 610528725290961ecc4a35d79ac9e4f2e07ed24e
-	* g10/keygen.c (do_generate_keypair): Use update_ownertrust.
-
-	po: auto update.
-	+ commit 69195ab2550ef1e8ccf8bfe2b6972e822d27c253
-
-
-	gpg: Add unfinished code for --export-secret-ssh-key.
-	+ commit afe5fcda52e88438c7a7278117b2e03f510a9c1c
-	* g10/gpg.c (exportSecretSshKey): New.
-	(opts): Add --export-secret-ssh-key.
-	(main): Implement option.
-	* g10/export.c (do_export_stream): Factor keywrap key code out to ...
-	(get_keywrap_key): new.
-	(mb_write_uint32, mb_write_uint8)
-	(mb_write_data, mb_write_cstring)
-	(mb_write_string, mb_write_mpi): New.
-	(receive_raw_seckey_from_agent): New.
-	(export_secret_ssh_key): New.
-
-	gpg: Allow passing a keygrip as description to pinentry.
-	+ commit ace15e1b09dc9fc83d71faeeb7805802ed5bcc82
-	* g10/keydb.h (FORMAT_KEYDESC_KEYGRIP): New.
-	* g10/passphrase.c (gpg_format_keydesc): Add new mode.
-
-	common: Add set_membuf_err.
-	+ commit da391022160804785dad7d53b464e0448ab8aba0
-	* common/membuf.c (set_membuf_err): New.
-
-	wkd: Don't beg for donations.
-	+ commit 038136ea48ae8963dd89c7e1999d640a112dd791
-	* tools/gpg-wks-server.c (send_congratulation_message): Remove
-	donation hint from message.
-
-2021-12-20 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	dirmngr: Ask keyservers to provide the key fingerprints.
-	+ commit c7fa4c7f8bf375e3739ef8361f38b6b31113b8bf
-	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Add "fingerprint=on" to
-	request URL.
-
-2021-12-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix ldap-url.c.
-	+ commit a9b95b20a8c358d9f8743acfa1076c3be4ff0ac1
-	* dirmngr/ldap-url.c (ldap_charray2str): Use memcpy instead of strncpy
-	when length is computed by strlen beforhand.
-
-	w32: Prepare for the case gcrypt.h will not include winsock2.h.
-	+ commit e08225030dfb2090e756d26575f38c371e5a81cf
-	* common/dynload.h: Include specific headers only.
-	* common/exechelp-w32.c: Include <windows.h>.
-	* common/gettime.c: Likewise.
-	* common/utf8conv.c: Likewise.
-	* tests/gpgscm/ffi.c: Likewise.
-	* tools/gpgconf.c: Likewise.
-	* configure.ac: Check winsock2.h, removing gl_HEADER_SYS_SOCKET.
-
-2021-12-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Emit compatible Ed25519 signature.
-	+ commit 61ac580a2075564bc775b6764a239dad5e336251
-	* g10/pkglue.c (sexp_extract_param_sos_nlz): New.
-	* g10/pkglue.h: Add the declaration.
-	* g10/sign.c (do_sign): Use sexp_extract_param_sos_nlz for Ed25519.
-
-2021-11-24 Jakub Jelen <jjelen@redhat.com>
-
-	gpg: Fix function prototype to match declaration.
-	+ commit 426d82fcf1c133bfc1d5c931109d71db3f3815a9
-	* g10/test-stubs.c (keyserver_import_mbox): Fix prototype
-
-	kbx: Fix allocation check.
-	+ commit 46efee8cb7009b0a0c04b42822d4579424c536e1
-	* kbx/kbxserver.c (cmd_search): Fix allocation check
-
-	homedir: Avoid memory leaks on errors.
-	+ commit 6ee3eb420207c51bc4f2e6aa0871bc8c51f977f0
-	* common/homedir.c (unix_rootdir): Free allocated memory on error path
-
-	dirmngr: Avoid memory leaks on errors.
-	+ commit 940af3f05231dd85138fd3415c7bb7a974bec950
-	* dirmngr/ldap-misc.c (ldap_parse_extfilter): Avoid direct return
-	 without freeing resources on errors.
-
-2021-11-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix format_keyid.
-	+ commit a9be9f4e6e6d451698afa3d4780a53ed3718b30b
-	* g10/keyid.c (format_keyid): Allocate buffer earlier.
-
-	gpg: Fix key conversion for SSH.
-	+ commit 07671917e476ad5ae8f5098630ef1cd531ff401a
-	* g10/export.c (key_to_sshblob): Use put_membuf with length counted
-	beforehand, and use memcmp instead of strncmp.
-
-2021-11-22 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --forbid-gen-key.
-	+ commit c397ba3ac02e38b428d3e13d0bebac2a99b81f01
-	* g10/gpg.c (oForbidGenKey, opts): New option.
-	(mopt): New local struct
-	(gen_key_forbidden): New.
-	(main): Set and handle the option.
-
-2021-11-19 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Include output of --list-dirs in --show-configs.
-	+ commit a0fb78ee0fba13fdbe22d8c3f408a78b847cee28
-	* tools/gpgconf.c (list_dirs): Add arg special.
-	(show_other_registry_entries): Print the Homedir.
-	(show_configs): List directories.
-
-2021-11-18 Werner Koch <wk@gnupg.org>
-
-	gpg,gpgsm: Add option --min-rsa-length.
-	+ commit 5f39db70c069a95731a8a1f65547e3314d6b1f85
-	* common/compliance.c (min_compliant_rsa_length): New.
-	(gnupg_pk_is_compliant): Take in account.
-	(gnupg_pk_is_allowed): Ditto.
-	(gnupg_set_compliance_extra_info): New.
-	* g10/gpg.c (oMinRSALength): New.
-	(opts): Add --min-rsa-length.
-	(main): Set value.
-	* g10/options.h (opt): Add field min_rsa_length.
-	* sm/gpgsm.c (oMinRSALength): New.
-	(opts): Add --min-rsa-length.
-	(main): Set value.
-	* sm/gpgsm.h (opt): Add field min_rsa_length.
-
-2021-11-17 Werner Koch <wk@gnupg.org>
-
-	gpgconf: --show-configs now prints a bunch of Registry entries.
-	+ commit 749bb80cb7685c12f3c65796559990952758f294
-	* tools/gpgconf.c (show_other_registry_entries): New.
-	(show_configs): Call it. Minor reformatting.
-
-	gpgconf: Extend --show-config to show envvars.
-	+ commit 9172fbc08473afa2c295f7c77a8ae78efd4f77b7
-	* tools/gpgconf.c (my_copy_file): Add arg LISTP and record certain
-	things.
-	(show_configs_one_file): New arg LISTP to be passed thru.
-	(show_configs): Show envars and regisiry values.
-
-	common,w32: New function read_w32_reg_string.
-	+ commit 50539394802fb9478296d52527582697a6693b52
-	* common/w32-reg.c (get_root_key): Remove.
-	(read_w32_registry_string): Turn into a wrapper for the gpgrt
-	function.
-	(read_w32_reg_string): New.
-
-2021-11-15 Werner Koch <wk@gnupg.org>
-
-	sm: Detect circular chains in --list-chain.
-	+ commit 74c5b350624b5636706bc39605857f10762371b1
-	* sm/keylist.c (list_cert_chain): Break loop for a too long chain.
-
-2021-11-15 NIIBE Yutaka <gniibe@fsij.org>
-	 Klas Lindfors
-
-	scd:openpgp: Support longer data for INTERNAL_AUTHENTICATE.
-	+ commit a575b0aba5424ed76b1067218beab748b56bde43
-	* scd/app-openpgp.c (do_auth): Use extended Lc, when supported.
-
-2021-11-14 Werner Koch <wk@gnupg.org>
-
-	agent: Print the non-option warning earlier.
-	+ commit bd5c775878fdfc151a3d996b335ea22d5247c963
-	* agent/gpg-agent.c (main): Move detection up.
-
-2021-11-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove stale ultimately trusted keys from the trustdb.
-	+ commit 99ef78aa0ca7e48ceba400e1a43f8185cf9bbf71
-	* g10/tdbdump.c (export_ownertrust): Skip records marked with the
-	option --trusted-key.
-	(import_ownertrust): Clear the trusted-key flag.
-	* g10/tdbio.h (struct trust_record): Add field flags.
-	* g10/tdbio.c (tdbio_dump_record): Improve output.
-	(tdbio_read_record, tdbio_write_record): Handle flags.
-	* g10/trustdb.c (verify_own_keys): Clear stale trusted-keys and set
-	the flag for new --trusted-keys.
-	(tdb_update_ownertrust): Add arg as_trusted_key. Update callers.
-
-	keyboxd: New option --steal-socket.
-	+ commit b0079ab39d31c74673e576149c7ac66d00c45c49
-	* kbx/keyboxd.c (oStealSocket): New const.
-	(opts): Add option.
-	(steal_socket): New file global flag.
-	(main): Set option.
-	(create_server_socket): Implement option.
-
-	agent,dirmngr: New option --steal-socket.
-	+ commit dd708f60d5cf571bd4f0312c1b291ec93c328047
-	* agent/gpg-agent.c (oStealSocket): New.
-	(opts): Add option.
-	(steal_socket): New file global var.
-	(main): Set option.
-	(create_server_socket): Implement option.
-
-	* dirmngr/dirmngr.c (oStealSocket): New.
-	(opts): Add option.
-	(steal_socket): New file global var.
-	(main): Set option. Add comment to eventually implement it.
-
-2021-11-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Don't use malloc for kek_params.
-	+ commit b124bca592e15dcf41b621be517bc4af9e1e9d4d
-	* g10/ecdh.c (pk_ecdh_default_params): Use stack for kek_params.
-
-2021-11-12 Jakub Jelen <jjelen@redhat.com>
-	 NIIBE Yutaka <gniibe@fsij.org>
-
-	kbx: Avoid use of uninitialized value.
-	+ commit fae1d2e2ccde6cb46974433cf769c83134b0f57d
-	* kbx/backend-kbx.c (be_kbx_search): Initialize skipped_long_blobs
-	value which is passed to keybox_search and incremented there.
-	(be_kbx_seek): Likewise.
-
-2021-11-12 Jakub Jelen <jjelen@redhat.com>
-
-	gpg: Avoid uninitialized revkey.fprlen.
-	+ commit d24c5df52b55e86b49b48f153a1ada5a5081eda5
-	* g10/keygen.c (parse_revocation_key): Store the fingerprint length in
-	created structure.
-
-2021-11-12 Jakub Jelen <jjelen@redhat.com>
-	 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Avoid uninitialized buffer.
-	+ commit ae3d0bb8e77ce1b2a096fff7d783c781c9f7a502
-	* agent/sexp-secret.c (fixup_when_ecc_private_key): Initialize buffer to
-	avoid its use on unexpected inputs.
-
-2021-11-12 Jakub Jelen <jjelen@redhat.com>
-
-	agent: Correctly free memory on error path.
-	+ commit 50f32eb0664d921242563f6602ce5a8f46557085
-	* agent/protect.c (merge_lists): Free memory on error.
-
-	scd: Avoid memory leak.
-	+ commit c0b1bcc5c6b5558c9f1f665797979134ade66fd7
-	* scd/command.c (cmd_readkey): Free allocated memory on failure path.
-
-	tools: Avoid memory leak from gpgspilt.
-	+ commit 50e6d63f12e700658f094bf1ff2fd25861690240
-	* tools/gpgsplit.c (write_part): Free memory when no longer needed.
-
-2021-11-09 Bernhard M. Wiedemann <bwiedemann@suse.de>
-
-	wks: Do not mark key files as executable.
-	+ commit 0c8bc154342bf54f7e6cce2075ee8e851dfd09b5
-
-
-	wks: Allow access to newly created dirs.
-	+ commit 60be00b0336bebc319d3e444841526be87dfe3bc
-
-
-2021-11-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix indentation of --print-mds and --print-md sha512.
-	+ commit d9deac7791904634848a4c178585f37205641124
-	* g10/gpg.c (print_hex): Fix indentation.
-
-	gpgconf: New command --show-configs.
-	+ commit fa738173f9d8aa1ddd6b5e665d2f035dae2c0b1f
-	* tools/gpgconf.c (aShowConfigs): New.
-	(opts): Add --show-configs.
-	(CUTLINE_FMT): New.
-	(show_version_gnupg): Add arg "prefix" and adjust caller.
-	(my_copy_file): New.
-	(show_configs_one_file): New.New.
-	(show_configs): New.
-	(main): Call show_configs.
-
-2021-11-03 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	gpgconf: Allow changing gpg's deprecated keyserver option.
-	+ commit 0a7d772a5c43eddad6fb3238614b8af722453919
-	* tools/gpgconf-comp.c (known_options_gpg): Add "keyserver".
-
-2021-11-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Simplify the loop of DEVINFO.
-	+ commit 49f7fcb90b5d4f33b9b65baec8774745aa2242c9
-	* scd/app.c (app_send_devinfo): Factor out lock/unlock.
-
-2021-10-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix the previous commit.
-	+ commit 99e00ec6db33ce86b92106307d637769e0914833
-
-
-	scd: Modify DEVINFO behavior to support looping forever.
-	+ commit 48e824b6ea69d21ccbc50aac125d8b442af66727
-	* scd/app.c (struct mrsw_lock): Add notify_cond member.
-	(notify_cond): Remove.
-	(card_list_r_lock, card_list_r_unlock): Rename.
-	(card_list_w_lock, card_list_w_unlock): Rename.
-	(card_list_signal, card_list_wait): New, fixing thinko about
-	notify/wakeup with MRSW lock.
-	(app_send_devinfo): Support looping.
-	(select_application): Notify app_send_devinfo thread for newly
-	detected device.
-	(initialize_module_command): Initialize notify_cond member.
-	(app_wait): Remove.
-	* scd/command.c (cmd_devinfo): Use new API of app_send_devinfo.
-	* scd/scdaemon.h (app_wait): Remove.
-
-2021-10-27 Werner Koch <wk@gnupg.org>
-
-	common: Support MYPROC_SELF_EXE for Solaris.
-	+ commit 50e43af3f1081ba3fe677b1030c5c62063461665
-	* common/homedir.c (MYPROC_SELF_EXE): Add case for SunOS.
-
-2021-10-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix printing of binary notations.
-	+ commit 62f838ea1fcad1c008c783946559b607cae37674
-	* g10/keylist.c (show_notation): Print binary notation from BDAT.
-
-2021-10-20 Werner Koch <wk@gnupg.org>
-
-	common: Silence warning from unix_rootdir on systems w/o /proc.
-	+ commit 4cb44914b57a8db9d2f0d24e11d2b5e6fedc0a87
-	* common/homedir.c (unix_rootdir): Silence diagnostic in the common
-	case.
-	(MYPROC_SELF_EXE): Support NetBSD.
-
-	common,w32: Do not always print "Garbled console data" warning.
-	+ commit e293da3b214958ff86e7636d17b0b6e10264882e
-	* common/init.c (_init_common_subsystems): Silence message.
-
-2021-10-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	dns: Make reading resolv.conf more robust.
-	+ commit 48359c723206254d3a22f08eb537a6acc2f04e01
-	* dirmngr/dns.c (dns_resconf_loadfile): Skip "search" which
-	begins with '.'.
-
-2021-10-13 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --override-compliance-check.
-	+ commit fb26e144adfd93051501d58f5d0d4f8826ddf436
-	* g10/gpg.c (oOverrideComplianceCheck): New.
-	(opts): Add new option.
-	(main): Set option and add check for batch mode.
-	* g10/options.h (opt): Add flags.override_compliance_check.
-
-	* g10/sig-check.c (check_signature2): Factor complaince checking out
-	to ...
-	(check_key_verify_compliance): this. Turn error into a warning in
-	override mode.
-
-2021-10-12 Werner Koch <wk@gnupg.org>
-
-	Release 2.3.3.
-	+ commit 9470d0338364b781d701ad8e81972c782b48aa2d
-
-
-	speedo: Put the keyboxd into the Windows installer.
-	+ commit 10f52f9bf3bcc6cf29835c2f11ea91ab0d5e7cdc
-	* build-aux/speedo/w32/inst.nsi: Install keyboxd.
-	* Makefile.am (sign-release): Sign the wixlib only if generated.
-	* autogen.rc: Remove meanwhile obsolete option --with-regex.
-
-	tests: New way to make use of gpgconf.ctl in tests.
-	+ commit bcd5feec0e916b864d004a47f36a41e2eba3b10e
-	* Makefile.am (all-local): New to setup symlinks.
-	(distclean-local): New.
-	* tests/Makefile.am: Remove the gpgconf related targets. Just keep
-	gpgconf.ctl.in in EXTRA_DIST
-	* tests/cms/Makefile.am (GNUPG_BUILD_ROOT):
-	* tests/gpgme/Makefile.am (GPGSCM_PATH):
-	* tests/openpgp/Makefile.am (GNUPG_BUILD_ROOT):
-	* tests/pkits/Makefile.am (GNUPG_BUILD_ROOT):
-	* tests/tpm2dtests/defs.scm (tools): Revert to the former values.
-	* tests/openpgp/defs.scm (tools): Ditto.
-
-2021-10-10 Werner Koch <wk@gnupg.org>
-
-	Do not build keyxboxd if sqlite has been disabled.
-	+ commit cf29c7dec0e845040a71aac383ee9f1dda901590
-	* configure.ac: Move clearing of build_keyboxd out of the conditional.
-
-2021-10-06 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	common: Respect gpgconf.ctl when looking up translations.
-	+ commit e99b9890c28dae491653279791e52771be866188
-	* common/i18n.c (i18n_init): Use gnupg_localedir() instead of LOCALEDIR.
-	(i18n_localegettext): Ditto.
-	* tools/gpgconf-comp.c (my_dgettext): Ditto.
-
-2021-10-06 Werner Koch <wk@gnupg.org>
-
-	dirmngr: New option --ignore-cert.
-	+ commit 4b3e9a44b58e74b3eb4a59f88ee017fe7483a17d
-	* dirmngr/dirmngr.h (struct fingerprint_list_s): Add field binlen.
-	(opt): Add field ignored_certs.
-	* dirmngr/dirmngr.c: Add option --ignore-cert
-	(parse_rereadable_options): Handle that option.
-	(parse_ocsp_signer): Rename to ...
-	(parse_fingerprint_item): this and add two args.
-	* dirmngr/certcache.c (put_cert): Ignore all to be igored certs.
-	Change callers to handle the new error return.
-
-	dirmngr: Fix Let's Encrypt certificate chain validation.
-	+ commit 68799378859739887549108bf765568ccbc328bc
-	* dirmngr/certcache.c (find_cert_bysubject): Return the first trusted
-	certififcate if any.
-
-2021-10-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent,dirmngr,kbx,scd,tpm2d: Use gnupg_sleep.
-	+ commit 3918fa1a9488d56040d43e4af1254f9564266513
-	* agent/findkey.c (unprotect): Use gnupg_sleep.
-	* agent/gpg-agent.c (handle_connections): Likewise.
-	* dirmngr/crlfetch.c (handle_connections): Likewise.
-	* kbx/keyboxd.c (handle_connections): Likewise.
-	* tpm2d/tpm3daemon.c (handle_connections): Likewise.
-	* scd/scdaemon.c (handle_connections): Likewise.
-	* scd/command.c (cmd_lock): Likewise.
-	* dirmngr/ldap-wrapper.c (ldap_reaper_thread): Likewise.
-	(ldap_wrapper_wait_connections): Use gnupg_usleep.
-
-	agent: Fix calibrate_get_time use of clock_gettime.
-	+ commit eeb25df6f8fc1e3cf18ec5578445f8fc281e41bc
-	* agent/protect.c (USE_CLOCK_GETTIME): New macro.
-	(calibrate_get_time): Only use clock_gettime if USE_CLOCK_GETTIME.
-
-2021-10-01 Werner Koch <wk@gnupg.org>
-
-	tests: Use the new gpgconf.ctl based method.
-	+ commit 84fcd8e6eb7e0786399e1f6461c3f60b0db2d070
-	* tests/openpgp/defs.scm: We expect that stuff is now installed.
-	(tools): Fix the names.
-	(intsalled?, bin-prefix): Remove.
-	(tool-hardcoded): Simplify.
-	(gpg-conf'): Simplify.
-	(GNUPG_BUILDDIR): Do not anymore set this envvar.
-	* tests/tpm2dtests/defs.scm: Ditto.
-
-	build: Prepare for using installed versions for tests.
-	+ commit 399ebf6d873d4178c1d527aa4df34bf16a76360e
-	* tests/gpgconf.ctl.in: New.
-	* tests/Makefile.am (EXTRA_DIST): Add new file.
-	(TESTINST_DIRS): New.
-	(clean-local): New.
-	(clean-local-testinst): New.
-	(check-recursive): New hook.
-	(bin/gpgconf.ctl): Run a test install.
-	* tests/cms/Makefile.am (TESTS_ENVIRONMENT): Set new envvar
-	GNUPG_BUILD_ROOT.
-	* tests/gpgme/Makefile.am (TESTS_ENVIRONMENT): Ditto.
-	* tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Ditto.
-	* tests/pkits/Makefile.am (TESTS_ENVIRONMENT): Ditto.
-	* tests/tpm2dtests/Makefile.am (TESTS_ENVIRONMENT): Ditto.
-
-	common: Support gpgconf.ctl also for BSDs.
-	+ commit dbe1b237a6525585b36ed84c8634d6436dddaad1
-	* common/homedir.c (MYPROC_SELF_EXE): New.
-	(unix_rootdir): Use it here. Also support GNUPG_BUILD_ROOT as
-	fallback.
-
-	common: Add keyword sysconfdir to the optional gpgconf.ctl file.
-	+ commit ec847cf17fa85b8684e88ccf04c6d4c75d59c3ba
-	* common/homedir.c (unix_rootdir): Add arg want_sysconfdir.
-	(gnupg_sysconfdir): Return it.
-
-2021-09-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	kbx: Let it include keybox.h to avoid multiple typedefs.
-	+ commit ca54d3f148933baac1f0243f76e4961abca285b1
-	* kbx/backend.h: Include keybox.h.
-
-2021-09-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Handle backsig for v5 signature.
-	+ commit dd2e092339627c03cd0f506f3ef1be3e98d5ff83
-	* g10/getkey.c (merge_selfsigs_subkey): Check v5 signature correctly.
-
-	gpg: Ed448 and X448 are only for v5 (for subkey).
-	+ commit 86cb04a23d2b0849cf684238d6d704aa45293214
-	* g10/keygen.c (generate_subkeypair): Specify
-	KEYGEN_FLAG_CREATE_V5_KEY for Ed448 or X448 key.
-
-2021-09-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	kbx: A 20 byte fingerprint is right filled in version 2 blob.
-	+ commit 08a3a4db27dcc3d50038cf5bdba94a6f0b548b01
-	* kbx/keybox-blob.c (create_blob_header): Fix creating FPR20 key
-	in blob with 32-byte fingerprint.
-
-	gpg: Skip the packet when not used for AEAD.
-	+ commit cc6152b802f2ab0ceaf3abb20caef6f7d806ffa3
-	* g10/free-packet.c (free_packet): Add the case for case
-	PKT_ENCRYPTED_AEAD.
-
-2021-09-20 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	build: Fix several "include file not found" problems.
-	+ commit e2069d563283ab295858d33a250f229aab240f75
-	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add KSBA_CFLAGS.
-	* kbx/Makefile.am (libkeybox_a_CFLAGS, libkeybox509_a_CFLAGS): Add
-	NPTH_CFLAGS.
-	* tools/Makefile.am (gpgtar_CFLAGS, gpg_wks_server_CFLAGS,
-	gpg_wks_client_CFLAGS, gpg_pair_tool_CFLAGS): Add LIBGCRYPT_CFLAGS.
-
-2021-09-20 giomba <giomba@linux.it>
-
-	po: Fixed Italian translation for key expiration.
-	+ commit 548ff0398353c106f4e361a46818cd1716b825b8
-	* po/it.po: Fix italian translation.
-
-2021-09-17 Werner Koch <wk@gnupg.org>
-
-	common: Support a gpgconf.ctl file under Unix.
-	+ commit d4768bb982adb5c8410303334ee8d82ba0d71f3b
-	* common/homedir.c (unix_rootdir): New.
-	(gnupg_bindir): Use it.
-	(gnupg_libexecdir): Use it.
-	(gnupg_libdir): Use it.
-	(gnupg_datadir): Use it.
-	(gnupg_localedir): Use it.
-
-	common: New function substitute_envvars.
-	+ commit 9c272dc245456d5403e3bd50553b4fdccb370e27
-	* common/stringhelp.c (substitute_envvars): New. Based on code in
-	gpg-connect-agent.
-	* common/t-stringhelp.c: Include sysutils.h.
-	(test_substitute_envvars): New.
-
-2021-09-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Print a warning when importing a bad cv25519 secret key.
-	+ commit dbfb7f809b89cfe05bdacafdb91a2d485b9fe2e0
-	* g10/import.c (transfer_secret_keys): Add simple check.
-
-2021-09-13 Werner Koch <wk@gnupg.org>
-
-	common: New envvar GNUPG_EXEC_DEBUG_FLAGS.
-	+ commit f2b01025c3da97068b699c1f51309e18730a4bdb
-	* common/exechelp-w32.c (gnupg_spawn_process_detached): Silence
-	breakaway messages and turn them again into debug messages.
-
-2021-09-09 Werner Koch <wk@gnupg.org>
-
-	sm: Add LotW support to the key listing.
-	+ commit 255d4d5815d00f8d1b45d93cc617c49d375e891b
-	* sm/certdump.c (parse_dn_part): Translate OID to "Callsign"
-	* sm/keylist.c (oidtranstbl): Some more OIDs.
-
-2021-09-08 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	build: Fix "ksba.h not found" problem.
-	+ commit 08f227052fa3cc7089829a3b2ab8c4dda990b05b
-	* sm/Makefile.am (t_minip12_CFLAGS): Add KSBA_CFLAGS.
-
-2021-09-07 Werner Koch <wk@gnupg.org>
-
-	agent: Fix segv in GET_PASSPHRASE (regression)
-	+ commit af3b1901549baa8fbe8140d9fa75a4a2b7a77a7e
-	* agent/command.c (cmd_get_passphrase): Do not deref PI. PI is always
-	NULL.
-
-2021-08-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	kbx: Fix checksum computation for no UBID entry on disk.
-	+ commit 0b64c27446c6f17f9c108e0fa95639db12d376ff
-	* kbx/keybox-blob.c (create_blob_header): Fix the flag to match no
-	UBID entry,
-	(create_blob_finish): Fix the length of data to be hashed.
-
-	common: Fix put_membuf.
-	+ commit f271c6916469c0054c143adb4cee0588866a2a61
-	* common/membuf.c (put_membuf): Allow NULL for the second arg.
-
-2021-08-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix get_signal_name for GNU/Linux.
-	+ commit c4ba712736ddeda66055567874d573e79d22666b
-	* common/signal.c (get_signal_name): Use sigdescr_np if available.
-	* configure.ac: Check the function.
-
-2021-08-24 Werner Koch <wk@gnupg.org>
-
-	Release 2.3.2.
-	+ commit 3bf8d7e1b7e0482f698b54a6975bdd9aa354244e
-
-
-	dirmngr: Change the default keyserver.
-	+ commit 55b5928099bafbd5409d3377a42259c11e394cd0
-	* configure.ac (DIRMNGR_DEFAULT_KEYSERVER): Change to
-	keyserver.ubuntu.com.
-
-	* dirmngr/certcache.c (cert_cache_init): Disable default pool cert.
-	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Ditto.
-	* dirmngr/http.c (http_session_new): Ditto.
-
-	* dirmngr/server.c (make_keyserver_item): Use a different mapping for
-	the gnupg.net names.
-
-2021-08-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Report the status of NO_SECKEY for decryption.
-	+ commit 3ed5f566fc057975d0158bb637c72bd118aba7f8
-	* g10/mainproc.c (proc_encrypted): Fix the condition to report
-	NO_SECKEY even when the key was not considered by get_session_key.
-
-2021-08-20 Werner Koch <wk@gnupg.org>
-
-	wkd: Properly unescape the user-id from a key listing.
-	+ commit 87d238de3d9d537cacc9dd3c6d954845203ea2cb
-	* tools/wks-util.c (append_to_uidinfo_list): Unescape UID.
-
-	wkd: Fix client issue with leading or trailing spaces in user-ids.
-	+ commit b4345f7521cb4c3f4af7894f5d6d840fda85e82f
-	* common/recsel.c (recsel_parse_expr): Add flag -t.
-	* common/stringhelp.c: Remove assert.h.
-	(strtokenize): Factor code out to do_strtokenize.
-	(strtokenize_nt): New.
-	(do_strtokenize): Add arg trim to support the strtokenize_nt.
-	* common/t-stringhelp.c (test_strtokenize_nt): New test cases.
-
-	* tools/wks-util.c (wks_list_key): Use strtokenize_nt and the recsel
-	flag -t.
-
-2021-08-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Don't release the context until list_finish for PC/SC.
-	+ commit 1565baa93ae39a81c5b00ca4558cd24838b4ce54
-	* scd/apdu.c (apdu_dev_list_start): Increment PCSC.COUNT here.
-	(apdu_dev_list_finish): Decrement PCSC.COUNT.
-
-2021-08-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Return SUCCESS/FAILURE status also for --card-edit/name.
-	+ commit c1a23c3664753656bd4d22aafe0fb89d9bac5147
-	* g10/card-util.c (change_name): Call write_sc_op_status.
-
-2021-08-18 Werner Koch <wk@gnupg.org>
-
-	agent: Use the sysconfdir for a pattern file.
-	+ commit 661c2ae96699e135294cfd98e1fbc385d35f5f0e
-	* agent/genkey.c (do_check_passphrase_pattern): Use make_filename.
-
-	agent: Ignore passphrase constraints for a generated passphrase.
-	+ commit b89b1f35c29ceaebe39b31444936aa66c9297f2c
-	* agent/agent.h (PINENTRY_STATUS_PASSWORD_GENERATED): New.
-	(MAX_GENPIN_TRIES): Remove.
-	* agent/call-pinentry.c (struct entry_parm_s):
-	(struct inq_cb_parm_s): Add genpinhash and genpinhas_valid.
-	(is_generated_pin): New.
-	(inq_cb): Suppress constraints checking for a generated passphrase.
-	No more need for several tries to generate the passphrase.
-	(do_getpin): Store a generated passphrase/pin in the status field.
-	(agent_askpin): Suppress constraints checking for a generated
-	passphrase.
-	(agent_get_passphrase): Ditto.
-	* agent/command.c (cmd_get_passphrase): Ditto.
-
-	agent: Improve the GENPIN callback.
-	+ commit 8ed79103474c17d8dce20c740fc9813ada5f79ac
-	* agent/call-pinentry.c (DEFAULT_GENPIN_BYTES): Replace by ...
-	(DEFAULT_GENPIN_BITS): this and increase to 150.
-	(generate_pin): Make sure that we use at least 128 bits.
-
-	agent: Fix for zero length help string in pinentry hints.
-	+ commit 9fb646660258c2842edd6662688eafbc8d751ba7
-	* agent/call-pinentry.c: Remove unused assert.h.
-	(inq_cb): Fix use use of assuan_end_confidential in case of nested
-	use.
-	(do_getpin): Ditto.
-	(setup_formatted_passphrase): Escape the help string.
-	(setup_enforced_constraints): Ignore empty help strings.
-
-	common,w32: Replace log_debug by log_info for InProcessJobs.
-	+ commit 629f4a5cffb737454aaf6a5965cfb6d7b03796fc
-	* common/exechelp-w32.c (gnupg_spawn_process_detached): Use log_info.
-
-2021-08-13 Werner Koch <wk@gnupg.org>
-
-	agent: Make QT_QPA_PLATFORMTHEME=qt5ct work for the pient.
-	+ commit 1305baf0994059f458b1d5ca28a355c12932fab3
-	* agent/call-pinentry.c (atfork_core): Pass DISPLAY.
-
-	agent: New option --check-sym-passphrase-pattern.
-	+ commit 7c45a69eb988e9c0329d75900af0c5b1e47291b7
-	* agent/gpg-agent.c (oCheckSymPassphrasePattern): New.
-	(opts): Add --check-sym-passphrase-pattern.
-	(parse_rereadable_options): Set option.
-	(main): Return option info.
-	* tools/gpgconf-comp.c: Add new option.
-	* agent/agent.h (opt): Add var check_sym_passphrase_pattern.
-	(struct pin_entry_info_s): Add var constraints_flags.
-	(CHECK_CONSTRAINTS_NOT_EMPTY): New to replace a hardwired 1.
-	(CHECK_CONSTRAINTS_NEW_SYMKEY): New.
-	* agent/genkey.c (check_passphrase_pattern): Rename to ...
-	(do_check_passphrase_pattern): this to make code reading
-	easier. Handle the --check-sym-passphrase-pattern option.
-	(check_passphrase_constraints): Replace arg no_empty by a generic
-	flags arg. Also handle --check-sym-passphrase-pattern here.
-	* agent/command.c (cmd_get_passphrase): In --newsymkey mode pass
-	CHECK_CONSTRAINTS_NEW_SYMKEY flag.
-	* agent/call-pinentry.c (struct entry_parm_s): Add constraints_flags.
-	(struct inq_cb_parm_s): New.
-	(inq_cb): Use new struct for parameter passing. Pass flags to teh
-	constraints checking.
-	(do_getpin): Pass constraints flag down.
-	(agent_askpin): Take constrainst flag from the supplied pinentry
-	struct.
-
-2021-08-12 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	agent: Make --pinentry-formatted-passphrase a simple flag.
-	+ commit 99601778f4a9dc1c9fee792361c959f5e0732cfd
-	* agent/agent.h (opt): Change type of pinentry_formatted_passphrase
-	to int (as for other flags).
-	* agent/call-pinentry.c (setup_formatted_passphrase): Remove no longer
-	needed translated strings. Write option without value to Assuan
-	connection.
-	* agent/gpg-agent.c (opts): Use ARGPARSE_s_n for
-	oPinentryFormattedPassphrase.
-	(parse_rereadable_options): Set option to 1.
-
-2021-08-11 Werner Koch <wk@gnupg.org>
-
-	w32: Move socketdir to LCOAL_APPDATA.
-	+ commit 0802cbb59b21e06e16b4fd8596934c5565e7f659
-	* common/homedir.c (is_gnupg_default_homedir): Use standard_homedir
-	instead of the constant which makes a difference on Windows.
-	(_gnupg_socketdir_internal) W32: Move the directory to LOCAL_APPDATA.
-	(gnupg_cachedir): Remove unsued function.
-
-	* common/sysutils.c (gnupg_rmdir): New.
-	* tools/gpgconf.c (main): s/rmdir/gnupg_rmdir/.
-
-	gpgconf,w32: Print more registry diagnostics with --list-dirs.
-	+ commit 4cc534020669fa038f6a2107a55fe3b42fc065dc
-	* tools/gpgconf.c (list_dirs): Figure out classes with the key.
-
-2021-08-10 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	agent: Add checkpin inquiry for pinentry.
-	+ commit 5976d293ef9bd953b6e9c61a45ad1f4e85a2743c
-	* agent/call-pinentry.c (inq_cb): Handle checkpin inquiry.
-	(setup_enforced_constraints): New.
-	(agent_get_passphrase): Call setup_enforced_constraints if new
-	passphrase is requested.
-
-	agent: New option --pinentry-formatted-passphrase.
-	+ commit bf20a80f68449cc83b67c53ba9a0a84c45827ac4
-	* agent/agent.h (opt): Add field pinentry_formatted_passphrase.
-	* agent/call-pinentry.c (setup_formatted_passphrase): New.
-	(agent_get_passphrase): Pass option to pinentry.
-	* agent/gpg-agent.c (oPinentryFormattedPassphrase): New.
-	(opts): Add option.
-	(parse_rereadable_options): Set option.
-
-2021-08-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Simplify for string.h and getopt.h.
-	+ commit 29d58e9de7838bcf32e358602abd4ed4498566f8
-	* configure.ac (AC_CHECK_HEADERS): Remove string.h and getopt.h.
-	* dirmngr/ks-engine-ldap.c: Remove including getopt.h.
-	* tools/make-dns-cert.c: Likewise.
-
-	sm: Fix pwri.
-	+ commit 100c954ab0d6df509df582cb22ef515171462654
-	* sm/decrypt.c (pwri_parse_pbkdf2): Use int for digest algo.
-	(pwri_decrypt): Use int for cipher algo and digest algo.
-
-	build: Remove duplication of AC_HEADER_TIME.
-	+ commit 3f33c7ffcca09d4252d0418fdc2d31c0c8e486f4
-	* configure.ac: Have a single AC_HEADER_TIME.
-
-	build: Update checking headers.
-	+ commit a89f13726d08413d4bddcb6afed402de1de9e4fd
-	* configure.ac (AC_CHECK_HEADERS): Remove pty.h utmp.h, util.h,
-	and libutil.h.
-
-2021-08-02 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	common: Pass XDG_SESSION_TYPE and QT_QPA_PLATFORM envvars to pinentry.
-	+ commit 94d18320b2b0bb5e3fa2023df8ac57078b2f6ecb
-	* common/session-env.c (stdenvnames): Add XDG_SESSION_TYPE and
-	QT_QPA_PLATFORM.
-
-2021-07-29 Werner Koch <wk@gnupg.org>
-
-	sm,w32: Fix Unicode problem on key box creation.
-	+ commit 7cdd06af479298748c79357dcb36ca1ba4d36bb1
-	* sm/keydb.c (maybe_create_keybox): Replace access by gnupg_access
-
-	tools: Extend gpg-check-pattern.
-	+ commit 73c03e02322880c740310207dd2151cfd843792e
-	* tools/gpg-check-pattern.c: Major rewrite.
-
-2021-07-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Small clean up for card access.
-	+ commit 5c8124b8b9554c7843feccf408648c9689bce243
-	* scd/app.c (app_get_challenge): Remove the check to ref_count.
-	* scd/command.c (send_client_notifications): Update comments.
-
-	scd: Fix direct use of card with no ctrl->card_ctx.
-	+ commit 50ad29f9a72f5454067bd0ca34fc1a71ac06b831
-	* scd/app.c (maybe_switch_app): Remove check of ref_count.
-
-2021-07-21 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	agent: Add translatable text for Caps Lock hint.
-	+ commit b2a6e5b5169602052ae87d38588bdd3bd76fddad
-	* agent/call-pinentry.c (start_pinentry): Add new default text.
-
-2021-07-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix access to list of cards (3/3).
-	+ commit 0d6b4210cf31d1c3ca0e8b034537a158fe3caca8
-	* scd/app-common.h (card_reset): Simplify more.
-	(select_additional_application): Supply CARD.
-	(card_ref, card_unref): Remove.
-	(card_get, card_put): New.
-	* scd/app.c (card_reset): No locking/unlocking inside.
-	(app_switch_current_card): Fix comment.
-	(select_additional_application): No locking/unlocking inside.
-	(do_with_keygrip): New, unlocked version.
-	(card_get): New, with support of KEYGRIP.
-	(card_unref): Remove.
-	(card_put): New.
-	(app_write_learn_status, app_readcert: No locking/unlocking inside.
-	(app_readkey, app_getattr, app_setattr, app_sign, app_auth): Likewise.
-	(app_decipher, app_writecert, app_writekey): Likewise.
-	(app_genkey, app_get_challenge, app_change_pin): Likewise.
-	(app_check_pin, app_switch_active_app): Likewise.
-	* scd/command.c (do_reset): Use card_get/card_put.
-	(open_card_with_request): Use card_get/card_put, return CARD locked.
-	(cmd_serialno): Follow the change of open_card_with_request.
-	(cmd_switchapp): Use card_get/card_put.
-	(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign): Likewise.
-	(cmd_pkauth, cmd_pkdecrypt, cmd_getattr): Likewise.
-	(cmd_setattr, cmd_writecert, cmd_writekey): Likewise.
-	(cmd_genkey, cmd_random, cmd_passwd): Likewise.
-	(cmd_checkpin, cmd_getinfo, cmd_restart): Likewise.
-	(cmd_disconnect, cmd_apdu, cmd_devinfo): Likewise.
-
-	scd: Fix access to list of cards (2/3).
-	+ commit b436fb6766b400167e5d57ff1116600bb496b04f
-	* scd/app-common.h (card_reset, select_application): Simplify.
-	* scd/app.c (card_reset, select_application): Simplify.
-	* scd/command.c (do_reset): Follow the change.
-	(open_card, open_card_with_request): Follow the change.
-
-	scd: Fix access to list of cards (1/3).
-	+ commit 216945a80e7b6b9d366493fa43fc7e99c830d81c
-	* scd/app.c (card_list_lock): Use MRSW lock.
-	(lock_r_card_list, unlock_r_card_list): New.
-	(lock_w_card_list, unlock_w_card_list): New.
-	(app_dump_state, app_send_devinfo): Use the MRSW lock.
-	(select_application, app_switch_current_card): Likewise.
-	(scd_update_reader_status_file): Likewise.
-	(initialize_module_command, send_card_and_app_list): Likewise.
-	(app_do_with_keygrip, app_wait): Likewise.
-
-2021-07-08 Werner Koch <wk@gnupg.org>
-
-	kbx: Improve debugging of the search descriptions in keyboxd.
-	+ commit b871824fefa114db931762243537663cc1095cfa
-	* kbx/frontend.c (dump_search_desc): New.
-	(kbxd_search): Actually log the search descriptions.
-
-	kbx: Fix keyboxd searching with multiple patterns.
-	+ commit 101ba4f18aceb39c4d5f0e0a7e16e66827f8e612
-	* kbx/keybox-search-desc.h (struct keydb_search_desc): New flag
-	name_used.
-	* common/userids.c (classify_user_id): Set flag.
-	* kbx/kbxserver.c (struct search_backing_store_s): New.
-	(cmd_search): use a backing store for the const pointers.
-	(kbxd_start_command_handler): Release the backing store.
-
-2021-07-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Detect external interference when PCSC_SHARED.
-	+ commit 044e5a3c3801fde7fa3b26986825377016e73103
-	* scd/app-common.h (check_aid): New method.
-	* scd/app-openpgp.c (do_check_aid): New.
-	* scd/app-piv.c (do_check_aid): New.
-	* scd/app.c (check_external_interference): New.
-	(maybe_switch_app): Check interference to determine switching is
-	needed.
-
-2021-06-29 Werner Koch <wk@gnupg.org>
-
-	artwork: Explain the license for the logo.
-	+ commit 5f78ae696c10df43c2b2fc29765e28b85caf5376
-
-
-2021-06-25 Werner Koch <wk@gnupg.org>
-
-	agent: Fix regression in agent_get_shadow_info_type.
-	+ commit a6efde307f7beb199b543f78b61c317fa2708202
-	* agent/protect.c (agent_get_shadow_info_type): Return the correct
-	value.
-
-	gpg: Let --fetch-key return an exit code on failure.
-	+ commit 9579c7786278b75d9c58b7c21b2f3c8bc7849810
-	* g10/keyserver.c (keyserver_fetch): Return an error code.
-	* g10/gpg.c (main) <aFetchKeys>: Return 1 in case of no data.
-
-2021-06-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd:ccid: Handle LIBUSB_TRANSFER_OVERFLOW interrupt transfer.
-	+ commit 25ae80b8eb6e9011049d76440ad7d250c1d02f7c
-	* scd/ccid-driver.c (intr_cb): Ignore LIBUSB_TRANSFER_OVERFLOW.
-
-2021-06-22 Werner Koch <wk@gnupg.org>
-
-	tools: Extend ccidmon to print T=1 APDUs.
-	+ commit 2c6b62b3572fe43cb6b89ec5fb0bc62385a4b230
-	* tools/ccidmon.c (print_as_ascii): New.
-	(print_t1_block): New.
-	(print_p2r_xfrblock): Print APDUs
-	(print_r2p_datablock): Ditto.
-
-	tests: Cope with broken Libgcrypt versions.
-	+ commit 5df658233a3a0c05fac0b4d4889f033ea0d0e034
-	* common/t-sexputil.c (test_ecc_uncompress): Ignore unknwon curve
-	errors.
-
-	w32: Add fallback in case the Windows console can't cope with Unicode.
-	+ commit edfe9453be5f8ba374da0ab860be863d66965c56
-	* common/ttyio.c (w32_write_console): Fallback to WriteConsoleA on
-	error.
-
-	scd:p15: Prepare AODF parsing for other authentication types.
-	+ commit e387cc97c82313457e4f79729a137e5871891bc1
-	* scd/app-p15.c (auth_type_t): New.
-	(struct aodf_object_s): Add field auth_type.
-	(read_ef_aodf): Distinguish between pin and authkey types. Include
-	the authtype in the verbose mode diags.
-
-2021-06-21 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix regression in KS_GET for mail address pattern.
-	+ commit d5126efd895bc2af0a7e63dbf4aa782ce47ecc40
-	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Munge mail address pattern.
-	(ks_hkp_get): Allow for mail addresses.
-	-
-
-	Before the keyserver changes in 2.2.28 gpg passed dirmngr a pail
-	address as an exact pattern (e.g. "=foo@example.org"). Since 2.2.28
-	the mail address is detected gpg gpg and we see for example
-	"<foo@example.org>". This patch fixes this to turn a mail address
-	into an exact match again.
-
-2021-06-18 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Add pre-check for ascii-numeric PINs.
-	+ commit 029924a46e08ffcda038d89f06abfb41c980a9ad
-	* scd/app-p15.c (verify_pin): acii-numerix is different than BCD.
-
-	scd:p15: Add basic support for AET JCOP cards.
-	+ commit 544ec7872aed24c296ea34fac777eca287f7bb47
-	* scd/app-p15.c (CARD_TYPE_AET): New.
-	(cardtype2str): Add string.
-	(card_atr_list): Add corresponding ATR.
-	(app_local_s): New flag no_extended_mode. Turn two other flags into
-	bit flags.
-	(select_ef_by_path): Hack to handle the 3FFF thing.
-	(readcert_by_cdf): Do not use etxended mode for AET.
-	(app_select_p15): Set no_extended_mode.
-
-	scd:p15: Handle cards with bad encoded path objects.
-	+ commit 7a8545c91b09277b0833dc0e5881ba5d1c8dbca3
-	* scd/app-p15.c (read_ef_prkdf, read_ef_pukdf)
-	(read_ef_cdf, read_ef_aodf): Allow for a zero length path and
-	correctly skip unsupported auth types.
-
-	scd: Improve reading of binary records.
-	+ commit 44f977d0e332e77fb8a775c4837c00118bbe08cb
-	* scd/iso7816.c (iso7816_read_binary_ext): Handle the 0x6a86 SW the
-	same as 6b00.
-	* scd/apdu.c (apdu_get_atr): Modify debug messages.
-	* scd/app-p15.c (app_select_p15): Print FCI on error.
-	(read_p15_info): Clean up diag in presence of debug options.
-
-2021-06-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix RESET handling.
-	+ commit 7718244168c948171ffd37d7e964cbcd172661c6
-	* scd/app.c (scd_update_reader_status_file): Clear ->reset_requested.
-
-2021-06-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix build with --disable-ldap.
-	+ commit c6900f5723b4edc899aaea267ed599b5ad724142
-	* dirmngr/dirmngr.c (parse_rereadable_options) USE_LDAP:
-	Conditionalize.
-
-2021-06-16 Werner Koch <wk@gnupg.org>
-
-	sm: New option --ldapserver as an alias for --keyserver.
-	+ commit 89df86157e3580aae7e391382f4a5451a192fc68
-	* sm/gpgsm.c (opts): Add option --ldapserver and make --keyserver an
-	alias.
-
-	dirmngr: Allow to pass no filter args to dirmngr_ldap.
-	+ commit 14528ec66bd7dce28c7540fa9a34f35de54261c1
-	* dirmngr/dirmngr_ldap.c (main): Handle no args case.
-
-	dirmngr: Rewrite the LDAP wrapper tool.
-	+ commit 864ea251983977b91a7f6ff5964e497cf4b208dc
-	* dirmngr/ldap-misc.c: New.
-	* dirmngr/ldap-misc.h: New.
-	* dirmngr/ks-engine-ldap.c: Include ldap-misc.h.
-	(ldap_err_to_gpg_err, ldap_to_gpg_err): Move to ldap-misc.c.
-	* dirmngr/ldap-wrapper.c (ldap_wrapper): Print list of args in debug
-	mode.
-	* dirmngr/server.c (lookup_cert_by_pattern): Handle GPG_ERR_NOT_FOUND
-	the saqme as GPG_ERR_NO_DATA.
-	* dirmngr/ldap.c (run_ldap_wrapper): Add args tls_mode and ntds.
-	Remove arg url. Adjust for changes in dirmngr_ldap.
-	(url_fetch_ldap): Remove args host and port. Parse the URL and use
-	these values to call run_ldap_wrapper.
-	(attr_fetch_ldap): Pass tls flags to run_ldap_wrapper.
-	(rfc2254_need_escape, rfc2254_escape): New.
-	(extfilt_need_escape, extfilt_escape): New.
-	(parse_one_pattern): Rename to ...
-	(make_one_filter): this. Change for new dirmngr_ldap calling
-	convention. Make issuer DN searching partly work.
-	(escape4url, make_url): Remove.
-	(start_cert_fetch_ldap): Change for new dirmngr_ldap calling
-	convention.
-	* dirmngr/dirmngr_ldap.c: Major rewrite.
-
-	* dirmngr/t-ldap-misc.c: New.
-	* dirmngr/t-support.h (DIM, DIMof): New.
-	* dirmngr/Makefile.am (dirmngr_ldap_SOURCES): Add ldap-misc.c
-	(module_tests) USE_LDAP: Add t-ldap-misc.
-	(t_ldap_parse_uri_SOURCES): Ditto.
-	(t_ldap_misc_SOURCES): New.
-
-	dirmngr: Remove useless code.
-	+ commit bcb99315627ec38aa5c9fe097075a82bdc8a2043
-	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Remove the
-	password_param thing because we set the password directly without an
-	intermediate var.
-
-	dirmngr: Fix default port for our redefinition of ldaps.
-	+ commit 58e4c82512a4b0828f78fc9f03dbcdbf77760b5c
-	* dirmngr/server.c (make_keyserver_item): Fix default port for ldaps.
-	Move a tmpstr out of the blocks.
-	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Improve diagnostics.
-
-	dirmngr: Use --ldaptimeout for OpenPGP LDAP keyservers.
-	+ commit 3e05f99e8db5c4039d352d5bd9dde01ed9653f2f
-	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Use LDAP_OPT_TIMEOUT.
-
-	* dirmngr/dirmngr.c (main): Move --ldaptimeout setting to ...
-	(parse_rereadable_options): here.
-
-	dirmngr: New option --ldapserver.
-	+ commit 52cf32ce2f904b2e6f53f406a90458f6ef148af9
-	* dirmngr/dirmngr.c (opts): Add option --ldapserver.
-	(ldapserver_list_needs_reset): New var.
-	(parse_rereadable_options): Implement option.
-	(main): Ignore dirmngr_ldapservers.conf if no --ldapserver is used.
-
-	* dirmngr/server.c (cmd_ldapserver): Add option --clear and list
-	configured servers if none are given.
-
-	dirmngr: Allow for non-URL specified ldap keyservers.
-	+ commit eb3a629154de10a5414a5d2c2b9941ef8bf1eeaf
-	* dirmngr/server.c (cmd_ldapserver): Strip an optional prefix.
-	(make_keyserver_item): Handle non-URL ldap specs.
-	* dirmngr/dirmngr.h (struct ldap_server_s): Add fields starttls,
-	ldap_over_tls, and ntds.
-
-	* dirmngr/ldapserver.c (ldapserver_parse_one): Add for an empty host
-	string. Improve error messages for the non-file case. Support flags.
-	* dirmngr/ks-action.c (ks_action_help): Handle non-URL ldap specs.
-	(ks_action_search, ks_action_get, ks_action_put): Ditto.
-	* dirmngr/ks-engine-ldap.c: Include ldapserver.h.
-	(ks_ldap_help): Handle non-URL ldap specs.
-	(my_ldap_connect): Add args r_host and r_use_tls. Rewrite to support
-	URLs and non-URL specified keyservers.
-	(ks_ldap_get): Adjust for changes in my_ldap_connect.
-	(ks_ldap_search): Ditto.
-	(ks_ldap_put): Ditto.
-
-	gpg,sm: Simplify keyserver spec parsing.
-	+ commit bebc71d2291e93afb76792c5e210836857103c36
-	* common/keyserver.h: Remove.
-	* sm/gpgsm.h (struct keyserver_spec): Remove.
-	(opt): Change keyserver to a strlist_t.
-	* sm/gpgsm.c (keyserver_list_free): Remove.
-	(parse_keyserver_line): Remove.
-	(main): Store keyserver in an strlist.
-	* sm/call-dirmngr.c (prepare_dirmngr): Adjust for the strlist. Avoid
-	an ambiguity in dirmngr by adding a prefix if needed.
-
-	* g10/options.h (struct keyserver_spec): Move definition from
-	keyserver.h to here. Remove most fields.
-	* g10/keyserver.c (free_keyserver_spec): Adjust.
-	(cmp_keyserver_spec): Adjust.
-	(parse_keyserver_uri): Simplify.
-	(keyidlist): Remove fakev3 arg which does not make any sense because
-	we don't even support v3 keys.
-
-	dirmngr: Support pseudo URI scheme "opaque".
-	+ commit 1c96f4d663c020167ed3d39e513751641dfc3567
-	* dirmngr/http.h (HTTP_PARSE_NO_SCHEME_CHECK): New.
-	* dirmngr/http.c (http_parse_uri): Use this flag. Change all callers
-	to use the new macro for better readability.
-	(do_parse_uri): Add pseudo scheme "opaque".
-	(uri_query_value): New.
-
-2021-06-11 Werner Koch <wk@gnupg.org>
-
-	sm: Fix finding of issuer in use-keyboxd mode.
-	+ commit 6b76693ff54297456b724ba53f7e6283e2a5a126
-	* sm/keydb.c (struct keydb_local_s): Add field saved_search_result.
-	(keydb_push_found_state): Implement for keyboxd.
-	(keydb_pop_found_state): Ditto.
-	(keydb_get_cert): Do not release the cert so that the function can be
-	used again to get the same cert. This is the same behaviour as in
-	pubring.kbx mode.
-
-	* sm/certchain.c, sm/import.c: Improve some error messages.
-
-2021-06-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support clearing of Reset Code by ''.
-	+ commit 4e02db75e3a1da9012176f2cfe1638c8c0129f6f
-	* scd/app-openpgp.c (do_change_pin): Allow null-string.
-
-2021-06-09 Werner Koch <wk@gnupg.org>
-
-	gpgtar,w32: Fix file size computation.
-	+ commit 14e36bdbe1c39bc23e70db775e05319367ee8adb
-	* tools/gpgtar-create.c (fillup_entry_w32): Move parentheses.
-
-2021-06-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix importing protected secret key.
-	+ commit 7a80004d5407c6c48b21d57ba6edb8e5a2db4995
-	* agent/cvt-openpgp.c (do_unprotect): Only modify SKEY when it is
-	correctly decrypted.
-
-2021-06-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix serial number detection for Yubikey 5.
-	+ commit c3a9ee0b658887ca9baa4514187b17857fdf6586
-	* scd/app.c (app_new_register): Handle serial number correctly.
-
-2021-06-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix READER-PORT option handling for PC/SC.
-	+ commit ee5b6af370fbee1b08136e5dc384cf7996bcfc4c
-	* scd/apdu.c (apdu_open_reader): READERNO should be -1 when
-	READER-PORT is specified for PC/SC.
-
-2021-06-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Appropriate error code for importing key with no passwd.
-	+ commit 21ef425e222ddfa460b37dece63adb67ff2e4dd1
-	* agent/cvt-openpgp.c (convert_from_openpgp_main): Return
-	GPG_ERR_BAD_SECKEY.
-
-2021-06-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Support KEYGRIP search with traditional keyring.
-	+ commit 9668ee097a1474299b8debecb1ee38620a327082
-	* g10/keyring.c (keyring_search): Handle KEYDB_SEARCH_MODE_KEYGRIP.
-
-2021-06-02 Werner Koch <wk@gnupg.org>
-
-	common: Allow for GCM decryption in de-vs mode.
-	+ commit c17dac5ac3ccb374e5a1276d4bc9b444c390a4c5
-	* common/compliance.c (gnupg_cipher_is_allowed): Allow GCM for gpgsm
-	in decrypt mode.
-
-	* tests/cms/samplemsgs/pwri-sample.gcm.p7m: Remove duplicated authtag
-
-	sm: Support AES-GCM decryption.
-	+ commit 4980fb3c6dde8c1dda975e8a36d6086c8456a631
-	* tests/cms/samplemsgs/: Add sample messages.
-	* sm/gpgsm.c (main): Use gpgrt_fcancel on decryption error.
-	* sm/decrypt.c (decrypt_gcm_filter): New.
-	(gpgsm_decrypt): Use this filter if requested. Check authtag.
-
-2021-05-28 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Make runtime changes with different homedir work.
-	+ commit 31c0aa2ff37f662c6391885d61ffd46ec3062e5a
-	* tools/gpgconf-comp.c (dirmngr_runtime_change): Pass --homedir first.
-
-2021-05-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix calling handle_pincache_put.
-	+ commit 36f50b259cae0428264f4b7d60b82209e3dd8725
-	* agent/call-scd.c (padding_info_cb): Fix the argument.
-
-	scd: Fix zero-byte handling in ECC.
-	+ commit 5b1806454c03b3b493222f405ffced80a5d430ad
-	* scd/app-openpgp.c (ecc_writekey): Don't remove zero-byte.
-
-2021-05-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Ed448 and X448 are only for v5 for --full-gen-key.
-	+ commit 2b50f942672d9a2c325a818f21f69d3ee69255d3
-	* g10/keygen.c (generate_keypair): Set pVERSION = 5, pSUBVERSION = 5,
-	when it's Ed448 or X448.
-
-	build: _DARWIN_C_SOURCE should be 1.
-	+ commit be81941e1aca75d9e1d0dd2e2b234ae6df53c05a
-	* configure.ac (*-apple-darwin*): Set _DARWIN_C_SOURCE 1.
-
-2021-05-25 Werner Koch <wk@gnupg.org>
-
-	gpg: Partial fix for Unicode problem in output files.
-	+ commit 30563ea29705016b08ff04fd8a833940ea94e4e8
-	* g10/openfile.c (overwrite_filep): Use gnupg_access.
-
-2021-05-21 Werner Koch <wk@gnupg.org>
-
-	common: Annotate leaked memory in homedir.c.
-	+ commit 260bbb4ab27eab0a8d4fb68592b0d1c20d80179c
-	* g10/trustdb.c (how_to_fix_the_trustdb): Use gnupg_homedir.
-	* common/homedir.c (standard_homedir): Annotate leaked memory.
-	(gnupg_daemon_rootdir): Ditto.
-	(gnupg_socketdir): Ditto.
-	(gnupg_sysconfdir): Ditto.
-	(gnupg_bindir): Ditto.
-	(gnupg_libdir): Ditto.
-	(gnupg_datadir): Ditto.
-	(gnupg_localedir): Ditto.
-	(gnupg_cachedir): Ditto.
-	(gpg_agent_socket_name): Ditto.
-	(dirmngr_socket_name): Ditto.
-	(keyboxd_socket_name): Ditto.
-	(get_default_pinentry_name): Ditto.
-	(gnupg_module_name): Ditto.
-	(default_homedir): Ditto. Make static.
-
-2021-05-20 Werner Koch <wk@gnupg.org>
-
-	sm: Let --dump-cert --show-cert also print an OpenPGP fingerprint.
-	+ commit 52bbdc731fd54ff6d2744d7aca8e48e2c2389cc9
-	* sm/keylist.c (list_cert_raw): Print the OpenPGP fpr.
-
-2021-05-20 Jakub Jelen <jjelen@redhat.com>
-
-	card: Intialize pointer to avoid double free.
-	+ commit 98c52aeb31f4bf2604727aacad982fb51c04063f
-	* tools/gpg-card.c (cmd_salut): Initialize data pointer
-
-	scd: avoid memory leaks.
-	+ commit 27e7bde12ee2b67425ae7011d976d2544c90fd9a
-	* scd/app-p15.c (send_certinfo): free labelbuf
-	 (do_sign): goto leave instead of return
-	* scd/app-piv.c (do_sign): goto leave instead of return, fix typo in
-	 variable name, avoid using uninitialized variables
-	* scd/command.c (cmd_genkey): goto leave instead of return
-
-	kbx: Avoid uninitialized read.
-	+ commit fc5fac83b778f0ff61608c286448ab7fa14ccb2d
-	* kbx/kbx-client-util.c (datastream_thread): Initialize pointer
-	* kbx/keybox-dump.c (_keybox_dump_cut_records): free blob
-	* kbx/kbxserver.c (kbxd_start_command_handler): do not free passed ctrl
-	* kbx/keyboxd.c (check_own_socket): free sockname
-
-	g10: Avoid memory leaks.
-	+ commit fa0771f609b5fcb104c64a11aefc501b7a91696d
-	* g10/call-agent.c (card_keyinfo_cb): free keyinfo. Restructure to
-	avoid backward gotos.
-	* g10/keyedit.c (menu_set_keyserver_url): properly enclose the block
-	* g10/keygen.c (gen_card_key): free pk and pkt
-
-	dirmgr: Avoid double free.
-	+ commit 25aa353bf833fdae1a96158b49daf7588ae3b109
-	* dirmgr/http.c (http_prepare_redirect): Avoid double free
-	* dirmgr/ocsp.c (check_signature): Initialize pointer
-
-	common: Avoid double-free.
-	+ commit 4704d1ce4e1e2ba9f986fb221346eda5c97f947b
-	* common/name-value.c (do_nvc_parse): reset to null after ownership
-	change
-
-	agent: Fix memory leaks.
-	+ commit 33a2362e566c0e0d7011abf2e5fa5704d7cb4206
-	* agent/call-daemon.c (daemon_start): free wctp
-	* agent/call-scd.c (agent_card_pksign): return error instead of noop
-	(card_keyinfo_cb): free keyinfo. Restructure to avoid a goto backwards.
-	* agent/protect.c (agent_get_shadow_info_type): allocate only as a last
-	action. Catch xtrymalloc failure.
-	(agent_is_tpm2_key): Free buf.
-
-	sm: Avoid memory leaks and double double-free.
-	+ commit e6132bc9f41727ea1abe2d6298610223c11639a2
-	* sm/certcheck.c (extract_pss_params): Avoid double free
-	* sm/decrypt.c (gpgsm_decrypt): goto leave instead of return
-	* sm/encrypt.c (encrypt_dek): release s_pkey
-	* sm/server.c (cmd_export): free list
-	(do_listkeys): free lists
-
-	g10: Fix memory leaks.
-	+ commit 2af7bb2295cda5377546cedd0c906a3cff4d2427
-	* g10/card-util.c (change_pin): free answer on errors
-	 (ask_card_keyattr): free answer on error
-	* g10/cpr.c (do_get_from_fd): free string
-	* g10/gpg.c (check_permissions): free dir on weird error
-	* g10/import.c (append_new_uid): release knode
-	* g10/keyedit.c (menu_set_keyserver_url): free answer
-	 (menu_set_keyserver_url): free user
-	* g10/keygen.c (print_status_key_not_created): move allocation after
-	 sanity check
-	 (ask_expire_interval): free answer
-	 (card_store_key_with_backup): goto leave instaed of return
-	* g10/keyserver.c (parse_keyserver_uri): goto fail instead of return
-	* g10/revoke.c (gen_desig_revoke): release kdbhd
-	 (gen_desig_revoke): free answer
-	* g10/tofu.c (ask_about_binding): free sqerr and response
-	* g10/trustdb.c (ask_ownertrust): free pk
-
-	dirmgr: clean up memory on error code paths.
-	+ commit 0d2c1e9046faf102809bc65329c22b6cf8d62ea0
-	* dirmgr/crlcache.c (finish_sig_check): goto leave instead of return
-	* dirmgr/http.c (send_request): free authstr and proxy_authstr
-	* dirmgr/ldap.c (start_cert_fetch_ldap): free proxy
-	* dirmgr/ocsp.c (check_signature): release s_hash
-
-	agent: Avoid memory leaks in error code paths.
-	+ commit a95ddffdcd58383cce93677be5e7e11c5c229a98
-	* agent/command.c (cmd_genkey): Use goto instead of return.
-	* agent/cvt-openpgp.c (convert_from_openpgp_main): Ditto.
-	* agent/genkey.c (agent_ask_new_passphrase): Fix typo to free correct
-	pointer
-	(agent_genkey): Release memory
-	* agent/gpg-agent.c (check_own_socket): Free sockname
-	* agent/protect-tool.c (read_key): Free buf.
-	(agent_askpin): Free passphrase
-
-2021-05-19 Werner Koch <wk@gnupg.org>
-
-	dirmngr: For KS_SEARCH return the fingerprint also with LDAP.
-	+ commit a660e1060630e8d75ecb43abf69dbb73378c1df9
-	* dirmngr/ks-engine-ldap.c (extract_keys): Return the fingerprint if
-	available.
-	(ks_ldap_search): Ditto.
-	(extract_keys): Make sure to free the ldap values also in corner
-	cases.
-	(my_ldap_value_free): New.
-	(ks_ldap_get): Ditto.
-	(ks_ldap_search): Ditto.
-	(my_ldap_connect): Ditto.
-
-	gpg: Improve speed of secret key listing.
-	+ commit 40da61b89b62dcb77847dc79eb159e885f52f817
-	* agent/command.c (cmd_keyinfo): Factor some code out to ...
-	(get_keyinfo_on_cards): ... new.
-	(cmd_havekey): Add --list mode.
-	* g10/gpg.h (struct server_control_s): Add new caching vars.
-	* g10/gpg.c (gpg_deinit_default_ctrl): Release cache.
-	* g10/call-agent.c (agent_probe_any_secret_key): Init and try to use
-	the keygrip cache.
-	(agent_genkey): Clear the cache.
-	(agent_import_key): Ditto.
-
-	* g10/keylist.c (list_all, list_one): Pass ctrl to
-	agent_probe_any_secret_key.
-	* g10/getkey.c (lookup): Ditto.
-
-2021-05-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix sending an OpenPGP key with umlaut to an LDAP keyserver.
-	+ commit b8e6e485ee0b3389992f5de4d717e2e9cca92a9e
-	* g10/call-dirmngr.c (record_output): Rewrite.
-
-2021-05-18 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	scd:p15: Fix logic for appending product name to MANUFACTURER.
-	+ commit 65bc5ea95e608869fe57dae43e201ed47b98f9fe
-	* scd/app-p15.c (do_getattr): Append product name to MANUFACTURER if
-	manufacturer_id does not already contain a bracket and if we have a
-	product name.
-
-2021-05-17 Werner Koch <wk@gnupg.org>
-
-	gpg: Use a more descriptive prompt for symmetric decryption.
-	+ commit 6dfae2f402a702ccd7f2c585b28cb356e9f26a26
-	* g10/keydb.h (GETPASSWORD_FLAG_SYMDECRYPT): New.
-	(passphrase_to_dek_ext): Remove this obsolete prototype.
-	* g10/passphrase.c (passphrase_get): Add arg flags. Use new flag
-	value.
-	(passphrase_to_dek): Add arg flags and pass it on.
-	* g10/mainproc.c (proc_symkey_enc): Use new flag.
-
-	* sm/decrypt.c (pwri_decrypt): Use "passphrase".
-
-	dirmngr: LDAP search by a mailbox now ignores revoked keys.
-	+ commit 1406f551f1e00a03eabf5b8bd3011bf6393ce318
-	* dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Ignore revoked
-	and disable keys in mail mode.
-
-	sm: Ask for the password for password based decryption (pwri)
-	+ commit eeb65d3bbd7d461694d30009631739735a2b9bad
-	* sm/decrypt.c (pwri_decrypt): Add arg ctrl. Ask for passphrase.
-
-	* sm/export.c (export_p12): Mark string as translatable.
-	* sm/import.c (parse_p12): Ditto.
-
-2021-05-14 Werner Koch <wk@gnupg.org>
-
-	sm: Support decryption of password based encryption (pwri)
-	+ commit 02029f9eab87e9fd667829dfb083846275576398
-	* sm/decrypt.c (pwri_parse_pbkdf2): New.
-	(pwri_decrypt): New.
-	(prepare_decryption): Support pwri.
-	(gpgsm_decrypt): Test for PWRI. Move IS_DE_VS flag to DFPARM.
-
-2021-05-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Remove wrong assertion and add protection to PCSC.COUNT.
-	+ commit 58b330e935b9225d5a389c5d858a0e7304f573ad
-	* scd/apdu.c (apdu_dev_list_finish): Fix for calling
-	release_pcsc_context.
-
-2021-05-12 Werner Koch <wk@gnupg.org>
-	 Jakub Jelen <jjelen@redhat.com>
-
-	agent: Use SHA-256 for SSH fingerprint by default.
-	+ commit 310b064f5271fe8566ebc996702ea1422875f425
-	* agent/gpg-agent.c (parse_rereadable_options): Change default ssh
-	fingerprint digest.
-	(main): Ditto.
-
-2021-05-11 Werner Koch <wk@gnupg.org>
-
-	A few minor code cleanups and typo fixes.
-	+ commit 965bb0693c0df04e6dbd57a8b471944367cf6c4e
-	* agent/command-ssh.c (ssh_handler_request_identities): Remove double
-	check of ERR.
-	* g10/getkey.c (get_pubkey_byname): Remove double use of break.
-	* g10/pkglue.c (pk_encrypt): Handle possible NULL-ptr access due to
-	failed malloc.
-
-2021-05-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix allocation for EXTRAHASH.
-	+ commit ac731dbbbd21f53d2f6bf69343e6bf553ebc9dad
-	* g10/sign.c (clearsign_file): Fix the size to allocate.
-
-	scd: Serialize READER_TABLE access for PC/SC.
-	+ commit 32baa9acfb153004bdb2509f9516482b78f256a4
-	* scd/apdu.c (apdu_dev_list_start): Remove locking READER_TABLE_LOCK.
-	Don't increment PCSC.COUNT here.
-	(apdu_dev_list_finish): Don't decrement PCSC.COUNT here.
-	(apdu_open_reader): Protect access with READER_TABLE_LOCK.
-
-2021-05-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix close_pcsc_reader.
-	+ commit ec5591dc4e1f1b0340b9043a410dc62b63a90416
-	* scd/apdu.c (close_pcsc_reader): Don't touch .RDRNAME field.
-	(apdu_dev_list_finish): Clear .RDRNAME field and replace call of
-	close_pcsc_reader by release_pcsc_context. Add assertion.
-
-	scd: Make sure releasing PC/SC context.
-	+ commit cccc9bd5db1f00c35dff192935e91d46cafb259f
-	* scd/apdu.c (release_pcsc_context): New.
-	(close_pcsc_reader): Use release_pcsc_context. Add assertion.
-	(apdu_dev_list_start): Replace call of close_pcsc_reader
-	into release_pcsc_context, add condition.
-
-2021-05-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Increment PCSC.COUNT correctly.
-	+ commit 0498ea8fbd57d0df3093301d551db6b287ccf622
-	* scd/apdu.c (open_pcsc_reader): PCSC.COUNT should
-	be incremented before possible call of close_pcsc_reader.
-
-	scd: Fix memory leak for RDRNAME and serialize access.
-	+ commit 5d1b41310682a599a16bcb95e18f56e62299059e
-	* scd/apdu.c (close_pcsc_reader): Move locking to...
-	(apdu_close_reader): ... here, as it's also needed for CCID driver.
-	Free RDRNAME when closed.
-
-	scd: Fix declarations for PC/SC access.
-	+ commit 039aed9d401f3875eee0251d34be74de7a1daf84
-	* scd/apdu.c (pcsc_begin_transaction, pcsc_transmit): Use HANDLE.
-
-2021-05-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Recover the partial match for PORTSTR for PC/SC.
-	+ commit 53bdc6288f9b474e53f06088130e304cee41b12d
-	* scd/apdu.c (apdu_open_reader): Allow partial match of
-	PORTSTR again just like 2.2 does.
-
-	scd: When reader is specified, make sure only open once.
-	+ commit d6fe82d3d1699eb417f87b487048f95fee91e2cd
-	* scd/apdu.c (apdu_open_reader): Make sure not to try multiple times,
-	when PORTSTR is specified.
-
-2021-04-29 Werner Koch <wk@gnupg.org>
-
-	scd: Fix PC/SC removed card problem.
-	+ commit 8d81fd7c01e8dfacc719ff190f8e364014e32fdf
-	* scd/apdu.c (pcsc_cancel): New.
-	(pcsc_init): Load new function.
-	(connect_pcsc_card): Use it after a removed card error.
-
-2021-04-28 Werner Koch <wk@gnupg.org>
-
-	scd: Fix problem with reader list becoming empty.
-	+ commit bb8e3996e44f4f057f0771b9b72c89feae00f1b1
-	* scd/apdu.c (close_pcsc_reader): Do not decrement refcount if already
-	zero. Always release context if or becomes zero.
-	(apdu_dev_list_start): Unlock prior to close_pcsc_reader. For PC/SC
-	increment the count. Always release the lock.
-	(apdu_dev_list_finish): No more unlocking. Use close_pcsc_reader
-	instead of code duplication.
-
-	* scd/apdu.c (pcsc_error_string): Add an error code.
-	* scd/scdaemon.c (scd_kick_the_loop): Fix a diagnostic.
-
-2021-04-27 Kirill Elagin <kirelagin@gmail.com>
-
-	scd: Fix unblock PIN by a Reset Code with KDF.
-	+ commit f209d7d2db0e963a6ad1fa8c4f0c034ba0297842
-	* scd/app-openpgp.c (do_change_pin): Use correct CHVNO=1 for
-	pin2hash_if_kdf, for user's PIN.
-
-2021-04-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix mailbox based search via AKL keyserver method.
-	+ commit 4fcfac6feb2a6c2b14883ba406afc917e8d4be42
-	* g10/keyserver.c (keyserver_import_name): Rename to ...
-	(keyserver_import_mbox): this. And use mail search mode.
-	* g10/getkey.c (get_pubkey_byname): Change the two callers.
-
-	gpg: Do not use import-clean for LDAP keyserver imports.
-	+ commit 99db4b0c7fd128ea5b2e251fe854bd57f6322238
-	* g10/options.h (opts): New field expl_import_only.
-	* g10/import.c (parse_import_options): Set it.
-	* g10/keyserver.c (keyserver_get_chunk): Add special options for LDAP.
-
-2021-04-25 Werner Koch <wk@gnupg.org>
-
-	gpg: Auto import keys specified with --trusted-keys.
-	+ commit 100037ac0f558e8959fc065d4703c85c2962489e
-	* g10/getkey.c (get_pubkey_with_ldap_fallback): New.
-	* g10/trustdb.c (verify_own_keys): Use it.
-
-	scd:p15: Fix last commit and improve D-TRUST detection.
-	+ commit cc5aa68b6310bdeaa1102bb0d6a33420920648e7
-	* scd/app-p15.c (read_p15_info): Improve D-TRUST card detection.
-	(do_getattr): Fix faulty code for the last commit. Append the product
-	name to MANUFACTURER.
-
-	scd:p15: Shorten the displayed s/n of RSCS cards.
-	+ commit 21e3f750bd7dde2ae9ece01b1abdd1b47ba4fb04
-	* scd/app-p15.c (get_dispserialno): Add dedicated handling for RSCS.
-
-2021-04-23 Werner Koch <wk@gnupg.org>
-
-	gpg: Replace an obsolete trustdb function.
-	+ commit 3cbc66410d62ad2f7e559095753a2385fe644d07
-	* g10/trustdb.c (tdb_register_trusted_keyid): Make static.
-	(tdb_register_trusted_key): Replace register_trusted_keyid by
-	tdb_register_trusted_key.
-	* g10/keygen.c (do_generate_keypair): Ditto.
-	* g10/trust.c (register_trusted_keyid): Remove.
-
-	gpg: Allow decryption w/o public key but with correct card inserted.
-	+ commit 50293ec2ebf2a997dbad9a47166d694efcc0709a
-	* agent/command.c (cmd_readkey): Add option --no-data and special
-	handling for $SIGNKEYID and $AUTHKEYID.
-	* g10/call-agent.c (agent_scd_getattr): Create shadow keys for KEY-FPR
-	output.
-	* g10/skclist.c (enum_secret_keys): Automagically get a missing public
-	key for the current card.
-
-	agent: Require verbose level 2 for handler started/terminated notices.
-	+ commit 84c2d97cca76045bbe9d0598a10623d5d91e6530
-	* agent/gpg-agent.c (do_start_connection_thread): Silence diags even
-	more.
-
-2021-04-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	tools: Fix for --disable-tpm2d.
-	+ commit 97ba94e52b2390f43fc1ac7db98e8ee7a37ddfb1
-	* tools/gpgconf-comp.c: Conditionalize with BUILD_WITH_TPM2D.
-
-2021-04-22 Werner Koch <wk@gnupg.org>
-
-	scd: Fix PSO_CSV for 512 bit curves.
-	+ commit 9e24f2a45ce8038f662ec1a9893669e1d5604ec7
-	* scd/iso7816.c (iso7816_pso_csv): Use BER-TLV instead of SIMPLE-TLV
-
-	tests: Make sure that the build keyboxd is used.
-	+ commit d36c4dc95b72b780375d57311bdf4ae842fd54fa
-	* tests/openpgp/defs.scm (create-gpghome): Add keyboxd-program.
-
-2021-04-21 Werner Koch <wk@gnupg.org>
-
-	card: New option --shadow for command list.
-	+ commit 2fce99d73a6afc1a1a29041722a934bb81c7d739
-	* tools/card-call-scd.c (scd_readkey): Add arg create_shadow.
-	* tools/gpg-card.c (list_one_kinfo): Add arg create_shadow and pass it
-	down to scd-readkey. Change all callers to convey this arg.
-	(cmd_list): Add option --shadow.
-
-	agent: Silence error messages for READKEY --card.
-	+ commit 8f2c9cb73538baab7da8107f2cceb2f6fc49642a
-	* agent/command.c (cmd_readkey): Test for shadow key before creating
-	it.
-
-	gpg: Allow fingerprint based lookup with --locate-external-key.
-	+ commit ec36eca08cdbf6653e7362e8e0e6c5f2c75b4a60
-	* g10/keyserver.c (keyserver_import_fprint_ntds): New.
-	* g10/getkey.c (get_pubkey_byname): Detect an attempt to search by
-	fingerprint in no_local mode.
-
-	keyboxd: Fix searching for exact mail addresses.
-	+ commit f79e9540ca643b5cb912e7bfca2af56be428efed
-	* kbx/kbxserver.c (cmd_search): Use the openpgp hack for calling
-	classify_user_id.
-	* kbx/backend-sqlite.c (run_select_statement): Remove angle brackets
-	in exact addrspec mode.
-	* g10/call-keyboxd.c (keydb_search): Do not duplicate the left angle
-	bracket.
-	* sm/keydb.c (keydb_search): Ditto.
-
-	gpg,sm: Ignore the log-file option from common.conf.
-	+ commit d153e4936e05ab3b15df3c092024d83ac9d6ca46
-	* g10/gpg.c (main): Don't use the default log file from common.conf.
-	* sm/gpgsm.c (main): Ditto.
-
-2021-04-20 Werner Koch <wk@gnupg.org>
-
-	Release 2.3.1.
-	+ commit cbbdb88627fe57ebf02b8b4bf9002d356e57e2e4
-
-
-	Support log-file option from common.conf for all daemon.
-	+ commit 45918813f0599505e4f84bd44b09fb708b4e7f23
-	* agent/gpg-agent.c: Include comopt.h.
-	(main): Read log-file option from common.conf.
-	(reread_configuration): Ditto.
-	* dirmngr/dirmngr.c: Include comopt.h.
-	(main): Read log-file option from common.conf.
-	(reread_configuration): Ditto.
-	* kbx/keyboxd.c: Include comopt.h.
-	(main): Read log-file option from common.conf.
-	(reread_configuration): Ditto.
-	* scd/scdaemon.c: Include comopt.h.
-	(main): Read log-file option from common.conf.
-
-	gpgconf: Fix a diagnostic output.
-	+ commit b657d6c3bd8103d40d511a3293313a891a26a9f5
-	* tools/gpgconf-comp.c (gc_component_launch): Fix diagnostic.
-	* doc/examples/common.conf: Fix example.
-
-	sm: New command --show-certs.
-	+ commit 51419d63415ae2aa029f8829099b6789b264edc5
-	* sm/keylist.c (do_show_certs): New.
-	(gpgsm_show_certs): New.
-	* sm/gpgsm.c (aShowCerts): New.
-	(opts): Add --show-certs.
-	(main): Call gpgsm_show_certs.
-
-2021-04-19 Werner Koch <wk@gnupg.org>
-
-	build: Fix build problems on macOS for gpgsm tests and gpg-card.
-	+ commit 5fe60576d50f7c857d0a865a9630212422fa1ad1
-	* tools/gpg-card.c: Include ctype.h.
-	* sm/Makefile.am (t_common_ldadd): Add LIBICONV.
-
-2021-04-19 Damien Goutte-Gattat via Gnupg-devel <gnupg-devel@gnupg.org>
-
-	build: Allow selection of TSS library.
-	+ commit 93c88d0af36b70a406997b40c49bfc14c17b4cd2
-	* configure.ac: New option --with-tss to force the use of a
-	specific TSS library.
-
-	gpg: Fix showpref to list AEAD feature.
-	+ commit 86f446fd446fcc7295ecf6b37a3f4cca45a165f1
-	* g10/keyedit.c (show_prefs): Show 'AEAD' if flags.aead is set.
-
-2021-04-19 Werner Koch <wk@gnupg.org>
-
-	gpg,gpgsm: Move use-keyboxd to the new conf file common.conf.
-	+ commit d13c5bc244ce1daed285424d920171fc2bcd7290
-	* common/comopt.c, common/comopt.h: New.
-	* common/Makefile.am: Add them.
-	* g10/gpg.c: Include comopt.h.
-	(main): Also parse common.conf.
-	* sm/gpgsm.c: Include comopt.h.
-	(main): Set a flag for the --no-logfile option. Parse common.conf.
-
-	* tools/gpgconf-comp.c (known_options_gpg): Remove "use-keyboxd", add
-	pseudo option "use_keyboxd".
-	(known_pseudo_options_gpg): Add pseudo option "use_keyboxd".
-	(known_options_gpgsm): Remove "use-keyboxd".
-
-	* tests/openpgp/defs.scm (create-gpghome): Create common.conf.
-
-	* doc/examples/common.conf: New.
-
-2021-04-16 Werner Koch <wk@gnupg.org>
-
-	gpg: Lookup a missing public key of the current card via LDAP.
-	+ commit d7e707170fbe2956deb3d81e2802d21352079722
-	* g10/getkey.c (get_seckey_default_or_card): Lookup a missing public
-	key from the current card via LDAP.
-	* g10/call-dirmngr.c: Include keyserver-intetnal.h.
-	(gpg_dirmngr_ks_get): Rename arg quick into flags. Take care of the
-	new LDAP flag.
-	* g10/keyserver-internal.h (KEYSERVER_IMPORT_FLAG_QUICK): New.
-	Replace the use of the value 1 for the former quick arg.
-	(KEYSERVER_IMPORT_FLAG_LDAP): New.
-	* g10/keyserver.c (keyserver_get_chunk): Increase the reserved line
-	length.
-	* dirmngr/ks-action.c (ks_action_get): Add arg ldap_only.
-	* dirmngr/server.c (cmd_ks_get): Add option --ldap.
-
-	scd:p15: Support attribute KEY-FPR.
-	+ commit 30f90fc8574be4c48ac8d3ff41479481414c0dee
-	* scd/app-p15.c: Include openpgpdefs.h.
-	(struct prkdf_object_s): Add fields have_keytime and ecdh_kdf.
-	(read_p15_info): Set ecdh_kdf.
-	(keygrip_from_prkdf): Flag that we have the keytime.
-	(send_keypairinfo): Send the key time only if valid.
-	(send_key_fpr_line): New.
-	(send_key_fpr): New.
-	(do_getattr): Add KEY-FPR.
-
-	common: New module to compute openpgp fingerprints.
-	+ commit 2f2bdd9c0894eb43f719da8b529b4c7a46f742a0
-	* common/openpgp-fpr.c: New.
-	* common/Makefile.am (common_sources): Add it.
-
-2021-04-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not use self-sigs-only for LDAP keyserver imports.
-	+ commit 6c26e593df51475921410ac97e9227df6b258618
-	* dirmngr/ks-engine-ldap.c (ks_ldap_get): Print a SOURCE status.
-	* g10/options.h (opts): New field expl_import_self_sigs_only.
-	* g10/import.c (parse_import_options): Set it.
-	* g10/keyserver.c (keyserver_get_chunk): Add special options for LDAP.
-
-2021-04-13 Jakub Jelen <jjelen@redhat.com>
-
-	common: Fix memory leaks.
-	+ commit a16f726f9404f173705cc3bef71daee38d2c094b
-	* common/name-value.c (do_nvc_parse): Free NAME.
-	* common/recsel.c (recsel_parse_expr): Release SE_HEAD and EXPR_BUFFER.
-
-	kbx: Fix memory leak.
-	+ commit 51bbd99a3c9b09a78e766a312d97a1d40372c6cd
-	* kbx/keybox-update.c (blob_filecopy): Goto leave instead of return.
-
-	tools: Fix memory leaks.
-	+ commit 4c8be54cc430bbebd41fd7c452ff4ff9e8ff2bd5
-	* tools/gpgsplit.c (write_part): Free BLOB on error.
-
-	scd: Fix memory leaks.
-	+ commit 7cbe29c4fb4f593e194b6c25cb31633b4a6e0b2b
-	* scd/apdu.c (apdu_dev_list_start): Free DL.
-	* scd/app-nks.c (pubkey_from_pk_file): Fix typo in condition.
-
-	agent,kbx: Add LIBASSUAN_CLFAGS.
-	+ commit cd66b2eb0d34b135175899362e191fff81588608
-	* agent/Makefile.am (gpg_preset_passphrase_CFLAGS, t_protect_CFLAGS):
-	Add LIBASSUAN_CFLAGS.
-	* kbx/Makefile.am (libkeybox_a_CFLAGS, libkeybox509_a_CFLAGS):
-	Likewise.
-
-2021-04-12 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Match private keys with certificates also by labels.
-	+ commit ecb9265b8dc03a153044e19be804d4c2d2caa4e8
-	* scd/app-p15.c (cdf_object_from_label): New.
-	(cdf_object_from_certid): Fallback to label matching.
-	(read_p15_info): Ditto.
-	(keygrip_from_prkdf): Ditto. Replace duplicated code by a call to
-	cdf_object_from_objid.
-
-2021-04-08 Werner Koch <wk@gnupg.org>
-
-	scd:nks: Handle APP_READKEY_FLAG_INFO.
-	+ commit 63320ba2f8147ee86f4406c9590f6b28cad4771d
-	* scd/app-nks.c (keygripstr_from_pk_file): Fix ignored error.
-	(get_nks_tag): New.
-	(do_learn_status_core): Use it. Make sure not to mange the
-	KEYPAIRINFO line if no usage is known.
-	(do_readkey): Output the KEYPAIRINFO for the keygrip case.
-
-	scd: Fix duplicate output of KEYPAIRINFO by readkey command.
-	+ commit 22fd48e48d007a0cba6c8a8f6ad6cb4fe7470534
-	* scd/app-help.c (app_help_get_keygrip_string_pk): Make HEXKEYGRIP
-	parm optional.
-	* scd/command.c (do_readkey): Remove duplicate output of keypairinfo
-	lines.
-
-2021-04-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Ed448 and X448 are only for v5.
-	+ commit 36355394d865f5760075e62267d70f7a7d5dd671
-	* g10/keygen.c (parse_key_parameter_part): Generate with version 5
-	packet, when it's Ed448 or X448.
-
-	scd: Fix CCID driver for SCM SPR332/SPR532.
-	+ commit ab66c4357595b8a10ca25fd735f439fe795919b2
-	* scd/ccid-driver.c (ccid_vendor_specific_pinpad_setup): New.
-	(ccid_vendor_specific_setup): Only send CLEAR_HALT.
-	(ccid_transceive_secure): Each time, use send_escape_cmd.
-
-	common: Fix gnupg_wait_processes, by skipping invalid PID.
-	+ commit d82dae5d2229a30dbc78aadc4d544d30dac76a1c
-	* common/exechelp-posix.c (gnupg_wait_processes): Skip invalid PID.
-
-2021-04-07 Werner Koch <wk@gnupg.org>
-
-	Release GnuPG 2.3.0.
-	+ commit c922a798a341261f1aafaf7c1c0217e4ce3e3acf
-
-
-2021-04-01 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Return a new pseudo option compliance_de_vs.
-	+ commit a78475fbb7b60ca96137fbe179d8b939cfe2cd89
-	* tools/gpgconf-comp.c (known_pseudo_options_gpg): Add
-	"compliance_de_vs".
-	* g10/gpg.c (gpgconf_list): Returh that pseudo option.
-
-	common: Make the compliance check more robust.
-	+ commit 1d1ec1146c04415c7051af62e133459a4537c945
-	* common/compliance.c (get_compliance_cache): New.
-	(gnupg_rng_is_compliant): Use per mode cache.
-	(gnupg_gcrypt_is_compliant): Ditto.
-
-	card: New flag --reread for LIST.
-	+ commit c727951a2440913bbab5b250c9bd2bb1d35ab0d7
-	* tools/gpg-card.c (cmd_list): Add flag --reread.
-	* tools/card-call-scd.c (scd_learn): New arg reread.
-
-	* tools/card-call-scd.c (release_card_info): Fix releasing of the new
-	label var.
-
-	scd: New flag --reread for LEARN.
-	+ commit ff87f4e578f412332ae59fdab016f0a5304baaf9
-	* scd/command.c (cmd_learn): Add flag --reread.
-	* scd/app-common.h (struct app_ctx_s): New field need_reset.
-	* scd/app.c (write_learn_status_core): Set need_reset if we notice an
-	error after returning from a reread. Change all callers of card
-	functions to return GPG_ERR_CARD_RESET so that that app is not anymore
-	used.
-
-	scd:p15: New flag APP_LEARN_FLAG_REREAD.
-	+ commit e17d3f866057543d142d63379fd4f4a36d79147f
-	* scd/app-p15.c (do_deinit): Factor code out to ...
-	(release_lists, release_tokeninfo): new.
-	(read_ef_tokeninfo): Reset all data before reading.
-	(read_p15_info): Ditto.
-	(do_learn_status): Implement reread flag.
-
-2021-03-31 Werner Koch <wk@gnupg.org>
-
-	scd: Replace all assert macros by the log_assert macro.
-	+ commit 1c16878efd0bcf036f56abef93d64ac41ce9e95b
-
-
-	build: Require automake 1.16.3.
-	+ commit 6ca540715139899137e1f86c7e1dcbd0288f15b3
-	* configure.ac (min_automake_version): Bump to 1.16.3
-
-2021-03-31 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update gpg-error.m4.
-	+ commit 8d6152a4cfd8a4cf176c01f99e1d49eeecab4367
-	* m4/gpg-error.m4: Update from libgpg-error.
-
-2021-03-30 Werner Koch <wk@gnupg.org>
-
-	card: Print the key's label if available.
-	+ commit 0d6f276f61c583d776687029c715b1ee4280e4ed
-	* tools/gpg-card.h (struct key_info_s): Add field 'label'.
-	* tools/card-call-scd.c (learn_status_cb): Parse KEY-LABEL.
-	(scd_learn): Always request KEY-LABEL.
-	* tools/gpg-card.c (nullnone): New.
-	(list_one_kinfo, list_card): Use it. Print the label.
-
-	scd:p15: Return labels for keys and certificates.
-	+ commit 7f9126363265a6b6fe4223d68fc4e87678c4ddfc
-	* scd/app-p15.c (send_certinfo): Extend certinfo.
-	(do_getattr): Support KEY-LABEL.
-
-	scd:p15: For CardOS make use of ISO7816_VERIFY_NOT_NEEDED.
-	+ commit 651c07a7301c33229af051d83edbf898bae52e8b
-	* scd/app-p15.c (verify_pin): Take care of verify status.
-
-	scd:p15: Return the creation time of the keys.
-	+ commit de4d3c99aa58ee06ae978d59e7e3aa7bace1c440
-	* scd/app-p15.c (struct prkdf_object_s): Add keytime and keyalgostr.
-	(keygrip_from_prkdf): Set them.
-	(send_keypairinfo): Extend KEYPAIRINFO.
-
-2021-03-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Fix for make distcheck, no EPS support.
-	+ commit d1bac0a3be7081a4bfc7f813f9d626e1396ad5c1
-	* Makefile.am (AM_DISTCHECK_DVI_TARGET): Specify 'pdf'.
-	* doc/Makefile.am (EXTRA_DIST, BUILT_SOURCES): Remove EPS files.
-	(gnupg.dvi): Remove.
-
-2021-03-29 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Make RSA with SHA512 work with CardOS.
-	+ commit 592f48011790e30d4bcfd9093eb58b786c8c9a8b
-	* scd/app-p15.c (do_sign): Rewrite.
-
-	agent: Skip unknown unknown ssh curves seen on cards.
-	+ commit 2d2391dfc25cfe160581b1bb4b4b8fc4764ac304
-	* agent/command-ssh.c (ssh_handler_request_identities): Skip unknown
-	curves.
-
-	scd:p15: Support ECDSA and ECDH for CardOS.
-	+ commit a494b29af9cc9c4c8c8323bae20e845d5a390448
-	* scd/iso7816.c (iso7816_pso_csv): New.
-	* scd/app-help.c (app_help_pubkey_from_cert): Uncompress a point if
-	needed.
-
-	* scd/app-p15.c (CARD_PRODUCT_RSCS): New.
-	(struct prkdf_object_s): Add fields is_ecc, token_label, and
-	tokenflags.
-	(do_deinit): Free new fields.
-	(cardproduct2str): New.
-	(read_ef_prkdf): Set new is_ecc flag.
-	(read_ef_tokeninfo): Store some data and move Tokeninfo diags to ...
-	(read_p15_info): here. set the product info here after all data has
-	been gathered.
-	(send_keypairinfo): Chnage the way the gpgusage flags are used.
-	(make_pin_prompt): If the token has a label and the current cert has
-	no CN, show the label as holder info.
-	(do_sign): Support ECDSA. Take care of the gpgusage flags.
-	(do_decipher): Support ECDH. Take care of the gpgusage flags.
-
-	gpg: Allow ECDH with a smartcard returning just the x-ccordinate.
-	+ commit f129b0e97730b47d62482fba9599db39b526f3d2
-	* g10/ecdh.c (extract_secret_x): Add extra safety check. Allow for
-	x-only coordinate.
-
-2021-03-28 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Do not i18n an empty string to the PO files meta data.
-	+ commit 18d884f8411a0ca263a8aa588bb49eb0dae9ee19
-	* tools/gpgconf-comp.c (my_dgettext): Ignore empty strings.
-
-2021-03-26 Werner Koch <wk@gnupg.org>
-
-	tests: Make sure the built keyboxd is used by the tests.
-	+ commit a5e72b663b3649c939d32d6526b5e2b3347dedd9
-	* tests/openpgp/defs.scm (tool): Add keyboxd.
-	* tests/openpgp/setup.scm: Ditto.
-
-	gpgconf: Fix another argv overflow if --homedir is used.
-	+ commit 057131159b445d2d49392e95c677ad7b4cd4ae9c
-	* tools/gpgconf-comp.c (gc_component_check_options): Increase array.
-
-	gpgconf: Fix argv overflow if --homedir is used.
-	+ commit d3d57a1bc88ece0c12c91f54b089482cce92c5a0
-	* tools/gpgconf-comp.c (gc_component_launch): Fix crasg due to too
-	small array.
-	(gpg_agent_runtime_change): Fix error message.
-	(scdaemon_runtime_change): Ditto.
-	(tpm2daemon_runtime_change): Ditto.
-	(dirmngr_runtime_change): Ditto.
-	(keyboxd_runtime_change): Ditto.
-
-	agent: Add debug output for failed RSA signature verification.
-	+ commit 6de1ec3ba59fa54ab60b2923ba9caa77fc9d5281
-	* agent/pksign.c (agent_pksign_do): Support ECC and DSA verification
-	and print some debug info in the error case.
-
-	common: New function to uncompress an ECC public key.
-	+ commit 935765b451aadc63fbba763a4a00f4efa0254436
-	* common/sexputil.c (ec2os): New.
-	(uncompress_ecc_q_in_canon_sexp): New.
-
-	* common/t-sexputil.c (fail2): new.
-	(test_ecc_uncompress): New.
-	(main): Run new test.
-
-2021-03-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix PC/SC error handling at apdu_dev_list_start.
-	+ commit d4e5979c630c2960cf1fd5796f1060419e71cb04
-	* scd/apdu.c (PCSC_E_NO_READERS_AVAILABLE): Add.
-	(pcsc_error_to_sw): Handle PCSC_E_NO_READERS_AVAILABLE.
-	(apdu_dev_list_start): Return error correctly.
-
-2021-03-24 Werner Koch <wk@gnupg.org>
-
-	card: Add option --use-default-pin to command "login".
-	+ commit 73bad368dacf5334bf78af15b243d06fd1273849
-	* tools/gpg-card.c (cmd_login): Add option.
-
-	scd:p15: Make $SIGNKEY et al determination more fault tolerant.
-	+ commit 964363e788210f96a471e31ffa8fd17b534c0aa8
-	* scd/app-p15.c (do_getattr): Change how we use gpgUsage to figure out
-	the keys to use.
-
-2021-03-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix v5 signature for clearsign.
-	+ commit 14ef703ad65850fa22d394c4d521ba602ff2cc8d
-	* g10/sign.c (clearsign_file): Prepare EXTRAHASH.
-
-	gpg: Support ECDH with v5 key.
-	+ commit 90a5b4e648b3c8a6fe645df7e61654dfdb3548be
-	* g10/ecdh.c (build_kdf_params): Use the first 20 octets.
-	* g10/pkglue.c (pk_encrypt): Remove length check to 20.
-	* g10/pubkey-enc.c (get_it): Likewise.
-
-2021-03-23 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Fix listing of default_pubkey_algo.
-	+ commit a107b24ddb45c9eef432d456f302c1acea3af27c
-	* tools/gpgconf-comp.c (known_options_gpg, known_options_gpgsm): No
-	flags needed for pseudo options.
-	(known_pseudo_options_gpg, known_pseudo_options_gpgsm): New.
-	(gc_component): Add field known_pseudo_options.
-	(struct read_line_wrapper_parm_s): New.
-	(read_line_wrapper): New.
-	(retrieve_options_from_program): Use read_line_wrapper to handle
-	pseudo options.
-
-2021-03-22 Werner Koch <wk@gnupg.org>
-
-	kbxd: Group the options.
-	+ commit ed82ef91459f72b955f4e342ab88a7a0949c436b
-	* kbx/keyboxd.h (opt): Remove unused field 'batch'.
-	* kbx/keyboxd.c (opts): Remove --batch. Add group descriptions.
-
-2021-03-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Support exporting Ed448 SSH key.
-	+ commit 1524a942b645d9facbedd9ed4a472e343838b6a1
-	* common/openpgp-oid.c (oid_ed448, openpgp_oidbuf_is_ed448): New.
-	(openpgp_oid_is_ed448): New.
-	* common/util.h (openpgp_oid_is_ed448): New.
-	* g10/export.c (export_one_ssh_key): Support Ed448 key.
-
-	gpg: Fix exporting SSH key.
-	+ commit 0b45c5a9941094bd4529c3bf5b1cb8ce2584b9a4
-	* g10/export.c (export_one_ssh_key): Finish base 64 encoder before
-	writing out the comment string.
-
-2021-03-19 Werner Koch <wk@gnupg.org>
-
-	card: Support OpenPGP.1 and OpenPGP.2 for readcert and writecert.
-	+ commit 475644e049436c49de7620a1539515479ad2aa4f
-	* tools/gpg-card.c (cmd_writecert): Allow the other key references.
-	(cmd_readcert): Ditto.
-
-	scd:openpgp: Allow reading and writing user certs for keys 1 and 2.
-	+ commit 37b1c5c2004c1147a13b388863aaa8f0caf7d71f
-	* scd/iso7816.c (CMD_SELECT_DATA): New.
-	(iso7816_select_data): New.
-	* scd/app-openpgp.c (do_readcert): Allow OpenPGP.1 and OPENPGP.2
-	(do_writecert): Ditto.
-	(do_setattr): Add CERT-1 and CERT-2.
-
-	scd:openpgp: Rename an internal variable.
-	+ commit bbdb48ec0ddd99ce23fcba42949c00a2594fb9a5
-	* scd/app-openpgp.c (struct app_local_s): s/extcap_v3/is_v3/.
-	s/max_certlen_3/max_certlen. Change users.
-
-	scd:openpgp: Small speedup reading card properties.
-	+ commit d5fb5983232cf4d60cf6aa00d0ae5a16cf948e19
-	* scd/app-openpgp.c (struct app_local_s): Add new flag.
-	(get_cached_data): Force chace use if flag is set.
-	(app_select_openpgp): Avoid reading DO 6E multiple times.
-
-2021-03-18 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Allow to use an auth object label with cmd CHECKPIN.
-	+ commit 85082a83c2c1bda50fe6b7aa2ac68cef4faca4c7
-	* scd/app-p15.c (prepare_verify_pin): Allow for PRKDF to be NULL.
-	(make_pin_prompt): Ditto.
-	(verify_pin): Ditto.
-	(do_check_pin): Allow using the Label to specify a PIN.
-
-	card: Print PIN descriptions and fix number of printed retry counters.
-	+ commit 1ac189f2df6cedab3a133baca69558fdf6a908d4
-	* tools/gpg-card.h (struct card_info_s): Add fields nmaxlen, nchvinfo,
-	and chvlabels.
-	* tools/card-call-scd.c (release_card_info): Free chvlabels.
-	(learn_status_cb): Parse CHV-LABEL. Set nmaxlen and nchvinfo.
-	* tools/gpg-card.c (list_retry_counter): Print CHV labels.
-
-	scd:p15: New attribute CHV-LABEL.
-	+ commit ef29a960bf06005c34093cd9a6bca5a202ed359a
-	* scd/app-p15.c (parse_common_obj_attr): Map spaces in the lapel to
-	underscores.
-	(read_ef_aodf): Prettify printing of the type.
-	(do_getattr): New attribute CHV-LABEL
-	(do_learn_status): Emit CHV-LABEL.
-	(verify_pin): Distinguish the PIN prompts.
-
-	agent: Simplify a function.
-	+ commit 26215cb211ad93ad9cc51fb4f8257b9e3c254a4e
-	* agent/findkey.c (agent_public_key_from_file): Use a membuf instead
-	of handcounting space.
-
-2021-03-16 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Implement CHV-STATUS attribute.
-	+ commit bf1d7bc3697c7d650994ba94d3704af189594657
-	* scd/command.c (send_status_direct): Return an error.
-	* scd/app-p15.c (do_learn_status): Emit CHV-STATUS.
-	(compare_aodf_objid): New.
-	(do_getattr): Implement CHV-STATUS.
-
-	card: Generalize the CHV counter printing.
-	+ commit e4c2d7be22ffb47b41a3b6c1152bd75dceed74e2
-	* tools/gpg-card.c (list_retry_counter): New. Factored out from the
-	other functions.
-	(cmd_verify): Re-read the chv status.
-
-2021-03-16 Damien Goutte-Gattat via Gnupg-devel <gnupg-devel@gnupg.org>
-
-	build: Check for the IBM TSS tools to run the tpm2d tests.
-	+ commit c0f50811fcf81e5ebe2df326342081cfdacfbbfc
-	* configure.ac (TEST_LIBTSS): Make that conditional depend on the
-	detection of tssstartup.
-
-	build: Fix distcheck when tpm2dtests are run.
-	+ commit ad481666ea6ef3743041ec6d043a3e6901ebab33
-	* tests/tpm2dtests/Makefile.am (EXTRA_DIST): Distribute test files.
-	(CLEANFILES): Make sure to remove log files.
-
-2021-03-15 James Bottomley <James.Bottomley@HansenPartnership.com>
-
-	tests:tpm2d: add missing start_sw_tpm.sh script.
-	+ commit a788f2e8306d80f7f3df34eb62ec7ce1a62d48e1
-	* tests/tpm2dtests/start_sw_tpm.sh: New.
-	* tests/tpm2dtests/Makefile.am: Add.
-
-2021-03-15 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --no-auto-trust-new-key.
-	+ commit 1523b5f76f6e600c4f2d153b49a807ff2dc8d268
-	* g10/gpg.c (oNoAutoTrustNewKey): New.
-	(opts): Add --no-auto-trust-new-key.
-	(main): Set it.
-	* g10/options.h (opt): Add flags.no_auto_trust_new_key.
-
-	build: new option to disable building of tpm2daemon.
-	+ commit 8d6123faa8cae0bad6f82c9021e9ac6686b2f55d
-	* configure.ac (build_tpmd): New configure option --disable-tpm2d
-	(BUILD_WITH_TPM2D): New.
-	* Makefile.am (tests): Use conditionally BUILD_TPM2D instead of
-	HAVE_LIBTSS.
-	* build-aux/speedo.mk (speedo_pkg_gnupg_configure) W32: Do not build
-	tpm2d.
-	* autogen.rc: Ditto.
-
-2021-03-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Add handling of Ed448 key.
-	+ commit b743942a9719be59f1da67cd338248fe7ee5aeab
-	* scd/app-openpgp.c (struct app_local_s): Add ecc.algo field.
-	(send_key_attr): Use ecc.algo field.
-	(ecc_read_pubkey): Use ecc.algo field.
-	(ecc_writekey): Ed448 means EdDSA.
-	(parse_algorithm_attribute): Set ecc.algo field from card.
-	Add checking for Ed25519 for ECC_FLAG_DJB_TWEAK flag.
-
-	scd: Fix count_sos_bits handling.
-	+ commit f482e4bd121ff2862bfb53a82f1d5c2cf3524a10
-	* scd/app-openpgp.c (count_sos_bits): Handle an exceptional case.
-
-	common: Fix the NBITS of Ed448in OIDTABLE.
-	+ commit 373b52e69a6ca609a663a0c4a018358fdf52dc7e
-	common/openpgp-oid.c (oidtable): Ed448 uses 456-bit signature.
-
-2021-03-12 Werner Koch <wk@gnupg.org>
-
-	scd: New option --pcsc-shared.
-	+ commit 5732e7a8e97cebf8e850c472e644e2a9b040836f
-	* scd/scdaemon.h (opt): Add field opcsc_shared.
-	* scd/scdaemon.c (opcscShared): New.
-	(opts): Add "--pcsc-shared".
-	(main): Set flag.
-	* scd/apdu.c (connect_pcsc_card): Use it.
-	(pcsc_get_status): Take flag in account.
-	* scd/app-openpgp.c (cache_pin): Bypass in shared mode.
-	(verify_chv2: Do not auto verify chv1 in shared mode.
-	* scd/app-piv.c (cache_pin): By pass caceh in shared mode.
-
-2021-03-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix computing fingerprint for ECC with SOS.
-	+ commit 95156ef9bfb6a3a525454d50ae2f5b538ccbd774
-	* scd/app-openpgp.c (count_sos_bits): New. Count as sos_write does.
-	(store_fpr): For ECC, use count_sos_bits.
-
-	gpg: Fix compute_fingerprint for ECC with SOS.
-	+ commit cfc1497efa8c98cf490f5efc9b280a6ec44514bd
-	* g10/keyid.c (hash_public_key): Tweak NBITS just as sos_write does.
-
-2021-03-11 Valtteri Vuorikoski <vuori@notcom.org>
-
-	scd:piv: Improve APT parser compatibility.
-	+ commit 8cad11d13b15b0ef672545b06450dfbea1fef18e
-	* scd/app-piv.c (app_select_piv): Allow for full AID.
-
-2021-03-11 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --force-sign-key.
-	+ commit fe02ef04500c1b35cd27132fb99ac1961f555193
-	* g10/gpg.c (oForceSignKey,opts): New option "--force-sign-key".
-	(main): Set it.
-	* g10/options.h (opt): New flag flags.force_sign_key.
-	* g10/keyedit.c (sign_uids): Use new flag.
-
-2021-03-11 James Bottomley via Gnupg-devel <gnupg-devel@gnupg.org>
-
-	tpmd2: Add Support for the Intel TSS.
-	+ commit b9c560e3a400da83073b232ee12fae090b21d20c
-	* configure.ac: Check for Intel TSS.
-	* tpm2d/intel-tss.h: New.
-	* tpm2d/tpm2.h (HAVE_INTEL_TSS): Use the Intel code.
-
-2021-03-10 James Bottomley <James.Bottomley@HansenPartnership.com>
-
-	tpm2d: add tests for the tpm2daemon.
-	+ commit 6720f1343aef9342127380b155c19e12c92d65ac
-	* configure.ac: Detect TPM emulator and enable tests.
-	* tests/tpm2dtests/: New test suite.
-	* tests/Makefile.am: Run tests.
-
-	gpg: Add new command keytotpm to convert a private key to TPM format.
-	+ commit 92b601fceec7da64939591001dba94e202f6e6a0
-	* agent/command.c (cmd_keytotpm): New.
-	(agent/command.c): Register new command KEYTOTPM.
-	* g10/call-agent.c (agent_keytotpm): New.
-	* g10/keyedit.c (cmdKEYTOTPM): New command "keytotpm".
-	(keyedit_menu): Implement.
-
-	agent: Add new shadow key type and functions to call tpm2daemon.
-	+ commit 1f995b9ba42b76c1d83b484e5362548a54a70dab
-	* agent/call-tpm2d.c: New.
-	* divert-tpm2.c: New.
-	* agent/Makefile.am: Add new files.
-	* agent/agent.h (DAEMON_TPM2D): New. Add stub fucntions.
-	* agent/call-daemon.c (GNUPG_MODULE_NAME_TPM2DAEMON): New.
-	* agent/command.c (do_one_keyinfo): Handle tpmv2.
-	* agent/gpg-agent.c (oTpm2daemonProgram): New.
-	(opts): New option --tpm2daemon-program.
-	(parse_rereadable_options): Handle option.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Divert to tpm2d.
-	(agent_pksign_do): Ditto.
-	---
-
-	A new shadow key type: "tpm2-v1" is introduced signalling that the
-	shadowed key is handled by the tpm2daemon. A function to identify
-	this type is introduced and diversions to the tpm2daemon functions are
-	conditioned on this function for pkign and pkdecrypt where the same
-	diversions to scd are currently done. The (info) field of the
-	shadowed key stores the actual TPM key. The TPM key is encrypted so
-	only the physical TPM it was created on can read it (so no special
-	protection is required for the info filed), but if the (info) field
-	becomes corrupt or damaged, the key will be lost (unlike the token
-	case, where the key is actually moved inside the token).
-
-	Note, this commit adds handling for existing TPM format shadow keys,
-	but there is still no way to create them.
-
-
-	Additional changes:
-	* Add ChangeLog entries.
-	* Some minor indentation fixes.
-	* agent/Makefile.am (gpg_agent_SOURCES): Change to make distcheck
-	 work.
-	* agent/agent.h !HAVE_LIBTSS: Do not return -EINVAL but an
-	 gpg_error_t. Mark args as unused.
-	* agent/protect.c (agent_is_tpm2_key): Free BUF.
-
-	tpm2d: Add tpm2daemon code.
-	+ commit 62a7854816b8f3661fb41f05463289e5b96663ee
-	* tpm2d: New directory.
-	* Makefile.am (SUBDIRS): Add directory.
-	* configure.ac: Detect libtss and decide whether to build tpm2d.
-	* am/cmacros.am: Add a define.
-	* util.h (GNUPG_MODULE_NAME_TPM2DAEMON): New.
-	* common/homedir.c (gnupg_module_name): Add tpm2d.
-	* common/mapstrings.c (macros): Add "TPM2DAEMON".
-	* tools/gpgconf.h (GC_COMPONENT_TPM2DAEMON): New.
-	* tools/gpgconf-comp.c (known_options_tpm2daemon): New.
-	(gc_component): Add TPM2.
-	(tpm2daemon_runtime_change): New.
-	* tpm2d/Makefile.am: New.
-	* tpm2d/command.c: New.
-	* tpm2d/ibm-tss.h: New.
-	* tpm2d/tpm2.c: New.
-	* tpm2d/tpm2.h: New.
-	* tpm2d/tpm2daemon.c: New.
-	* tpm2d/tpm2daemon.h: New.
-
-	---
-	This commit adds and plumbs in a tpm2daemon to the build to mirror the
-	operation of scdaemon. The architecture of the code is that
-	tpm2daemon.c itself is pretty much a clone of scd/scdaemon.c just with
-	updated function prefixes (this argues there could be some further
-	consolidation of the daemon handling code). Note that although this
-	commit causes the daemon to be built and installed, nothing actually
-	starts it or uses it yet.
-
-	Command handling
-	----------------
-
-	command.c is copied from the command handler in scd.c except that the
-	command implementation is now done in terms of tpm2 commands and the
-	wire protocol is far simpler. The tpm2daemon only responds to 4
-	commands
-
-	IMPORT: import a standard s-expression private key and export it to
-	 TPM2 format. This conversion cannot be undone and the
-	 private key now can *only* be used by the TPM2. To anyone
-	 who gets hold of the private key now, it's just an
-	 encrypted binary blob.
-
-	PKSIGN: create a signature from the tpm2 key. The TPM2 form private
-	 key is retrieved by KEYDATA and the hash to be signed by
-	 EXTRA. Note there is no hash specifier because the tpm2
-	 tss deduces the hash type from the length of the EXTRA
-	 data. This is actually a limitation of the tpm2 command
-	 API and it will be interesting to see how this fares if the
-	 tpm2 ever supports say sha3-256 hashes.
-
-	PKDECRYPT: decrypt (RSA case) or derive (ECC case) a symmetric key.
-		 The tpm2 for private key is retrieved by KEYDATA and the
-		 information used to create the symmetric key by EXTRA.
-
-	KILLTPM2D: stop the daemon
-
-	All the tpm2 primitives used by command.c are in tpm2.h and all the
-	tpm2 specific gunk is confined to tpm2.c, which is the only piece of
-	this that actually does calls into the tss library.
-
-
-	Changes from James' patch:
-
-	- gpgconf: The displayed name is "TPM" and not "TPM2". That
-	 string is used by GUIs and should be something the user
-	 understands. For example we also use "network" instead
-	 of "Dirmngr".
-	- Removed some commented includes.
-	- Use 16 as emulation of GPG_ERR_SOURCE_TPM2.
-	- Silenced a C90 compiler warning and flags unused parameters.
-	- Removed "if HAVE_LIBS" from tpm2/Makefile.am and add missing
-	 files so that make distcheck works.
-
-2021-03-10 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Support special extended usage flags for OpenPGP keys.
-	+ commit 08b5ac492afc6c6e7eaaa1f70d67c81cbda2c9be
-	* scd/app-p15.c (struct gpgusage_flags_s): New.
-	(struct prkdf_object_s): Add field gpgusage.
-	(struct app_local_s): Add field any_gpgusage.
-	(dump_gpgusage_flags): New.
-	(read_p15_info): Parse athe gpgusage flags.
-	(do_getattr): Take care of the gpgusage flags.
-
-2021-03-08 Werner Koch <wk@gnupg.org>
-
-	sm: Init nPth which might be used by some helper code.
-	+ commit a4021d9be4aeac7429bf6a8e9f336dbb62cacfc4
-	* sm/gpgsm.c: Include npth.h.
-	(main): Init nPth.
-
-	w32: Cleanup use of pid_t in call-daemon.
-	+ commit 33c492dcb955bff01fffae31fb7750f88e07b8ff
-	* agent/call-daemon.c (struct wait_child_thread_parm_s) W32: Do not
-	use HANDLE for pid_t.
-	(wait_child_thread): Ditto.
-
-	w32: Change spawn functions to use Unicode version of CreateProcess.
-	+ commit cf2f6d8a3f0594c03c383b4989a3041e9c4536d7
-	* common/exechelp-w32.c (gnupg_spawn_process): Change to use
-	CreateProcessW.
-	(gnupg_spawn_process_fd): Ditto.
-	(gnupg_spawn_process_detached): Ditto.
-	* g10/exec.c (w32_system): Ditto.
-
-2021-03-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for X448.
-	+ commit fc99f77b14b6c2cdfb547607651922c16863dcf0
-	* scd/app-openpgp.c (do_decipher): Support with no prefix.
-
-2021-03-05 Werner Koch <wk@gnupg.org>
-
-	w32: Always use Unicode for console input and output.
-	+ commit 8c41b8aac3efb78178fe1eaf52d8d1bbc44941a8
-	* common/init.c (_init_common_subsystems) W32: Set the codepage to
-	UTF-8 for input and putput. Switch gettext to UTF-8.
-	* tools/gpgconf.c (main): Display the input and output codepage if
-	they differ.
-	* g10/gpg.c (utf8_strings) W32: Make sure this is always set.
-
-	w32: Free memory allocated by new function w32_write_console.
-	+ commit 31b708e268ebb725307856865f34a61670a35586
-	* common/ttyio.c (w32_write_console): Free buffer.
-
-	common,w32: Allow Unicode input and output with the console.
-	+ commit f165c8a737cc968554c9d78932c69869456108ff
-	* common/ttyio.c (do_get) W32: Use ReadConsoleW.
-	(w32_write_console): New.
-	(tty_printf, tty_fprintf) W32: Use new function.
-
-	common: Re-indent ttyio.c and remove EMX, RISCOS, and CE support.
-	+ commit 8622f53994249d8fb49a488cfe480ffbeb8cbfba
-	* common/ttyio.c: Remove cruft like EMX and RISCOS support. Translate
-	a few strings. Re-indent.
-
-2021-03-04 Werner Koch <wk@gnupg.org>
-
-	common: Rename w32-misc.c to w32-cmdline.c.
-	+ commit 7262d602d802c4a3840097d5de217fcfb9728b49
-	* common/w32-misc.c: Rename to ....
-	* common/w32-cmdline.c: this.
-	* common/Makefile.am: Adjust.
-
-	common,w32: Implement globing of command line args.
-	+ commit 089c9439674e8ecbc64f0ba924e6fb447bbc2b9d
-	* common/w32-misc.c W32: Include windows.h
-	(struct add_arg_s): New.
-	(add_arg): New.
-	(glob_arg): New.
-	(parse_cmdstring): Add arg argvflags and set it.
-	(w32_parse_commandline): Add arg r_itemsalloced. Add globing.
-
-	* common/init.c (prepare_w32_commandline): Mark glob created items as
-	leaked.
-
-	* common/t-w32-cmdline.c : Include windows.h
-	(test_all): Add simple glob test for Unix.
-	(main): Add manual test mode for Windows.
-
-	common,w32: Refine the command line parsing for \ in quotes.
-	+ commit 20c60076866904187a09393de596deef286116f8
-	* common/t-w32-cmdline.c (test_all): Add new test cases.
-	* common/w32-misc.c (strip_one_arg): Add arg endquote.
-	(parse_cmdstring): Take care of backslashes in quotes.
-
-	gpg: Prepare for globing with UTF-8.
-	+ commit 8e15506d6680bbee85bc01453da28fc90b4cb673
-	* g10/gpg.c (_dowildcard): Remove.
-	(my_strusage): Enable wildcards using our new system.
-
-	common: First take on handling Unicode command line args.
-	+ commit deb6c94362c0f179de1cac18707aad2f51a21e10
-	* common/w32-misc.c: New.
-	* common/t-w32-cmdline.c: New.
-	* common/init.c: Include w32help.h.
-	(prepare_w32_commandline): New.
-	(_init_common_subsystems) W32: Call prepare_w32_commandline.
-
-	* common/Makefile.am (common_sources) W32: Add w32-misc.c
-	(module_tests): Add t-w32-cmdline
-	(t_w32_cmdline_LDADD): New.
-
-2021-03-01 Nicolas Fella via Gnupg-devel <gnupg-devel@gnupg.org>
-
-	gpg: Keep temp files when opening images via xdg-open.
-	+ commit be2da244565822ad1f268f84dc88a23e5aa8d26a
-	* g10/photoid.c (get_default_photo_command): Change parameter for
-	xdg-open.
-
-2021-02-25 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Read out the access flags.
-	+ commit d51a5ca1084c69c0ed304126a7aaa0a648b2eba6
-	* scd/app-p15.c (struct keyaccess_flags_s): New.
-	(struct prkdf_object_s): Add field accessflags.
-	(dump_keyusage_flags): New.
-	(dump_keyaccess_flags): New.
-	(parse_keyaccess_flags): New.
-	(parse_common_key_attr): Return access flags.
-	(read_ef_prkdf): Parse the access flags. Allow for ECkeys.
-	(read_ef_pukdf): Ditto. Use new functions for printing.
-	(read_p15_info): Use new fucntion for printing.
-
-	sm: Do not print certain issuer not found diags in quiet mode.
-	+ commit a170f0e73f38e474b6d4463433fe344eca865fa5
-	* sm/certchain.c (find_up_dirmngr): Print one diagnostic only in
-	verbose mode. Do not print issuer not found diags in quiet mode.
-	* sm/minip12.c (parse_bag_data): Add missing verbose condition.
-
-	sm: Fix issuer certificate look error due to legacy error code.
-	+ commit 473b83d1b9efe51fcca68708580597dddf3f50b7
-	* sm/certchain.c (find_up): Get rid of the legacy return code -1 and
-	chnage var name rc to err.
-	(gpgsm_walk_cert_chain): Change var name rc to err.
-	(do_validate_chain): Get rid of the legacy return code -1.
-
-2021-02-24 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Get the label value of all objects for better diagnostics.
-	+ commit cfdaf2bcc85b3b6f16904006f239b400a3487ff8
-	* scd/app-p15.c (struct cdf_object_s): Add fields authid, authidlen,
-	and label.
-	(struct prkdf_object_s): Add field label.
-	(struct aodf_object_s): Ditto.
-	(release_cdflist): Free new fields.
-	(release_prkdflist): Free new field.
-	(release_aodf_object): Ditto.
-	(parse_common_obj_attr): Return the label.
-	(read_ef_prkdf): Store the label.
-	(read_ef_pukdf): Ditto.
-	(read_ef_cdf): Use parse_common_obj_attr and store authid and label.
-	Print them im verbose mode.
-	(read_ef_aodf): Store the label and print it.
-
-	sm: Silence some output on --quiet.
-	+ commit 615d2e4fb15859320ea0ebec1bb457c692c57f0a
-	* sm/encrypt.c (gpgsm_encrypt): Take care of --quiet.
-	* sm/gpgsm.c: Include minip12.h.
-	(set_debug): Call p12_set_verbosity.
-	* sm/import.c (parse_p12): Dump keygrip only in debug mode.
-	* sm/minip12.c (opt_verbose, p12_set_verbosity): New.
-	(parse_bag_encrypted_data): Print info messages only in verbose mode.
-
-2021-02-23 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Make it code work again for D-Trust cards.
-	+ commit 33aaa37e5bc0beb75305cdf9d8be850daccaee5e
-	* scd/app-p15.c (select_and_read_binary): Allow to skip the select.
-	(select_and_read_record): Return the statusword. Silence error
-	message for SW_FILE_STRUCT.
-	(select_ef_by_path): Fix selection with a home_DF.
-	(read_first_record): Fallback to read_binary for CardOS and return
-	info about this.
-	(read_ef_prkdf): Use info from read_first_record to decide whether to
-	use record or binary mode.
-	(read_ef_pukdf): Ditto.
-	(read_ef_aodf): Ditto.
-	(read_ef_cdf): Ditto. New arg cdftype for diagnostics.
-	(read_p15_info): Pass cdftype.
-
-	* scd/apdu.h (SW_FILE_STRUCT): New.
-	* scd/apdu.c (apdu_strerror): Map that one to a string.
-	* scd/iso7816.c (map_sw): and to a gpg-error.
-
-2021-02-22 Werner Koch <wk@gnupg.org>
-
-	scd: Fix readkey --info in case a readkey command is available.
-	+ commit 2490f4e8e1d1feecb44aefa79bd71f5f8b06c9a4
-	* scd/command.c (do_readkey): Make --info also work if a readkey
-	command is available.
-
-	* scd/app-p15.c (cdf_object_from_certid): Fix a but introduced with
-	the previous commit.
-
-	scd:p15: Extract extended usage flagsand act upon them.
-	+ commit 488eaedc9a332d8164dea22e469354fc10b0a253
-	* scd/app-p15.c: Add a couple of oid constants.
-	(struct cdf_object_s): Replace fields image and imagelen by cert.
-	(struct prkdf_object_s): Add extusage flags
-	(send_keypairinfo): Use them.
-	(cdf_object_from_certid): Factor parts out to ...
-	(cdf_object_from_objid): new function.
-	(read_ef_prkdf): Move info printing to ...
-	(read_p15_info): here. Fill the extusage flags.
-	(readcert_by_cdf): Cache the ksba cert object instead of the binary
-	cert.
-	* scd/app.c (select_additional_application): Fix a log_debug call.
-	(scd_update_reader_status_file): Ditto.
-
-	sm: Extend the list of known OIDs.
-	+ commit 4c9b509d2402f79668e502a9db5879280a4f683b
-	* sm/keylist.c (oidtranstbl): Add a couple of OIDs and mark them for
-	key usage.
-
-2021-02-19 Werner Koch <wk@gnupg.org>
-
-	build: Remove now obsolete HAVE_NEWER_LIBGCRYPT AM conditional.
-	+ commit 5573ab714b92f6ee899a816998e56e1238f4c573
-	* configure.ac (HAVE_NEWER_LIBGCRYPT): Remove conditional.
-	* tools/Makefile.am (gpg_pair_tool_SOURCES): We build it always.
-
-	scd: Minor tweak for easier backporting.
-	+ commit 6d4280b13ddc928ff6bc41bdf482030f0f814fdb
-	* scd/app-common.h (APP_CARD): New. Use it in app-*.c to access
-	app->card.
-
-2021-02-18 Werner Koch <wk@gnupg.org>
-
-	po: Change translatability of a fallback string.
-	+ commit 0be4861762c21ebfb4c2e28bb9a3e5cfbc08e1a9
-	* agent/call-pinentry.c (setup_genpin): Do not make the fallback
-	translatable.
-
-	speedo: Update w32 stuff from 2.2.
-	+ commit 919a969354d4021f2e64a948b4c224cd37323713
-	* build-aux/speedo.mk: Update from 2.2. Add target w32-msi-release.
-	* build-aux/speedo/w32/inst.nsi: Fix location of doc files.
-	* build-aux/speedo/w32/wixlib.wxs: Add gpg-card and fix a wrong name.
-	* Makefile.am (release): Support a WITH_MSI variable.
-	(wixlibfile): Improve copying to archive.
-	(release): Use AMTAR instead of TAR.
-
-2021-02-17 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Support new gpgNtds parameter in LDAP keyserver URLs.
-	+ commit ab7dc4b524c3e2ad5153acfdbfa879a9e62d2dbe
-	* dirmngr/ldap-parse-uri.c (ldap_parse_uri): Support a new gpgNtds
-	extension.
-	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Do ldap_init always with
-	hostname - which is NULL and thus the same if not given. Fix minor
-	error in error code handling.
-
-2021-02-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update gpg-error.m4 again.
-	+ commit 3fa1fa747b61867076e344c3eb07a66826c1983a
-	* m4/gpg-error.m4: Update from libgpg-error.
-
-2021-02-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update gpg-error.m4.
-	+ commit 985e85dc0e6c54aa465a2af610c5a04fc10649a0
-	* m4/gpg-error.m4: Update from libgpg-error.
-
-2021-02-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update gpg-error.m4.
-	+ commit e1e3f1db4660b5416828aeb636a7f767fadcc7a4
-	* m4/gpg-error.m4: Update from libgpg-error.
-
-	build: Fix library dependency of g13 test program.
-	+ commit 83e0a9d6b990aa517bc338b578f7faf393ae1b0d
-	* g13/Makefile.am (t_common_ldadd): Add GPG_ERROR_LIBS.
-
-2021-02-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not allow old cipher algorithms for encryption.
-	+ commit 825dd7220ff6079cbe2d0df7fde93526c077fb6d
-	* g10/gpg.c: New option --allow-old-cipher-algos.
-	(set_compliance_option): Set --rfc4880bis explictly to SHA256 and
-	AES256. Allow old cipher algos for OpenPGP, rfc4880, and rfc2440.
-	* g10/options.h (opt): Add flags.allow_old_cipher_algos.
-	* g10/misc.c (print_sha1_keysig_rejected_note): Always print the note
-	unless in --quiet mode.
-	* g10/encrypt.c (setup_symkey): Disallow by default algos with a
-	blocklengt < 128.
-	(encrypt_crypt): Ditto. Fallback by default to AES instead of 3DES.
-	* g10/pkclist.c (algo_available): Take care of old cipher also.
-	(select_algo_from_prefs): Use AES as implicit algorithm by default.
-
-	* tests/openpgp/defs.scm (create-gpghome): Set allow-old-cipher-algos.
-
-	Remove obsolete M4 macros.
-	+ commit 6e730c18816fbb3e074d93840396ed18f00ab7e2
-	* m4/gnupg-pth.m4: Remove.
-	* m4/libcurl.m4: Remove.
-
-	Require GpgRT version 1.41.
-	+ commit 2b75b256054427119a284792540243c3471267d4
-	* configure.ac (NEED_GPG_ERROR_VERSION): Rename to NEED_GPGRT_VERSION
-	and set to 1.41.
-	* common/sysutils.c (gnupg_access): Remove code for older gpgrt
-	versions.
-	* kbx/backend-sqlite.c: Ditto.
-	* sm/gpgsm.c (main): Ditto.
-
-2021-02-09 Werner Koch <wk@gnupg.org>
-
-	build: Make make distcheck work again.
-	+ commit f9e4dae08d7caed741d35916c46b8302e098d521
-	* m4/Makefile.am (EXTRA_DIST): Remove isc-posix.m4
-
-	tools: Remove the symcryptrun tool.
-	+ commit 209b7113f3493bd829ec5c90275ff95a273d9dd4
-	* tools/symcryptrun.c: Remove.
-	* tools/Makefile.am: Ditto.
-	* doc/tools.texi: Remove man page.
-	* configure.ac: Remove build option and tests used only by this tool.
-	* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Do not build
-	symcryptrun.
-
-2021-02-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix selection of key.
-	+ commit 390f597868a5b5934f21f81ebf6ff110b6792283
-	* g10/getkey.c (pubkey_cmp): Handle the case of TRUST_EXPIRED.
-
-2021-02-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove support for PKA.
-	+ commit 7f3ce66ec56a5aea6170b7eb1bda5626eb208c83
-	* g10/gpg.c (oPrintPKARecords): Remove.
-	(opts): Remove --print-pka-records.
-	(main): Remove "pka-lookups","pka-trust-increase" and other PKA stuff.
-	* g10/options.h (EXPORT_DANE_FORMAT): Remove.
-	(VERIFY_PKA_LOOKUPS, VERIFY_PKA_TRUST_INCREASE): Remove.
-	(KEYSERVER_HONOR_PKA_RECORD): Remove.
-	* g10/packet.h (pka_info_t): Remove.
-	(PKT_signature): Remove flags.pka_tried and pka_info.
-	* g10/parse-packet.c (register_known_notation): Remove
-	"pka-address@gnupg.org".
-	* g10/pkclist.c (check_signatures_trust): Remove PKA stuff.
-	* g10/call-dirmngr.c (gpg_dirmngr_get_pka): Remove.
-	* g10/export.c (parse_export_options): Remove "export-pka".
-	(do_export): Adjust for this.
-	(write_keyblock_to_output): Ditto.
-	(do_export_stream): Ditto.
-	(print_pka_or_dane_records): Rename to ...
-	(print_dane_records): this and remove two args. Remove PKA printing.
-	* g10/free-packet.c (free_seckey_enc, cp_pka_info): Adjust for removed
-	pka_info field.
-	* g10/getkey.c (get_pubkey_byname): Make AKL_PKA a dummy.
-	* g10/keyserver.c: Remove "honor-pka-record".
-	(keyserver_import_pka): Remove.
-	* g10/mainproc.c (get_pka_address): Remove.
-	(pka_uri_from_sig): Remove.
-	(check_sig_and_print): Remove code for PKA.
-
-	gpg: Remove more or less useless tool gpgcompose.
-	+ commit fde7d833573d358b2c5b5eb7d837bc27c6dcb3d1
-	* g10/gpgcompose.c: Remove
-
-	gpg: Remove experimental feature to export w/o user-ids.
-	+ commit 3491faa3bb62c1c96c6dd5947516128b2a966535
-	* g10/options.h (IMPORT_DROP_UIDS, EXPORT_DROP_UIDS): Remove.
-	* g10/import.c (parse_import_options): Remove option import-drop-uids.
-	(import_one_real): Remove drop uids code.
-	(remove_all_uids): Remove function.
-	* g10/export.c (parse_export_options): Remove option export-drop-uids.
-	(do_export_one_keyblock): Remove drop uids code.
-
-	card: List keys of pkcs#15 cards.
-	+ commit a06c79b6143fc49e6f5169b8a9f53c691031d6ca
-	* tools/gpg-card.c (list_p15): New.
-	(list_card): Call it.
-
-	scd:p15: Read PuKDF and minor refactoring.
-	+ commit 0c080ed5791ecf1606d1c2fddc0c55362fd171d3
-	* scd/app-p15.c (pukdf_object_t): New.
-	(struct app_local_s): Add field public_key_info.
-	(release_pukdflist): New.
-	(select_and_read_record): No diagnostic in case of not_found.
-	(read_first_record): New. Factored out from the read_ef_ fucntions.
-	(read_ef_pukdf): New. Basically a copy of read_ef_prkdf for now.
-	(read_p15_info): Also read the public keys.
-
-	(cardtype2str): New.
-	(read_ef_tokeninfo): Print a string with the cardtype.
-
-2021-02-01 Werner Koch <wk@gnupg.org>
-
-	sm: Add a few OIDs and merge OID tables.
-	+ commit 0737dc8187a0eb9ca4661e2ad45954c718daa451
-	* sm/keylist.c (OID_FLAG_KP): New.
-	(key_purpose_map): Merge into ...
-	(oidtranstbl): this.
-	(get_oid_desc): New arg 'matchflag'. Use function in place of direct
-	access to key_purpose_map.
-
-2021-01-28 Werner Koch <wk@gnupg.org>
-
-	Include the library version in the compliance checks.
-	+ commit 90c514868ff5fcf6d39490d4874ac3a31ba9e85f
-	* common/compliance.c (gnupg_gcrypt_is_compliant): New.
-	(gnupg_rng_is_compliant): Also check library version.
-	* g10/mainproc.c (proc_encrypted): Use new function.
-	(check_sig_and_print): Ditto.
-	* sm/decrypt.c (gpgsm_decrypt): Ditto.
-	* sm/encrypt.c (gpgsm_encrypt): Ditto.
-	* sm/verify.c (gpgsm_verify): Ditto
-
-2021-01-27 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Make file selection more robust.
-	+ commit 1e197c29ed95d021f5693cd3652b6acb07d928ea
-	* scd/app-p15.c: Include host2net.h.
-	(DEFAULT_HOME_DF): New.
-	(select_and_read_binary): Replace slot by app. Change callers. Use
-	select_ef_by_path.
-	(select_and_read_record): ditto.
-	(select_ef_by_path): Make use use the home_df.
-	(parse_certid): Adjust for always set home_df.
-	(print_tokeninfo_tokenflags): Ditto.
-	(app_select_p15): Take the home_df from the FCI returned by select.
-
-	scd: Define new status word.
-	+ commit 7620473cd007c074b0625a678caa6105a4c87142
-	* scd/apdu.h (SW_NO_CURRENT_EF): New.
-
-	scd:p15: Factor the commonKeyAttributes parser out.
-	+ commit 5bcbc8cee310067aa3cc48665b0fb0595c64ae4d
-	* scd/app-p15.c (read_ef_prkdf): Fix detection of unsupported key
-	 objects. Factor some code out to ...
-	(parse_common_key_attr): new.
-
-	gpg: Fix ugly error message for an unknown symkey algorithm.
-	+ commit b08418d22cc898c9d135217e07ca77f3daf3c9e9
-	* g10/mainproc.c (proc_symkey_enc): Do not continue with an unknown
-	algorithm.
-
-2021-01-26 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Factor the commonObjectAttributes parser out.
-	+ commit fb84674d6c645a423b8ed9835437d25e4893e183
-	* scd/app-p15.c (parse_common_obj_attr): New.
-	(read_ef_prkdf): Use new function.
-	(read_ef_aodf): Ditto.
-
-	scd:p15: First step towards real CardOS 5 support.
-	+ commit fc287c0552b0fe489c66bb493879f4330c34f287
-	* scd/iso7816.c (iso7816_select_path): Add arg from_cdf.
-	* scd/app-nks.c (do_readkey): Adjust for this change.
-
-	* scd/app-p15.c (CARD_TYPE_CARDOS_53): New.
-	(IS_CARDOS_5): New.
-	(card_atr_list): Add standard ATR for CardOS 5.3.
-	(select_and_read_binary): Remove the fallback to record read hack.
-	(select_and_read_record): New.
-	(select_ef_by_path): Rework and support CardOS feature.
-	(read_ef_prkdf): Use read record for CardOS.
-	(read_ef_cdf): Ditto.
-	(read_ef_aodf): Ditto. Also fix bug in the detection of other
-	unsupported attribute types.
-	(verify_pin): Use IS_CARDOS_5 macro.
-	(app_select_p15): Force direct method for CardOS.
-
-2021-01-25 Werner Koch <wk@gnupg.org>
-
-	agent: Support ssh-agent extensions for environment variables.
-	+ commit 224e26cf7b67f22bb0140133eac6b4ad24f3b1b7
-	* common/session-env.c (session_env_list_stdenvnames): Extend to allow
-	return all names as one string.
-	* agent/command-ssh.c (SSH_REQUEST_EXTENSION): New.
-	(SSH_RESPONSE_EXTENSION_FAILURE): New.
-	(request_specs): Add handler for the extension command.
-	(ssh_handler_extension): New.
-
-2021-01-21 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Show the ATR as part of the TokenInfo diagnostics.
-	+ commit 60499d98940d4b7a1673b8584cafe0f7ac2901dd
-	* scd/app-p15.c (read_ef_tokeninfo): Print the ATR in verbose mode.
-
-2021-01-19 Werner Koch <wk@gnupg.org>
-
-	Require Libgcrypt 1.9.
-	+ commit 9500432b7ae10d98b30c58de4357e2ffb93bf795
-	* configure.ac: Require at least Libgcrypt 1.9.0. Remove all
-	GCRYPT_VERSION_NUMBER dependent code.
-
-2021-01-12 Werner Koch <wk@gnupg.org>
-
-	tools: Add option --clock to watchgnupg.
-	+ commit 93d5d7ea2a8b110b3ad88be25f2f67d706361e44
-	* tools/watchgnupg.c (print_fd_and_time) ENABLE_LOG_CLOCK: Use
-	clock_gettime.
-	(print_version): New option --clock.
-
-2021-01-11 Werner Koch <wk@gnupg.org>
-
-	gpg,w32: Fix gnupg_remove.
-	+ commit b6967d31912912ad3c0a2ff6bf6eb9822a194562
-	* common/sysutils.c (map_w32_to_errno): New.
-	(gnupg_w32_set_errno): New.
-	(gnupg_remove) w32: Set ERRNO
-
-2021-01-06 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	I meant "SHA-2 digests" in the previous commit.
-	+ commit 7eef40cc1143fb19132786ebcca1c9a6c9a85e6e
-
-
-	scd:nks: Add support for signing plain SHA-3 digests.
-	+ commit 8fe976d5b9a0f2902868737dd502c749565222a6
-	* scd/app-nks.c (do_sign): Handle plain SHA-3 digests and verify
-	encoding of ASN.1 encoded hashes.
-
-2020-12-30 Werner Koch <wk@gnupg.org>
-
-	wkd: Minor permission fix for created files.
-	+ commit c008e8d20e12c8845403ad7dad499f6a196ecc6a
-	* 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-21 Werner Koch <wk@gnupg.org>
-
-	common: Remove superfluous debug output from dotlock.c.
-	+ commit fc0eaa9add3c9bc93d4404988be3e1eb8f88ffa2
-	* common/dotlock.c (dotlock_create_unix): Remove debug output.
-
-	doc: Explain LDAP keyserver parameters.
-	+ commit e0cbb97925a109fee7c0a7450bcac120f2766ed2
-
-
-2020-12-18 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Do not block threads in LDAP keyserver calls.
-	+ commit 355e2992c043dd3241a9e838255f01418490ef33
-	* dirmngr/ks-engine-ldap.c: Wrap some ldap calls.
-
-2020-12-17 Werner Koch <wk@gnupg.org>
-
-	gpg: New AKL method "ntds"
-	+ commit 4a3836e2b2f9a91995d5ce058820e1121298f548
-	* 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 1194e4f7e2dff620e0da87f212f3a35f8021b142
-	* 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 2cadcce3e877c857bb8859574762b59b9c193b44
-	* 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.
-
-2020-12-15 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Store all version 2 schema attributes.
-	+ commit a2434ccabdd1956876b44e05e07c3c3630c50f8f
-	* 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.
-
-2020-12-14 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Support the new Active Directory schema.
-	+ commit e9ddd61fe979b1b8e1a4801f7f916d0222397245
-	* 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).
-	* doc/ldap/gnupg-ldap-init.ldif (pgpSoftware): Update definition of
-	pgpVersion.
-	* doc/ldap/gnupg-ldap-ad-init.ldif: New.
-	* doc/ldap/gnupg-ldap-ad-schema.ldif: New.
-
-	dirmngr: Do not store the useless pgpSignerID in the LDAP.
-	+ commit cc056eb534c1b8f7d1a90af3b9ecb9d6b2f322fa
-	* 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 37a899d0e4fd49512d522e7f6f86b6968309fece
-	* dirmngr/ks-engine-ldap.c (ks_ldap_put): Extract attribites into
-	addlist.
-
-2020-12-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd:nks: Support READKEY with keygrip and for "NKS-IDLM" keyref.
-	+ commit 3b392630881350baabeba16fa760bad04be94d03
-	* scd/app-nks.c (do_readkey): Allow KEYGRIP access.
-	Support NKS-IDLM.XXXX keyref.
-
-	scd:nks: Factor out pubkey retrieval from keygrip handling.
-	+ commit b7c087375d84c31ab8a645cd81e6b1e6185cb30d
-	* scd/app-nks.c (pubkey_from_pk_file): New.
-	(keygripstr_from_pk_file): Use pubkey_from_pk_file.
-
-2020-12-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd:nks: Add support of KEYGRIP for do_readcert.
-	+ commit 4020cd9d656264bec5e7fb5e45c5e06eff8656c3
-	* scd/app-nks.c (do_readcert): Support KEYGRIP.
-
-	scd:nks: Factor out iteration over filelist.
-	+ commit 6c4365847666cefac73ccc743a99fac473da2186
-	* scd/app-nks.c (iterate_over_filelist): New.
-	(do_with_keygrip): Use iterate_over_filelist.
-
-2020-12-09 Werner Koch <wk@gnupg.org>
-
-	wks-client: Improve an error message.
-	+ commit c7c88648b71b8ce3a5507946afb91761fc6d931e
-	* tools/gpg-wks-client.c (read_confirmation_request): Print trust
-	letter.
-
-2020-12-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd:ccid:spr532: Extend abort_cmd for initialization time.
-	+ commit a9aa30ed2c2c399c2baa6a5aa2624d8fdee6286f
-	* scd/ccid-driver.c (abort_cmd): Add INIT argument to support
-	synchronize until success, even ignoring timeout.
-	(bulk_in): Normal use case of abort_cmd.
-	(ccid_vendor_specific_init): Initial use case of abort_cmd.
-
-	scd:ccid: Call libusb_clear_halt in ccid_vendor_specific_setup.
-	+ commit f50373027222f28ab9d37843178a5d44cc1e3cc0
-	* 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 ffabc29d5eadfe81b9f62b7d4fe6e858b191354d
-	* scd/ccid-driver.c (ccid_setup_intr): Don't call libusb_clear_halt.
-
-2020-12-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd:yubikey: Fix support of Yubikey NEO.
-	+ commit 946555ea3ceb823b95ed13654ae4fd667daa4337
-	* scd/app-openpgp.c (get_public_key): Yubikey NEO also has this issue.
-
-	agent: Allow decryption with card but no file.
-	+ commit eda3c688fc2e85c7cd63029cb9caf06552d203b4
-	* agent/pkdecrypt.c (agent_pkdecrypt): Support decryption with card
-	but without a stub key.
-
-	agent: Clean up the API of agent_pkdecrypt.
-	+ commit 9beab36dfa39106f6efd1bb89551a581bcf9df60
-	* agent/agent.h (agent_pkdecrypt): Use gpg_error_t type.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Use gpg_error_t type.
-
-	agent: Allow pksign operation with card but no file.
-	+ commit cbb0e069f55bc45037bbd69d54ce23dae2af2ac6
-	* agent/pksign.c (agent_pksign_do): Add support with no file.
-
-2020-12-07 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	gpg: Make quick-gen-key with algo "card" work for keys without keytime.
-	+ commit 255d33d65126df00bc036580d0b32735d7178c8b
-	* g10/keygen.c (quick_generate_keypair): Set pCARDKEY flag if algostr
-	is "card" or "card/...".
-
-2020-12-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg,card: Allow no version information of Yubikey.
-	+ commit 1cd615afe3010d2c3919de489d7c9a78513c8694
-	* g10/call-agent.c (learn_status_cb): Assume >= 2 when no version.
-	* tools/card-call-scd.c (learn_status_cb): Likewise.
-
-2020-12-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd:nks: Fix caching keygrip (more).
-	+ commit 87d2c579cc38c1d2787945650125fb0e0336652c
-	* scd/app-nks.c (keygripstr_from_pk_file): Distinguish by APP_ID.
-
-	scd: Fix KEYINFO command with --data option.
-	+ commit 54b88ae4606265f3d51c1ca603dbf846f3dfd678
-	* scd/command.c (cmd_keyinfo): Handle --data option correctly.
-
-	scd:openpgp: Fix writing ECC key to card.
-	+ commit a25c99b156ca9acaa7712e9c09a6df0a7a23c833
-	* scd/app-openpgp.c (build_privkey_template): Adding another argument
-	of ecc_d_fixed_len to handle variable-size MPI.
-
-2020-12-02 Werner Koch <wk@gnupg.org>
-
-	kbx: Better error message in case of a crippled Libgcrypt.
-	+ commit 63ed2054a1f3cfbdff5cda390952f10a512dab83
-	* 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 4f9ac5dac093300ac18fd3732bffdd2a3fc38776
-	* doc/gpg.texi: Add parameters for batch generation of ECC keys.
-
-2020-11-30 Werner Koch <wk@gnupg.org>
-
-	scd:nks: Minor additions to the basic IDLM application support.
-	+ commit 806547d9d243b26c2275fc00c645ee39d258b49b
-	* scd/app-nks.c (filelist): Use special value -1 for IDLM pubkeys.
-	(keygripstr_from_pk_file): Handle special value.
-	(do_readcert): Ditto.
-	(do_writecert): Ditto.
-
-2020-11-27 Werner Koch <wk@gnupg.org>
-
-	card: Let the APDU command prints a description of the status word.
-	+ commit ad469609b101fe6c1128135180fef8eae13279ff
-	* tools/card-call-scd.c (scd_apdu_strerror): New.
-	* tools/gpg-card.c (cmd_apdu): Print a description.
-
-	scd: New getinfo sub-command apdu_strerror.
-	+ commit 0e34683a6c4b037aa50ca0f97ddb9d5c4e499084
-	* scd/apdu.c (apdu_strerror): Add missing status codes.
-	* scd/command.c (cmd_getinfo): New sub-command apdu_strerror.
-
-	card: Netkey improvement for passwd.
-	+ commit 5804db1a13d2cf8f4010d1257c586bed978c3173
-	* tools/gpg-card.c (cmd_passwd) Netkey: No Standard/QES menu if the
-	card does not support it. Print no error in cases the user canceled.
-
-2020-11-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd:ccid-driver: Fix pinpad error handling for cancel/timeout.
-	+ commit bb591222c3c5cb1a1750b1b1dd26d0bc53b347cb
-	* scd/apdu.h (SW_HOST_UI_CANCELLED, SW_HOST_UI_TIMEOUT): New.
-	* scd/ccid-driver.h (CCID_DRIVER_ERR_UI_CANCELLED): New.
-	(CCID_DRIVER_ERR_UI_TIMEOUT): New.
-	* scd/ccid-driver.c (bulk_in): Handle PIN input cancel/timeout error.
-	* scd/iso7816.c (map_sw): Support SW_HOST_UI_CANCELLED and
-	SW_HOST_UI_TIMEOUT.
-
-2020-11-26 Werner Koch <wk@gnupg.org>
-
-	agent: Fix YK s/n and prettify the request card prompt for Yubikeys.
-	+ commit 7113263a00d8c9b09f0dfdb9590bfe2bab1bc776
-	* agent/divert-scd.c (ask_for_card): Detect and re-format the Yubikey
-	prompt.
-	* scd/app.c (app_munge_serialno): Fix Yubikey s/n munging.
-	(card_get_dispserialno): Ditto.
-	* scd/app-openpgp.c (get_disp_serialno): Remove.
-	(get_prompt_info): Use app_get_dispserialno.--
-
-	scd: Do not try to use a non-enabled app after card switching.
-	+ commit d784e763495c8d53e29a2debdd9c0e0578f15a6a
-	* scd/app.c (app_dump_state): Also print the refcount.
-	(maybe_switch_app): Make sure the app exists on the card.
-
-	scd: Add special serialno compare for OpenPGP cards.
-	+ commit 764c69a841abc1a4dff2fa86b4cd0b63ec737860
-	* scd/app.c (is_same_serialno): New.
-	(check_application_conflict): Use this.
-	(select_application): Ditto.
-	(app_switch_current_card): Ditto.
-	* scd/app-openpgp.c (check_keyidstr): Ignore the card version and also
-	compare case insensitive.
-
-2020-11-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Report an error for receiving key from agent.
-	+ commit 605ab99912ac632363d1b4378a710229e40ca99e
-	* g10/export.c (do_export_one_keyblock): Report an error.
-
-	scd,nks: Fix caching keygrip.
-	+ commit 920154370834ad8d947aed19c9d914a27dde6baa
-	* scd/app-nks.c (keygripstr_from_pk_file): Identify by cfid if
-	available.
-
-2020-11-25 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Print the internal card type.
-	+ commit 00037f499db830c75fee2111dfbef72fa11bd98a
-	* scd/app-p15.c (read_ef_tokeninfo): Print the internal card type.
-
-	scd:p15: Improve support for some CardOS based cards.
-	+ commit c7b9a4ee439eca5a4bde4781f7d8983af3b9201e
-	* scd/iso7816.c (iso7816_read_binary_ext): Add optional arg r_sw and
-	change callers.
-	(iso7816_read_record): Factor all code out to ...
-	(iso7816_read_record_ext): new.
-	* scd/app-p15.c (select_and_read_binary): Fallback to record reading.
-	(read_ef_aodf): Clear EOF error.
-
-	scd: Rework the handling of the displayed serial number.
-	+ commit 3a8250c02031080c6c8eebd5dea03f5f87f9ddd7
-	* scd/app.c (app_new_register): Call app_munge_serialno for Yubikeys.
-	(app_munge_serialno): Handle Yubikey serial numbers.
-	(card_get_serialno): Remove special Yubikey treatment. Drop arg
-	is_canonical.
-	(app_get_serialno): Clear ERRNO on error.
-	(card_get_dispserialno): New. Also change formatting of Yubikey and
-	OpenPGP numbers to match those printed on the card.
-	(app_get_dispserialno): New.
-	* scd/app-openpgp.c (do_getattr): Use app_get_dispserialno.
-	(yubikey_get_serialno): Remove.
-	* scd/app-piv.c (get_dispserialno): Remove.
-	(do_getattr): Use app_get_dispserialno.
-
-2020-11-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix an error return for READKEY.
-	+ commit c3a20c88fb30b0fc4ce50a01de97fae333003682
-	* scd/command.c (cmd_readkey): Return when error.
-
-	scd,nks: Fix SEGV for learn for older card.
-	+ commit 006944b856ee2202905290e8a2f5523a7877d444
-	* scd/app-nks.c (keygripstr_from_pk_file): Set algostr.
-
-2020-11-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Change API of agent_scd_serialno.
-	+ commit 777019faf0b8f10a897c3ee477d35f9b29f02224
-	* g10/call-agent.c (agent_scd_serialno): Extend API to allow with
-	R_SERIALNO == NULL.
-	* g10/card-util.c (card_status): Use NULL for agent_scd_serialno.
-	(factory_reset): Likewise.
-	* g10/skclist.c (build_sk_list): Likewise.
-
-	Fix the previous comment changes help doc string.
-	+ commit cc8b99d18e26397028ca185e44d0886a94cc1bf6
-	* scd/command.c (hlp_learn): Fix the doc string.
-
-2020-11-19 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Also print revision of libksba.
-	+ commit 4070f302e4decc8d54d1305cbd30f6dab052ef7e
-	* dirmngr/dirmngr.c (get_revision_from_blurb): Fix detection of empty
-	string.
-	(gpgconf_versions): Print ksba revision.
-
-2020-11-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix creating shadow key on card key generation.
-	+ commit 8ddadbbdbbe20b9e87eb2bfa142577e26dae297e
-	* agent/command.c (cmd_readkey): Fix handling --card option.
-
-	gpg: Fix --card-edit command.
-	+ commit e45455d3020ca8f21c54112b6dfb1cc9bd3f2623
-	* g10/card-util.c (get_info_for_key_operation): Revert the change.
-
-2020-11-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update to newer autoconf constructs.
-	+ commit d66fb3aa53a6c4a815fe35a15e3c61886c5df628
-	* acinclude.m4 (GNUPG_CHECK_ENDIAN): Use AC_COMPILE_IFELSE instead of
-	AC_TRY_COMPILE. Use AC_RUN_IFELSE instead of AC_TRY_RUN.
-	(GNUPG_BUILD_PROGRAM): Use AS_HELP_STRING instead of AC_HELP_STRING.
-	* configure.ac: Use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE.
-	Use AS_HELP_STRING instead of AC_HELP_STRING.
-	(AC_ISC_POSIX): Replace by AC_SEARCH_LIBS.
-	(AC_TYPE_SIGNAL): Remove.
-	* m4/isc-posix.m4: Remove.
-	* m4/codeset.m4: Update from gnulib.
-	* m4/gettext.m4: Update from gnulib.
-	* m4/lcmessage.m4: Update from gnulib.
-	* m4/socklen.m4: Update from gnulib.
-	* m4/ldap.m4: Use AS_HELP_STRING instead of AC_HELP_STRING.
-	Use AC_LINK_IFELSE instead of AC_TRY_LINK.
-	Use AC_RUN_IFELSE instead of AC_TRY_RUN.
-	* m4/gpg-error.m4: Update from libgpg-error.
-	* m4/readline.m4: Update from libgpg-error.
-	* m4/npth.m4: Update from npth.
-	* m4/libassuan.m4: Update from libassuan.
-	* m4/libgcrypt.m4: Update from libgcrypt.
-	* m4/ksba.m4: Update from libksba.
-	* m4/ntbtls.m4: Update from ntbtls.
-	* common/signal.c !HAVE_DOSISH_SYSTEM (init_one_signal): Replace
-	RETSIGTYPE to void.
-	!HAVE_DOSISH_SYSTEM (got_fatal_signal, got_usr_signal): Likewise.
-
-	build: Use modern Autoconf check for types.
-	+ commit aeeb8e975dc740cb79954de7fec4fcfe902d3a42
-	* common/types.h: Use HAVE_TYPE_BYTE, HAVE_USHORT_TYPEDEF,
-	HAVE_ULONG_TYPEDEF, HAVE_U16_TYPEDEF, and HAVE_TYPE_U32.
-	* configure.ac (byte, ushort, ulong, u16, u32): Use AC_CHECK_TYPES.
-
-2020-11-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix the encrypt+sign hash algo preference selection for ECDSA.
-	+ commit e37c2e184448f64e285f925ab9636b5f21be99f7
-	* 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): Rework the hash detection from
-	recipient prefs.
-
-2020-11-12 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Yet another fix for --apply-profile.
-	+ commit e546cc78b75978a696298f2fcc072faeb7f69be4
-	* tools/gpgconf.c (main): Use gnupg_homedir instead of
-	default_homedir. Check for existance of the directory.
-
-2020-11-11 Werner Koch <wk@gnupg.org>
-
-	w32: Replace some fopen by es_fopen.
-	+ commit d574213ce21c495d9432eeb5956e8857826876c6
-	* agent/protect-tool.c (read_file): Replace fopen by es_fopen.
-	* dirmngr/dirmngr-client.c (read_pem_certificate): Ditto.
-	(read_certificate): Ditto.
-	* g10/keydb.c (rt_from_file): Ditto.
-	* kbx/kbxutil.c (read_file): Ditto.
-	* g10/plaintext.c (get_output_file) __riscos__: Remove code.
-
-2020-11-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix the previous commit.
-	+ commit dd2703096f3ee7f4b6b96e2b649daf85aa8d6030
-	* g10/delkey.c (do_delete_key): Fix the condition for the error.
-
-2020-11-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: In batch mode, delete-secret-key is not okay without --yes.
-	+ commit f9bbc751633f38f58fecb71c33aae735e9b30241
-	* g10/delkey.c (do_delete_key): Emit an error when not --yes.
-
-	gpg: Fix agent_delete_key interaction.
-	+ commit 9854369a729b9fde43eac2e2f7154f5187378787
-	* g10/call-agent.c (agent_delete_key): Set up CTX.
-
-2020-11-09 Werner Koch <wk@gnupg.org>
-
-	card: Run factory-reset in locked stated also in gpg-card.
-	+ commit 12fd10791f1dec4ec42810d7b92c69e1ae2327b9
-	* tools/card-call-scd.c (scd_apdu): Add more pseudo APDUs.
-	* tools/card-misc.c (send_apdu): Handle them.
-	* tools/gpg-card.c (cmd_factoryreset): Use lock commands.
-
-	card: Run factory-reset in locked stated.
-	+ commit 8fb0d5e3c775f40e321689b35431d81425406237
-	* 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: Do not print rejected digest algo notes with --quiet.
-	+ commit e08e1d62d089a154ec5d7c80cd58e8e3b18d2d6b
-	* g10/misc.c (print_digest_rejected_note): Do not print in quiet mode.
-	(print_sha1_keysig_rejected_note): Ditto.
-
-2020-11-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix SOS handling when exporting SSH key with libgcrypt 1.8.
-	+ commit bf3a9377d147d8a83d9c71ca5a7284897c913951
-	* g10/export.c (key_to_sshblob): Fix SOS correctly.
-
-	agent: Fix SOS handling with libgcrypt 1.8.
-	+ commit ba4f68416742eb241ec5490d16f88b0eb0bdc811
-	* agent/cvt-openpgp.c (apply_protection): Handle opaque MPI.
-
-2020-11-06 Werner Koch <wk@gnupg.org>
-
-	agent: Minor tweaks to the new genpin inquiry.
-	+ commit c896112fa3f7f3289b5198bfac992160feb0ad0a
-	* agent/call-pinentry.c (generate_pin): Use STRING random which is
-	sufficient for a passphrase.
-	(inq_cb): s/rc/err/. Do not print two errors in case generate_pin
-	fails. Lowercase strings as per GNU standards.
-	(setup_genpin): Fix translation test.
-	(setup_qualitybar): Ditto.
-
-2020-11-06 Andre Heinecke <aheinecke@gnupg.org>
-
-	agent: Add genpin inquiry for pinentry.
-	+ commit 557ddbde32585c534626b57a595a2ccf28fd585e
-	* agent/call-pinentry.c (agent_get_passphrase): Setup genpin.
-	(do_getpin): Update with new name for inquire callback.
-	(inq_quality): Rename to inq_cb and add genpin support.
-	(inq_cb): Renamed form inq_quality.
-	(generate_pin): New helper to generate a pin.
-	(agent_askpin): Fix some typos.
-	(setup_genpin): Provide new strings for pinentry.
-
-2020-11-05 Ben Kibbey <bjk@luxsci.net>
-
-	gpg: Add canceled status message.
-	+ commit 31e47dfad0f40e31e8b3113b933696e8e4105136
-	* 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-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Use lock_slot for apdu_send_direct.
-	+ commit f808012ac2cf67ec563da178d963f300a7f2564d
-	* scd/apdu.c (apdu_send_direct): Use lock_slot.
-
-	scd: Internal CCID driver: Fix a race condition on close.
-	+ commit 484bafda4dbf5ffe9e7c41ef24fbc5bd791a3b32
-	* 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-04 Werner Koch <wk@gnupg.org>
-
-	speedo,w32: Install gpg-check-pattern and example profiles.
-	+ commit f5a81953e172a7bb4d02f2dc0e398f379c39ec84
-	* 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 b7f4e2d71fe3dee680f834cfc3dd620352830147
-	* g13/create.c: Include sysutuls.h
-
-	gpgconf: Make sure the homedir exists for --apply-profile.
-	+ commit 7d95f2e7e7a09e3d433d449b117e3470f9dd38c7
-	* tools/gpgconf.c (main) <aApplyDefaults, aApplyProfile>: Create the
-	standard home directory.
-
-	common: Fix duplicate implementation of try_make_homedir.
-	+ commit dabc314b71378f585fac2753149f3358e32ec621
-	* 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 c8f6f6bbc8b203e633d382aa84862807c1aeb3d1
-	* common/homedir.c (get_default_pinentry_name): Try ../bin/pinentry.exe
-
-	w32: Add windows subsystem variant of gpgconf.
-	+ commit e2659f4bf603693c43af0444239bc52744291edc
-	* 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 e8aae18b997b3fdbfac86c644be94044aa67224d
-	* 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 d1f2a6d9f71cf50318f4891c84aeedb975553896
-	* 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-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow setting notations with the empty string as value.
-	+ commit e1bafa3574ccd56d9f8f8c1deb3d8fb9fd7025cc
-	* 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.
-
-	build: Remove m4 macro defs which are not anymore used.
-	+ commit 6397cf5fbe3bbc1f616431b011f76e031a387d4c
-	* configure.ac (GNUPG_FUNC_MKDIR_TAKES_ONE_ARG): Do not use.
-	* acinclude.m4 (GNUPG_FUNC_MKDIR_TAKES_ONE_ARG): Remove unused macro
-	defs.
-	(GNUPG_CHECK_FAQPROG): Ditto.
-	(GNUPG_CHECK_DOCBOOK_TO_TEXI): Ditto.
-	(GNUPG_CHECK_MLOCK): Ditto.
-
-	gpg: Do not use weak digest algos if selected by recipient prefs.
-	+ commit 15746d60d492f5792e4a179ab0a08801b4049695
-	* 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-11-02 Ingo Klöcker <dev@ingo-kloecker.de>
-
-	gpg: Fix iteration over signatures.
-	+ commit b004701adca89ba85f75e12a4d284297147fe4f2
-	* g10/keyedit.c (keyedit_quick_revsig): Take signature of correct node
-
-2020-11-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	kbx: Don't put zero-byte for ECC.
-	+ commit 8211d0bc3ba5ed15d0668050c08a6e28228b08a4
-	* kbx/keybox-openpgp.c (parse_key): Only put zero for non-ECC.
-
-	gpg: Fix debug output for key_check_all_keysigs with opaque MPI.
-	+ commit 90c3d623ce37695a1eb29c0a7276b23490d14603
-	* g10/key-check.c (key_check_all_keysigs): Handle opaque MPI.
-
-	gpg: Fix check_signature2 for opaque MPI.
-	+ commit 029ba6dc961c683d6683c97667d3c0e103738aa4
-	* g10/sig-check.c (check_signature2): Handle the case of opaque MPI.
-
-	gpg: Change the API for checksum to use const qualifier.
-	+ commit 21d8927f794bd901b13feaaac6d31d463349a64f
-	* g10/main.h (checksum): Use const.
-	* g10/misc.c (checksum): Use const.
-
-	gpg: Fix counting buffer size in check_signature2.
-	+ commit 3151210e455f14848921fac838a5064749258d9f
-	* g10/sig-check.c (check_signature2): Use GCRYMPI_FMT_PGP.
-
-2020-10-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix SOS handling with libgcrypt version <= 1.8.
-	+ commit 813e24108a139c8059dad8bc679b2ab76b807ed9
-	* g10/misc.c (checksum_mpi): Don't depend new feature
-	of gcry_mpi_print which supports opaque MPI.
-
-	gpg: Fix first zero-byte case for SOS handling.
-	+ commit dd4fb1c8f668f78fbcf5052e80c5c40d4cdad20c
-	* g10/export.c (transfer_format_to_openpgp): Check the first byte.
-	* g10/pkglue.c (sexp_extract_param_sos): Likewise.
-
-2020-10-28 Werner Koch <wk@gnupg.org>
-
-	gpg: New command --quick-revoke-sig.
-	+ commit 243f9176e799b2328f2e5bed93099bfc474fdc5a
-	* 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): Make global.
-
-2020-10-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Sort the signatures in standard key listings.
-	+ commit 742e2729f4bcadfeb93260107462f4faa108d3b2
-	* g10/gpg.c (parse_list_options): Add "sort-sigs".
-	(main): Make it the default.
-	* g10/options.h (LIST_SORT_SIGS): New.
-	* g10/keylist.c (cmp_signodes): New.
-	(list_keyblock_print): Sort signatures and factor signature printing
-	code out to ...
-	(list_signature_print): new.
-
-2020-10-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Handle canonical serialno and app specific serialno differently.
-	+ commit e59d2b3632d8c778bd2c4375a1c3ba9c786c4360
-	* scd/app-common.h (card_get_serialno): Add IS_CANONICAL arg.
-	* scd/app.c (app_send_devinfo): Use app specific serialno.
-	(card_get_serialno): Support two different cases.
-	(app_get_serialno): Return app specific serialno.
-	(send_serialno_and_app_status): Return canonical serialno.
-	* scd/command.c (cmd_serialno): Return app specific serialno.
-	(cmd_learn): Return canonical serialno.
-
-2020-10-26 Werner Koch <wk@gnupg.org>
-
-	g10: Make call to agent_scd_serialno more robust.
-	+ commit 0f780b1aebb1b1bde219401735a1c24c1f0a7978
-	* g10/call-agent.c (agent_scd_serialno): Make sure that NULL is stored
-	on error at r_serialno.
-	* g10/card-util.c (card_status): Simplify freeing of seriaono.
-	(factory_reset): Ditto.
-
-2020-10-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Flush the cache when writing cert data object.
-	+ commit 8264b10d33e46d2caac2f2c38ccb5f764c31ad77
-	* scd/app-piv.c (do_writecert): Flush the cache of the data object.
-
-	gpg: Fix double free on error.
-	+ commit a153d0f7691486efe0aadfb1e226544ae6d20ffd
-	* g10/card-util.c (card_status): Check an error return.
-
-	gpg,tools: Fix detecting OpenPGP card by serialno.
-	+ commit 157f1de64e437cecd75335e9f4077ba9835e3da0
-	* tools/gpg-card.c (list_openpgp): Use ->apptype to determine card's
-	APP.
-	* g10/card-util.c (get_info_for_key_operation): Likewise.
-	(current_card_status): Even if its SERIALNO is not like OpenPGP card,
-	it's OpenPGP card when app says so.
-
-	scd: Internal CCID driver thing only for SPR532.
-	+ commit 31def32eeed8cff705ca827e4bbc0bfcc80c512f
-	* 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.
-
-2020-10-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Internal CCID driver limiting only for SPR532.
-	+ commit 3c6b5dfa2a2379a5f5eaa052f7dbc73462097425
-	* scd/ccid-driver.c (ccid_vendor_specific_init): Only do that for
-	SPR532.
-
-2020-10-23 Werner Koch <wk@gnupg.org>
-
-	common: Allow building with released libgpg-error.
-	+ commit 32f336d9555f18464d72a5068c290ab82ee92617
-	* common/sysutils.c (gnupg_access) W32: Fix for older libgpgrt.
-
-2020-10-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Handle Yubikey's multiple apps and serialno.
-	+ commit 2d4de4b6f06c87cd0f72b2a0d09950e1b50841b2
-	* scd/app-common.h (yubikey_get_serialno): New.
-	* scd/app-openpgp.c (yubikey_get_serialno): New.
-	* scd/app.c (card_get_serialno): Use OpenPGP app's serialno,
-	when it's enabled for Yubikey.
-	(send_serialno_and_app_status): Use card_get_serialno, not
-	directly accessing ->serialno.
-
-	scd: Use app_get_serialno for app_getattr.
-	+ commit c8cc35dd2c106d91a793667690c0b200560d5d2d
-	* scd/app.c (app_getattr): Use app_get_serialno.
-
-	scd: Don't overwrite serialno for Yubikey.
-	+ commit 65c91e601ae93aee1a5fa399d4a5d4498ad76eda
-	* scd/app-openpgp.c (app_select_openpgp): Keep ->serialno.
-
-	scd,openpgp: Use app_get_serialno function to get SERIALNO.
-	+ commit 41505f0ae544535b524a409d87aa2540607fc9a4
-	* scd/app-openpgp.c (check_keyidstr): Don't directly access
-	app->serialno, but use app_get_serialno.
-	(do_with_keygrip): Likewise.
-
-2020-10-21 Werner Koch <wk@gnupg.org>
-
-	common: New functions gnupg_opendir et al.
-	+ commit 7e22e08e2ab09cd3c2317f5e80e8ee47d46eff4b
-	* 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 9a0197b6fe412cfc66b0cece521267180e454416
-	* common/sysutils.c (w32_rename): New.
-	(gnupg_rename_file) W32: Support Unicode.
-	(gnupg_remove) W32: Support Unicode. Drop Windows-CE support.
-
-2020-10-20 Werner Koch <wk@gnupg.org>
-
-	Replace all calls to stat by gnupg_stat.
-	+ commit 18e5dd7b03ced51611c9ba1345cf498a0aaf14a6
-	* common/sysutils.c (gnupg_stat): New.
-	* common/sysutils.h: Include sys/stat.h.
-
-	Replace most calls to open by a new wrapper.
-	+ commit 4dcef0e17836e8725c31a3b76f2bf7144345c808
-	* 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.
-
-	w32: Allow Unicode filenames for dotlock.
-	+ commit b47c355b18d9537ccc3dd3e80cc1825b018ecff7
-	* 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 c94ee1386e0d5cdac51086c4d5b92de59c09c9b5
-	* 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-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg,ecc: Fix SOS handling when receiving from agent.
-	+ commit 228836f79f64559c9582ac2d475e50af57684bf8
-	* g10/export.c (transfer_format_to_openpgp): It's not simple opaque
-	MPI, but SOS.
-
-	agent: Fix SEGV when debuging for cache enabled.
-	+ commit 33cb1655f1b7c597d1ebdcb38447648477e6ac9f
-	* agent/cache.c (agent_get_cache): Avoid dereferencing NULL.
-
-2020-10-05 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Fix detection of too old keyboxd.
-	+ commit 4eb9ce847825e8c6a07ce27d303c56233e85d007
-	* sm/keydb.c (warn_version_mismatch): Add arg ctrl and pass on.
-	(create_new_context): Pass ctrl to warn function.
-
-	dirmngr: Minor cleanup for better readability.
-	+ commit b258f8de7e9fc436d72c4d4ff8f98e9b86d2f3f5
-	* 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.
-
-	dirmngr: Add warning on the use of --add-servers.
-	+ commit 210575d8826ea61e4914e4b61eff7b875c972b85
-	* tools/gpgconf-comp.c (known_options_dirmngr): Degrade add-servers to
-	expert mode.
-
-	gpg: Switch to ed25519+cv25519 as default algo.
-	+ commit ff31dde456f32950f0df6c974b4c41f1d650d68f
-	* g10/keygen.c (DEFAULT_STD_KEY_PARAM): Change to former future
-	default ago.
-	(ask_algo): Change default and also the way we indicate the default
-	algo in the list of algos.
-	(ask_curve): Indicate the default curve.
-
-	keyboxd: Fix duplicates when listing keys by uid.
-	+ commit 194034f813a09a0021e6aa82d64ea0693b37c8d0
-	* kbx/backend-sqlite.c (struct be_sqlite_local_s): Add fields
-	lastubid_valid and lastubid.
-	(run_sql_prepare): Add optional extra2 arg and chage callers.
-	(run_select_statement): Add an ORDER BY clause to most SELECTs.
-	(be_sqlite_search): Skip duplicated keyblocks in a search.
-
-2020-10-04 Werner Koch <wk@gnupg.org>
-
-	build: Fix SENDMAIL define for a PATH with spaces.
-	+ commit 6c36b8bb23bb033aaae5f1dff3b38d8e0e44717c
-	* configure.ac: Fix use of $PATH
-
-	(cherry picked from commit 77e416741abb0a871733bd46cbc81329859de96e)
-
-2020-10-02 Werner Koch <wk@gnupg.org>
-
-	gpgconf: New option --show-versions.
-	+ commit 357ad9ae29677c1676b56d2b81282e2f78ec8040
-	* 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.
-	* tools/gpgconf-comp.c (GPGNAME): Remove unused macro.
-	* dirmngr/dirmngr.c (main): New internal option --gpgconf-versions.
-	(get_revision_from_blurb): New.
-	(gpgconf_versions): New.
-
-	w32: Silence warning due to recent change of split_fields.
-	+ commit 371228a244232f2b74181e0aa3c44d698df840ce
-	* common/compliance.c (gnupg_rng_is_compliant): Make fields const.
-
-	gpg: Fix parameter parsing form ed448.
-	+ commit e824e27d36021a868c855244d22c7d40a88a396e
-	* g10/keygen.c (parse_key_parameter_part): Set algo also for 448.
-
-2020-10-01 Andre Heinecke <aheinecke@gnupg.org>
-
-	doc: Remove enable-extended-key-format in vsnfd.
-	+ commit d84862cf109c75ae30ed5e2531b4554083c6a558
-	* doc/examples/vsnfd.prf: Remove enable-extended-key-format
-
-2020-09-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Internal CCID driver: More fix for SPR532.
-	+ commit 920f258eb6018ecec1d63bad6a0fb0772f72affa
-	* scd/ccid-driver.c (bulk_in): Handle the case of missing intr_cb.
-
-	scd: Report any error for LEARN command.
-	+ commit 862d9c6face9b4ad61f6e59bf1ba9b5f5d05c58c
-	* scd/app-openpgp.c (do_learn_status): Report any error.
-
-2020-09-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Internal CCID driver fix.
-	+ commit 1444203ca32ccfa4bd5097d2d49565c4055c620b
-	* 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 6af978713e4c69d7814f47e709f1dfb3fe9076d1
-	* scd/ccid-driver.c (ccid_setup_intr): Reset the endpoint.
-	(ccid_vendor_specific_init): Don't call libusb_clear_halt.
-
-2020-09-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Internal CCID driver: Fix a failure path.
-	+ commit d561c936a217627bc29aac628a8d01f7003dcd28
-	* 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 b1e8072320c19246962beb6d67dc5784b5a72364
-	* scd/ccid-driver.c (ccid_slot_status): Handle LIBUSB_ERROR_TIMEOUT.
-
-	scd: Internal CCID: Clear the handle after use.
-	+ commit c5e8ef3ab980012b64f5894f437e2ff568b02f43
-	* scd/apdu.c (close_ccid_reader): Clear the handle.
-	(open_ccid_reader): Likewise.
-
-	scd: Change handling of SPR532 card reader.
-	+ commit 684a52dffa8b7f79b26fe53b3ab10d7748a8fb37
-	* scd/ccid-driver.c (ccid_vendor_specific_init): Put some workaround
-	for SPR532 initialization.
-	(ccid_slot_status): Send ESCape command after GetSlotStatus.
-
-2020-09-25 Werner Koch <wk@gnupg.org>
-
-	keyboxd: Make use of the config table.
-	+ commit f8fbd9e7346ee0c3b09271ec2cdb589282eae1c9
-	* kbx/backend-sqlite.c (DATABASE_VERSION): New.
-	(table_definitions): Make column name of table config unique.
-	(create_or_open_database): Read and set the database version.
-	(get_config_value, set_config_value): New.
-
-2020-09-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: For PC/SC, send the ESC command at init for SPR532 reader.
-	+ commit 93e3c97889120dd17d79b7c8dd04293553785c9b
-	* scd/apdu.c (struct reader_table_s): Remove is_spr532.
-	(pcsc_vendor_specific_init): Send the ESC command for SPR532.
-	(pcsc_pinpad_verify, pcsc_pinpad_modify): Remove no_lc hack.
-
-	scd: For SPR532, submit the ESCape command at initialization.
-	+ commit 4fae55f8ee11b3f710524e5e8b8a91b159949f2d
-	* 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.
-
-2020-09-24 Werner Koch <wk@gnupg.org>
-
-	gpg: New experimental import option "bulk-import"
-	+ commit d49a945b12d98fadd0d37f4e50b5e02799e16305
-	* g10/options.h (IMPORT_BULK): New.
-	* g10/import.c (parse_import_options): Add "bulk-import".
-	* g10/call-keyboxd.c (in_transaction): New var.
-	(gpg_keyboxd_deinit_session_data): Run a commit if in bulk import
-	mode.
-	(create_new_context): Run a begin transaction if in bulk import mode.
-
-	keyboxd: New command TRANSACTION.
-	+ commit c2b14f5d6852fb9efaca8aeec7961e9d036203e8
-	* kbx/backend-sqlite.c (be_sqlite_rollback): New.
-	(be_sqlite_commit): New.
-	(be_sqlite_search): Take care of global transactions.
-	(be_sqlite_store): Ditto.
-	(be_sqlite_delete): Ditto.
-	* kbx/frontend.c (kbxd_rollback, kbxd_commit): New.
-	* kbx/keyboxd.h (opt): Add vars for transactions.
-	* kbx/kbxserver.c (struct server_local_s): Add fields next_session and
-	client_pid.
-	(session_list): New var.
-	(cmd_transaction): New.
-	(register_commands): Register command.
-	(kbxd_start_command_handler): Store pids and track sessions. Do a
-	final rollback.
-
-	tests: Integrate --use-keyboxd into the OpenPGP test suite.
-	+ commit b19a60c6f7e892635db9e22499a7a44087c86c41
-	* tests/openpgp/all-tests.scm (all-tests): Replace extended-key-format
-	mode with a new keyboxd mode.
-	* tests/openpgp/defs.scm (create-gpghome): Ditto.
-	* tests/openpgp/gpgv.scm: Adjust for keyboxd mode.
-	* tests/openpgp/issue2419.scm: Fix to allow setting a log-file into
-	gpg.conf for debugging.
-
-	keyboxd: Implement multiple search descriptions.
-	+ commit 25ad3c22d79d06c16a5fc652b0a6e3ffd99ad2b6
-	* kbx/kbx-client-util.c (kbx_client_data_simple): New.
-	* kbx/backend-sqlite.c (struct be_sqlite_local_s): Add field descidx.
-	(be_sqlite_search): Use that.
-	* g10/call-keyboxd.c (keydb_search): Implement multi mode.
-
-	keyboxd: Fix UDPATE keyblob SQL statement.
-	+ commit 1f89d50537b3b16165e921df60734ce6203650cb
-	* kbx/backend-sqlite.c: Always use ?NNN for SQL parameters.
-
-	tests: Fix convenience function to run gpg.
-	+ commit 97798eec4b77470b3aecdbee9729fa76b8550dfe
-	* tests/openpgp/defs.scm (pipe:gpg): Remove stray dash.
-
-	keyboxd: Remove unused variables.
-	+ commit 0ac003b4576392ca3e930304a98bbf8183ab5f8b
-	* kbx/kbx-client-util.c (datastream_thread): No need to set PK_NO and
-	UID_NO.
-
-	keyboxd: Integrate into gpgconf.
-	+ commit acaeba2dbdb9bbd68a823c671d5c3577fef5d26d
-	* common/asshelp.c (lock_spawning): Use a dedicated name for keyboxd.
-	* common/homedir.c (keyboxd_socket_name): New.
-	(gnupg_module_name): Put keyboxd into libexecdir.
-	* tools/gpgconf-comp.c (known_options_keyboxd): New.
-	(gc_component): Add entry for keyboxd.
-	(keyboxd_runtime_change): New.
-	(gc_component_launch): Support keyboxd.
-	* tools/gpgconf.c (list_dirs): Emit new item keyboxd-socket.
-	(main): Also remove keyboxd socket.
-
-2020-09-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix CCID internal driver for interrupt transfer.
-	+ commit 7cbb513a2dc150a90a30c53316970df2a439d494
-	* scd/ccid-driver.c (intr_cb): Handle the case of multiple messages.
-
-2020-09-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Set the found-by flags in the keyblock in keyboxd mode.
-	+ commit 183509756179fadd95d1cc740047b94dc16bb279
-	* g10/keydb-private.h (struct keydb_handle_s): Add fields to return
-	the ordinals of the last found blob.
-	* g10/call-keyboxd.c (keydb_get_keyblock): Pass them to the keyblock
-	parser.
-
-	sm: Fix returning of the ephemeral flag in keyboxd mode.
-	+ commit b810320b1bf76209dc1087cb91ca34232d9268c3
-	* sm/keydb.c (search_status_cb): Skip over the ubid.
-
-	common: Fix name of keyboxd.
-	+ commit c81a7b09368a474de4e3572fbb527d1597408ab1
-	* common/homedir.c (gnupg_module_name): Fix name.
-
-	keyboxd: Extend PUBKEY_INFO status line with an uid ordinal.
-	+ commit 0e892bda4e0bf9db9116d7d5585d4e7b0d2eae57
-	* kbx/backend-sqlite.c (table_definitions): Add column UINO to
-	userids.
-	(be_sqlite_local_s): Add fields select_col_uidno and
-	select_col_subkey.
-	(run_select_statement): Also select subkey or uidno column.
-	(be_sqlite_search): Return their values.
-	(store_into_userid): Store the UIDNO.
-	* kbx/backend-support.c (be_return_pubkey): Extend PUBKEY_INFO.
-
-	kbx: Add bounds check to detect corrupt keyboxes.
-	+ commit e0a312bfd646485ae8a0ae5e26720fc1667c5490
-	* kbx/keybox-dump.c (_keybox_dump_blob): Fix the fixmes.
-
-2020-09-21 Werner Koch <wk@gnupg.org>
-
-	scd: Extend KEYPAIRINFO with an algorithm string.
-	+ commit 26da47ae53d51e16ae6867cd419ddbf124a94933
-	* scd/app-openpgp.c (send_keypair_info): Emit the algo string as part
-	of a KEYPAIRINFO.
-	* scd/command.c (do_readkey): Ditto.
-	* scd/app-piv.c (do_readkey): Ditto.
-	* scd/app-nks.c (do_learn_status_core): Ditto.
-	(struct fid_cache_s): Add field algostr.
-	(flush_fid_cache): Release it.
-	(keygripstr_from_pk_file): Fill it and add it to the cache. Use a
-	single exit label.
-	* scd/app-help.c (app_help_get_keygrip_string_pk): Add new arg
-	r_algostr. Change all callers.
-
-	sm: Implement delete key in keyboxd mode.
-	+ commit c772770574ea2d337f8745ff304b1b8acd8a2e4c
-	* sm/keydb.c (keydb_delete): Implement keyboxd mode.
-	(keydb_update_cert): Disable unused function.
-	* kbx/backend-sqlite.c (be_sqlite_delete): Delete from issuer.
-
-2020-09-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix regression for access through the extra secket.
-	+ commit 8a84a71f3a58a3e943f238b70743cd6408477eba
-	* agent/command.c (cmd_keyinfo): Allow KEYINFO command for one key.
-	(cmd_scd): Allow SCD command to invoke GETINFO, GETATTR, and
-	KEYINFO --list=encr sub commands.
-
-	common,agent,dirmngr,g10,tools: Fix split_fields API.
-	+ commit dfdcf14738976c6b236f4fa1c3b68af351024b3c
-	* common/stringhelp.h (split_fields): Use const * for the strings in
-	the ARRAY.
-	(split_fields_colon): Likewise.
-	* common/stringhelp.c (split_fields, split_fields_colon): Fix
-	the implementation.
-	* agent/call-scd.c, agent/command.c: Follow the change.
-	* common/t-stringhelp.c, dirmngr/loadswdb.c: Likewise.
-	* g10/call-agent.c, tools/card-call-scd.c: Likewise.
-	* tools/card-yubikey.c, tools/gpg-card.c: Likewise.
-	* tools/gpg-card.h, tools/gpg-wks-client.c: Likewise.
-	* tools/gpgconf-comp.c, tools/gpgconf.c: Likewise.
-	* tools/wks-util.c: Likewise.
-
-2020-09-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Clear PIN cache when changing key attributes.
-	+ commit 8ff36630277f05fbe4e43c7d757eb90da8645e3f
-	* scd/app-openpgp.c (change_keyattr): Clear all PINs.
-
-	scd: Clear caching PIN at KDF setup.
-	+ commit f4c07fc3d3c32e96d4306f6daa60b6de7fba7dc5
-	* scd/app-openpgp.c (do_setattr): Clear PINs.
-
-	scd: Add better support for KDF feature.
-	+ commit 316a8cbc7523560d999e46eb524165db11682210
-	* scd/app-openpgp.c (do_setattr): Handle kdf-seup "off" for Gnuk.
-
-	gpg,scd: Fix handling of KDF feature.
-	+ commit 8dfd0ebfd8cf2b6bcecbd91c8f7fad6db583aa5a
-	* g10/card-util.c (kdf_setup): Fix the default value.
-	* scd/app-openpgp.c (do_setattr): Support kdf-setup "off" by
-	Zeitcontrol. Make sure Gnuk and Yubikey work well.
-
-2020-09-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix the use case of verify_chv2 by CHECKPIN.
-	+ commit 6e51f2044aebb885ea81dae259db1b7f477b1c44
-	* scd/app-openpgp.c (verify_chv2): Call verify_a_chv with chvno=1
-	when needed.
-
-2020-09-11 Werner Koch <wk@gnupg.org>
-
-	scd:piv: Avoid conflict when writing a cert.
-	+ commit fbc1b199fdc8fd9a4ab422f005b4eb521b594c5c
-	* scd/app-piv.c (map_curve_name_to_oid): New.
-	(my_cmp_public_key): New.
-	(do_writecert): Replace simple memcmp by cmp_canon_sexp.
-
-	common: New function cmp_canon_sexp.
-	+ commit b6ba6a79ce9336f1b53f16f3d1190dd009fb166e
-	* common/sexputil.c (cmp_canon_sexp): New.
-	(cmp_canon_sexp_def_tcmp): New.
-	* common/t-sexputil.c (test_cmp_canon_sexp): Add a simple test.
-
-	keyboxd: Implement lookup by short and long keyid.
-	+ commit 9a94db1f662a1c5973b57b25e25aeab1bc33250e
-	* kbx/backend-sqlite.c: Change definition of column KID.
-	(kid_from_mem): Remove.
-	(kid_from_u32): Rewrite.
-	(run_sql_bind_int64): Remove.
-	(run_select_statement): Implement lookup by short keyid. Fix lookup
-	by long keyid.
-	(store_into_fingerprint): Adjust kid arg.
-
-	keyboxd: Add ephemeral and revoked flag to the sqlite backend.
-	+ commit 616c60d93dfab27dde00e1489c6c51340ec93b6c
-	* kbx/backend-support.c (be_return_pubkey): Add args is_ephemeral and
-	is_revoked. Adjust callers.
-	* kbx/backend-sqlite.c: Alter table pubkey to add new columns.
-	(run_select_statement): Add new column to all selects.
-	(be_sqlite_search): Return the new flags.
-
-2020-09-10 Andre Heinecke <aheinecke@gnupg.org>
-
-	doc: Update and extend module overview.
-	+ commit d62797ebcc15ffac52664fe08759d18a92491ddc
-	* doc/gnupg-module-overview.svg: Add examples of GPGME aware
-	applications
-
-2020-09-10 Werner Koch <wk@gnupg.org>
-
-	sm: Implement initial support for keyboxd.
-	+ commit ed6ebb696e4063dc664d7ee74fc492025881c459
-	* sm/gpgsm.h (MAX_FINGERPRINT_LEN): New.
-	* sm/keydb.c (struct keydb_local_s): Change definition of
-	search_result.
-	(keydb_get_cert): Implement keyboxd mode.
-	(keydb_get_flags): Temporary hack for keyboxd mode. Needs to be
-	fixed.
-	(struct store_parm_s, store_inq_cb): New.
-	(keydb_insert_cert): Implement keyboxd mode.
-	(keydb_locate_writable): Make static.
-	(keydb_search_reset): Implement keyboxd mode.
-	(search_status_cb): New.
-	(keydb_search): Implement keyboxd mode. Replace return code -1 by
-	GPG_ERR_NOT_FOUND.
-	(keydb_set_cert_flags): Replace return code -1 by GPG_ERR_NOT_FOUND.
-	* sm/keylist.c (list_cert_colon): Adjust for replacement of -1 by
-	GPG_ERR_NOT_FOUND.
-	(list_internal_keys): Ditto.
-	* sm/sign.c (add_certificate_list): Ditto.
-	* sm/certchain.c (find_up_search_by_keyid): Ditto.
-	(find_up_external, find_up, find_up_dirmngr): Ditto.
-	(gpgsm_walk_cert_chain): Ditto.
-	(get_regtp_ca_info): Ditto.
-	* sm/certlist.c (gpgsm_add_to_certlist): Ditto.
-	(gpgsm_find_cert): Ditto.
-	* sm/delete.c (delete_one): Ditto.
-	* sm/export.c (gpgsm_export): Ditto.
-	(gpgsm_p12_export): Ditto.
-	* sm/import.c (gpgsm_import_files): Ditto.
-
-	keyboxd: Add basic support for X.509.
-	+ commit c9677d416e6ff190c589af35b514a01a787085fb
-	* kbx/keybox-blob.c (x509_email_kludge): Rename to ...
-	(_keybox_x509_email_kludge): this and make global.
-	* kbx/backend.h: Include ksba.h.
-	* kbx/backend-support.c (be_get_x509_serial): New.
-	(be_get_x509_keygrip): New.
-	* kbx/backend-sqlite.c (table_definitions): New table 'issuers'.
-	(run_select_statement): Implements modes ISSUER, ISSUER_SN, SUBJECT.
-	(store_into_userid): Add arg override_mbox.
-	(store_into_issuer): New.
-	(be_sqlite_store): Implement x509 part.
-
-	keyboxd: Use D-lines instead of a separate thread.
-	+ commit 6fcc263c182fc49d9ba2d1bd7649b4af1e9f3e3a
-	* kbx/kbx-client-util.c (kbx_client_data_new): Add arg 'dlines'.
-	* g10/call-keyboxd.c (open_context): Set DLINES to true.
-	* sm/keydb.c (open_context): Ditto.
-
-	keyboxd: Add options --openpgp and --x509 to SEARCH.
-	+ commit 29977e21d18188e16e50fee95a95e05fdbd97caf
-	* kbx/keyboxd.h (struct server_control_s): Replace the two request
-	objects by just one. Add filter flags.
-	* kbx/kbxserver.c (cmd_search): Add options --openpgp and --x509.
-	(cmd_killkeyboxd): Do not return GPG_ERR_EOF.
-	* kbx/frontend.c (kbxd_release_session_info): Adjust for the new
-	request object.
-	(kbxd_search, kbxd_store, kbxd_delete): Ditto.
-	* kbx/backend-sqlite.c (struct be_sqlite_local_s): Add filter flags.
-	(run_sql_prepare): Add optional arg 'extra'. Change callers.
-	(run_sql_bind_ntext): New.
-	(run_sql_bind_text): Just call run_sql_bind_ntext.
-	(run_select_statement): Add ctrl arg. Implement the filter flags.
-
-	* g10/call-keyboxd.c (keydb_search): Use the --openpgp option.
-
-	gpg-connect-agent: Catch signals so that SIGPIPE is ignored.
-	+ commit 3cf9bb4d73cfe78d3d48734e7c8a65d9a98112a5
-	* 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 5a87011c46b5b01659c3cbc3c7a04da94ae5ca9e
-	* 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 faabc49797df43c4904b6230f83e8c6677e88b22
-	* dirmngr/http.c (http_session_new) <gnutls>: Use only the special
-	pool certificate for the default keyserver.
-
-2020-09-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Flush KDF DO (0x00F9) when it's being set.
-	+ commit d4cb774ddd8830836c9c87a90db01f749ac8d67c
-	* scd/app-openpgp.c (do_setattr): Call flush_cache_item always.
-
-2020-09-09 Werner Koch <wk@gnupg.org>
-
-	agent: Keep some permissions of private-keys-v1.d.
-	+ commit 8ed85ef3de9cdeee86e281a8b46be1bd49a36e7a
-	* common/sysutils.c (modestr_to_mode): Re-implement.
-	(gnupg_chmod): Support keeping of permissions.
-
-	kbx: Change X.509 S/N search definition.
-	+ commit adec6a84f6ee176764391da358ae150f92b1f1e4
-	* kbx/keybox-search-desc.h (struct keydb_search_desc): Do not overload
-	SNLLEN with a hex flag. Add SNHEX.
-	* kbx/keybox-search.c (keybox_search): Adjust.
-	* common/userids.c (classify_user_id): Adjust.
-	* sm/keydb.c (keydb_search_desc_dump): Adjust.
-	* g10/keydb.c (keydb_search_desc_dump): Adjust.
-
-2020-09-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg,tools: Add handling of supported algorithms by a card.
-	+ commit 2bc1ec294422504e2d2e5d20716aba68f1c2b0d7
-	* g10/call-agent.h (struct agent_card_info_s): Add supported_keyalgo.
-	* g10/call-agent.c (learn_status_cb): Parse KEY-ATTR-INFO.
-	(agent_release_card_info): Release supported_keyalgo.
-	* tools/gpg-card.h (struct card_info_s): Add supported_keyalgo.
-	* tools/card-call-scd.c (learn_status_cb): Parse KEY-ATTR-INFO.
-	(release_card_info): Release supported_keyalgo.
-
-	scd: Add a workaround for Yubikey.
-	+ commit 0db9c83555b4a8a0c52f96e96ec20dbfd3d75272
-	* scd/app-openpgp.c (get_public_key): Handle wrong code for Yubikey.
-
-2020-09-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix handling 0x00FA to support OpenPGP card 3.4.
-	+ commit 270c49b8c6eaf99df7b417f9d0e45eba0acfb423
-	* scd/app-openpgp.c (data_objects): It may be longer.
-
-2020-09-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Initialize a parameter to silence valgrind.
-	+ commit 65eb1569809a3c42e8afb064f6194fac2e34a03a
-	* g10/keygen.c (read_parameter_file): Initialize nline.
-	* g10/textfilter.c (copy_clearsig_text): Initialize bufsize.
-
-2020-09-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support GET DATA response with no header for DO 0x00FA.
-	+ commit 43bbc25b0f57dec24412886ff46041e0b1f3de26
-	* scd/app-openpgp.c (do_getattr): Support Gnuk, as well.
-
-	scd: Parse "Algorithm Information" data object in scdaemon.
-	+ commit eba2563dabbb4f61537900289fbe3ae113904733
-	* scd/app-openpgp.c (data_objects): 0x00FA for binary data.
-	(do_getattr): Parse the data and send it in status lines.
-	(get_algorithm_attribute_string): New.
-
-2020-09-03 Werner Koch <wk@gnupg.org>
-
-	sm: New options to prepare the use of keyboxd.
-	+ commit 046f419f806036248c058c4bd44368f8596287b7
-	* sm/Makefile.am (AM_CFLAGS): Add npth flags.
-	(common_libs): Use npth version of the lib.
-	(gpgsm_LDADD): Add npth libs.
-	* sm/gpgsm.c (oUseKeyboxd, oKeyboxdProgram): New.
-	(opts): New options --use-keyboxd and --keyboxd-program.
-	(main): Set them.
-	(gpgsm_deinit_default_ctrl): New.
-	(main): Call it.
-	* sm/server.c (gpgsm_server): Ditto.
-	* sm/gpgsm.h (opt): Add fields use_keyboxd and keyboxd_program.
-	(keydb_local_s): New type.
-	(struct server_control_s): Add field keybd_local.
-	* sm/keydb.c: Include assuan.h, asshelp.h, and kbx-client-util.h.
-	(struct keydb_local_s): New.
-	(struct keydb_handle): Add fields for keyboxd use.
-	(gpgsm_keydb_deinit_session_data): New.
-	(warn_version_mismatch): New.
-	(create_new_context): New.
-	(open_context): New.
-	(keydb_new): Implement keyboxd mode.
-	(keydb_release): Ditto.
-	(keydb_get_resource_name): Ditto.
-
-	* sm/keydb.c: Add stub support for all other functions.
-
-	sm: Add arg ctrl to keydb_new.
-	+ commit a7d006293ec84532cc1972cd2f990198eadf1a1a
-	* sm/keydb.c (keydb_new): Add arg and change all callers.
-
-2020-09-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Add handling of "Algorithm Information" DO.
-	+ commit 90d0072165cc5c6888f14462392a211de0c4b232
-	* cd/app-openpgp.c (data_objects): Add 0x00FA.
-	(do_getattr): Add KEY-ATTR-INFO.
-
-2020-09-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix segv importing certain keys.
-	+ commit 8ec9573e57866dda5efb4677d4454161517484bc
-	* g10/key-check.c (key_check_all_keysigs): Initialize issuer.
-
-	keyboxd: Restructure client access code.
-	+ commit 497db0b5bcd688c4e2144ba167bd2ac485069d1b
-	* kbx/kbx-client-util.c: New.
-	* kbx/kbx-client-util.h: New.
-	* kbx/Makefile.am (client_sources): New.
-	* g10/keydb.c (parse_keyblock_image): Rename to keydb_parse_keyblock
-	and make global.
-	* g10/call-keyboxd.c: Include kbx-client-util.h.
-	(struct keyboxd_local_s): Remove struct datastream. Add field kcd.
-	Remove per_session_init_done.
-	(lock_datastream, unlock_datastream): Remove.
-	(prepare_data_pipe, datastream_thread): Remove.
-	(keydb_get_keyblock_do_parse): Remove.
-	(gpg_keyboxd_deinit_session_data): Release the KCD object.
-	(open_context): Use of kbx_client_data_new.
-	(keydb_get_keyblock): Simplify.
-	(keydb_search): Use kbx_client_data_cmd and _wait.
-
-	keyboxd: Fix user id based queries.
-	+ commit 4d839f5a8083e1ddd4767c838f56a4079f846c6d
-	* kbx/backend-sqlite.c (run_select_statement): Add the missing join
-	for user id bases queries.
-
-	common: New helper function gnupg_close_pipe.
-	+ commit 2042f5a4641f4e43137b7683077b4d733d216417
-	* common/exechelp-posix.c (gnupg_close_pipe): New.
-	* common/exechelp-w32.c (gnupg_close_pipe): New.
-
-2020-09-01 Werner Koch <wk@gnupg.org>
-
-	Use only one copy of the warn_server_mismatch function.
-	+ commit 2cd8bae23d7382588cf096df3eed83e02331a2bf
-	* common/asshelp.c (warn_server_version_mismatch): New. Actually a
-	slightly modified version of warn_version_mismatch found in other
-	modules.
-	* common/status.c (gnupg_status_strings): New.
-	* g10/cpr.c (write_status_strings2): New.
-	* g10/call-agent.c (warn_version_mismatch): Use the new unified
-	warn_server_version_mismatch function.
-	* g10/call-dirmngr.c (warn_version_mismatch): Ditto.
-	* g10/call-keyboxd.c (warn_version_mismatch): Ditto.
-	* sm/call-agent.c (warn_version_mismatch): Ditto.
-	* sm/call-dirmngr.c (warn_version_mismatch): Ditto.
-	* tools/card-call-scd.c (warn_version_mismatch): Ditto.
-
-2020-08-28 Werner Koch <wk@gnupg.org>
-
-	sm: Fix a bug in the rfc2253 parser.
-	+ commit 16c1d8a14e98894408f30349cab68ff17ef6b35e
-	* sm/certdump.c (parse_dn_part): Fix parser flaw.
-
-2020-08-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix fallback handling to utf-8.
-	+ commit 393dcdd61c3b2da00a97176c647d9bd1c908ceba
-	* common/utf8conv.c (handle_iconv_error): Set NO_TRANSLATION.
-
-2020-08-27 Werner Koch <wk@gnupg.org>
-
-	scd: New option to APDU command to return the ATR as data.
-	+ commit a0a4744bd0640e587b33ec3dae819ec4054f0472
-	* scd/command.c (cmd_apdu): Add new option --data-atr.
-	* tools/gpg-card.c (cmd_apdu): Use that here. Also fix the --exlen
-	option and do not print the statusword in atr mode.
-	* tools/card-call-scd.c (scd_apdu): Detect atr mode anddon't assume a
-	status word.
-
-	scd: Fix reading of the ATR for card type detection.
-	+ commit 95b5a852e269e602ade6a07ed468e9072c247b8c
-	* scd/app.c (app_new_register): Do not use apdu_get_slot.
-
-	dirmngr: Print the last alert message returned by NTBTLS.
-	+ commit 05358d73841149f64dc5d620f4b8855255e7f4da
-	* dirmngr/http.c (send_request): Print the last TLS alert.
-
-2020-08-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Add heuristics to identify cardtype.
-	+ commit 9f148360a2bf04672b43ef7cec48e21d44b06ae1
-	* scd/app-common.h (cardtype_t): Add CARDTYPE_GNUK and
-	CARDTYPE_ZEITCONTROL.
-	* scd/app.c (strcardtype): Handle CARDTYPE_GNUK and
-	CARDTYPE_ZEITCONTROL.
-	(app_new_register): Detect Gnuk and Zeit Control implementation
-	by examining its ATR string.
-
-	scd: Add condition for VERIFY with 0x82.
-	+ commit af189be481df02a77e088aa0a60a1fc02dfa12bf
-	* 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 90a87d96eaf5b97cd53cb0ee0495b646be7b84bb
-	* configure.ac: Avoid useless gcc warning. We use an empty string
-	quite often, for example in log_printhex.
-
-2020-08-25 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove left over debug output from recent change.
-	+ commit fc1a1857551c05135d54e2e620e609fda59d5bca
-	* g10/import.c (collapse_subkeys): Remove debug out.
-
-	examples: Simplify vsnfd.prf.
-	+ commit 40acc5ef3ef73494e67d88ea310503e5bf08bc36
-	* doc/examples/vsnfd.prf: Remove default-new-key-algo option.
-
-	sm: Do not require a default keyring for --gpgconf-list.
-	+ commit e7677da479c4fb5abd0339de807b27c0f487d2e0
-	* sm/gpgsm.c (main): No default keyring for gpgconf mode.
-
-	gpgconf: Silence warnings from parsing the options files.
-	+ commit ad1254b59d41e127879fc9f495d392316135b4a5
-	* tools/gpgconf-comp.c (retrieve_options_from_program): Set verbose
-	flag for the arg parser only in --verbose mode.
-
-	agent: Allow using --gogconf-list even if HOME does not exist.
-	+ commit b17846e4fd02f65b24ada306855fb110c56c5e73
-	* agent/gpg-agent.c (main): Do not create directories in gpgconf mode.
-
-	gpgconf,w32: New debug command --show-codepages.
-	+ commit 32021dfa5bcaa056c18e4ec40fdcd0f8b7de382b
-	* tools/gpgconf.c (aShowCodepages): New.
-	(opts): New command --show-codepages.
-	(main) W32: Implement
-
-	gpg: Collapse duplicate subkeys.
-	+ commit 633c1fea5f0dc4cb270c22ee41c24e1ec0706204
-	* g10/options.h (IMPORT_COLLAPSE_UIDS): New.
-	(IMPORT_COLLAPSE_SUBKEYS): New.
-	* g10/gpg.c (main): Make them the default.
-	* g10/import.c (parse_import_options): New import options
-	"no-collapse-uids" and "no-collapse_subkeys".
-	(collapse_subkeys): New.
-	(import_one_real): Collapse subkeys and allow disabling the collapsing
-	using the new options.
-	(read_key_from_file_or_buffer): Always collapse subkeys.
-	* g10/keyedit.c (fix_keyblock): Call collapse_subkeys.
-
-2020-08-21 Werner Koch <wk@gnupg.org>
-
-	gpgtar,w32: Handle Unicode file names.
-	+ commit 34e7703a962809921e83770f20f3eb66599265d1
-	* 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.
-	+ commit eec70e539e44c288068f26f190d52a5718fd3a10
-	* common/sysutils.c (gnupg_mkdir): Divert to gpgrt_mkdir.
-	(gnupg_chdir): Divert to gpgrt_chdir
-
-	common,w32: Do not assume the ANSI code during string conversion.
-	+ commit 5305ce17ff7a68ecc88c5ae8c4bec5897df6322f
-	* 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 33fd55ca6f3efc50c260469179788e9f725ddc58
-	* 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 e276f63e4a80e8d1cb1ba5621cedaeb0ccda956d
-	* 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 32aac55875f324f8c3d85dad8483604eae65e3e8
-	* 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 b8c4dd902df34faa4d23efb2bb4ac222c8bbdbdb
-	* agent/command.c (cmd_get_passphrase): Take care of --repeat with
-	--newsymkey.
-
-2020-08-19 Werner Koch <wk@gnupg.org>
-
-	gpg,gpgsm: Record the creation time of a private key.
-	+ commit 4031c42bfd0135874a5b362df175de93a19f1b51
-	* 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.
-
-2020-08-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix condition of string_to_aead_algo.
-	+ commit 1d66b518ca83e8d315283682b1e504f1e171a0b1
-	* g10/misc.c (string_to_aead_algo): Only compare if not NULL.
-
-	dns: Fix memory use-after-free.
-	+ commit cc0d53905ce9306b51bace2682ae3d1d122c7881
-	* dirmngr/dns.c (dns_res_stub): Fix RESCONF usage.
-
-	common: Fix iobuf.c.
-	+ commit f58d441bee7e93e6344f833acc1412b3be2f6818
-	* common/iobuf.c (iobuf_cancel): Initialize DUMMY.
-	(do_iobuf_fdopen): Initialize LEN.
-	(iobuf_read_line): Fix the loop condition.
-
-	Silence compiler warnings.
-	+ commit f3e424d4e7273e60e69747ca4936149af7b6482a
-	* common/openpgp-oid.c (map_openpgp_pk_to_gcry): Use cast for enum
-	conversion.
-	* dirmngr/dns-stuff.c (get_dns_srv): Use explicit conversion from
-	int to float.
-	* sm/gpgsm.c (parse_keyserver_line): Initialize ERR.
-
-	scd: Fix possible uninitialized variables.
-	+ commit 4fa0a65676a29cb53ee242caf13c393f7573c9a3
-	* scd/app-openpgp.c (do_change_pin): Initialize resultlen2.
-	(do_change_pin): Don't call wipe_and_free on the error path.
-	Initialize bufferlen2.
-
-2020-08-17 Werner Koch <wk@gnupg.org>
-
-	agent: Allow to pass a timestamp to genkey and import.
-	+ commit 0da923a1240ac78d60c92cdd8488c4e405c3243b
-	* 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
-	new key 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-14 Werner Koch <wk@gnupg.org>
-
-	Add --chuid to gpg, gpg-card, and gpg-connect-agent.
-	+ commit 6bcb609e1b2a507caa2e1a078178709d808b590b
-	* g10/gpg.c (oChUid): New.
-	(opts): Add --chuid.
-	(main): Implement --chuid. Delay setting of homedir until the new
-	chuid is done.
-	* sm/gpgsm.c (main): Delay setting of homedir until the new chuid is
-	done.
-	* tools/gpg-card.c (oChUid): New.
-	(opts): Add --chuid.
-	(changeuser): New helper var.
-	(main): Implement --chuid.
-	* tools/gpg-connect-agent.c (oChUid): New.
-	(opts): Add --chuid.
-	(main): Implement --chuid.
-
-2020-08-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Ignore personal_digest_prefs for ECDSA keys.
-	+ commit 53d84f98157070f24dc861f1a75980474d074ddb
-	* g10/sign.c (hash_for): Simplify hash algo selection for ECDSA.
-
-2020-08-12 Werner Koch <wk@gnupg.org>
-
-	scd: Log info about CCIDs with permission problems.
-	+ commit 2af884c64354182b1903d7a77df07e877f5ed7ba
-	* scd/apdu.c (open_ccid_reader): Add arg r_cciderr.
-	(apdu_open_reader): Print a note on EPERM of the USB device.
-
-	scd: Map some error codes from libusb to ccid-driver error codes.
-	+ commit 9a8d7e41bba1926158a21ebdda542241493ef983
-	* 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.
-
-	common: Pass the WAYLAND_DISPLAY envvar along.
-	+ commit 3944430ffeaa032719fd82f8eaa118b3f326b8ed
-	* common/session-env.c (stdenvnames): Add WAYLAND_DISPLAY.
-
-2020-08-10 Werner Koch <wk@gnupg.org>
-
-	scd:piv: Allow signing using PSS.
-	+ commit cbf203801e021e0f4d4143ecc92296ae7d0f0dd7
-	* scd/app-piv.c (do_sign): Allow for PSS.
-
-	agent: Add option --pss to pksign to be used by smartcards.
-	+ commit bb096905b9ee1f5175efee1ab6c98045a26a2678
-	* agent/command.c (cmd_sethash): Add option --pss and allow for
-	--hash=null.
-	* agent/agent.h (struct server_control_s): Add digest.is_pss and
-	zero where needed.
-	* agent/pksign.c (agent_pksign_do): Allow for PSS with cards.
-	* scd/command.c (cmd_pksign): Add for --hash=none.
-
-2020-08-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix trustdb for v5key.
-	+ commit 373c975859a55f942276d6078f27ee33570bf2d5
-	* g10/keydb.h (fpr20_from_pk): New.
-	* g10/keyid.c (fpr20_from_pk): New.
-	* g10/tdbio.c (tdbio_search_trust_byfpr): Use fpr20_from_pk.
-	* g10/trustdb.c (keyid_from_fpr20): New.
-	(verify_own_keys): Use keyid_from_fpr20.
-	(tdb_update_ownertrust): Use fpr20_from_pk.
-	(update_min_ownertrust): Likewise.
-	(update_validity): Likewise.
-
-	gpg: Fix short key ID for v5key.
-	+ commit 20982bbd7539d2032f4d6249a2654c245445521d
-	* g10/keyid.c (keyid_from_pk): Return keyid0 for v5key.
-	* g10/keyring.c (keyring_search): Handle short key ID for v5key.
-
-2020-08-06 Werner Koch <wk@gnupg.org>
-
-	gpgsm: New option --chuid.
-	+ commit 646a30fd394a739ef653556b1a7b2eeebda95951
-	* sm/gpgsm.c (oChUid, opts): New option --chuid.
-	(main): Implement option.
-
-	gpgconf: New option --chuid.
-	+ commit d10f45184c4482036c41f4818c84c0725a0c2c94
-	* tools/gpgconf.c (oChUid, opts): New option --chuid.
-	(main): Implement.
-
-	common: New helper function gnupg_chuid.
-	+ commit 8ff00ef0de871ca43076b00df4871c3165ced001
-	* common/sysutils.c (try_set_envvar): New.
-	(gnupg_chuid): New.
-
-2020-08-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	kbx: Support v5key for short kid and long kid.
-	+ commit df531848a9618131921d584baba81c128f94de68
-	* kbx/keybox-search.c (has_short_kid): Support v5key.
-	(has_long_kid): Likewise.
-
-2020-08-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Add level 16 to --gen-random.
-	+ commit d847f0651ab4304129145b55353501636b4e4728
-	* g10/gpg.c (main): Add that hack.
-
-2020-08-04 Werner Koch <wk@gnupg.org>
-
-	sm: Also show the SHA-256 fingerprint.
-	+ commit e7d70923901eeb6a2c26445aee9db7e78f6f7f3a
-	* sm/keylist.c (list_cert_colon): Emit a new "fp2" record.
-	(list_cert_raw): Print the SHA2 fingerprint.
-	(list_cert_std): Ditto.
-
-2020-08-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	w32: Fix cast from intptr_t of _get_osfhandle.
-	+ commit 8e04cf969e95ccaa31bbaa7333938af1ea7476c6
-	* common/exectool.c (gnupg_exec_tool_stream): Cast to unsigned long.
-
-2020-07-31 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix coercion for pinentry_pid handling.
-	+ commit da3a4c54a8ce8a7dc442c70bda9b7eda22d43e57
-	* agent/call-pinentry.c (start_pinentry): Don't use pid_t.
-
-	scd: Silence compiler warning.
-	+ commit 2a34a2afea5fcb5f4ed206afa110650db3dd7ef0
-	* scd/app-openpgp.c (build_ecc_privkey_template): Fix allocation size.
-
-2020-07-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	w32: Add NETLIBS for sm/t-minip12.
-	+ commit c1f81eb9fc2544a417ebc2ce19b04541525da684
-	* sm/Makefile.am (t_minip12_LDADD): Add NETLIBS.
-
-	w32: More adding NETLIBS.
-	+ commit 5fa4427419c875e46d051ae6ed376d5ad6037401
-	* common/Makefile.am (t_common_ldadd): Add $(NETLIBS).
-
-	w32: Add link to $(NETLIB) for -lws2_32.
-	+ commit d69f5570ee5e1b099e39fdf64e18add23ff5c815
-	* dirmngr/Makefile.am (dirmngr_LDADD): Add $(NETLIBS).
-	* sm/Makefile.am (gpgsm_LDADD): Ditto.
-	* tools/Makefile.am (gpg_wks_client_LDADD): Ditto.
-
-2020-07-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	kbx: Fix short KID and long KID handling for FPR32.
-	+ commit fa4a2bd7a1ba8d4bda5f9cec0826104f50142d4f
-	* kbx/keybox-search.c (blob_cmp_fpr_part): For FPR32, it's
-	the first part in the fingerprint.
-
-2020-07-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix closing reader and reeleasing context in PC/SC.
-	+ commit daa2cec6a543f06a2e408d97a80a5041027f16a9
-	* scd/apdu.c (close_pcsc_reader): Unlock the reader_table_lock.
-	(apdu_dev_list_finish): Release the context when no readers.
-
-	Use gpgrt's new option parser for symcryptrun.
-	+ commit f484ac2b2d2ea176db1a70d961a778180147d9b2
-	* tools/symcryptrun.c: Follow API change of the new option parser.
-
-	scd: PC/SC: Don't release the context when it's in use.
-	+ commit 46d185f60397f68830bfdfb99627b29aea5016f1
-	* scd/apdu.c (close_pcsc_reader): Check if it's not in the loop.
-
-	gpg-card: Fix type of historyname.
-	+ commit 43000b0434b47a72608b41d67054ba42db21b699
-	* tools/gpg-card.c (interactive_loop): Remove const qualifier.
-
-2020-07-16 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not close stdout after --export-ssh-key.
-	+ commit 5c514a274ca8ac6be875818237e2e1bbc0c6a2a5
-	* g10/export.c (export_ssh_key): Do not close stdout.
-
-2020-07-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Avoid undefined behavior of left shift operator.
-	+ commit 8abf065307ff4a7ea873fe59f76173bf17dac241
-	* common/iobuf.c (block_filter): Handle an error earlier.
-	Make sure it's unsigned.
-
-2020-07-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	regexp: Import change from JimTcl.
-	+ commit 91cb46d948db234be1ea8092f5db9e14294f1b79
-	* regexp/jimregexp.h, regexp/jimregexp.c: Fix from JimTcl.
-
-2020-07-14 Werner Koch <wk@gnupg.org>
-
-	agent: Fix regression with --newsymkey in loopback mode.
-	+ commit 0a6af6dc12998ef7b19673ad05d11e82f826de9d
-	* 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 109d16e8f644da97ed9c00e6f9010a53097f587a
-	* dirmngr/http.c (connect_server): Skip server with EAFNOSUPPORT.
-
-2020-07-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: For decryption, support use of a key with no 'encrypt' usage.
-	+ commit 31ae0718ba10c3b1b670ba6131b4995de24aa7a1
-	* g10/pubkey-enc.c (get_session_key): Don't skip at no PUBKEY_USAGE_ENC.
-	Emit information the key has no 'encrypt' usage.
-
-2020-07-08 Werner Koch <wk@gnupg.org>
-
-	Do not use the pinentry's qualitybar.
-	+ commit 999d25d47d45a0f594c84d51c041da0b24d68c5d
-	* 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 a6a4bbf6debd925a23c22eea86a562f061fdfe6c
-	* 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 eace4bbe1ded8b01f9ad52ebc1871f2fd13c3a08
-	* agent/call-pinentry.c (agent_get_passphrase): Add arg pininfo.
-	* 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 6864bba78e76a1ff72aec140ae9f4e752454c463
-	* 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 969abcf40cdfc65f3ee859c5e62889e1a8ccde91
-	* 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.
-	(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.
-
-2020-07-02 Werner Koch <wk@gnupg.org>
-
-	scd:nks: Implement writecert for the Signature card v2.
-	+ commit c1663c690b29d2dea8bc782c42de5eca08a24cc9
-	* scd/iso7816.c (CMD_UPDATE_BINARY): New.
-	(iso7816_update_binary): New.
-	* scd/app-nks.c (do_deinit): Factor some code out to...
-	(flush_fid_cache): new.
-	(do_writecert): New.
-	(app_select_nks): Register new handler.
-
-	dirmngr: Silence annoying warning for missing default ldap server file.
-	+ commit f55a05a69ba07eb2ed354a9275e71e94c5e362aa
-	* dirmngr/dirmngr.c (parse_ldapserver_file): Add arg ignore_enoent.
-	(main): Use that arg for the default file.
-
-	Support a history file in gpg-card and gpg-connect-agent.
-	+ commit d70b8769c888f42896ae3ef4972bf82e9b5a0c32
-	* common/gpgrlhelp.c (read_write_history): New.
-	(gnupg_rl_initialize): Register new function.
-	* common/ttyio.c (my_rl_rw_history): New var.
-	(tty_private_set_rl_hooks): Add arg read_write_history.
-	(tty_read_history): New.
-	(tty_write_history): New.
-	* tools/gpg-card.c (HISTORYNAME): New.
-	(oNoHistory): New enum value.
-	(opts): New option --no-history.
-	(cmd_history): New.
-	(cmds): New command "history".
-	(interactive_loop): Read and save the history.
-	* tools/gpg-connect-agent.c (HISTORYNAME): New.
-	(opts): New option --no-history.
-	(main): Read and save the history. New command /history.
-
-2020-06-30 Werner Koch <wk@gnupg.org>
-
-	scd:nks: Fix certificate read problem with TCOS signature card v2.
-	+ commit 07aef873ebc77241e9a2be225537319f6fc15a41
-	* scd/app-nks.c (filelist): Add a dedicated key entry for ESIGN.
-	(do_readcert): Test for the app_id.
-
-	scd: Change how the removed card flag is set.
-	+ commit 58b091df831f61c8d3551114f2480d36e73de2da
-	* scd/command.c (cmd_serialno): Set/clear card removed flags for all
-	connections using the current card.
-
-	card: Better detect removed cards. Add TCOS PIN menu.
-	+ commit fb10b6cba43f4ed8675093ac25f461de4dacdce9
-	* tools/card-call-scd.c (scd_change_pin): Add arg 'nullpin'.
-	* tools/gpg-card.h (struct card_info_s): Add field 'card_removed'.
-	* tools/gpg-card.c (fixup_scd_errors): New.
-	(maybe_set_card_removed): New.
-	(list_one_kinfo): Change type of first arg to get access to INFO. Set
-	card_removed flag.
-	(list_all_kinfo): Improve label alignment.
-	(cmd_list): Check that the current card is still available.
-	(cmd_passwd): Add option --nullpin and menu to chnage TCOS PINs.
-	(dispatch_command): Handle card_removed flag.
-	(interactive_loop): Ditto.
-
-2020-06-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	ecc: Support Ed448/X448 key generation.
-	+ commit 45398518fb76e2b859d2d48cf4cdbc11fbbda4fa
-	* g10/keygen.c (ask_curve): Support Ed448/X448 keys.
-	(generate_keypair): Support switch to X448 key.
-
-2020-06-29 Werner Koch <wk@gnupg.org>
-
-	scd: Shorten cardio debug output for all zeroes.
-	+ commit 9b6f574928546e6905a92c3e74d72478f1585c66
-	* scd/apdu.c (all_zero_p): New.
-	(send_le): Use it.
-
-	sm: Fix regression in Friday's commit.
-	+ commit 4f1c257c03667497d642930884b65c4f2245adbd
-	* sm/gpgsm.c (main): Set ERR also for encrypt.
-
-2020-06-26 Werner Koch <wk@gnupg.org>
-
-	sm: Try not to output a partial new message after an error.
-	+ commit ccbb0cfeefed096a9841b6557d10eef12d55b721
-	* sm/gpgsm.c (main) <aSign,aEncr>: Uses gpgrt_fcancel on error.
-
-	sm: Print the serial number of a cert also in decimal.
-	+ commit 208a90197317fb9746ecf54a1d14acbeeddfbd18
-	* 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-25 Werner Koch <wk@gnupg.org>
-
-	scd:nks: Fix remaining tries warning in --reset mode.
-	+ commit 2429e8559844e27de478d7e90834a714b3748834
-	* scd/app-nks.c (do_change_pin): Chnage computaion of 'remaining'.
-
-	card: Add password change menu for NKS cards.
-	+ commit 28c069db3bb5a1065de69bcc0435c8415df87e5b
-	* tools/gpg-card.c (cmd_passwd): Add menu for NKS. Add option
-	--reset.
-
-	sm: Fix support verification of nistp521 signatures.
-	+ commit 17a25c14f1ed1199898ad618c17204eafd5524c1
-	* sm/certcheck.c (do_encode_md): Fix obvious bug.
-
-2020-06-24 James Bottomley <James.Bottomley@HansenPartnership.com>
-	 Werner Koch <wk@gnupg.org>
-
-	agent: separate out daemon handling infrastructure for reuse.
-	+ commit f541e1d95a91d4764c7ed0df10c293bfd493dd41
-	* agent/call-scd.c: Factor re-usable code out to ...
-	* agent/call-daemon.c: new. Store infos in an array to allow for
-	other backend daemons.
-	* agent/Makefile.am (gpg_agent_SOURCES): Add new file.
-	* agent/agent.h: Include assuan.h.
-	(enum daemon_type): New.
-	(opt): Replace scdaemon_program by daemon_program array. Replace
-	scd_local by a array d_local. Change users accordingly.
-
-2020-06-24 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Fix regression in --launch and --kill from March.
-	+ commit 2d8f060679bafed27909a5ad54b7f74a9f8dd51b
-	* tools/gpgconf.h (gc_component_id_t): Align order with gc_component
-	array.
-
-2020-06-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg,agent: Support Ed448 signing.
-	+ commit a763bb2580b0d586a80b8ccd3654f41e49604f4f
-	* agent/pksign.c (do_encode_eddsa): First argument is NBITs,
-	so that it can support Ed448, as well as Ed25519.
-	(agent_pksign_do): Follow the change.
-	* agent/sexp-secret.c (fixup_when_ecc_private_key): No fix-up needed
-	for Ed448, it's only for classic curves.
-	* common/openpgp-oid.c (oidtable): Add Ed448.
-	* common/sexputil.c (get_pk_algo_from_key): Ed448 is only for EdDSA.
-	* g10/export.c (match_curve_skey_pk): Ed448 is for EdDSA.
-	* g10/keygen.c (gen_ecc): Support Ed448 with the name of "ed448".
-	(ask_algo, parse_key_parameter_part): Handle "ed448".
-	* g10/pkglue.c (pk_verify): Support Ed448.
-	(pk_check_secret_key): Support Ed448.
-	* g10/sign.c (hash_for): Defaults to SHA512 for Ed448.
-	(make_keysig_packet): Likewise.
-
-2020-06-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	ecc: Use "cv448" to specify key using X448.
-	+ commit c94eea15d6847c08d2d9ff1c7608953f25fea67d
-	* common/openpgp-oid.c (oidtable): Use "cv448".
-	(oid_cv448): Rename from oid_x448.
-	(openpgp_oidbuf_is_cv448, openpgp_oid_is_cv448): Likewise.
-	* common/util.h (openpgp_oid_is_cv448): Follow the change.
-	* g10/ecdh.c (pk_ecdh_generate_ephemeral_key): Likewise.
-	* g10/keygen.c (gen_ecc, ask_algo): Use "cv448".
-	(parse_key_parameter_part): Likewise.
-	* g10/pkglue.c (get_data_from_sexp): Fix for debug output.
-
-2020-06-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Use get_pk_algo_from_key.
-	+ commit 4bdade5b0bea1816a2479c73abc71b41f09ba727
-	* agent/findkey.c (key_parms_from_sexp, is_eddsa): Remove.
-	(agent_pk_get_algo): Remove.
-	* agent/pksign.c (agent_pksign_do): Use get_pk_algo_from_key.
-
-	agent: Clean up for getting info from SEXP.
-	+ commit d2e4aa5ee4c5128547cc45c2e1ac35fdc5c00f45
-	* agent/agent.h (agent_is_dsa_key, agent_is_eddsa_key): Remove.
-	(agent_pk_get_algo): New.
-	* agent/findkey.c (agent_pk_get_algo): New.
-	* agent/pksign.c (do_encode_dsa): Use generic GCRY_PK_ECC.
-	(agent_pksign_do): Use agent_pk_get_algo.
-
-	agent: A little clean up.
-	+ commit abc6a3100a33122ba3673b578a2b364a6b45d252
-	* agent/findkey.c (agent_is_eddsa_key): Remove dead case.
-
-2020-06-17 Werner Koch <wk@gnupg.org>
-
-	agent: Fix regression in 'd' fixup code for shadowed keys.
-	+ commit d1e1c622d55e783ae5bf601249598f0da8d5e688
-	* agent/sexp-secret.c (fixup_when_ecc_private_key): Ignore shadowed
-	keys.
-
-	sm: Support verification of nistp521 signatures.
-	+ commit 596212e71abf33b30608348b782c093dace83110
-	* sm/certcheck.c (do_encode_md): Take care of nistp521.
-
-2020-06-09 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix for new SOS changes when used with Libgcrypt < 1.8.6.
-	+ commit eeb599c9e261586a664430058b7cfad7025a503f
-	* g10/free-packet.c (is_mpi_copy_broken): New.
-	(my_mpi_copy): Mix gcry_mpi_copy.
-
-	gpg: Extend the TRUST_ status lines.
-	+ commit 96f1ed5468002330ea21d9ad32ac3b464bb40b1a
-	* g10/pkclist.c (write_trust_status): Add arg mbox.
-	(check_signatures_trust): Appenmd mbox to the status lines.
-
-2020-06-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Use bytes for ECDH.
-	+ commit da5e0bc31b4c6f16ed5ff9b35063f3b03eb7ff16
-	* g10/ecdh.c (extract_secret_x): Use byte * instead of MPI.
-	(prepare_ecdh_with_shared_point): Use char * instead of MPI.
-	(pk_ecdh_encrypt_with_shared_point): Likewise.
-	(pk_ecdh_decrypt): Likewise.
-	* g10/pkglue.h (pk_ecdh_encrypt_with_shared_point, pk_ecdh_decrypt):
-	Change declaration.
-	* g10/pkglue.c (get_data_from_sexp): New.
-	(pk_encrypt): Use get_data_from_sexp instead of get_mpi_from_sexp.
-	Follow the change of pk_ecdh_encrypt_with_shared_point.
-	* g10/pubkey-enc.c (get_it): Follow the change of pk_ecdh_decrypt.
-
-	gpg: Add X448 support.
-	+ commit e9760eb9e70b9804c988dafe01851f6600869d9e
-	* common/openpgp-oid.c (oidtable): Add X448.
-	(oid_x448,openpgp_oidbuf_is_x448,openpgp_oid_is_x448): New.
-	* common/util.h (openpgp_oid_is_x448): New.
-	* g10/ecdh.c (gen_k): Add handling of opaque MPI and support
-	endianness.
-	(pk_ecdh_generate_ephemeral_key): X448 requires opaque MPI.
-	* g10/keygen.c (gen_ecc): Add support for X448.
-	(ask_algo, parse_key_parameter_part): Likewise.
-
-	gpg,ecc: Handle external representation as SOS with opaque MPI.
-	+ commit f5bc94555458123f93d8b07816a68fb7485421e1
-	* g10/pkglue.h (sexp_extract_param_sos): New.
-	* g10/build-packet.c (sos_write): New.
-	(do_key, do_pubkey_enc, do_signature): Use sos_write for ECC.
-	* g10/export.c (cleartext_secret_key_to_openpgp): Use
-	sexp_extract_param_sos.
-	(transfer_format_to_openpgp): Use opaque MPI for ECC.
-	* g10/keygen.c (ecckey_from_sexp): Use sexp_extract_param_sos.
-	* g10/keyid.c (hash_public_key): Handle opaque MPI for SOS.
-	* g10/parse-packet.c (sos_read): New.
-	(parse_pubkeyenc,parse_signature,parse_key): Use sos_read for ECC.
-	* g10/pkglue.c (sexp_extract_param_sos): New.
-	(pk_verify): Handle opaque MPI for SOS.
-	(pk_encrypt): Use sexp_extract_param_sos.
-	* g10/seskey.c (encode_session_key): Use opaque MPI.
-	* g10/sign.c (do_sign): Use sexp_extract_param_sos.
-
-2020-06-08 Werner Koch <wk@gnupg.org>
-
-	gpg: If possible TRUST values now depend on signer's UID or --sender.
-	+ commit 5c2080f4670a768787f5cb4ed5c32e0946837883
-	* g10/mainproc.c (check_sig_and_print): Add failsafe check for PK.
-	Pass KEYBLOCK down do check_signatures_trust. Protect existsing error
-	ocde in case the signature expired.
-	* g10/pkclist.c (is_in_sender_list): New.
-	(check_signatures_trust): Add args keyblock and pk. Add new uid based
-	checking code.
-	* g10/test-stubs.c, g10/gpgv.c: Adjust stubs.
-
-2020-06-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix the condition to detect leading 0x00 problem.
-	+ commit e2e5736842299ebfb8263b674d5cbfb9b784d70f
-	* agent/sexp-secret.c (fixup_when_ecc_private_key): Use curve name
-	to identify the issue.
-
-2020-06-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent,ecc: Use of opaque MPI for ECC, fixup 'd'.
-	+ commit 47c1c329ed823a562185f86e98ac903605104f11
-	* agent/Makefile.am: Add sexp-secret.c.
-	* agent/agent.h: New function declarations.
-	* agent/sexp-secret.c: New.
-	* agent/findkey.c (agent_key_from_file): Use sexp_sscan_private_key.
-	* agent/protect-tool.c (read_and_unprotect): Fix up private part,
-	calling fixup_when_ecc_private_key.
-
-	agent: For ECC, use opaque MPI for key representation.
-	+ commit 2b118516240b4bddd34c68c23a99bea56682a509
-	* agent/cvt-openpgp.c (scan_pgp_format): New with SOS support.
-	(do_unprotect): Use scan_pgp_format, handle opaque MPI for ECC.
-	(convert_from_openpgp_main): Use opaque MPI for ECC.
-	(apply_protection): Set GCRYMPI_FLAG_USER1 flag for encrypted secret.
-	(extract_private_key): Use "/qd" for ECC, opaque MPI.
-
-	agent,ssh: Tighten condition for EdDSA.
-	+ commit a7d46c78e242e72f6ff681f6fe56ffc4dcb74a18
-	* agent/command-ssh.c (ssh_key_to_blob): Prepare for non-prefixed
-	point representation of EdDSA.
-
-	agent: Remove duplicated code for EdDSA.
-	+ commit 2e988546c59ba25bf9e63521112c0c3c73b012f1
-	* agent/command-ssh.c (ssh_receive_key): Curve is "Ed25519".
-	Use sexp_key_construct always.
-
-	agent: Clean up do_encode_md.
-	+ commit 4c0b12f817f15862111a01493aaadce943410ee9
-	* agent/pksign.c (do_encode_md): Directly use sexp_build.
-
-2020-06-03 Werner Koch <wk@gnupg.org>
-
-	doc: Minor enhancement for reproducibility.
-	+ commit 074ab108e768b2f946d789c1f3a7f14a65e07c52
-	* doc/Makefile.am (defsincdate): In no repo mode and with
-	SOURCE_DATE_EPOCH set, use that instead of blanking the date.
-
-	card: Improve openpgp key writing in "writecert".
-	+ commit 4f6e0e12cbd3444b9e6ea5e4b92ea5b3072a3e17
-	* tools/card-keys.c (struct export_key_status_parm_s): New.
-	(export_key_status_cb): New.
-	(get_minimal_openpgp_key): New.
-	* tools/gpg-card.c (cmd_writecert): Allow writing a keyblock directly
-	from an existing gpg key.
-
-	gpg: Improve generation of keys stored on card (brainpool,cv25519).
-	+ commit 48251cf9a7d3776667342f4705ac3de89bd75534
-	* g10/keygen.c (ask_key_flags_with_mask): Allow more than ECDH for
-	legacy curves.
-	(ask_algo): Tweak mapping of ECC to OpenPGP algos
-	(parse_key_parameter_part): Ditto.
-	(generate_subkeypair): Create the subkey with the time stored on the
-	card.
-
-	sm: Fix recently introduced regression in CSR creation.
-	+ commit 7558128e16d7fc20b9c40bf7e150ca08bbb4467f
-	* sm/certreqgen.c (create_request): Also set SIGKEYLEN.
-
-2020-05-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix condition for C5 data object for newer Yubikey.
-	+ commit f3df8dbb696fed192501fa7f741c2e0e0936a3d5
-	* scd/app-openpgp.c (compare_fingerprint): Relax the condition.
-
-2020-05-28 Werner Koch <wk@gnupg.org>
-
-	card: Allow to store and retrieve keyblocks in OpenPGP cards.
-	+ commit 2d9592e78f4978307e378e07d6c170a28000a494
-	* tools/gpg-card.c: Include tlv.h.
-	(cmd_writecert): Add option --openpgp.
-	(cmd_readcert): Ditto.
-
-	card: New command "apdu"
-	+ commit ed0759f39be04dd6108237f5ed03c7cfd1cb4642
-	* tools/card-call-scd.c (scd_apdu): Add optional arg 'options'.
-	* tools/gpg-card.c (cmd_apdu): New.
-	(enum cmdids): Add cmdAPDU.
-	(dispatch_command): Add command "apdu".
-	(interactive_loop): Ditto.
-
-2020-05-27 Werner Koch <wk@gnupg.org>
-
-	card: Update card info after "generate".
-	+ commit 94d31660c6db22c3b539f440994d286f687c273f
-	* tools/gpg-card.c (cmd_generate): Re-read the card on success.
-
-	scd:openpgp: New KEY-STATUS attribute.
-	+ commit 21496761226c1020a98e3ec7dd2b9dd013d4386b
-	* scd/app-openpgp.c (do_getattr): Return KEY-STATUS
-
-	card: Add command "bye"
-	+ commit 08310849a28071fbca761fa4ca18702b39092947
-	* tools/gpg-card.c: Add command "bye" as alias for "quit".
-	* tools/gpg-connect-agent.c (main): Add "/quit" as alias for "/bye"
-
-	card: Take care of removed and re-inserted cards.
-	+ commit 46a3de4b5acb37274ddd132499a3243e1f92b506
-	* tools/gpg-card.c (cmd_list): Take care of the need_sn_cmd flag.
-	(cmd_factoryreset): Clear that flag.
-	(dispatch_command): Set flag after a reset and after a
-	CARD_NOT_PRESENT error.
-
-2020-05-26 Werner Koch <wk@gnupg.org>
-
-	card: Implement UID command and print capabilities.
-	+ commit c2a47475ba0f6bd1de80e92dd91949501256025e
-	* tools/card-call-scd.c (learn_status_cb): Return the full value for
-	UIF. Add info about SM, MCL3, and PD.
-	* tools/gpg-card.h (struct card_info_s): Add corresponding fields.
-	* tools/gpg-card.c (list_openpgp): Print capabilities. Print the
-	permanent flag for UIF.
-	(cmd_uif): Implement.
-
-	scd:openpgp: Add attribute "UIF" for convenience.
-	+ commit 11f0700282c1eeaee8db6686c38aca0900271351
-	* scd/app-openpgp.c (do_getattr): New attrubute "UIF".
-	(do_learn_status): Use that.
-
-	scd: Fix Yubikey app switching problem.
-	+ commit 20090886706e2af6723ca11e292272fc00cffe07
-	* scd/app.c (select_all_additional_applications_internal): Re-select
-	first app. Add arg 'ctrl'.
-
-2020-05-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Clean up ECDH code path (5).
-	+ commit 510bda7d3754801be18a592694578589fe503fb8
-	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Now, it's only for
-	encrytion.
-	(pk_ecdh_decrypt): Use prepare_ecdh_with_shared_point and move decrypt
-	code path in original pk_ecdh_encrypt_with_shared_point here.
-	* g10/pkglue.h (pk_ecdh_encrypt_with_shared_point): Change API.
-	* g10/pkglue.c (pk_encrypt): Follow the change.
-
-	gpg: Clean up ECDH code path (4).
-	+ commit 64d93271bfce1968ebe61324b900875dbd6dd2eb
-	* g10/ecdh.c (prepare_ecdh_with_shared_point): New.
-	(pk_ecdh_encrypt_with_shared_point): Fixing error paths for closing
-	the cipher handle, use prepare_ecdh_with_shared_point.
-
-	gpg: Clean up ECDH code path (3).
-	+ commit 80c02d13d9994abae9e67c3554528352c621cd9b
-	* g10/ecdh.c (derive_kek): New.
-	(pk_ecdh_encrypt_with_shared_point): Use derive_kek.
-
-	gpg: Clean up ECDH code path (2).
-	+ commit a973d9113840282468015eb26f07f2b32f977d70
-	* g10/ecdh.c (build_kdf_params): New.
-	(pk_ecdh_encrypt_with_shared_point): Use build_kdf_params, and check
-	things before extract_secret_x.
-
-	gpg: Clean up ECDH code path (1).
-	+ commit 960d37644cbbe2a234352d0bc58095e2b0371eec
-	* g10/ecdh.c (extract_secret_x): New.
-	(pk_ecdh_encrypt_with_shared_point): Use extract_secret_x.
-
-2020-05-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: dns: Fix allocation of string buffer in stack.
-	+ commit 30eef28bc0f5deaa1b4b7f04293a6527524280a9
-	* 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-19 Werner Koch <wk@gnupg.org>
-
-	sm: Create ECC certificates with AKI and SKI by default.
-	+ commit 44676819f2873705b78849e7b2fd22214b691642
-	* sm/certreqgen.c (create_request): Create AKI and SKI by default.
-
-	common: New function to extract Q from an ECC key.
-	+ commit 3cd9dac7e0976643c6e4b6537cf363b2b12d422f
-	* common/sexputil.c (get_ecc_q_from_canon_sexp): New.
-
-2020-05-18 Werner Koch <wk@gnupg.org>
-
-	sm: Support creation of EdDSA certificates.
-	+ commit 6dc3846d78192e393be73c16c72750734a9174d1
-	* sm/misc.c (transform_sigval): Support EdDSA.
-	* sm/certreqgen.c (create_request): Support EdDSA cert creation.
-	* sm/certcheck.c (gpgsm_check_cert_sig): Map some ECC algo OIDs to
-	hash algos.
-	* sm/call-agent.c (struct sethash_inq_parm_s): New.
-	(sethash_inq_cb): New.
-	(gpgsm_agent_pksign): Add mode to pass plain data for EdDSA.
-
-	agent: Allow to use SETHASH for arbitrary data.
-	+ commit b18fb0264abdb6cb0a99ba0ba941dc9a6e35f74a
-	* agent/agent.h (struct server_control_s): Add field digest.data.
-	* agent/gpg-agent.c (agent_deinit_default_ctrl): Free that field.
-	* agent/command.c (reset_notify): Ditto.
-	(start_command_handler): ditto.
-	(cmd_sethash): Add new option --inquire.
-	* agent/call-scd.c (agent_card_pksign): For now return an error if
-	inquire mode was used.
-	* agent/command-ssh.c (ssh_handler_sign_request): Make sure
-	digest.data is cleared.
-	* agent/divert-scd.c (divert_pksign): Implement inquire mode.
-	* agent/pksign.c (agent_pksign_do): Ditto.
-
-2020-05-13 Werner Koch <wk@gnupg.org>
-
-	sm: Support import and verification of EdDSA certificates.
-	+ commit b1694987bb6484405d41d34046a5290176feadd0
-	* sm/certdump.c (gpgsm_get_serial): New.
-	* sm/certcheck.c (gpgsm_check_cert_sig): Support EdDSA signatures.
-
-2020-05-11 Werner Koch <wk@gnupg.org>
-
-	sm: Support signing using ECDSA.
-	+ commit f44d395bdfec464b1e2a0a1aef39561e6e48a45c
-	* sm/gpgsm.h (struct certlist_s): Add helper field pk_algo.
-	* sm/sign.c (gpgsm_sign): Store the public key algo. Take the hash
-	algo from the curve. Improve diagnostic output in verbose mode.
-
-2020-05-08 Werner Koch <wk@gnupg.org>
-
-	sm: Allow decryption using dhSinglePass-stdDH-sha1kdf-scheme.
-	+ commit 68b857df13c8a4e6cae5e3a29fd065bf90764547
-	* sm/decrypt.c (ecdh_decrypt): Support
-	dhSinglePass-stdDH-sha1kdf-scheme. Factor key derive code out to ...
-	(ecdh_derive_kek): new global function. Allow for hashs shorter than
-	the key.
-	(hash_ecc_cms_shared_info): Make file-only.
-	* sm/encrypt.c (ecdh_encrypt): Replace derive code by a call to the
-	new ecdh_derive_kek. Add test code to create data using
-	dhSinglePass-stdDH-sha1kdf-scheme.
-	* sm/gpgsm.h (opt): Add member force_ecdh_sha1kdf.
-	* sm/gpgsm.c: Add option --debug-force-ecdh-sha1kdf.
-
-	sm: Print algorithm infos in data decryption mode.
-	+ commit 439c9b5cb55044f13d4af6563f4e791093d510b0
-	* common/sexputil.c (cipher_mode_to_string): New.
-	* sm/decrypt.c (prepare_decryption): Show cipher algo and mode.
-	(gpgsm_decrypt): Show key algo and fingerprint
-
-	sm: Cleanup the use of GCRY_PK_ECC and GCRY_PK_ECDSA.
-	+ commit 34b628db4618a8712536aea695f934b0286e7b18
-	* common/sexputil.c (pubkey_algo_to_string): New.
-	* sm/certcheck.c (do_encode_md): Replace GCRY_PK_ECDSA by GCRY_PK_ECC.
-	* sm/certreqgen-ui.c (check_keygrip): Add all ECC algorithms.
-	* sm/gpgsm.c (our_pk_test_algo): Also allow EdDSA.
-	* sm/verify.c (gpgsm_verify): Map ECC algo to ECDSA. Use new pubkey
-	algo name function
-
-	sm: Improve readability of the data verification output.
-	+ commit a759fa963a42e0652134130029217270b6d5d00b
-	* sm/verify.c (gpgsm_verify): Print the used algorithms.
-
-2020-05-07 Werner Koch <wk@gnupg.org>
-
-	card: Allow listing of NKS cards.
-	+ commit 94966347452632f8140fae70f7fcbadcc2b81071
-	* tools/card-call-scd.c (learn_status_cb): Always fill chvinfo.
-	* tools/gpg-card.h (struct card_info_s): Increase size of chvinfo and
-	chvmaxlen.
-	* tools/gpg-card.c (list_nks): New.
-	(print_a_version): Support single part version numbers.
-	(list_card): Call list_nks.
-
-	scd:nks: Add framework to support IDKey cards.
-	+ commit 1f6a39092fe4b5f02bc4741a0a23d102d30f4063
-	* scd/app-nks.c (NKS_APP_IDLM): New.
-	(struct app_local_s): Replace NKS_VERSION by the global APPVERSION.
-	(do_learn_status): Always send CHV-STATUS.
-	(find_fid_by_keyref): Basic support for IDLM only use.
-	(do_learn_status_core): Ditto.
-	(do_readcert): Ditto.
-	(verify_pin): Ditto.
-	(parse_pwidstr): Ditto.
-	(do_with_keygrip): Ditto.
-	(switch_application): Ditto.
-	(app_select_nks): Fallback to IDLM.
-
-	scd:nks: Get the PIN prompts right for the Signature Card.
-	+ commit aecc008acb64ebbb6c667c4a128af4e61da57f84
-	* scd/app-nks.c (get_dispserialno): Move more to the top.
-	(do_getattr): Add $DISPSERIALNO and SERIALNO. Make CHV-STATUS work
-	with NKS15.
-	(verify_pin): Use dedicated min. PIN lengths.
-	(parse_pwidstr): Support NKS15
-
-	sm: Print the key types as standard key algorithm strings.
-	+ commit 5c29d25e6c7c0a5a63ab4c46d4624217307adb78
-	* sm/fingerprint.c (gpgsm_get_key_algo_info): Factor code out to ...
-	(gpgsm_get_key_algo_info2): new.
-	(gpgsm_pubkey_algo_string): New.
-	* sm/keylist.c (list_cert_colon): Put curve into field 17
-	(list_cert_raw): Print the unified key algotithm string instead of the
-	algo and size.
-	(list_cert_std): Ditto.
-
-	scd:nks: Support decryption using ECDH.
-	+ commit af45d884aa1c3eccbc6972a2e5197ece3fd1987a
-	* scd/app-nks.c (struct fid_cache_s): Add field 'algo'.
-	(keygripstr_from_pk_file): Add arg 'r_algo' to return the algo.
-	(find_fid_by_keyref): Ditto.
-	(get_dispserialno): New.
-	(make_prompt): New.
-	(verify_pin): Provide better prompts.
-	(do_decipher): Support ECDH.
-	(parse_pwidstr): Add hack tospecify any pwid..
-	(do_change_pin): Support Signature Card V2.0 (NKS15) style NullPIN.
-	Provide a better prompt.
-
-	sm: Support decryption of ECDH data using a smartcard.
-	+ commit ee6d29f1797e06977ae3d2edae9edc1165c6f144
-	* sm/decrypt.c (ecdh_decrypt): Add arg nbits and detect bare secret.
-	(prepare_decryption): Add arg nbits and pass on.
-	(gpgsm_decrypt): Pass size of curve to prepare_decryption.
-
-2020-05-05 Werner Koch <wk@gnupg.org>
-
-	scd: Extend an internal function to also return the algo.
-	+ commit 314859d7e7de5010ca1e9d90b83acf3bc8493631
-	* scd/app-help.c (app_help_get_keygrip_string_pk): Add optional arg
-	r_algo. Change all callers.
-	(app_help_get_keygrip_string): Ditto.
-
-2020-05-04 Werner Koch <wk@gnupg.org>
-
-	scd:nks: Add do_with_keygrip and implement a cache.
-	+ commit 1e72a1a218490c0fc07811a02ddad6cc38913f77
-	* scd/app-nks.c (struct fid_cache_s): New.
-	(struct app_local_s): Add field 'fid_cache'.
-	(do_deinit): Release the cache.
-	(keygripstr_from_pk_file): Implement the cache.
-	(find_fid_by_keyref): New
-	(do_sign, do_decipher): Use new function.
-	(do_with_keygrip): New.
-
-	sm: Support encryption using ECDH keys.
-	+ commit d5051e31a8fc07c339253c6b82426e0d0115a20a
-	* sm/decrypt.c (hash_ecc_cms_shared_info): Make global.
-	* sm/encrypt.c (ecdh_encrypt): New.
-	(encrypt_dek): Add arg PK_ALGO and support ECDH.
-	(gpgsm_encrypt): Pass PK_ALGO.
-
-2020-04-27 Werner Koch <wk@gnupg.org>
-
-	sm: Add support to export ECC private keys.
-	+ commit 5da6925a334c68d736804d8f19a684a678409d99
-	* sm/minip12.c TEST: Remove test code. Include util.h, tlv.h. and
-	openpgpdefs.h. Remove the class and tag constants and replace them by
-	those from tlv.h.
-	(builder_add_oid, builder_add_mpi): New.
-	(build_key_sequence): Rename to ...
-	(build_rsa_key_sequence): this.
-	(build_ecc_key_sequence): New.
-	(p12_build): Call RSA or ECC builder.
-	(p12_raw_build): Ditto.
-	* sm/export.c (gpgsm_p12_export): Use correct armor header for ECC.
-	(sexp_to_kparms): Support ECC.
-
-	* sm/t-minip12.c: New to replace the former TEST code in minip12.h.
-
-2020-04-24 Werner Koch <wk@gnupg.org>
-
-	common: Add an easy to use DER builder.
-	+ commit 5ea878274ef51c819368f021c69c518b9aef6f82
-	* common/tlv-builder.c: New.
-	* common/tlv.c: Remove stuff only used by GnuPG 1.
-	(put_tlv_to_membuf, get_tlv_length): Move to ...
-	* common/tlv-builder.c: here.
-	* common/tlv.h (tlv_builder_t): New.
-
-2020-04-23 Werner Koch <wk@gnupg.org>
-
-	sm: Support decryption of ECDH data.
-	+ commit 95d83cf906177fe9f00e88ae42d4c118c7db4371
-	* sm/decrypt.c: Include tlv.h.
-	(string_from_gcry_buffer): New.
-	(hash_ecc_cms_shared_info): New.
-	(ecdh_decrypt): New.
-	(prepare_decryption): Support ECDH. Add arg pk_algo.
-	(gpgsm_decrypt): Lift some variables from an inner code block.
-
-	common: Add functions to help create DER objects.
-	+ commit 5d015b38eb9f828acf522fa89e4944f3b343678c
-	* common/tlv.c (put_tlv_to_membuf): New.
-	(get_tlv_length): New.
-	* common/tlv.h: Include membuf.h.
-
-2020-04-21 Werner Koch <wk@gnupg.org>
-
-	sm: Support import of PKCS#12 encoded ECC private keys.
-	+ commit 8dfef5197af9f655697e0095c6613137d51c91e7
-	* sm/minip12.c: Include ksba.h.
-	(oid_pcPublicKey): New const.
-	(parse_bag_data): Add arg 'r-curve'. Support parsing of ECC private
-	keys.
-	(p12_parse): Add arg 'r_curve'.
-	* sm/import.c (parse_p12): Support ECC import.
-
-2020-04-17 Werner Koch <wk@gnupg.org>
-
-	scd:nks: Allow retrieving certificates from a Signature Card v.20.
-	+ commit f05a32e5c9db7d0840c74fccc350a9e0ff5fb819
-	* scd/app-nks.c: Major rework to support non-RSA cards.
-
-	scd: Detect missing card in "getinfo all_active_apps".
-	+ commit 3633ca6e21f7feb97b6690025614575bb6909f8b
-	* scd/app.c (send_card_and_app_list): Detect no app case.
-
-2020-04-16 Werner Koch <wk@gnupg.org>
-
-	sm: Always allow authorityInfoAccess lookup if CRLs are also enabled.
-	+ commit bbb7edb8807b7d3c8bb5284d8fdf21adb67cd87d
-	* 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 f5efbd5a1169ca7700f430a4a26ba086e603c887
-	* 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 7f1be1ea524ee53d8c7b628e0305b61ebad4ab25
-	* dirmngr/crlfetch.c (read_cert_via_http): New.
-	(fetch_cert_by_url): Implement http scheme.
-
-	gpg: Make AEAD modes subject to compliance checks.
-	+ commit cec397e00240829495de2b487fe60d997d810c03
-	* g10/decrypt-data.c (decrypt_data): Move aead algo detection up.
-
-2020-04-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix broken setting of AEAD algo.
-	+ commit df0edaf91a220f8c6dffbfd1f795e229858b096b
-	* g10/main.h (DEFAULT_AEAD_ALGO): Set to OCB.
-
-	sm,dirmngr: Restrict allowed parameters used with rsaPSS.
-	+ commit c0d5c673542b3d517c33fe1a9ab26bcda1a5a95f
-	* 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.
-
-2020-04-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	regexp: Fix generation of _unicode_mapping.c.
-	+ commit 50b320952e99ea20f9b77c6c501280fe37fd2598
-	* 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.
-
-2020-04-14 Werner Koch <wk@gnupg.org>
-
-	sm: Support rsaPSS verification also for CMS signatures.
-	+ commit 6c28d9343ea6df9cda1b69e77751a9e958eb3d70
-	* sm/certcheck.c (gpgsm_check_cert_sig): Factor PSS parsing out to ...
-	(extract_pss_params): new.
-	(gpgsm_check_cms_signature): Implement PSS.
-
-2020-04-09 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Support rsaPSS also in the general validate module.
-	+ commit ba34f1415366d91d1831d717ec310ddda33f9cc4
-	* 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 b45ab0ca08f8d6f9831192210b9ab141f4e450cf
-	* 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 5d5b70ae0f515290a3d64daa1d687fe8c8477f76
-	* common/sexputil.c (hash_algo_to_string): New.
-
-	scd:p15: Return a display S/N via Assuan.
-	+ commit bfedc760efdcf606da7c214e84d12a10ee4cbcc0
-	* scd/app-p15.c (make_pin_prompt): Factor some code out to ...
-	(get_dispserialno): this.
-	(do_getattr): Use new fucntion for a $DISPSERIALNO.
-
-2020-04-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: ECDH: Accept longer padding.
-	+ commit fd79cadf7ba5ce45dfb5e266975f58bf5c7ce145
-	* g10/pubkey-enc.c (get_it): Remove check which mandates shorter
-	padding.
-
-2020-04-07 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Show a pretty PIN prompt.
-	+ commit 9ec8d984be4676126843d5aa7dfd0b7d71eff13c
-	* 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 f28795b615c3042f6eb7c9d941e232d0da50efbc
-	* scd/iso7816.c (map_sw): Detect 0x63Cn status code.
-
-	scd: Factor common PIN status check out.
-	+ commit 60d018f6a91c4c90b8ecf13f88ac4256699f4007
-	* 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/app-piv.c (get_chv_status): Ditto.
-	(verify_chv): Ditto.
-
-	scd:p15: Fix decrypt followed by sign problem for D-Trust cards.
-	+ commit 42ddcc87f4bca40d605d133b6cdb4e761a49a1c9
-	* 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. Chnage the passing
-	indicator to 0x81.
-
-2020-04-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	tools: Use internal regexp routines.
-	+ commit 7ee2a9687da9560a5d17c7046c87c2f7a6733d5c
-	* tools/gpg-check-pattern.c: Use jimregexp.h.
-
-2020-04-03 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Emit MANUFACTURER, $ENCRKEYID, $SIGNKEYID.
-	+ commit aa60645b997d23ac2958f75fd349c1cd7b8af902
-	* scd/app-p15.c (read_ef_tokeninfo): Store manufacturer_id.
-	(do_getattr): Implement MANUFACTURER, $ENCRKEYID and $SIGNKEYID.
-	(send_keypairinfo): Also print usage flags.
-
-	gpg,card: Use the new MANUFACTURER attribute.
-	+ commit 15352b0eac335e7993fcd7720106a3a7d22caae1
-	* tools/gpg-card.h (struct card_info_s): Add manufacturer fields.
-	* tools/card-call-scd.c (release_card_info): Release them.
-	(learn_status_cb): Parse MANUFACTURER attribute.
-	* tools/gpg-card.c (get_manufacturer): Remove.
-	(list_card): Use the new attribute.
-	* 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 541a6a903e79c9146a379f5c6c0fb34e6c2b42c4
-	* scd/app-openpgp.c (get_manufacturer): New..
-	(do_getattr): Add new attribute "MANUFACTURER".
-	(do_learn_status): Always print it.
-
-2020-04-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Add regular expression support.
-	+ commit ba247a114c75a84473c11c1484013b09fbb9bcd1
-	* 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-04-02 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Implement do_with_keygrip and capabilities.
-	+ commit 61c5b0767fac4c2d7fe95cdbc6d0f0a94878c813
-	* scd/app-p15.c (prepare_verify_pin): Allow use without an AODF.
-	(verify_pin): Ditto.
-	(do_with_keygrip): Implement capability restrictions.
-
-	scd:p15: Rename some variables and functions for clarity.
-	+ commit 8149742ddfea6c76898786cb7de7c92bbf8aab0a
-	* scd/app-p15.c: Rename keyinfo to prkdf.
-
-	scd: Use Gcrypt usage constants for the do_with_keygrip capabilities.
-	+ commit 5b7b42e2b2b7ba7b88f89ff4b4ee7baf0eef2a04
-	* scd/command.c (cmd_keyinfo): Use Gcrypt constants for CAP.
-	* scd/app-openpgp.c (do_with_keygrip): Adjust for them.
-	* scd/app-piv.c (do_with_keygrip): Ditto.
-
-2020-04-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: New command DEVINFO.
-	+ commit 2ccbcfec121f768574a59aa2ecff22d8b422d61b
-	* scd/app.c (notify_cond): New condition variable.
-	(app_send_devinfo, app_wait): New.
-	(scd_update_reader_status_file): Kick NOTIFY_COND.
-	(initialize_module_command): Initialize NOTIFY_COND.
-	* scd/command.c (struct server_local_s): Add watching_status.
-	(cmd_devinfo): New.
-	(register_commands): Add DEVINFO command.
-	(send_client_notifications): Write status change to DEVINFO channel.
-	* scd/scdaemon.h (app_wait, app_send_devinfo): New.
-
-2020-04-01 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Cache the PIN.
-	+ commit 29f8f52bf8161c238c26389ab178caa98801234e
-	* scd/app-p15.c (struct prkdf_object_s): Add flag pin_verified.
-	(verify_pin): Make use of it.
-
-	scd:p15: Run a keygrip_from_prkdf before verify_pin.
-	+ commit 132d82c1582009013af5c7bdb17cbaaa8807c70e
-	* scd/app-p15.c (do_sign): Move keygrip_from_prkdf before PIN
-	verification.
-	(do_decipher): Add keygrip_from_prkdf.
-
-	scd:p15: Support decryption with CardOS 5 cards.
-	+ commit ca4391399c690a45270cca30f03ac564c394c1f6
-	* scd/app-p15.c (do_decipher): New.
-
-	scd:p15: Factor PIN verification out to a new function.
-	+ commit 375b1454875ff079efc122e33b1216b412eecfaf
-	* scd/app-p15.c (do_sign): Factor code out to ...
-	(prepare_verify_pin, verify_pin): new functions.
-
-	sm: Fix a warning in an es_fopencooie function.
-	+ commit c7ff8c59b9252f8f27cabee3fea503f06c7d46ff
-	* sm/certdump.c (format_name_writer): Take care of a flush request.
-
-2020-03-31 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Support signing with CardOS 5 cards.
-	+ commit 103c1576b73ed75b771a8ffd1c97628651b99797
-	* 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.
-	(do_with_keygrip): New.
-	(app_select_p15): Register new function.
-
-	scd:p15: Read certificates in extended mode.
-	+ commit 2bdd4fc7b6cfd9ac5410d20f1cee66567a6b24c5
-	* scd/app-p15.c (readcert_by_cdf): Allow reading in extended mode.
-
-	scd: Add function for binary read in extended mode.
-	+ commit c9ad81070a2bb1116d3f096a440c43e57e6f933a
-	* scd/iso7816.c (iso7816_read_binary): Factor code out to ...
-	(iso7816_read_binary_ext): new function. Add arg extended_mode.
-
-2020-03-30 Werner Koch <wk@gnupg.org>
-
-	scd:p15: Detect CardOS 5 cards and print some basic infos.
-	+ commit 8a68d497f1dd0b124318eb47db9da0c4b64c8b8b
-	* 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
-
-	agent: Print an error if gpg-protect reads the extended key format.
-	+ commit c5c21a064671dc8e461434d19cbde67b89df25e2
-	* agent/protect-tool.c (read_key): Detect simple extended key format.
-
-	sm: Fix possible NULL deref in error messages of --gen-key.
-	+ commit 9c5c7c6f602c84589cd5c93a85a27b416e744338
-	* sm/certreqgen.c: Protect printing the liniernur in case of !R.
-
-2020-03-27 Werner Koch <wk@gnupg.org>
-
-	sm: Consider certificates w/o CRL DP as valid.
-	+ commit 0b583a555e75fbb9140310390a267febd3329a12
-	* 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.
-
-	scd:openpgp: Allow PKSIGN with keygrip also for OPENPGP.3.
-	+ commit 4c4999b8185ace55eb5f3a6fa7d3dc0a77267b63
-	* scd/app-openpgp.c (check_keyidstr): Add optional arg r_use_auth to
-	test also for OpenPGP.3.
-	(do_sign): Enable that new mode.
-
-2020-03-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpgsm: Fix the previous commit.
-	+ commit e06a8e3e87f044a5bf6ee06f92cc4fd2a0914863
-
-
-2020-03-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpgsm: Support key generation with ECC.
-	+ commit 49ea53b755f0fef468055a1493e790735908f865
-	* sm/certreqgen.c (pKEYCURVE): New.
-	(read_parameters): Add pKEYCURVE handling.
-	(proc_parameters): Support ECC key generation.
-
-	gpgsm: Remove restriction of key generation (only RSA).
-	+ commit 238707db8b05a385af5419e606ea5110ace31d2b
-	* sm/certreqgen.c (proc_parameters): Remove checking GCRY_PK_RSA.
-
-2020-03-19 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Take care of --homedir when reading/updating options.
-	+ commit c1844ca7520f9a67bff85ee4fbf49c6725668289
-	* tools/gpgconf-comp.c (gpg_agent_runtime_change): Remove unused var.
-	(scdaemon_runtime_change): Ditto.
-	(dirmngr_runtime_change): Ditto.
-	(gc_component_check_options): Pass --homedir if needed.
-	(retrieve_options_from_program): Take care of --homedir.
-
-2020-03-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Also allow a v5 fingerprint for --trusted-key.
-	+ commit 4287f89557b3bc9ab2876331e1bcb143d759fb47
-	* g10/trustdb.c (tdb_register_trusted_key): Add case for 32 octet
-	fingerprints.
-
-2020-03-18 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: Update --trusted-key to accept fingerprint as well as long key id.
-	+ commit 810ea2cc684480c6aadceb2a10dd00f3fa67f2fb
-	* g10/trustdb.c (tdb_register_trusted_key): accept fingerprint as well
-	as long key ID.
-	* doc/gpg.texi: document that --trusted-key can accept a fingerprint.
-
-2020-03-18 Werner Koch <wk@gnupg.org>
-	 gniibe@fsij.org
-
-	gpg: Fix key expiration and usage for keys created at the Epoch.
-	+ commit 161a098be6f9d50fb5f7e120baee81e75d6eb5ad
-	* g10/getkey.c (merge_selfsigs_main): Take a zero key creation time in
-	account.
-
-2020-03-14 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Further simplify the gpgconf option processing.
-	+ commit 451cd1b3928172b312ca2597c3318e6e9e8be97d
-	* common/gc-opt-flags.h (GC_OPT_FLAG_RUNTIME): Move to ...
-	* tools/gpgconf-comp.c: here.
-	(known_options_scdaemon): Remove "options".
-	(known_options_dirmngr): Remove "options".
-	(known_options_gpgsm): Remove "options".
-	(known_options_gpg): Remove "options" and "keyserver".
-	(struct gc_option_s): Rename active t gpgconf_list.
-	(gc_component_list_options): Do not act upon active.
-	(option_check_validity): Ditto.
-	(is_known_option): Make it work correctly for unknown options.
-	(retrieve_options_from_program): Use renamed flag gpgconf_list only to
-	detect duplicated items from --gpgconf-list. Do not set runtime.
-	Only e set the options if set by --gpgconf-list; never clear them.
-	* agent/gpg-agent.c: Simplify the --gpgconf-list output.
-	* dirmngr/dirmngr.c: Ditto.
-	* g10/gpg.c: Ditto.
-	* kbx/keyboxd.c: Ditto.
-	* scd/scdaemon.c: Ditto.
-	* sm/gpgsm.c: Ditto.
-	* tests/openpgp/gpgconf.scm: Use "compliance" instead of "keyserver"
-	for the string arg test.
-
-	gpg: New option --auto-key-import.
-	+ commit 6b306f45f4fbe36b90cec4685aabb267a61e283f
-	* g10/gpg.c (opts): New options --auto-key-import,
-	--no-auto-key-import, and --no-include-key-block.
-	(gpgconf_list): Add them.
-	* g10/options.h (opt): Add field flags.auto_key_import.
-	* g10/mainproc.c (check_sig_and_print): Use flag to enable that
-	feature.
-	* tools/gpgconf-comp.c: Give the new options a Basic config level.
-
-2020-03-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Make use of the included key block in a signature.
-	+ commit 6a4443c8425fd548020553b22d5a16ffad98371f
-	* g10/import.c (read_key_from_file): Rename to ...
-	(read_key_from_file_or_buffer): this and add new parameters. Adjust
-	callers.
-	(import_included_key_block): New.
-	* g10/packet.h (PKT_signature): Add field flags.key_block.
-	* g10/parse-packet.c (parse_signature): Set that flags.
-	* g10/sig-check.c (check_signature2): Add parm forced_pk and change
-	all callers.
-	* g10/mainproc.c (do_check_sig): Ditto.
-	(check_sig_and_print): Try the included key block if no key is
-	available.
-
-	gpg: New option --include-key-block.
-	+ commit 865d485180240369a20d3be14d0c6499783df2b5
-	* common/openpgpdefs.h (SIGSUBPKT_KEY_BLOCK): New.
-	* g10/gpg.c (oIncludeKeyBlock): New.
-	(opts): New option --include-key-block.
-	(main): Implement.
-	* g10/options.h (opt): New flag include_key_block.
-	* g10/parse-packet.c (dump_sig_subpkt): Support SIGSUBPKT_KEY_BLOCK.
-	(parse_one_sig_subpkt): Ditto.
-	(can_handle_critical): Ditto.
-	* g10/sign.c (mk_sig_subpkt_key_block): New.
-	(write_signature_packets): Call it for data signatures.
-
-	gpg: Add property "fpr" for use by --export-filter.
-	+ commit 32493ce50ad880de7b548d7870c6040a8233a8f5
-	* g10/export.c (push_export_filters): New.
-	(pop_export_filters): New.
-	(export_pubkey_buffer): Add args prefix and prefixlen. Adjust
-	callers.
-	* g10/import.c (impex_filter_getval): Add property "fpr".
-	* g10/main.h (struct impex_filter_parm_s): Add field hexfpr.
-
-2020-03-12 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Rewrite the gpgconf-comp module.
-	+ commit b4f1159a5bd7b2799d7d35e883e0632ebf3339c8
-	* tools/gpgconf.h (gc_component_t): Change type to ...
-	(gc_component_id_t): this.
-	(GC_COMPONENT_ANY): New, so that we can use that in gpgconf-comp.c
-	directly.
-	* tools/gpgconf-comp.c: Major rework.
-
-2020-03-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Re-group the options in the --help output.
-	+ commit 41eb5108ce59244d961df43bbf73b8aa6e95e9cd
-	* g10/gpg.c (opts): Change oLoadExtensions, oStrict, and oNoStrict to
-	use ARGPARSE_ignore and remove the code in the option switch.
-
-	agent: Re-group the options in the --help output.
-	+ commit c693b7f4ade97357c33b410728bb741674255487
-	* agent/gpg-agent.c (oGreeting): Remove non existant dummy option.
-
-	gpgconf: Support reading global options (part 2).
-	+ commit 4423e9dcde5e1a8d73ff7386942fe3c0c4b917fc
-	* tools/gpgconf-comp.c: Remove all regular option descriptions. They
-	are now read in from the component. Also remove a few meanwhile
-	obsolete options.
-	* agent/gpg-agent.c: Add option description which were only set in
-	gpgconf-comp.c.
-	* dirmngr/dirmngr.c: Ditto.
-	* scd/scdaemon.c: Ditto.
-	* sm/gpgsm.c: Ditto.
-	* g10/gpg.c: Ditto.
-
-2020-03-05 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Support reading global options (part 1).
-	+ commit d2425d1495f4fe4f5c3a79d7dc5571fda00849d8
-	* tools/gpgconf.c (main): Set the coinfig directories.
-	* tools/gpgconf-comp.c (gc_backend): Change the name of the config
-	files.
-	(struct gc_option): Add new field 'attr'.
-	(retrieve_options_from_program): Rewrite to use gpgrt_argparser.
-
-2020-03-04 Werner Koch <wk@gnupg.org>
-
-	common: Add xreallocarray function.
-	+ commit 6fa1808cb7639f0f3745b78c4b7ce902e42b228c
-	* common/miscellaneous.c (xreallocarray): New func.
-	* common/util.h (xtryreallocarray): New macro.
-
-2020-03-03 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Always use xmalloc.
-	+ commit 178b3772ff79148b496715da1b8ca5ba86caf2bc
-	* tools/gpgconf-comp.c: Fix spelling of "cannot". Use log_assert
-	instead of a plain assert.
-	(gc_percent_escape, percent_deescape): Fail on malloc error.
-
-2020-02-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix the previous commit.
-	+ commit 19f70b5072b2ef80759ced83fe0dac9cf4dde830
-	* scd/app-openpgp.c (do_setattr): Flush the KDF DO just before setting.
-
-	scd: Improve setattr for KDF.
-	+ commit 3ba7c9bcf7f19b0a308499fcf3dbbb15da38799a
-	* scd/app-openpgp.c (do_setattr): For setting KDF DO, support standard
-	OpenPGP card, which needs to update PIN.
-
-	scd: Fix pinpad handling when KDF enabled.
-	+ commit 11da441016222337284c519ff56aca34e3042373
-	* scd/app-openpgp.c (do_getattr): Send the KDF DO information.
-
-2020-02-25 Werner Koch <wk@gnupg.org>
-
-	gpg: Re-enable versioned config files.
-	+ commit 79f2318aa5c54c57220aa73251635d21cee0ccfa
-	* g10/gpg.c (main): Use ARGPARSE_FLAG_USERVERS.
-
-	gpg: Re-add checking of config file permissions.
-	+ commit 7e8f28653c1b4305758a61c064d793e32ba633d5
-	* g10/gpg.c (main): Re-add permission checking of the user config
-	file. Re-add code to check against the SE-Linux secured file list.
-	(get_default_configname): Remove unused func.
-	* configure.ac (SAFE_VERSION, SAFE_VERSION_DOT)
-	(SAFE_VERSION_DASH): Remove.
-
-2020-02-22 Werner Koch <wk@gnupg.org>
-
-	Use gpgrt's new option parser for the new keyboxd.
-	+ commit 833c04334a53530bd40d7dd815b6a0f1ffef296d
-	* kbx/keyboxd.c: Switch to the new option parser and enable a global
-	conf file.
-
-	agent,dirmngr: Re-read the user specified config file.
-	+ commit 941a48f9b12b4c470686321bf4fd58c23b6cf86d
-	* agent/gpg-agent.c (reread_configuration): Use a two-part config
-	file.
-	* dirmngr/dirmngr.c (reread_configuration): Ditto.
-
-	Remove the now obsolete argparse code.
-	+ commit cdbe10b762f38449b86da69076209324b0c99982
-	* tests/gpgscm/main.c: Switch to the new option parser.
-	* common/argparse.c, common/argparse.h: Remove.
-	* common/init.c (_init_common_subsystems): Do not call obsolete func.
-	* common/Makefile.am (common_sources): Remove those files.
-
-2020-02-21 Werner Koch <wk@gnupg.org>
-
-	Use gpgrt's new option parser for the remaining daemons.
-	+ commit ba463128ce65a0f347643f7246a8e097c5be19f1
-	* scd/scdaemon.c: Switch to the new option parser and enable a global
-	conf file.
-	* dirmngr/dirmngr.c: Ditto.
-	* g13/g13.c: Ditto.
-	* g13/g13-syshelp.c: Ditto. Do not force verbose mode.
-	* dirmngr/dirmngr_ldap.c: Switch to the new option parser.
-	* dirmngr/dirmngr-client.c: Switch to the new option parser.
-
-	Use gpgrt's new option parser for the tools.
-	+ commit 3bc004decd289810bc1b6ad6fb8f47e45c770ce6
-	* agent/preset-passphrase.c: Switch to the new option parser.
-	* agent/protect-tool.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.
-
-2020-02-20 Werner Koch <wk@gnupg.org>
-
-	Use gpgrt's new option parser for gpgc, gpgsm, and gpg-agent.
-	+ commit 2c823bd878fcdbcc4f6c34993e1d0539d9a6b237
-	* g10/gpgv.c: Use new option parser.
-	* sm/gpgsm.c: Ditto.
-	* agent/gpg-agent.c: Ditto.
-	(opts): Add option --no-options.
-
-	gpg: Use gpgrt's new option parser to provide a global conf file.
-	+ commit 0e8f6e2aa98c212442001036fb5178cd6cd8af59
-	* common/util.h: Remove argparse.h.
-	* common/argparse.c: Undef GPGRT_ENABLE_ARGPARSE_MACROS.
-	* configure.ac (GPGRT_ENABLE_ARGPARSE_MACROS): Define.
-	* agent/gpg-agent.c: Undef GPGRT_ENABLE_ARGPARSE_MACROS and include
-	argparse.h. Do this also for all main modules which use our option
-	parser except for gpg. Replace calls to strusage by calls to
-	gpgrt_strusage everywhere.
-
-	* g10/gpg.c (opts): Change type to gpgrt_opt_t. Flag oOptions and
-	oNoOptions with ARGPARSE_conffile and ARGPARSE_no_conffile.
-	(main): Change type of pargs to gpgrt_argparse_t. Rework the option
-	parser to make use of the new gpgrt_argparser.
-
-2020-02-19 Werner Koch <wk@gnupg.org>
-
-	card: New option --info for command list and select by s/n.
-	+ commit ee911df979e9b53787162367865ca24682adae6e
-	* tools/gpg-card.c (cmd_list): add option --info. Factor soem code
-	out to ...
-	(print_card_list): new.
-
-2020-02-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix default-key selection when card is available.
-	+ commit 41913d76f7db4a7dabab26c1bc439c96ad86712f
-	* g10/getkey.c (get_seckey_default_or_card): Handle the case
-	when card key is not suitable for requested usage.
-
-2020-02-19 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	Spelling cleanup.
-	+ commit 0904b8ef348a52335c378bee6dc90a978885d66f
-	No functional changes, just fixing minor spelling issues.
-
-	---
-
-	Most of these were identified from the command line by running:
-
-	 codespell \
-	 --ignore-words-list fpr,stati,keyserver,keyservers,asign,cas,iff,ifset \
-	 --skip '*.po,ChangeLog*,help.*.txt,*.jpg,*.eps,*.pdf,*.png,*.gpg,*.asc' \
-	 doc g13 g10 kbx agent artwork scd tests tools am common dirmngr sm \
-	 NEWS README README.maint TODO
-
-2020-02-19 Nick Piper <nick.piper@cgi.com>
-
-	doc: Correction of typo in documentation of KEY_CONSIDERED.
-	+ commit 0e1cbabc0ad4fe2ca9644fffb5cf27b1a8a1509f
-
-
-2020-02-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Disable pinpad if it's impossible by KDF DO.
-	+ commit 95c7498b76231d3297541172d878f6a26702539b
-	* scd/app-openpgp.c (struct app_local_s): Add pinpad.disabled field.
-	(do_getattr): Set pinpad.disabled field.
-	(check_pinpad_request): Use the pinpad.disabled field.
-	(do_setattr): Update pinpad.disabled field.
-
-2020-02-15 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Fix import of some CR,LF ternminated certificates.
-	+ commit 6248739799fd4a877529089375e2a4103d33e6f4
-	* common/ksba-io-support.c (base64_reader_cb): Detect the END tag and
-	don't just rely on the padding chars. This could happen only with
-	CR+LF termnmated PEM files. Also move the detection into the invalid
-	character detection branch for a minor parser speedup.
-
-2020-02-13 Werner Koch <wk@gnupg.org>
-
-	build: New configure option --disable-keyboxd.
-	+ commit 6cac2bd0382eb7ed0d249f077522516e64fc1d8f
-	* configure.ac: Add option --dsiable-keyboxd
-	* kbx/Makefile.am: Do not build keyboxd in that case.
-
-	scd: Print the main app name also for not fully supported cards.
-	+ commit 11d917c7796dc748e2d798d327a045ba295994f4
-	* scd/app.c (send_serialno_and_app_status): Add fallback.
-
-	card: Fix openpgp subkey listing.
-	+ commit e582d8f5b2c1bac8b6ccdfd6412b621a2584eb7f
-	* tools/gpg-card.c (list_one_kinfo): Fix printing of the subkeys.
-
-	gpg: New option --full-timestrings.
-	+ commit 86312b920a1d5817903d7175e9c2109bcf521b7c
-	* g10/options.h (opt): Add flags.full_timestrings.
-	* g10/gpg.c (oFullTimestrings): New.
-	(opts): New option.
-	(main): Set new flag.
-	* g10/keyid.c (dateonlystr_from_pk): New.
-	(dateonlystr_from_sig): New.
-	(datestr_from_pk): Divert to isotimestamp if requested.
-	(datestr_from_sig): Ditto.
-	(expirestr_from_pk): Ditto.
-	(expirestr_from_sig): Ditto.
-	(revokestr_from_pk): Ditto.
-	* g10/import.c (impex_filter_getval): Use dateonlystr_from_sig and
-	dateonlystr_from_pk.
-
-	gpg: Changes to allow direct key generation from an OpenPGP card.
-	+ commit 14ac350f868ca71492c20c7b682d0b55b4893c9c
-	* g10/call-agent.h (struct keypair_info_s): Add fields keytime and
-	usage.
-	* g10/call-agent.c (struct keypairinfo_cb_parm_s): New.
-	(scd_keypairinfo_status_cb): Rework to store parsed KEYPAIRINFO data.
-	(agent_scd_keypairinfo): Change accordingly.
-	(agent_scd_readkey): Add arg ctrl and change callers. Change return
-	arg from an strlist_t to a keypair_info_t.
-	(readkey_status_cb): Use KEYPAIRINFO instead of KEY-TIME.
-	* g10/keygen.c (pSUBKEYCREATIONDATE): New.
-	(pAUTHKEYCREATIONDATE): New.
-	(get_parameter_u32): Allow for new parameters.
-	(do_create_from_keygrip): For card keys use direct scd call which does
-	not create a stub file.
-	(ask_algo): Rework to use the new keypair_info_t as return from
-	agent_scd_keypairinfo.
-	(parse_key_parameter_part): Likewise. Also get and return the key
-	creation time using a arg.
-	(parse_key_parameter_string): New args r_keytime and r_subkeytime.
-	(parse_algo_usage_expire): New arg r_keytime.
-	(proc_parameter_file): Ignore the explict pCREATIONDATE for card keys.
-	(quickgen_set_para): New arg keytime.
-	(quick_generate_keypair): Get the keytimes and set the pCARDKEY flag.
-	(generate_keypair): Likewise.
-	(do_generate_keypair): Implement the cardkey with keytime thingy.
-	(generate_subkeypair): Use the keytime parameters.
-	* g10/keygen.c (pAUTHKEYCREATIONDATE): New. Not yet set but may come
-	handy later.
-	(get_parameter_u32): Take care of that.
-	(do_generate_keypair): For cardkeys sign with the current time.
-
-	card: Take the key creation time from the KEYPAIRINFO.
-	+ commit e63f8bee4044e0cc9ebc1f9c0f9f6b63660d45e8
-	* tools/card-call-scd.c (learn_status_cb): Adjust for recent change.
-
-	scd:openpgp: Return key creation time as part of KEYPARIINFO.
-	+ commit 1ad84aabb410e56bea074b82a06fe32b2897b660
-	* scd/app-openpgp.c (send_keypair_info): Reaturn the key creation time
-	as part of a KEYPAIRINFO.
-	(do_readkey): Do not return the KEY-TIME anymore.
-
-	agent: Allow signing with card key even without a stub key.
-	+ commit 638526d37fee0a1febac9d29fab384b913819fc9
-	* agent/call-scd.c (agent_card_serialno): Allow NULL for R_SERIAL.
-	(struct readkey_status_parm_s): New.
-	(readkey_status_cb): New.
-	(agent_card_readkey): Add optional arg R_KEYREF and change all
-	callers.
-	* agent/findkey.c (key_parms_from_sexp): Allow also a "public-key".
-	* agent/divert-scd.c (ask_for_card): Allow for SHADOW_INFO being NULL.
-	* agent/pksign.c (agent_pksign_do): Fallback to sign with an on-card
-	if there is no stub key yet. Create the stub key. Also fixed a
-	misnaming between s_pkey and s_skey.
-
-2020-02-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Rename the struct card_key_info_s.
-	+ commit 8c63430d1a40a70ff8b4ddf1ed0fcabf9c0afbcc
-	* g10/call-agent.h (struct card_key_info_s): Rename to ...
-	(struct keypair_info_s): this.
-	(keypair_info_t): New. Use this everywhere instead of
-	card_key_info_s.
-	* g10/call-agent.c (agent_scd_free_keyinfo): Rename to ..
-	(free_keypair_info): this. Change all callers.
-
-	card: Fix parsing of the received card_list.
-	+ commit 125c959677d55a8cf663c2dc248a3fc6f9be50bb
-	* tools/card-call-scd.c (scd_cardlist): Allow for SERIALNO without any
-	apps.
-
-	card: List more info for an OpenPGP key.
-	+ commit 1abfce82bd525de2976c31b83bb0e67e33364e58
-	* tools/gpg-card.h (struct pubkey_s): Add field created.
-	* tools/card-keys.c (parse_key_record): Set that field.
-	* tools/gpg-card.c (print_shax_fpr): Print the fingerprint without
-	spaces for easier c+p.
-	(list_one_kinfo): Print the actual used fingerprint and creation date
-	from the keyblock.
-
-	card: New option --no-key-lookup.
-	+ commit 2c6092bc5d794ae36cbf2f6b62337dc23f57bf3e
-	* tools/gpg-card.h (opt): Add var no_key_lookup.
-	* tools/gpg-card.c (oNoKeyLookup): New const.
-	(opts): New option --no-key-lookup.
-	(list_one_kinfo): Add arg no_key_lookup and implement.
-	(list_all_kinfo): Add arg no_key_lookup.
-	(list_openpgp, list_piv, list_card): Ditto.
-	(cmd_list): New option --no-key-lookup.
-
-2020-02-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve key creation direct from the card.
-	+ commit 9c719c9c1ff34cc06a0fef2bfe29cfd7182753eb
-	* g10/call-agent.c (readkey_status_cb): New.
-	(agent_scd_readkey): Add new arg r_keytime and allow NULL for
-	r_result. Change all callers.
-	(agent_readkey): Minor code reformatting.
-	* g10/keygen.c (pCARDKEY): New.
-	(struct para_data_s): Add u.bool.
-	(get_parameter_bool): New.
-	(do_create_from_keygrip): Add arg cardkey and make use of it.
-	(ask_algo): Add args r_cardkey and r_keytime. Read the keytime of the
-	selected card key and return it.
-	(generate_keypair): Store CARDKEY and KEYTIME.
-	(do_generate_keypair): Pass CARDKEY to do_create_from_keygrip.
-	(generate_subkeypair): Ditto.
-
-	scd:openpgp: Send a KEY-TIME status with READKEY.
-	+ commit 77ea916533c5ca918b17ce83f6cc1b1afbd31e55
-	* scd/app-openpgp.c (retrieve_fprtime_from_card): New.
-	(do_readkey): Send a KEY_TIME status.
-
-	card: First code to actually create openpgp keys.
-	+ commit 6bc7318ef55017e1aca6e52899fd0b223da7cfc1
-	* tools/gpg-card.c (generate_all_openpgp_card_keys): Add demo key
-	generation.
-	(generate_key): Allow generatiing one OpenPGP key.
-
-	scd:openpgp: Optional allow for lowercase keyrefs.
-	+ commit 323548acd9defde0a8ea7d74c18cd4a1b339ff2e
-	* scd/app-openpgp.c (do_readkey): Use case insensitive match of the
-	keyref.
-	(do_writekey, do_sign, do_auth, do_decipher): Ditto.
-
-	scd:openpgp: Allow auto-changing of the key attributes in genkey.
-	+ commit d7d75da50543bc7259c5a6e6367b58cbca7f1b7b
-	* scd/app-openpgp.c (struct app_local_s): Add field keyalgo.
-	(parse_algorithm_attribute): Store the new keyalgo field.
-	(change_keyattr): Change info message.
-	(change_keyattr_from_string): Rewrite to also accept a keyref and a
-	keyalgo string.
-	(do_genkey): Change the keyattr if a keyalgo string is given.
-
-	common: Extend the openpgp_curve_to_oid function.
-	+ commit 24095101a5069f15a9aea7512498ac436a76814a
-	* common/openpgp-oid.c (openpgp_curve_to_oid): Add optional arg R_NBITS.
-	Change all callers.
-
-2020-02-10 Werner Koch <wk@gnupg.org>
-
-	doc: Improve the warning section of the gpg man page.
-	+ commit 113a8288b85725f7726bb2952431deea745997d8
-	* doc/gpg.texi: Update return valeu and warning sections.
-
-2020-02-10 Werner Koch <wk@gnupg.org>
-	 Tomáš Mráz
-
-	build: Always use EXTERN_UNLESS_MAIN_MODULE pattern.
-	+ commit 6aff8a132815a84bab69401c1e7de96ec549fbf2
-	* common/util.h (EXTERN_UNLESS_MAIN_MODULE): Add the definion only
-	here but now without the Norcroft-C. Change all other places where it
-	gets defined.
-	* common/iobuf.h (iobuf_debug_mode): Declare unconditionally as
-	extern.
-	* common/iobuf.c (iobuf_debug_mode): Define it here.
-	* agent/gpg-agent.c (INCLUDED_BY_MAIN_MODULE): Define here and also in
-	all main modules of all other programs.
-
-	* g10/main.h: Put util.h before the local header files.
-
-2020-02-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Make really sure that --verify-files always returns an error.
-	+ commit 5681b8eaa44005afdd30211b47e5fb1a799583dd
-	* g10/verify.c (verify_files): Track the first error code.
-
-	card: Remove command "key-attr" and hack on "generate".
-	+ commit 438b7881ba0bf4e5fd8e5d5212601e5691f2aafe
-	* tools/gpg-card.h (struct key_attr): Remove.
-	(struct key_info_s): Remove key_attr. Add keyalgo and keyalgo_id.
-	* tools/card-call-scd.c (learn_status_cb): Rework the key-attr info.
-	* tools/gpg-card.c (list_one_kinfo): Always show the algorithm; if
-	there is no key show the key attributes instead.
-	(list_openpgp): Do not print the "Key attributes".
-	(generate_key): Factor the repalce key pormpt out to ...
-	(ask_replace_keys): new.
-	(generate_openpgp): Rename to generate_all_openpgp_card_keys and add
-	an algo parameter.
-	(generate_generic): Rename to generate_key. Prepare generation of a
-	single OpenPGP key.
-	(cmd_generate): Revamp.
-	(ask_card_rsa_keysize): Remove.
-	(ask_card_keyattr): Remove.
-	(do_change_keyattr): Remove.
-	(cmd_keyattr): Remove.
-	(enum cmdids): Remove cmdKEYATTR.
-	(cmds): Ditto.
-	(dispatch_command): Ditto.
-	(interactive_loop): Ditto.
-
-	scd:openpgp: Let the genkey function also accept a full keyref.
-	+ commit fb6ff7ead7dff33541b595f3e8d5342f9c7a6d6c
-	* scd/app-openpgp.c (send_key_attr): Use log_assert.
-	(do_genkey): Allow prefix.
-
-	common: Extend the new get_keyalgo_string function.
-	+ commit 332a72f7340895e7db1e9c5f89046f722bb7465b
-	* common/openpgp-oid.c (openpgp_oid_or_name_to_curve): New.
-	(get_keyalgo_string): Use it.
-
-2020-02-09 Werner Koch <wk@gnupg.org>
-
-	common: Remove duplicated call to a function.
-	+ commit d1c518cdc9330c2dd4034efc544de0dd6ec73ea1
-	* common/openpgp-oid.c (openpgp_oid_to_str): Remove duplicated call.
-
-	common: New function get_keyalgo_string.
-	+ commit 3a1fa13eedb969b561bae18cd3d7c2fb0b63d6ab
-	* common/openpgp-oid.c (struct keyalgo_string_s): New.
-	(keyalgo_strings): New.
-	(keyalgo_strings_size, keyalgo_strings_used): New.
-	(get_keyalgo_string): New.
-
-	common: Add OpenPGP<->Gcrypt pubkey id mapping functions.
-	+ commit 49c891a9bfac24a1d95e76d33d44a49426247777
-	* g10/misc.c (map_pk_gcry_to_openpgp): Move to ...
-	* common/openpgp-oid.c (map_gcry_pk_to_openpgp): here and rename.
-	Change all 4 callers.
-	(map_openpgp_pk_to_gcry): New.
-
-	card: Support brainpool curves in the generate command.
-	+ commit 9df9996b415ee671a0f22b6936745f829884eda2
-	* tools/gpg-card.c (cmd_generate): Add brainpool curves and dummy name
-	"help".
-
-2020-02-03 Werner Koch <wk@gnupg.org>
-
-	sm: New option --issuer-der for the listkey commands.
-	+ commit 2e5ab34496fe7e1b9bd2194ab59a58cf44ca9d1e
-	* sm/server.c (do_listkeys): Implement new option.
-
-2020-01-21 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix building w/o LDAP support.
-	+ commit d8973975e7636ec0f007575a0bede92147d835f8
-	* dirmngr/Makefile.am: Conditionally build dirmngr_ldap.
-
-	gpg: Fix printing of keyring name (regression in master)
-	+ commit bf931299e846fa47bcabe3716ec82af7c3290ce5
-	* g10/keydb.c (keydb_get_resource_name):
-
-2020-01-20 Werner Koch <wk@gnupg.org>
-
-	tools: Let watchgnupg determine the socket name via gpgconf.
-	+ commit e0d9181ad11aaf7e68231db4b3708978a9a52fd6
-	* tools/watchgnupg.c: Include sys/wait.h.
-	(GNUPG_DEF_COPYRIGHT_LINE): Add a default value for standalone
-	building.
-	(get_logname): New.
-	(main): Use a default socket name and add option --homedir.
-
-2020-01-17 Werner Koch <wk@gnupg.org>
-
-	gpgconf,w32: Print a warning for a suspicious homedir.
-	+ commit 7f12fb55f9757cd68147eca8f162c85378538405
-	* tools/gpgconf.c (list_dirs): Check whether the homedir has been
-	taken from the registry.
-
-2020-01-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Prefer card key on use in multiple subkeys situation.
-	+ commit 8748c50bfaa8df2b1e59c301d15fd6b9ddbd9c47
-	* g10/call-agent.c (keyinfo_status_cb): Parse more fields.
-	(agent_probe_secret_key): Use KEYINFO and returns bigger value
-	representing the preference.
-	* g10/getkey.c (finish_lookup): For subkeys, select one
-	by using value of agent_probe_secret_key.
-
-	gpg: Prepare enhancement of agent_probe_secret_key.
-	+ commit 853d5b7677ea01f65c9bc5160cd8509b62f486f7
-	* g10/call-agent.c (agent_probe_secret_key): Change semantics of
-	return value.
-	* g10/call-agent.h (agent_probe_secret_key): Change comment.
-	* g10/delkey.c (do_delete_key): Follow the change.
-	* g10/getkey.c (get_seckey, parse_def_secret_key): Likewise.
-	(finish_lookup, have_secret_key_with_kid): Likewise.
-	* g10/gpgv.c (agent_probe_secret_key): Likewise.
-	* g10/keyedit.c (keyedit_menu, quick_find_keyblock): Likewise.
-	(show_key_with_all_names_colon): Likewise.
-	* g10/revoke.c (gen_desig_revoke, gen_revoke): Likewise
-	* g10/test-stubs.c (agent_probe_secret_key): Likewise.
-
-2020-01-16 Werner Koch <wk@gnupg.org>
-
-	card: Allow switching of cards and applications.
-	+ commit bd85f9232ad639d4acba443272147c4fc01b1b65
-	* tools/card-call-scd.c (struct card_cardlist_parm_s): Add field
-	with_apps.
-	(card_cardlist_cb): Handle the new with_apps flag.
-	(scd_switchcard): New.
-	(scd_switchapp): New.
-	(scd_applist): New.
-	(scd_serialno): Pass --all also in --demand mode.
-
-	* tools/gpg-card.c (cmd_list): Simplify switching of cards. Add
-	switching of alls. Print a list of apps per card.
-
-	scd: New commands SWITCHCARD and SWITCHAPP.
-	+ commit 718555874efcbad502112449c7d15025cb193628
-	* scd/app.c: Include membuf.h.
-	(app_switch_current_card): New.
-	(send_card_and_app_list): Factor code out to ...
-	(send_serialno_and_app_status): new.
-	(app_send_card_list): New.
-	(app_send_active_apps): New.
-	(app_switch_active_app): New.
-	* scd/command.c (cmd_switchcard): New.
-	(cmd_switchapp): New.
-	(register_commands): Register new commands.
-	(cmd_getinfo): New sub-commands "active_apps" and "all_active_apps".
-
-	scd:piv: Remove debug code from a recent commit.
-	+ commit dd61164410ee185750d1aa55ee0e33dcab8f4542
-	* scd/app-piv.c (ask_and_prepare_chv): here.
-
-	gpg: Print better debug info in case of broken sig subpackets.
-	+ commit 3ccad75d76b9c17b9495c48df8dd4be46d3b3105
-	* g10/parse-packet.c (enum_sig_subpkt): Print a hexdump.
-
-2020-01-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Use "SCD KEYINFO" to get available card keys.
-	+ commit 8edd4b8b8cdcbdcf1986214d6d17cadb604ddf54
-	* g10/skclist.c (enum_secret_keys): Don't use agent_scd_cardlist and
-	agent_scd_serialno, but agent_scd_keyinfo.
-
-	gpg: Add agent_scd_keyinfo to retrieve available card keys.
-	+ commit 8240a70c31a8e1617de64c42168cf3299b85b39e
-	* g10/call-agent.c (card_keyinfo_cb, agent_scd_free_keyinfo)
-	(agent_scd_keyinfo): New.
-	* g10/call-agent.h: Define new functions.
-
-	gpg: default-key: Simply don't limit by capability.
-	+ commit 1aa2a0a46dc19e108b79dc129a3b0c5576d14671
-	* g10/getkey.c (parse_def_secret_key): Remove the check.
-
-2020-01-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Cert only key should be usable with --default-key.
-	+ commit 9287f9e87b215e79fdb7fb9dfdf2b47666e6ea2f
-	* g10/getkey.c (parse_def_secret_key): Allow cert-only key.
-
-2020-01-13 Werner Koch <wk@gnupg.org>
-
-	scd: Make the PIN cache robust against wrongdoing of gpg-agent.
-	+ commit 2dd6b4b998dd6e156e2e75ede0f40fb768c69f40
-	* scd/app-openpgp.c (struct app_local_s): New field pincache.
-	(cache_pin): Set it.
-	(pin_from_cache): Consult it.
-	* scd/app-piv.c (struct app_local_s): New field pincache.
-	(cache_pin): Set it.
-	(pin_from_cache): Consult it.
-
-	scd:piv: Implement PIN cache.
-	+ commit 60502c3606ee425d07c84b175ab310368c12b0ad
-	* scd/command.c (pincache_put): Add arg pinlen and change all callers
-	to provide it.
-	* scd/app-piv.c (cache_pin): New.
-	(pin_from_cache): New.
-	(ask_and_prepare_chv): Add args no_cache and r_unpaddedpinlen. Take
-	PIN from the cache. Return the unpadded length.
-	(verify_chv): Add arg ctrl. Cache the PIN.
-	(do_change_chv): Clear PIN cache.
-
-	agent: Avoid multiple calls to scd for KEYINFO.
-	+ commit 2e86cca7f4181310bebfd795c059369ba03a8d8b
-	* agent/command.c (struct server_local_s): Add last_card_keyinfo.
-	(eventcounter): Add maybe_key_change.
-	(cmd_genkey, cmd_scd, cmd_import_key, cmd_delete_key): Bump new
-	counter.
-	(cmd_keyinfo): Cache the keyinfo from the card.
-	(start_command_handler): Release the cache.
-
-	agent: Replace free by xfree in recently added code.
-	+ commit aaef0fc3a743d06012c4a7fd8caa80d969863cc9
-	* agent/call-scd.c (agent_card_free_keyinfo): Use xfree.
-
-	gpg,sm: Avoid useless ASFW diagnostic in loopback mode.
-	+ commit 14aa797bb8f3f7d3f4ef66b8fcdac7439000b49a
-	* common/sysutils.c (inhibit_set_foregound_window): New var.
-	(gnupg_inhibit_set_foregound_window): New func.
-	(gnupg_allow_set_foregound_window): Use var.
-	* g10/gpg.c (main): Inhibit in loopback mode.
-	* sm/gpgsm.c (main): Ditto.
-
-	scd: Fix memory leak in command READKEY.
-	+ commit 2b843be5ac9f37c9faf2d9ab720eafceb3d534ad
-	* scd/command.c (cmd_readcert): Replace xstrdup by xtrystrdup.
-	(cmd_readkey): Ditto. Fix memory leak.
-
-	scd: Make SERIALNO --all work correctly and use it.
-	+ commit 0e48aa084921c77944d4802c86ac33c607c519af
-	* scd/app.c (maybe_switch_app): Factor reselect code out to ...
-	(run_reselect): new.
-	(app_write_learn_status): Tweak diagnostics.
-	(app_do_with_keygrip): Run reselect if a card has more than one
-	switchable application.
-
-	* agent/call-scd.c (agent_card_serialno): Ditto.
-	* tools/card-call-scd.c (start_agent): Use option --all with SERIALNO.
-	(scd_serialno): Ditto.
-
-2020-01-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: handle SSH operation by KEYGRIP.
-	+ commit 15028627a1655b7ad1835fbd0a32cf30debe807a
-	* agent/command-ssh.c (card_key_available): Supply KEYINFO argument.
-	Call agent_card_readkey by KEYGRIP of KEYINFO.
-	Don't use $AUTHKEYID, but IDSTR of KEYINFO.
-	(ssh_handler_request_identities): Follow the change of
-	card_key_available.
-
-	agent: Extend agent_card_getattr with KEYGRIP.
-	+ commit c31266716dd69fee7bd64cf1e33d7631cd328e72
-	* agent/agent.h (struct card_key_info_s): KEYGRIP null terminated.
-	(agent_card_getattr): Add KEYGRIP argument.
-	* agent/call-scd.c (agent_card_getattr): Handle KEYGRIP argument.
-	(card_keyinfo_cb): Make KEYGRIP null terminated.
-	* agent/command.c (cmd_readkey): Follow the change.
-
-2020-01-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Implement direct access by KEYGRIP for GETATTR and READKEY.
-	+ commit 0cfded4bb1484366c785c268f2fb1061c7be5fdb
-	* scd/app-openpgp.c (do_readkey): Handle KEYGRIP access.
-	* scd/command.c (do_readkey): New.
-	(cmd_readkey): Use do_readkey supporting KEYGRIP access.
-	(cmd_getattr): Supporting KEYGRIP access.
-
-2020-01-09 Werner Koch <wk@gnupg.org>
-
-	scd:openpgp: Implement PIN cache.
-	+ commit 63bda3aad8ec4163b0241f64e8b587d665d650c3
-	* scd/app-openpgp.c (wipe_and_free, wipe_and_free_string): Use them
-	everywere where we do a wipememory followed by a free.
-	(pin2hash_if_kdf): Change interface. The input PIN is not anymore
-	changed. Further there are no more assumptions about the length of
-	the provided buffer.
-	(cache_pin): Restructure.
-	(chvno_to_keyref): New.
-	(pin_from_cache): New.
-	(verify_a_chv): Add arg CTRL. Adjust for changed pin2hash_if_kdf.
-	Chache and retrieve the PIN here.
-	(verify_chv2): Do not cache the PIN here.
-	(build_enter_admin_pin_prompt): Add arg 'r_remaining'.
-	(verify_chv3): Adjust for changed pin2hash_if_kdf. Implement the PIN
-	cache.
-	(do_change_pin): Clear the PIN cache. Do not change the PIN here.
-	Lots of adjustments to cope with the chnaged pin2hash_if_kdf.
-	(do_sign): Do not cache the PIN here.
-
-	scd: Use a scdaemon internal key to protect the PIN cache IPC.
-	+ commit ce5a7fb72b599de592a087867768ac1f81fd2989
-	* agent/call-scd.c (handle_pincache_put): Do not decrypt.
-	(handle_pincache_get): New.
-	(inq_needpin): Call it.
-	* scd/command.c (set_key_for_pincache): New.
-	(pincache_put): Restructure and set key.
-	(pincache_get): Ditto.
-
-2020-01-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: SSH: SCD KEYINFO to list available keys.
-	+ commit 57b8ed61ab93dd5aa73159f6db8adeb83d54b85f
-	* agent/agent.h (agent_card_cardlist): Remove.
-	(agent_card_keyinfo): Add CAP argument.
-	* agent/call-scd.c (card_cardlist_cb): Remove.
-	(agent_card_cardlist): Remove.
-	(agent_card_keyinfo): Support CAP constraint.
-	* agent/command-ssh.c (card_key_list): Remove.
-	(ssh_handler_request_identities): Use SCD KEYINFO command.
-	* agent/command.c (cmd_keyinfo): Follow the API change.
-	* agent/divert-scd.c (ask_for_card): Likewise.
-
-2020-01-07 Werner Koch <wk@gnupg.org>
-
-	scd: First changes to implement a PIN cache.
-	+ commit fbf97a7856bd2f80a1714f63417c59d6c604d333
-	* scd/command.c (pincache_put): New. Uses a dummy key for now.
-	(pincache_get): New.
-	* scd/app.c (select_application): Flush the PIN cache.
-	(scd_update_reader_status_file): Ditto.
-	(maybe_switch_app): Call the new prep_reselect function.
-	(app_write_learn_status): Ditto.
-	* scd/app-openpgp.c (cache_pin): New helper to cache a PIN.
-	(verify_chv2): Call it.
-	(verify_chv3): Call it.
-	(clear_chv_status): Call it.
-	(do_change_pin): Call it.
-
-	* scd/app-common.h (struct app_ctx_s): Add function 'prep_select'.
-	* scd/app-openpgp.c (do_prep_reselect): New stub function.
-	(app_select_openpgp): Set new stub function.
-	* scd/app-piv.c (do_prep_reselect): New stub function.
-	(app_select_piv): Set new stub function.
-
-	* scd/app-common.h (struct app_ctx_s): Add parameter ctrl to setattr,
-	sign, auth, decipher, and check_pin. Change all implementations and
-	callers to pass such a parameter.
-
-	agent: First changes to support a PIN cache for scdaemon.
-	+ commit d5c00354bb02ae6cb2e3a72136a1a95cb2db7f3f
-	* agent/agent.h (CACHE_MODE_PIN): New.
-	* agent/cache.c (housekeeping): Special handling of new new mode.
-	(agent_flush_cache): Ditto. Add arg 'pincache_only' and change
-	caller.
-	(agent_put_cache): Support new mode.
-	(agent_get_cache): Ditto.
-	* agent/call-scd.c (wait_child_thread): Flush the entire PIN cache.
-	(start_scd): Ditto.
-	(agent_card_killscd): Ditto.
-	(handle_pincache_put): New. Uses a dummy encryption key for now.
-	(pincache_put_cb): New.
-	(inq_needpin): Prepare for PINCACHE_GET inquiry.
-	(learn_status_cb): Handle the PINENTRY_PUT status line.
-	(get_serialno_cb): Ditto
-	(agent_card_pksign): Ditto.
-	(padding_info_cb): Ditto.
-	(agent_card_readcert): Ditto.
-	(agent_card_readkey): Ditto.
-	(agent_card_writekey): Ditto.
-	(card_getattr_cb): Ditto.
-	(card_cardlist_cb): Ditto.
-	(card_keyinfo_cb): Ditto.
-	(pass_status_thru): Ditto.
-
-	kbx: Make sure the tables are joined in a select.
-	+ commit 41a882443622fe08ebaa75bf358e83630bbb8631
-	* kbx/backend-sqlite.c (run_select_statement): Join the tables.
-
-2020-01-03 Werner Koch <wk@gnupg.org>
-
-	scd: Minor fix for readibility.
-	+ commit c0625c15c1fb6d06202669eb8caff2710377952d
-	* scd/command.c (open_card_with_request): Use NULL instead of
-	APPTYPE_NULL.
-
-2020-01-02 Werner Koch <wk@gnupg.org>
-
-	kbx: Initial support for an SQLite backend.
-	+ commit f4da1455c7ab858ea9007d0813774c6d04cd4576
-	* kbx/backend-sqlite.c: New.
-	* kbx/Makefile.am (keyboxd_SOURCES): Add it.
-	(keyboxd_CFLAGS, keyboxd_LDADD): Add SQLite flags.
-	* kbx/backend.h (enum database_types): Add DB_TYPE_SQLITE.
-	(be_sqlite_local_t): New typedef.
-	(struct db_request_part_s): Add field besqlite.
-	* kbx/backend-support.c (strdbtype): Add string for DB_TYPE_SQLITE.
-	(be_generic_release_backend): Support SQLite.
-	(be_release_request): Ditto.
-	(be_find_request_part): Ditto.
-	(is_x509_blob): Rename to ...
-	(be_is_x509_blob): this and make global.
-	* kbx/frontend.c (kbxd_set_database): Detect ".db" suffix and use that
-	for SQLite.
-	(kbxd_search): Support SQLite
-	(kbxd_store): Ditto.
-	(kbxd_delete): Ditto.
-	* kbx/frontend.h (kbxd_store_modes): Move to ...
-	* kbx/keyboxd.h (enum kbxd_store_modes): here.
-	* kbx/keyboxd.c (main): USe pubring.db for now. This is a temporary
-	hack.
-
-	* kbx/backend-kbx.c (be_kbx_delete): Remove unused var cert.
-
-2019-12-23 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix output of --with-secret if a pattern is given.
-	+ commit 59d49e4a0ac2ed27803507cb7d2c6af166527bd5
-	* g10/keylist.c (list_one): Probe for a secret key in --with-secret
-	mode.
-
-	kbx: Change keyboxd to work only with one database.
-	+ commit 8a556c23a29776b2b5aa1d563e779b6ae0139dff
-	* kbx/frontend.c (the_database): New var.
-	(db_desc_t): Remove.
-	(kbxd_add_resource): Renamed to ...
-	(kbxd_set_database): this. Simplify.
-	(kbxd_search): Change to use only one database.
-	(kbxd_store): Ditto.
-	(kbxd_delete): Ditto.
-
-2019-12-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Enhance KEYINFO command to limit listing with capability.
-	+ commit b2a2df174b216881387ae849770d875cd74984c2
-	* scd/app-common.h: Add CAPABILITY argument to the WITH_KEYGRIP.
-	(app_do_with_keygrip): Likewise.
-	* scd/app-openpgp.c (send_keyinfo_if_available): New.
-	(do_with_keygrip): Support listing with CAPABILITY.
-	* scd/app-piv.c (do_with_keygrip): Likewise.
-	* scd/app.c (maybe_switch_app): Supply the argument.
-	(app_do_with_keygrip): Add CAPABILITY argument.
-	* scd/command.c (cmd_pksign, cmd_pkauth): Supply the argument.
-	(cmd_pkdecrypt): Likewise.
-	(cmd_keyinfo): Support listing with CAPABILITY.
-
-2019-12-06 Werner Koch <wk@gnupg.org>
-
-	sm: Add special case for expired intermediate certificates.
-	+ commit d246f317c04862cacfefc899c98da182ee2805a5
-	* sm/gpgsm.h (struct server_control_s): Add field 'current_time'.
-	* sm/certchain.c (find_up_search_by_keyid): Detect a corner case.
-	Also simplify by using ref-ed cert objects in place of an anyfound
-	var.
-
-	dirmngr: Tell gpg about WKD looks resulting from a cache.
-	+ commit 8a6ecc6ff52b9ec045e200cc200977707278f89c
-	* dirmngr/server.c (proc_wkd_get): Print new NOTE status
-	"wkd_cached_result".
-	* g10/call-dirmngr.c (ks_status_cb): Detect this and print a not ein
-	verbose mode.
-
-2019-12-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Use AKL for angle bracketed mail address with -r.
-	+ commit 1abb39fdaf44c2477719fbea43ef8042d8b9033e
-	* g10/getkey.c (get_pubkey_byname): Extend is_mbox checking.
-	(get_best_pubkey_byname): Ditto.
-
-2019-11-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Change the way v5 fingerprints are printed.
-	+ commit d2ff62dbdf891319e6db5850c6077c85e5eb784e
-	* g10/gpg.h (MAX_FORMATTED_FINGERPRINT_LEN): Increase by one.
-	* g10/keyid.c (format_hexfingerprint): Change v5 key formatting.
-
-	gpg: Implement insert, update, and delete via keyboxd.
-	+ commit 7244666926929f3b2475d8cab50db3ff620cdbe3
-	* g10/call-keyboxd.c (struct store_parm_s): New.
-	(store_inq_cb): New.
-	(keydb_update_keyblock): Implement the keyboxd part.
-	(keydb_insert_keyblock): Ditto.
-	(keydb_delete_keyblock): Ditto.
-	(keydb_search_reset): Clear ubid flag. Also use the correct union
-	member for building the search string.
-
-	kbx: Add new command DELETE.
-	+ commit 490e0cd0bab8d8d06ffdc5b8977964d5a76a8df0
-	* kbx/kbxserver.c (cmd_delete): New.
-	* kbx/frontend.c (kbxd_delete): New.
-	* kbx/backend-kbx.c (be_kbx_delete): New.
-
-	kbx: Redefine the UBID which is now the primary fingerprint.
-	+ commit 915297705af6f1db74dacf0d6665b83eb0a58459
-	* common/util.h (UBID_LEN): New. Use it at all places.
-	* kbx/keybox-blob.c (create_blob_finish): Do not write the UBID item.
-	* kbx/keybox-dump.c (print_ubib): Remove.
-	(_keybox_dump_blob): Do not print the now removed ubid flag.
-	* kbx/keybox-search-desc.h (struct keydb_search_desc): Use constants
-	for the size of the ubid and grip.
-	* kbx/keybox-search.c (blob_cmp_ubid): New.
-	(has_ubid): Make it a simple wrapper around blob_cmp_ubid.
-	(keybox_get_data): Add arg 'r_ubid'.
-
-	* kbx/frontend.h (enum kbxd_store_modes): New.
-	* kbx/kbxserver.c (cmd_store): Add new option --insert.
-
-	* kbx/backend-cache.c (be_cache_initialize): New.
-	(be_cache_add_resource): Call it here.
-	* kbx/backend-kbx.c (be_kbx_seek): Remove args 'fpr' and 'fprlen'.
-	(be_kbx_search): Get the UBID from keybox_get_data.
-	* kbx/backend-support.c (be_fingerprint_from_blob): Replace by ...
-	(be_ubid_from_blob): new. Change all callers.
-
-	* kbx/frontend.c (kbxd_add_resource): Temporary disable the cache but
-	use the new cache init function.
-	(kbxd_store): Replace arg 'only_update' by 'mode'. Seek using the
-	ubid. Take care of the mode.
-
-2019-11-27 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Replace no-strict-overflow pragma by wrapv pragma.
-	+ commit f59455d054a79068ebf480cd28f02993c1facf3b
-	* dirmngr/dirmngr.c (time_for_housekeeping_p): Build with --fwrapv.
-	Replace protecting macro.
-
-	gpg: Move a keydb function to another file.
-	+ commit 61f41cdce5b60b9df05d6531ab1b7aab84ada659
-	* g10/keydb.c (build_keyblock_image): Move to ...
-	* g10/build-packet.c (build_keyblock_image): here.
-
-2019-11-26 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Rework of the LDAP code, part 1.
-	+ commit 264c15c72fe050f5e8d2f1cb2444a459df6fe99f
-	* dirmngr/http.h (struct parsed_uri_s): Add flag is_ldap.
-	* dirmngr/http.c (do_parse_uri): Set flag. Do not error out for a
-	missing slashes in an http scheme if NO_SCHEME_CHECK is active.
-	* dirmngr/t-http.c (main): Print new flag.
-	* dirmngr/ks-engine-ldap.c (ks_ldap_help): Use flag instead of
-	checking the scheme.
-	* dirmngr/ldap-parse-uri.c (ldap_uri_p): Re-implement using
-	http_parse_uri.
-	* dirmngr/t-ldap-parse-uri.c (main): Add option --verbose.
-
-	dirmngr: Make building with a TLS library mandatory.
-	+ commit 1009e4e5f71347a1fe194e59a9d88c8034a67016
-	* configure.ac: Do not build dirmngr if no TLS is available.
-	* dirmngr/http.c: Remove all uses of the USE_TLS macro.
-
-	doc: Fixed variable naming.
-	+ commit 8fb14d3b3f9c5c27ff8b9f0e7e7207ec388687ff
-	* kbx/keybox.h: Fix naming of arguments.
-	* scd/ccid-driver.c (print_error) TEST: Add missing break. Note
-	that this is anyway an impossible case.
-
-2019-11-25 Werner Koch <wk@gnupg.org>
-
-	agent: Improve --debug-pinentry diagnostics.
-	+ commit c8783b3a204b371d44b8953429652101cf2e4d1b
-	* agent/call-pinentry.c (atfork_cb): Factor code out to ...
-	(atfork_core): new.
-
-2019-11-23 Werner Koch <wk@gnupg.org>
-
-	wkd: Let --install-key write a template policy file.
-	+ commit 50cd1a58f3a612704a0056386e1d5cd7cb28d57d
-	* tools/wks-util.c (ensure_policy_file): New.
-	(wks_cmd_install_key): Call it.
-
-2019-11-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Apply removal of dirmngr/ldap-wrapper-ce.c.
-	+ commit 116dfb20013b73b950bbcee1d1f6c2a5d1d7ffdd
-	* po/POTFILES.in: Update.
-
-2019-11-18 Werner Koch <wk@gnupg.org>
-
-	dirmngr,gpg: Better diagnostic in case of bad TLS certificates.
-	+ commit d9c7935188483dae381c12e7eef19072bbade4b3
-	* doc/DETAILS: Specify new status code "NOTE".
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Print a NOTE status for a
-	bad TLS certificate.
-	* g10/call-dirmngr.c (ks_status_cb): Detect this status.
-
-	dirmngr: Forward http redirect warnings to gpg.
-	+ commit ae9acb8745c1654b446b3cd5b9322b235723d9cb
-	* dirmngr/http.c: Include dirmngr-status.h
-	(http_prepare_redirect): Emit WARNING status lines for redirection
-	problems.
-	* dirmngr/http.h: Include fwddecl.h.
-	(struct http_redir_info_s): Add field ctrl.
-	* dirmngr/ks-engine-hkp.c (send_request): Set it.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Set it.
-	* g10/call-dirmngr.c (ks_status_cb): Detect the two new warnings.
-
-2019-11-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd,ccid: Fix detection of supported readers with pinpad.
-	+ commit 1cb9a831f6eedfa4c8950b8a7706ea77b74693f7
-	* scd/ccid-driver.c (ccid_transceive_secure): When not supported,
-	return CCID_DRIVER_ERR_NOT_SUPPORTED.
-
-2019-11-12 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Use IPv4 or IPv6 interface only if available.
-	+ commit 12def3a84e0358528347107dc88cfe740a54941f
-	* dirmngr/dns-stuff.c (cached_inet_support): New variable.
-	(dns_stuff_housekeeping): New.
-	(check_inet_support): New.
-	* dirmngr/http.c (connect_server): Use only detected interfaces.
-	* dirmngr/dirmngr.c (housekeeping_thread): Flush the new cache.
-
-2019-11-12 Andre Heinecke <aheinecke@gnupg.org>
-
-	dirmngr: Tune down err on missing ldapservers file.
-	+ commit 40daa0bc0bc87a521713d7dd1568f3874759a143
-	* dirmngr/dirmngr.c (parse_ldapservers_file): Tune down error
-	in case no such file exists.
-
-2019-11-11 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Remove cruft from dirmngr_ldap.
-	+ commit 4c295646ba0e175743e6be13457308c1e6d21dd3
-	* configure.ac (USE_LDAPWRAPPER): Remove ac_define and conditional.
-	* dirmngr/Makefile.am: Remove USE_LDAPWRAPPER and considere true.
-	* dirmngr/ldap-wrapper-ce.c: Remove.
-	* dirmngr/ldap-wrapper.c: Remove USE_LDAPWRAPPER stuff. Minor chnages
-	to debug output.
-	* dirmngr/dirmngr_ldap.c: Remove USE_LDAPWRAPPER stuff. Remove
-	my_ldap macros.
-	(fetch_ldap) W32: Use ldap_sslinit.
-
-	gpg: Forbid the creation of SHA-1 third-party key signatures.
-	+ commit dd18be979e138dd3712315ee390463e8ee1fe8c1
-	* g10/sign.c (SIGNHINT_KEYSIG, SIGNHINT_SELFSIG): New.
-	(do_sign): Add arg signhints and inhibit SHA-1 signatures. Change
-	callers to pass 0.
-	(complete_sig): Add arg signhints and pass on.
-	(make_keysig_packet, update_keysig_packet): Set signhints.
-
-	dirmngr: Rename an enum value for clarity.
-	+ commit eebd43d5b688e99131fcbf8f8292a485b91402a2
-	* dirmngr/ldapserver.h: Rename LDAPSERVER_OPT.
-
-2019-11-09 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Allow sepcification of ldaps servers.
-	+ commit 6e1c99bc397382f1ea2ba9d61a64328410adc95f
-	* sm/gpgsm.h (struct keyserver_spec): Add field use_ldaps.
-	* sm/gpgsm.c (parse_keyserver_line): Parse flags.
-	* sm/call-dirmngr.c (prepare_dirmngr): Send ldaps flag to the dirmngr.
-
-	* dirmngr/dirmngr.h (struct ldap_server_s): Add field use_ldaps.
-	* dirmngr/ldapserver.c (ldapserver_parse_one): Parse flags.
-	* dirmngr/ldap.c (start_cert_fetch_ldap): Call wrapper with --tls.
-
-	* dirmngr/dirmngr_ldap.c: New option --tls.
-	(fetch_ldap): Make use of that option.
-
-2019-11-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix a potential loss of key sigs during import with self-sigs-only.
-	+ commit 6701a38f8e4a35ba715ad37743b8505bfd089541
-	* g10/import.c (import_one_real): Don't do the final clean in the
-	merge case.
-
-	gpg: Add option --allow-weak-key-signatures.
-	+ commit e624c41dbafd33af82c1153188d14de72fcc7cd8
-	* g10/gpg.c (oAllowWeakKeySignatures): New.
-	(opts): Add --allow-weak-key-signatures.
-	(main): Set it.
-	* g10/options.h (struct opt): Add flags.allow_weak_key_signatures.
-	* g10/misc.c (print_sha1_keysig_rejected_note): New.
-	* g10/sig-check.c (check_signature_over_key_or_uid): Print note and
-	act on new option.
-
-	gpg: Print rfc4880bis note only in verbose mode.
-	+ commit f4047f56058cf9be2aa362fc439846ce930da8c7
-	* g10/gpg.c (main): Change condition for an info diagnostic.
-
-2019-11-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove an unused variable.
-	+ commit fd88b8847a371a2927f52afceeeb457b64cce162
-	* g10/delkey.c (do_delete_key): here.
-
-	gpg: Do not require --batch when using --log-file.
-	+ commit 584b65ad7e937710a4fc6db42d6849bb3449d6ef
-	* g10/gpg.c (main): Remove a long standing FIXME.
-
-2019-10-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd,ccid: Fix GEMPC_EZIO handling.
-	+ commit c6702d77d936b3e9d91b34d8fdee9599ab94ee1b
-	* scd/ccid-driver.c (ccid_transceive_secure): Fix for 08e6:34c2.
-
-2019-10-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: More fix of get_best_pubkey_byname.
-	+ commit e2c2b0fb2d9b31fa1b61803d04919645a9149996
-	* g10/getkey.c (get_best_pubkey_byname): Remove useless req_usage
-	setting of CTX.
-
-	gpg: Fix two other cases in get_best_pubkey_byname.
-	+ commit 286d4c607574e91f590512a1385bb3320cf8da77
-	* g10/getkey.c (pubkey_cmp): Handle a primary key with
-	PUBKEY_USAGE_ENC, and make sure new key is for encryption.
-	(get_best_pubkey_byname): Add comment for ranking.
-
-	doc: Fix documentation about --locate-keys.
-	+ commit 627a990f8e306d4f34bc503b303dc8b13616029e
-	* doc/gpg.texi (--locate-keys): Remove mentioning signing keys.
-
-2019-10-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix get_best_pubkey_byname to consider the first match.
-	+ commit f2734381ae1431e395a0bed16df2f4d5d13aa2c5
-	* g10/getkey.c (get_best_pubkey_byname): Always use PK0 to search
-	by get_pubkey_byname. Add initial call to pubkey_cmp to fill
-	BEST at first before the loop.
-
-2019-10-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Also delete key-binding signature when deleting a subkey.
-	+ commit d1bc12d1b66e0657969a8eb846bdcd9bee717a7c
-	* g10/delkey.c (do_delete_key): Simplify and correct subkey deletion.
-
-2019-10-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Put the first key in candidates correctly.
-	+ commit 44604209c1cfe18532d13eda63d8c1f86a6e12ec
-	* g10/getkey.c (get_best_pubkey_byname): After the call of
-	get_pubkey_byname, set up CTX with KEYDB_SEARCH_MODE_LONG_KID to enter
-	the loop.
-
-	scd,ccid: Add 08e6:34c2 (GEMPC_EZIO).
-	+ commit c933c15d587a1c0df3f4b3bf37d8d15164dd318f
-	* scd/ccid-driver.c (ccid_transceive_secure): Add pinpad support
-	for 08e6:34c2 which supports extended APDU exchange.
-
-2019-10-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: The first key should be in candidates.
-	+ commit 7535f1d47a35e30f736f0e842844555f7a4a9841
-	* g10/getkey.c (get_best_pubkey_byname): Handle the first key
-	as the initial candidate for the selection.
-
-2019-10-07 Werner Koch <wk@gnupg.org>
-
-	kbx: Implement update for the STORE command.
-	+ commit f4bdf8e590877e9bfddfd19a4e4167f6531c9fb1
-	* kbx/backend-kbx.c (be_kbx_update): New.
-	* kbx/frontend.c (kbxd_store): Call it.
-
-2019-10-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix a memory leak in get_best_pubkey_byname.
-	+ commit e28572116fe4c586ba9d1e8f27389bf3f06e036b
-	* g10/getkey.c (get_best_pubkey_byname): Free the public key parts.
-
-2019-10-03 Werner Koch <wk@gnupg.org>
-
-	gpg: Ignore all SHA-1 signatures in 3rd party key signatures.
-	+ commit 7d9aad63c4f1aefe97da61baf5acd96c12c0278e
-	* g10/sig-check.c (check_signature_over_key_or_uid): No cut-off date
-	and remove debug output.
-
-	gpg: Be prepared for chosen-prefix SHA-1 collisions in key signatures.
-	+ commit c4f2d9e3e1d77d2f1f168764fcdfed32f7d1dfc4
-	* g10/sig-check.c (check_signature_over_key_or_uid): Reject cewrtain
-	SHA-1 based signatures.
-
-2019-10-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Read the UBID from the keybox and detect wrong blob type.
-	+ commit 63dbc817e7dcc6edc757281f09e1ca80500ab2d1
-	* g10/keydb-private.h (struct keydb_handle_s): Add fields for UBID.
-	* g10/call-keyboxd.c (search_status_cb): New.
-	(keydb_search): Set new UBID fields.
-
-	kbx: Add first version of STORE command to keyboxd.
-	+ commit c7293a4d125c4675c86ecdee0f2f3186fc4bdaf7
-	* kbx/Makefile.am (keyboxd_CFLAGS): -DKEYBOX_WITH_X509.
-	(keyboxd_LDADD): Add libksba.
-	* kbx/kbxserver.c (cmd_store): New.
-	* kbx/frontend.c (kbxd_store): New.
-	* kbx/backend-support.c (is_x509_blob): New.
-	(be_fingerprint_from_blob): New.
-	* kbx/backend-kbx.c (be_kbx_seek): Add args FPR and FPRLEN.
-	(be_kbx_insert): New.
-
-	common: New function hex2fixedbuf.
-	+ commit 61765136cf92be2884603bc3fac020a1c6ed91f4
-	* common/convert.c (hex2fixedbuf): New.
-
-2019-09-30 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix --recv-key in case of a given fingerprint.
-	+ commit a605dbb430b1f73ef974ad54f74679dfc0eefb18
-	* g10/keyserver.c (keyserver_retrieval_screener): Compare against
-	actual length.
-
-	gpg: Fix expand GPG groups when resolving a key.
-	+ commit ec81c437e71b4c630a799ed29447cc5e3db162cd
-	* g10/expand-group.c (expand_group): Add arg prepend_input.
-	* g10/pkclist.c (build_pk_list): Adjust for it.
-	* g10/getkey.c (key_byname): Keep the expanded names in the CTX and
-	don't premature free them.
-	(get_pubkey_byname): Append the namelist to the extra_list.
-
-2019-09-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix a recently introduced printf format buglet.
-	+ commit b966a7c142ab6341f4149d55e2609dbb9914acec
-	* g10/parse-packet.c (dump_sig_subpkt): Fix format error.
-
-	kbx: Fix error code return in keyboxd.
-	+ commit 8e574130482167dc7d2e2888cc80ad6584345e3d
-	* kbx/frontend.c (kbxd_add_resource): Print a diagnostic on error.
-	* kbx/backend-kbx.c (be_kbx_add_resource): Acttually returh the error
-	code.
-
-	kbx: Store the UBIB in the blob.
-	+ commit 0af1c6447dc0f981ab7306e3bef520f37aded167
-	* kbx/keybox-blob.c (create_blob_header): New blob flag UBIB.
-	(create_blob_finish): Write the UBIB.
-	* kbx/keybox-dump.c (print_ubib): New.
-	(_keybox_dump_blob): Print UBIB flag.
-	* kbx/keybox-search.c (has_ubid): Compare the stored UBIB if
-	available.
-
-	kbx,gpg: Allow lookup using a UBID.
-	+ commit 4be79b5abeae82b9840e6aa93874f743e13c6df7
-	* common/userids.c (classify_user_id): Detect UBIDs.
-	* kbx/backend-cache.c (blob_table_put): Store the public key type.
-	(be_cache_search): Add search mode for UBIDs.
-	* kbx/backend.h (struct db_request_part_s): Add cache.seqno_ubid.
-	* g10/keydb.c (keydb_search_desc_dump): Fix printing of keygrip. Add
-	ubid printing.
-	* g10/call-keyboxd.c (keydb_search): Support search by UBID.
-
-	kbx: First take on a cache for the keyboxd.
-	+ commit 280e9c9cfac31ae5ac874c928eee063cc922e27e
-	* kbx/backend.h (enum database_types): Add DB_TYPE_CACHE.
-	(struct db_request_part_s): Add seqno fields.
-	(struct db_request_s): Add infos for the cache backend.
-	* kbx/backend-support.c (struct backend_handle_s): Add 'backend_id'.
-	(strdbtype): Support DB_TYPE_CACHE.
-	(be_generic_release_backend): Ditto.
-	(be_find_request_part): New.
-	(be_return_pubkey): New arg UBID and chnage status name.
-	* kbx/backend-cache.c: New.
-	* kbx/backend-kbx.c (be_kbx_init_request_part): New.
-	(be_kbx_search): Factor some code out to a support function.
-	(be_kbx_seek): New.
-	* kbx/frontend.c (kbxd_add_resource): Support DB_TYPE_CACHE.
-	(kbxd_search): Support the NEXR operation with the cache.
-	* kbx/keybox-search-desc.h (KEYDB_SEARCH_MODE_UBID): New.
-	(struct keydb_search_desc): Add field u.ubid.
-	* kbx/keybox-search.c (has_ubid): New.
-	(keybox_search): Support the UBID search.
-
-2019-09-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Build gpg-pair-tool only when there is newer libgcrypt.
-	+ commit bb5ed9fe1abfcbb6128325508366bc802eb576c5
-	* configure.ac (HAVE_NEWER_LIBGCRYPT): New.
-	* tools/Makefile.am: Conditionalize build of gpg-pair-tool.
-
-2019-09-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	tools: Fix gpg-pair-tool to follow new API.
-	+ commit 7c81e5cb97c77244be164daf7a80e29f6b6e437b
-
-
-	tools: Don't prepare G in gpg-pair-tool.
-	+ commit b928de70e072fce15d7bba39f370d32dd8b74095
-	* tools/gpg-pair-tool.c (create_dh_keypair): Use NULL for G.
-
-	tools: Use new API of libgcrypt for gpg-pair-tool.
-	+ commit f22a00416149448172bf8110d466d65c87962cae
-	* tools/gpg-pair-tool.c (create_dh_keypair): Just use
-	gcry_random_bytes for secret. Call gcry_ecc_mul_point
-	with G to get the public key.
-	(compute_master_secret): Use gcry_ecc_mul_point.
-
-2019-09-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd,pcsc: Use HANDLE for context and card.
-	+ commit 49671b76eae2c7d1edb13ed927654d0c11d879f1
-	* scd/apdu.c (HANDLE): New.
-
-2019-09-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Remove old fallback logic from CCID to PC/SC.
-	+ commit 980d0234d31699e51051e0cc6002ad177b6e7136
-	* scd/apdu.c (apdu_dev_list_start): Return an error on failure.
-
-	scd,pcsc: Support "reader-port" option for PC/SC reader.
-	+ commit 6d750fe7fc4224924f13ef578010a26cdbe0a67b
-	* scd/apdu.c (apdu_open_reader): Skip use of a reader if it's not the
-	one specified when it is specified.
-
-	scd,pcsc: Remove the restriction of no-scanning in PC/SC.
-	+ commit c569e49d1764d2573aec5684f9cee397bdd8ccb1
-	* scd/apdu.h (app_open_reader): Remove the last argument.
-	* scd/apdu.c (app_open_reader): Ditto.
-	* scd/app.c (select_application): Don't supply APP_EMPTY.
-
-2019-09-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd,pcsc: Fix examining the list of readers.
-	+ commit 92be4e87eec984a3f3737339c311761d2650c55a
-	* scd/apdu.c (apdu_dev_list_start): Traverse the string+NUL carefully.
-
-	scd,pcsc: Fix for initializing PC/SC.
-	+ commit 441106cdf0fdd310e3b36370186849167db11345
-	* scd/apdu.c (pcsc_init): Load it at first.
-	(apdu_open_reader): Check for the CCID internal driver.
-
-	scd,pcsc: Support multiple card readers.
-	+ commit e8534f899915a039610973a84042cbe25a5e7ce2
-	* scd/apdu.c (close_pcsc_reader, apdu_init): Clear pcsc.rdrname.
-	(pcsc_init): Load of PC/SC module moved from ...
-	(open_pcsc_reader): ... here.
-	(apdu_dev_list_start): Add support for PC/SC.
-	(apdu_dev_list_finish): Likewise.
-	(apdu_open_reader): Likewise.
-
-	scd,pcsc: Use a single context.
-	+ commit 1080e91efd60cb41c2d6dbafaee810e5967a3161
-	* scd/apdu.c (pcsc): New variable.
-	(struct reader_table_s): Remove pcsc.context from member.
-	(pcsc_get_status, connect_pcsc_card): Use pcsc.context.
-	(close_pcsc_reader): Release pcsc.context here with reference count.
-	(pcsc_init): New.
-	(open_pcsc_reader): Don't call pcsc_establish_context here. Call
-	close_pcsc_reader instead of pcsc_release_context.
-	(apdu_open_reader): Call pcsc_init if needed.
-	(apdu_init): Initialize pcsc.count and pcsc.context.
-
-	scd: Clean up the structure for future fix of PC/SC.
-	+ commit f44aa290c1368a3119b2323664c0f356195c4206
-	* 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.
-
-2019-09-10 Werner Koch <wk@gnupg.org>
-
-	gpg: First rough implementation of keyboxd access for key lookup.
-	+ commit ce9906b008c94c2aa4ac770a981d1e1e0b8aea47
-	* g10/Makefile.am: Add nPth flags.
-	* g10/gpg.c: Include npth.h.
-	(gpg_deinit_default_ctrl): Deinit call-keyboxd local data.
-	(main): Init nPth.
-	* g10/keydb-private.h (struct keydb_handle_s): Add field 'kbl' and
-	remove the search result and the assuan context.
-	* g10/call-keyboxd.c (struct keyboxd_local_s): Add more fields.
-	(lock_datastream, unlock_datastream): New.
-	(gpg_keyboxd_deinit_session_data): Adjust for changed data structures.
-	(prepare_data_pipe): New.
-	(open_context): Return kbl instead of an Assuan context. Init mutexes
-	etc.
-	(close_context): Merge into ...
-	(keydb_release): here. Adjust for changed data structures.
-	(datastream_thread): New.
-	(keydb_get_keyblock): Implement datastream stuff.
-	(keydb_search): Ditto.
-
-	* common/asshelp.c (wait_for_sock): Add arg connect_flags.
-	(start_new_service): Set FDPASSING flag for the keyboxd.
-
-	kbx: Allow fd-passing for the keyboxd.
-	+ commit 6c327b4dd6d8041b84f856ffc2a7d82b352d273f
-	* kbx/kbxserver.c: Include host2net.h
-	(struct server_local_s): Add field outstream.
-	(prepare_outstream): New.
-	(kbxd_writen): New.
-	(kbxd_write_data_line): Write to file descrptor. Disable the slow
-	human reader friendly data line formatting.
-	(cmd_search, cmd_next): Disable data logging.
-	(kbxd_start_command_handler): Add OUTPUT command.
-	* kbx/keyboxd.c (main): Enable log monitor.
-
-	common: Allow a readlimit for iobuf_esopen.
-	+ commit 2f0fdab8aabdf408495163ef99b2d4d111f74692
-	* common/iobuf.c (file_es_filter_ctx_t): Add fields use_readlimit and
-	readlimit.
-	(file_es_filter): Implement them.
-	(iobuf_esopen): Add new arg readlimit.
-	* g10/decrypt-data.c (decrypt_data): Adjust for change.
-	* g10/import.c (import_keys_es_stream): Ditto.
-
-2019-09-10 Andre Heinecke <aheinecke@gnupg.org>
-
-	doc: Fix distchek for generated eps file.
-	+ commit c69a37dcbdc8db47489fbf744f58bb61399d223f
-	* doc/Makefile.am (EXTRA_DIST, BUILT_SOURCES): Add
-	gnupg-module-overview.eps, gnupg-card-architecture.eps
-	(DISTCLEANFILES): Remove them.
-
-2019-09-09 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --use-keyboxd.
-	+ commit aba82684fe14289cf62b4694bc398f3a274b4762
-	* g10/gpg.c (oUseKeyboxd,oKeyboxdProgram): New consts.
-	(opts): New options --use-keyboxd and --keyboxd-program.
-	(main): Implement them.
-	* g10/keydb.c: Move some defs out to ...
-	* g10/keydb-private.h: new file.
-	* g10/keydb.c: prefix function names with "internal" and move original
-	functions to ...
-	* g10/call-keyboxd.c: new file. Divert to the internal fucntion if
-	--use-keyboxd is used. Add a CTRL arg to most fucntions and change
-	all callers.
-	* g10/Makefile.am (common_source): Add new files.
-	(noinst_PROGRAMS): Do bot build gpgcompose.
-
-	kbx: Fix keyboxd search first.
-	+ commit 5e00c1773d8fd44ba95b39a48e12b0ec94ac8cbe
-	* kbx/kbxserver.c (cmd_next): Switch to mode next if needed.
-
-	kbx: Allow searching from start.
-	+ commit 1545b948e1c8e8fa4873d434fb790a88ed96091c
-	* kbx/kbxserver.c (cmd_search): Detect empty pattern.
-
-2019-09-06 Stephan Mueller <smueller@chronox.de>
-
-	gpg: expand GPG groups when resolving a key.
-	+ commit e825aea2ba3529c333d7ec2c76e63998cb83d999
-	* g10/expand-group.c: New
-	* g10/pkclist.c: Extract expand_group and expand_id into expand-group.c.
-	* g10/keydb.h: Add prototypes of expand_id and expand_group.
-	* g10/getkey.c: Use expand_group before resolving key references.
-	* g10/Makefile.am: Compile expand-group.c.
-
-2019-09-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Make --quiet work on --send-keys.
-	+ commit d9c4c3776b8ec3261e13693e230dd480b1127b18
-	* g10/keyserver.c (keyserver_put): Act upon --quiet.
-
-2019-09-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Prepare parser for the new attestation certificates.
-	+ commit 209caaff66fbe96df144e6b1474435992e087fa4
-	* common/openpgpdefs.h (SIGSUBPKT_ATTST_SIGS): New.
-	* g10/keydb.h (IS_ATTST_SIGS): New.
-	(IS_CERT): Include the new one.
-	* g10/sign.c (mk_notation_policy_etc): Do not put notations into
-	attestation key signatures.
-	* g10/parse-packet.c (dump_sig_subpkt): Add new arg digest_algo.
-	Print the attestation sigs.
-	(parse_one_sig_subpkt): Support SIGSUBPKT_ATTST_SIGS.
-	(can_handle_critical): Ditto.
-	(enum_sig_subpkt): Pass digest algo to dump_sig_subpkt.
-
-	gpg: Rework the signature subpacket iteration function.
-	+ commit e1d9be730ca07e10a20df5ef60d7562030f10676
-	* g10/parse-packet.c (enum_sig_subpkt): Replace first arg by two args
-	so that the entire signature packet is available. Change all callers.
-	(parse_sig_subpkt): Ditto.
-
-	scd: Implement auto-switching between Yubikey apps.
-	+ commit 7febb4f2476742936b829424ad23df662b37f4b4
-	* scd/app.c (apptype_from_keyref): New.
-	(maybe_switch_app): Add arg 'keyref' and use this also for switching.
-	Change all callers to pass a keyref if needed.
-
-	scd:openpgp: Avoid PIN caching issues after re-select.
-	+ commit 5d9eb060b764d45152edb266cd8a08f5724ad709
-	* scd/app-openpgp.c (do_reselect): Clear PIN cache flags.
-
-	scd:piv: Allow the keygrip as alternative to a keyref.
-	+ commit 947b44e835dec5967d400a9391d8746fb3f759df
-	* scd/app-piv.c (find_dobj_by_keyref): Allow the keygrip as input.
-
-	scd: Improve locking of app_do_with_keygrip.
-	+ commit c8d739a356d3dacdf63fa2d722d117401cf52caf
-	* scd/app.c (app_do_with_keygrip): Lock once per card.
-
-	scd: New debug flag "app".
-	+ commit 4e701953fec6efb10aaf34373e648b1dcafba054
-	* scd/scdaemon.h (DBG_APP_VALUE, DBG_APP): New.
-	* scd/scdaemon.c (debug_flags): Add "app".
-	* scd/app.c (xstrapptype): New.
-	(app_readcert, app_readkey, app_getattr): Add debug output.
-	(app_setattr, app_sign, app_auth): Ditto.
-	(app_writecert, app_writekey, app_change_pin): Ditto.
-	(app_check_pin): Ditto.
-
-2019-09-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix ask_for_card to allow a key on multiple cards.
-	+ commit 9f39e0167d0642bcfb9bcabcbc7f8160b39a20ee
-	* agent/divert-scd.c (ask_for_card): Don't use SERIALNO to select
-	card, but use KEYGRIP.
-
-2019-09-04 Werner Koch <wk@gnupg.org>
-
-	scd: New sub-command cmd_has_option for GETINFO.
-	+ commit fed9c93e05af4aeeb2fe9af81200fc7a745f2dec
-	* scd/command.c (cmd_getinfo): Add cmd_has_option sub-command.
-
-	scd: Add option --all to the SERIALNO command.
-	+ commit 9a0d8f2d8906d2f37c2755c4695b91c27c8acc2f
-	* scd/command.c (cmd_serialno): Add option --all.
-	(open_card_with_request): Implement that option.
-	* scd/app.c (select_all_additional_applications_internal): New.
-	(select_additional_application): Add mode to call new function.
-
-	scd: Fix Error checking in additioal app selection.
-	+ commit fa258379424c6d48538b054b8dc7c1ab5c2d4290
-	* scd/app.c (select_additional_application): Return error for unknown
-	NAME.
-
-	scd: Add option --multi to the LEARN command.
-	+ commit 5cf5a04bae03d622a42753735c60dfab3b24ade8
-	* scd/app-common.h (APP_LEARN_FLAG_MULTI): New.
-	* scd/command.c (cmd_learn): Add option --multi.
-	* scd/app.c (app_write_learn_status): Factor some code out to ...
-	(write_learn_status_core): new.
-	(app_write_learn_status): Implement flag --multi.
-
-	scd: Use a macro for the flag parameter of learn_status.
-	+ commit 2cdea776cd6db13c8f4ff45c89bd3292f216b186
-	* scd/app-common.h (APP_LEARN_FLAG_KEYPAIRINFO): New flag macro..
-	* scd/command.c (cmd_learn): Pass that flag instead of a plain number.
-	* scd/app-nks.c (do_learn_status_core): Use new flag.
-	* scd/app-p15.c (do_learn_status): Ditto.
-	* scd/app-piv.c (do_learn_status): Ditto.
-	* scd/app-sc-hsm.c (do_learn_status): Ditto.
-	* scd/app.c (app_write_learn_status): Ditto.
-
-2019-08-23 Werner Koch <wk@gnupg.org>
-
-	gpg,sm: Implement keybox compression run and release lock in gpgsm.
-	+ commit e64f0dfd72de548837f630bccd249a87451b89c5
-	* g10/keydb.c (keydb_add_resource): Call keybox_compress.
-	* sm/keydb.c (keydb_add_resource): Release the lock after a compress.
-
-	kbx: Include deleted records into the --stats output.
-	+ commit 5ef0d7a795cf2462314ea0cb72c7efa7243ab405
-	* kbx/keybox-dump.c (_keybox_dump_file): Take deleted records in
-	account.
-
-	kbx: Fix regression in compression trigger from July 18.
-	+ commit 30aaa4ba007210aa043c3d524415495a4d9fd17f
-	* kbx/keybox-update.c (keybox_compress): Change condition back.
-	Also use make_timestamp for CUT_TIME.
-
-	gpg: Allow --locate-external-key even with --no-auto-key-locate.
-	+ commit d058d80ed0d5edeff6d85108054b1dfd45ddad7d
-	* g10/getkey.c (akl_empty_or_only_local): New.
-	* g10/gpg.c (DEFAULT_AKL_LIST): New.
-	(main): Use it here.
-	(main) <aLocateExtKeys>: Set default AKL if none is set.
-
-	gpg: Silence some warning messages during -Kv.
-	+ commit d7aca1bef68589134b36395901b92496a7a37392
-	* g10/options.h (glo_ctrl): Add flag silence_parse_warnings.
-	* g10/keylist.c (list_all): Set that during secret key listsings.
-	* g10/parse-packet.c (unknown_pubkey_warning): If new flag is set do
-	 not print info message normally emitted inh verbose mode.
-	(can_handle_critical_notation, enum_sig_subpkt): Ditto.
-	(parse_signature, parse_key, parse_attribute_subpkts): Ditto.
-
-	gpg: Do not show two informational diagnostics with quiet.
-	+ commit f14ddeb89c4519cd7ccf52c4595b93ab11ccbda1
-	* g10/trustdb.c (verify_own_keys): Silence informational diagnostic.
-
-	gpgconf: Suggest the use of --gpgconf-test on --launch problems.
-	+ commit 2a45800b2f8043d2533403eaadf8736d15ad7017
-	* tools/gpgconf-comp.c (gc_component_launch): Change suggestion.
-
-2019-08-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Extend --quick-gen-key for creating keys from a card.
-	+ commit d3f5d8544fdb43082ff34b106122bbf0619a0ead
-	* g10/keygen.c (parse_key_parameter_part): Add arg R_KEYGRIP and
-	support the special algo "card".
-	(parse_key_parameter_string): Add args R_KEYGRIP and R_SUBKEYGRIP.
-	Handle the "card" algo. Adjust callers.
-	(parse_algo_usage_expire): Add arg R_KEYGRIP.
-	(quickgen_set_para): Add arg KEYGRIP and put it into the parameter
-	list.
-	(quick_generate_keypair): Handle algo "card".
-	(generate_keypair): Also handle the keygrips as returned by
-	parse_key_parameter_string.
-	(ask_algo): Support ed25519 from a card.
-
-2019-08-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Factor export_ssh_key.
-	+ commit 6f760e6eb0e8820d386b33c28cb14210adfc6aef
-	* g10/export.c (export_one_ssh_key): Factor out.
-	(export_ssh_key): Use export_one_ssh_key.
-
-	dns: Fix irrelevant use of tmpfile.
-	+ commit e00e68135c01351ed66fed3c4453a1b13c8d522f
-	* dirmngr/dns.c (dns_trace_open): Don't use tmpfile.
-
-2019-08-21 Werner Koch <wk@gnupg.org>
-
-	gpg: In a list of card keys show the standard keys.
-	+ commit ce403c74dbc9c027b823910f22338269e625f76f
-	* g10/keygen.c (ask_algo): Identify the standard keys.
-
-	scd:nks: Extend keypairinfo with usage flags.
-	+ commit 0d2c9ef29c1741845df2d56f0024f87eab42efb3
-	* scd/app-nks.c (do_learn_status_core): Return usage.
-
-	(cherry picked from commit 0a9053eff0406c6799ee201013194200c0ed3487)
-
-	scd:nks: Support attributes $ENCRKEYID and $SIGNKEYID.
-	+ commit 671e54d62c39a9e196d13714cb67c2f3c38f2fa0
-	* scd/app-nks.c (do_getattr): Add new attributes.
-
-	gpg: New option --use-only-openpgp-card.
-	+ commit c97c2e578dd173ef5e7916a3aa539b3a65a7d86d
-	* g10/gpg.c (opts): Add option.
-	(main): Set flag.
-	* g10/options.h: Add flags.use_only_openpgp_card.
-	* g10/call-agent.c (start_agent): Implement option.
-
-2019-08-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix check_application_conflict.
-	+ commit 6fae96094c973be880919f3a7798ca69d9365b69
-	* scd/scd/app.c (check_application_conflict): Compare APPTYPE.
-
-	scd: Fix selecting additional APP.
-	+ commit 8dc19d35e854264cfe503cdbb9e5ccafa9bc97d0
-	* scd/app.c (select_additional_application_internal): Factor out.
-	(select_additional_application): Getting the lock and call
-	select_additional_application_internal, set current_apptype, then.
-	(select_application): Call select_additional_application_internal
-	for Yubikey.
-
-	scd: Fix how select_additional_application is called.
-	+ commit 4781c4a86608b57f9d1daf55b9b2970130fe6120
-	* scd/app.c (check_application_conflict): Check against current APP.
-	(select_additional_application): Update current_apptype of CTRL.
-
-	scd: Fix resetting CARD_CTX.
-	+ commit 09d000babb71990ef1b3f42017a67516bb994388
-	* scd/app.c (deallocate_card): Don't call scd_clear_current_app.
-	(card_reset): Reset ctrl->current_apptype.
-	* scd/command.c (open_card_with_request): Likewise.
-	(send_client_notifications): Likewise.
-	(scd_clear_current_app): Remove.
-
-	scd: Fix switching to another APP.
-	+ commit d4f135c34b332f1f833617a7f1ef0bdbff5eb589
-	* scd/app.c (select_additional_application): Initialize card of APP.
-	Break after the selection.
-	Don't free APP if success.
-
-2019-08-20 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc: fix minor spelling and tense errors.
-	+ commit b7793c3af32b2d99359022f805636953a50d8c68
-	* doc/{gpg,gpgsm,wks}.texi: minor orthographic cleanup.
-
-	doc: clarify CARD event counter.
-	+ commit cba6e1bd7242e8b8c6822f4e93368cb315b5524b
-	* doc/gpg-agent.texi: improve documentation of CARD entry in
-	GETEVENTCOUNTER description.
-
-2019-08-08 Andre Heinecke <aheinecke@intevation.de>
-
-	speedo, w32: Add w32-wixlib target for MSI package.
-	+ commit 0b7088dc8035e8d5832c89085eea3b288de67710
-	* Makefile.am (EXTRA_DIST): Add wixlib.wxs
-	* build-aux/speedo.mk (w32-wixlib): New target.
-	(w32-release): Build wixlib if WIXPREFIX is set.
-	(help): Add documentation.
-	* build-aux/speedo/w32/wixlib.wxs
-
-2019-08-08 Werner Koch <wk@gnupg.org>
-
-	build: Sign all Windows binaries.
-	+ commit 4964691861796ad6e7bd59dd553a617f68676b2b
-	* build-aux/speedo.mk (AUTHENTICODE_SIGNHOST): New.
-	(AUTHENTICODE_TOOL): New.
-	(AUTHENTICODE_FILES): New.
-	(installer): Sign listed files.
-	(AUTHENTICODE_SIGNHOST): New macro.
-	(sign-installer): Use that macro instead of direct use of osslsigncode.
-
-2019-08-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Remove fallback mechanism to PC/SC.
-	+ commit 100642e776964219936e493315eb8b7c99742f41
-	* scd/apdu.c HAVE_LIBUSB (apdu_open_reader): Simply let it fail.
-
-2019-08-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix an error path of agent_get_confirmation.
-	+ commit bb82ad018a7bf93bd704cf44e51cd086e41a4ad5
-	* agent/call-pinentry.c (agent_get_confirmation): Make sure
-	unlock_pinentry is always called.
-
-2019-08-06 Werner Koch <wk@gnupg.org>
-
-	kbx: Add framework for the SEARCH command.
-	+ commit 5ea6250cc5761612d17ca4fb34eed096f26e2826
-	* kbx/backend-kbx.c: New.
-	* kbx/backend-support.c: New.
-	* kbx/backend.h: New.
-	* kbx/frontend.c: New.
-	* kbx/frontend.h: New.
-	* kbx/kbxserver.c: Implement SEARCH and NEXT command.
-	* kbx/keybox-search-desc.h (enum pubkey_types): New.
-	* kbx/keybox-search.c (keybox_get_data): New.
-	* kbx/keyboxd.c (main): Add a standard resource.
-
-	kbx: Allow writing using a estream.
-	+ commit 1f980d23af8b818ed8246ec6bf13b9c61b963ec0
-	* kbx/keybox-file.c (_keybox_write_header_blob): New optional arg
-	stream. Change callers.
-
-	tools: New option --keyboxd for gpg-connect-agent.
-	+ commit 0611f548bcd3c772084d6c3111dc88a09a67f65a
-	* configure.ac: New option --keyboxd-pgm.
-	(KEYBOXD_NAME, KEYBOXD_DISP_NAME): New ac_defines.
-	* common/util.h: Add substitutes for new error codes.
-	(GNUPG_MODULE_NAME_KEYBOXD): New.
-	* common/homedir.c (gnupg_module_name): Support
-	GNUPG_MODULE_NAME_KEYBOXD.
-	* common/asshelp.c (SECS_TO_WAIT_FOR_KEYBOXD): New.
-	(wait_for_sock): Support keyboxd.
-	(start_new_service): Ditto.
-	(start_new_keyboxd): New.
-	* tools/gpg-connect-agent.c: New options --keyboxd and
-	--keyboxd-program.
-	(start_agent): Implement new option.
-
-2019-08-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix line break handling, finding a space.
-	+ commit f588dd8d1766de48c90a5501cf2d537f256d003e
-	* common/name-value.c (assert_raw_value): Correctly find a space.
-
-	gpg: Don't report NO_SECKEY for valid key.
-	+ commit d8a49bbcd1b1d40ab0ddadac0dbb16a5d75c626e
-	* g10/mainproc.c (proc_encrypted): Report status of STATUS_NO_SECKEY
-	only when some error occurred.
-
-2019-08-05 Werner Koch <wk@gnupg.org>
-
-	common: Remove code duplication for service starting.
-	+ commit e22ebf357050f98558b428502a565fc3dc256932
-	* common/homedir.c (gpg_agent_socket_name): New.
-	* common/asshelp.c (start_new_service): New. Based on
-	start_new_gpg_agent.
-	(start_new_gpg_agent): Divert to start_new_service.
-	(start_new_dirmngr): Ditto.
-
-2019-08-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	sm: Support AES-256 key.
-	+ commit ef2424144a070c9199e40424ec8d9b5a9919aa72
-	* sm/decrypt.c (prepare_decryption): Handle a case for AES-256.
-
-2019-08-02 Werner Koch <wk@gnupg.org>
-
-	common: Change yet unused status_printf function.
-	+ commit d8a84594abe4be933756db07b987dc8bcd79c8b9
-	* common/asshelp2.c (status_printf): Rename to status_no_printf.
-	(status_printf): New.
-
-2019-07-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	sm: Fix error checking of decryption result.
-	+ commit 15fe78184cc66ce6e657a6e949a522d7821f8a1c
-	* sm/call-agent.c (gpgsm_agent_pkdecrypt): Fix condition.
-
-2019-07-26 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg,gpgsm: Handle pkdecrypt responses with/without NUL terminators.
-	+ commit 3ba091ab8c93c87741a451f579d63dd500d7621d
-	* g10/call-agent.c (agent_pkdecrypt): accept but do not require
-	NUL-terminated data from the agent.
-	* sm/call-agent.c (gpgsm_agent_pkdecrypt): accept but do not require
-	NUL-terminated data from the agent.
-
-2019-07-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: photoid: Use standard spawn API.
-	+ commit fd9e6ae22eb93aa5140b56e1b0fa14e6402d6099
-	* g10/photoid.c (exec_write, exec_read, exec_finish): Remove.
-	(setup_input_file): Rename from make_tempdir.
-	(expand_args): Drop support of 'o' and 'O'.
-	(fill_command_argv, run_with_pipe, create_temp_file) New.
-	(show_photo): New with gnupg_spawn_process_fd and gnupg_wait_process.
-	(show_photos): Call show_photo.
-
-	gpg: photoid: Move functions from exec.c.
-	+ commit c57c5004ec6cc7dc7b7a4f250516199a8a1e31fc
-	* g10/exec.c (w32_system): Expose to public.
-	(exec_write, exec_read, exec_finish, make_tempdir, expand_args): Move
-	to photoid.c.
-	* g10/exec.h: Likewise.
-	* g10/photoid.c (exec_write, exec_read, exec_finish, make_tempdir)
-	(expand_args): Move here.
-
-	scd: Handle CCID bwi of time extension.
-	+ commit 996c497a864d820af06333014b2c5f74d1054866
-	* scd/ccid-driver.c (bulk_in): Increase timeout by the multiplier
-	value as defined section 6.2.6 in CCID specification.
-
-	scd: Fix bBWI value.
-	+ commit 858dc9564326e65e6d8771af160d4513aea1e4eb
-	* scd/ccid-driver.c (ccid_transceive_apdu_level): Use bBWI=0 for APDU
-	level transfer.
-	(ccid_transceive): Use bBWI=0 or the value returend by WTX for TPDU
-	level transfer.
-
-2019-07-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix the previous commit.
-	+ commit 044379772fc5b0f39c6a36809722e702808b6ec3
-	* common/asshelp.c HAVE_W32_SYSTEM (start_new_gpg_agent): Use
-	gnupg_spawn_process_detached.
-	(start_new_dirmngr): Likewise.
-
-	common: Use gnupg_spawn_process_fd to invoke gpg-agent/dirmngr.
-	+ commit b1c56cf9e2bb51abfd47747128bd2a6285ed1623
-	* common/asshelp.c (start_new_gpg_agent): Call gnupg_spawn_process_fd
-	and gnupg_wait_process.
-	(start_new_dirmngr): Likewise.
-
-	common,w32: Fix cast from gnupg_fd_t to call _open_osfhandle.
-	+ commit a64411c607d5450e786c3207b9023394574c979b
-	* common/sysutils.c (translate_sys2libc_fd): Use intptr_t.
-	(gnupg_tmpfile): Likewise.
-
-2019-07-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: A little clean up.
-	+ commit 7bfbb9fa7e7693cd7f19a8d130aa0a9a82825d5d
-	* g10/keyserver.c: Don't include exec.h.
-	* g10/photoid.c (image_type_to_string): It's constant.
-	* g10/photoid.h (image_type_to_string): Likewise.
-
-2019-07-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Error code map fix for older Yubikey.
-	+ commit 13bc0431ff1ce51246694208df611cc4561fb4b3
-	* scd/iso7816.c (map_sw): Recognize 6A86.
-
-2019-07-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: The option --passphrase= can be empty.
-	+ commit fcd766719a6e8f18f4be4c0f91e12aa157ca5506
-	* g10/gpg.c (opts): Use ARGPARSE_o_s for oPassphrase to allow
-	empty string.
-
-	card: Fix showing KDF object attribute.
-	+ commit 98f4eff7ffde106ae4f60739d1104282430ac14f
-	* g10/call-agent.c (learn_status_cb): Parse the KDF DO.
-	* g10/card-util.c (current_card_status): Show it correctly.
-
-	scd: Support "CHV3" attribute for keyid string.
-	+ commit 57565d5f975d3c00853bb49678d63ee8b896b741
-	* scd/app-openpgp.c (check_keyidstr0: Relax the check.
-
-	card: Support disabling KDF functionality.
-	+ commit 9c0cd9d07546698ab66cedd06c503e6b698593f9
-	* g10/card-util.c (kdf_setup): Can be "off".
-
-2019-07-18 Werner Koch <wk@gnupg.org>
-
-	kbx: Allow "gpgsm --faked-system-time" to kick off a compression run.
-	+ commit 824ca6f042dc69edaf67bf9d4e875be75babab00
-	* kbx/keybox-update.c (keybox_compress): Use make_timestamp.
-
-2019-07-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: More check for symmetric key encryption.
-	+ commit 44be675b759d27bac310c2de8bae1b7882a26b65
-	* g10/dek.h (DEK): Use debugger friendly type of unsigned int.
-	* g10/mainproc.c (symkey_decrypt_seskey): Add another check.
-
-2019-07-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	doc: Fix description of the field 11.
-	+ commit 4195ce15f4942245a29ef20ace42ad0f27e82ffd
-	* doc/DETAILS: Fix.
-
-	dirmngr: Don't add system CAs for SKS HKPS pool.
-	+ commit 75e0ec65170b7053743406e3f3b605febcf7312a
-	* dirmngr/http.c HTTP_USE_GNUTLS (http_session_new): Clear
-	add_system_cas.
-
-2019-07-12 Werner Koch <wk@gnupg.org>
-
-	scd: Remove useless GNUPG_SCD_MAIN_HEADER macro.
-	+ commit fb1c8978f57b8f92e2ea9d10afc1d133656c9706
-	* scd/apdu.c (): Remove never set and useless macro.
-	* scd/ccid-driver.c: Ditto.
-	* scd/iso7816.c: Ditto.
-
-2019-07-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	doc: Dependencies for figures are only for maintainers.
-	+ commit 58bab1a8784b0dbae70b5d74757cd56484292d1c
-	* doc/Makefile.am MAINTAINER_MODE (.svg.eps, etc.): Enable only
-	when maintainer-mode.
-
-	Fix a reference in comment.
-	+ commit 4e601c7643fcfa3d8babcce58daa4c6c6a42d338
-	* common/openpgp-s2k.c: Fix.
-
-	gpg: Don't try decryption by session key when NULL.
-	+ commit 89303b9998ea30d87b4c60dd48097dbe5e986a89
-	* g10/mainproc.c (proc_encrypted): Only call get_session_key when
-	PKENC_LIST is not NULL.
-	Return GPG_ERR_BAD_KEY, instead of GPG_ERR_NO_SECKEY, when
-	it's encrypted only by symmetric key.
-
-2019-07-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Relax the handling of pinentry error for keyboard grab.
-	+ commit 02d8b383833bac0382e910a2058b11b127acfd4d
-	* agent/call-pinentry.c (start_pinentry): It's not fatal when
-	pinentry doesn't support no-grab/grab option.
-
-	scd: Fix internal CCID driver, so that -DTEST works.
-	+ commit b31060425226b45deb21915bf5cd8b6ba62bd098
-	* scd/ccid-driver.c: Support a test program by ccid-driver.
-
-	scd: Fix debug logging of the internal CCID driver.
-	+ commit 2536bf276189a474a3a1ca9716368cf5d991b0d6
-	* scd/ccid-driver.c GNUPG_MAJOR_VERSION (DEBUGOUT): Use log_debug.
-
-	gpg: Fix getting User ID.
-	+ commit 29c7fb4053d207c163802642babbdbb6f885727e
-	* g10/getkey.c (user_id_db): Remove, as no use anymore.
-	(get_user_id_string): Use cache_get_uid_bykid.
-	(get_user_id_byfpr): Use cache_get_uid_byfpr.
-	* g10/objcache.c (cache_get_uid_byfpr): New.
-	* g10/objcache.h (cache_get_uid_byfpr): New.
-
-2019-07-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Improve import slowness.
-	+ commit 33c17a8008c3ba3bb740069f9f97c7467f156b54
-	* g10/import.c (read_block): Avoid O(N^2) append.
-	(sec_to_pub_keyblock): Likewise.
-
-	gpg: Fix keyring retrieval.
-	+ commit a7a043e82555a9da984c6fb01bfec4990d904690
-	* g10/keyring.c (keyring_get_keyblock): Avoid O(N^2) append.
-
-2019-07-09 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not try the import fallback if the options are already used.
-	+ commit a29156d5a650702ad79fe11f45782bc4bc159c13
-	* g10/import.c (import_one): Check options.
-
-	gpg: Fix regression in option "self-sigs-only".
-	+ commit eec150eca78a053193a0994a96482791b5da36be
-	* g10/import.c (read_block): Make sure KEYID is availabale also on a
-	pending packet.
-
-2019-07-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	sm: Fix card access.
-	+ commit 37d758e5f2b5d07dc937098cf48096cf35ea61e4
-	* sm/call-agent.c (gpgsm_scd_pksign): Cast to integer for %b.
-
-	scd: ccid-driver: Initial getting ATR more robustly.
-	+ commit c51a5685554a06e00ae1e99070b44613b2f8d417
-	* scd/ccid-driver.c (send_power_off): New.
-	(do_close_reader): Use send_power_off.
-	(ccid_get_atr): Add error recovery.
-
-2019-07-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix keygrip search.
-	+ commit 39c40e572c5632f836d089dce49224f947244bf2
-	* scd/app.c (app_do_with_keygrip): Break the entire loop.
-
-2019-07-05 Werner Koch <wk@gnupg.org>
-
-	gpg: With --auto-key-retrieve prefer WKD over keyservers.
-	+ commit 96bf8f477805bae58cfb77af8ceba418ff8aaad9
-	* g10/mainproc.c (check_sig_and_print): Print a hint on how to make
-	use of the preferred keyserver. Remove keyserver lookup just by the
-	keyid. Try a WKD lookup before a keyserver lookup.
-
-	wkd: Change client/server limit back to 64 KiB.
-	+ commit b0e8724b102535c27a8c973ec038d340858a8eb8
-	* tools/wks-receive.c (decrypt_data): Change limit.
-
-2019-07-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	sm: Return the last error for pubkey decryption.
-	+ commit 38b9da7de3350b1e56b85a058cdb1fdded78cf6d
-	* sm/decrypt.c: Use TMP_RC for ksba_cms_get_issuer_serial,
-	and return the last error when no key is available.
-	Fix the error report with TMP_RC for second call of
-	ksba_cms_get_issuer_serial.
-
-	gpg: Return the last error for pubkey decryption.
-	+ commit 6cc4119ec03be61c78189a0bec99372035289b91
-	* g10/mainproc.c (proc_encrypted): Check ->result against -1.
-	When c->dek == NULL, put GPG_ERR_NO_SECKEY only when not set.
-	* g10/pubkey-enc.c (get_session_key): Set k->result by the result of
-	get_it.
-	When no secret key is available for some reasons, return the last
-	specific error, if any.
-
-2019-07-04 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	dirmngr: fix handling of HTTPS redirections during HKP.
-	+ commit 064aeb14c9b869e114e9ec789526fad8da657230
-	* dirmngr/ks-engine-hkp.c (send_request): Reinitialize HTTP session when
-	following a HTTP redirection.
-
-2019-07-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Add "self-sigs-only" and "import-clean" to the keyserver options.
-	+ commit 23c978640812d123eaffd4108744bdfcf48f7c93
-	* g10/gpg.c (main): Change default.
-
-	gpg: Avoid printing false AKL error message.
-	+ commit 91a6ba32347a21c9029728eec96b8ff80f944629
-	* g10/getkey.c (get_pubkey_byname): Add special traeatment for default
-	and skipped-local.
-
-	gpg: New command --locate-external-key.
-	+ commit d00c8024e58822e0623b3fad99248ce68a8b7725
-	* g10/gpg.c (aLocateExtKeys): New.
-	(opts): Add --locate-external-keys.
-	(main): Implement that.
-	* g10/getkey.c (get_pubkey_byname): Implement GET_PUBKEY_NO_LOCAL.
-	(get_best_pubkey_byname): Add arg 'mode' and pass on to
-	get_pubkey_byname. Change callers.
-	* g10/keylist.c (public_key_list): Add arg 'no_local'.
-	(locate_one): Ditto. Pass on to get_best_pubkey_byname.
-
-	gpg: Make the get_pubkey_byname interface easier to understand.
-	+ commit 9980f81da765f88a65604ab083563bf15ccdb425
-	* g10/keydb.h (enum get_pubkey_modes): New.
-	* g10/getkey.c (get_pubkey_byname): Repalce no_akl by a mode arg and
-	change all callers.
-
-2019-07-03 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Avoid endless loop in case of HTTP error 503.
-	+ commit 8b113bb148f273524682252233b3c65954e1419e
-	* dirmngr/ks-engine-hkp.c (SEND_REQUEST_EXTRA_RETRIES): New.
-	(handle_send_request_error): Use it for 503 and 504.
-	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Pass a new var for
-	extra_tries.
-
-	dirmngr: Do not rewrite the redirection for the "openpgpkey" subdomain.
-	+ commit 37f0c55c7be3fc4912237f2bc72466aef6f8aa36
-	* dirmngr/http.c (same_host_p): Consider certain subdomains to be the
-	same.
-
-2019-07-02 Peter Lebbing <peter@digitalbrains.com>
-
-	Mention --sender in documentation.
-	+ commit cf92f7d96f83e5af7d2c232c8450c2c7d900ade8
-
-
-2019-07-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Fallback to import with self-sigs-only on too large keyblocks.
-	+ commit 3a403ab04eeb45f12b34f9d9c421dac93eaf2160
-	* g10/import.c (import_one): Rename to ...
-	(import_one_real): this. Do not print and update stats on keyring
-	write errors.
-	(import_one): New. Add fallback code.
-
-	gpg: New import and keyserver option "self-sigs-only"
-	+ commit 2e349bb6173789e0e9e42c32873d89c7bc36cea4
-	* g10/options.h (IMPORT_SELF_SIGS_ONLY): New.
-	* g10/import.c (parse_import_options): Add option "self-sigs-only".
-	(read_block): Handle that option.
-
-	gpg: Make read_block in import.c more flexible.
-	+ commit 894b72d796c826b1c7e1df788e16874cd051e672
-	* g10/import.c: Change arg 'with_meta' to 'options'. Change callers.
-
-2019-07-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	tools: gpgconf: Killing order is children-first.
-	+ commit 7c877f942a344e7778005840ed7f3e20ace12f4a
-	* tools/gpgconf-comp.c (gc_component_kill): Reverse the order.
-
-2019-06-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Close a dialog cleanly when gpg/ssh is killed for CONFIRM.
-	+ commit 374a0775546b6241ca2dd10836202c50300d8e91
-	* agent/call-pinentry.c (watch_sock_start): Factor out
-	from do_getpin.
-	(watch_sock_end): Likewise.
-	(do_getpin): Use those functions.
-	(agent_get_confirmation): Likewise.
-	(popup_message_thread): Likewise.
-
-2019-06-25 Werner Koch <wk@gnupg.org>
-
-	scd: Do not conflict if a card with another serialno is demanded.
-	+ commit 92ba831758cff0262504ac51e5df7a439844327c
-	* scd/app.c (check_application_conflict): Add args to pass a serialno.
-	* scd/command.c (open_card_with_request): Pass the serialno to
-	check_application_conflict.
-
-	scd: Return a stable list with "getinfo card_list".
-	+ commit c8e62965bc90eabff5c4b7cb349bd8e41584c01b
-	* scd/app.c (compare_card_list_items): New.
-	(app_send_card_list): Sort the card objects by slot.
-
-	scd: Add an re-select mechanism to switch apps.
-	+ commit d803b3bb3c084b6bce4d2bd161db50dc45442e5b
-	* scd/app-common.h (struct app_ctx_s): Add func ptr 'reselect'.
-	* scd/app-piv.c (do_reselect): New.
-	(app_select_piv): Move AID constant to file scope.
-	* scd/app-openpgp.c (do_reselect): New.
-	(app_select_openpgp): Move AID constant to file scope.
-	* scd/app.c (apptype_from_name): New.
-	(check_application_conflict): Check against all apps of the card.
-	Always set current_apptype.
-	(select_additional_application): New.
-	(maybe_switch_app): New.
-	(app_write_learn_status, app_readcert, app_readkey, app_getattr)
-	(app_setattr, app_sign, app_auth, app_decipher, app_writecert)
-	(app_writekey, app_genkey, app_change_pin, app_check_pin): Use it here.
-	(app_do_with_keygrip): Force reselect on success.
-	(app_new_register): Move setting of CURRENT_APPTYPE to ...
-	(select_application): here so that it will be set to the requested
-	card.
-	* scd/command.c (open_card_with_request): Select additional
-	application if possible.
-
-2019-06-24 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	spelling: Fix "synchronize"
-	+ commit d7d1ff45574ed935d07642964a529a358b11a1a7
-
-
-2019-06-21 Werner Koch <wk@gnupg.org>
-
-	scd: Take the card look while running app->with_keygrip.
-	+ commit b304c006a3c9ba186fb2510859df7f02a0acad25
-	* scd/app.c (app_do_with_keygrip): Lock the card.
-
-	scd: Take the lock earlier in the function dispatchers.
-	+ commit 0400a4eb1782e7a4aea5b04492c93939c6b9799a
-	* scd/app.c: Chnage all function dispatcher.
-
-	scd: Add code to check whether app switching is possible.
-	+ commit 1b78e4951ed7a66ec71ca036e7680148a63143be
-	* scd/app.c (check_conflict): Fold into ...
-	(check_application_conflict): this and adjust callers. Return a
-	different error code if it is possible to switch apps.
-
-	scd: Track the currently selected app.
-	+ commit 91e2931caac9b914efa0a4524effaaa5948ebd00
-	* scd/scdaemon.h (struct server_control_s): Add 'current_apptype'.
-	* scd/command.c (scd_clear_current_app): New.
-	* scd/app.c (app_new_register): Set it.
-	(deallocate_card): Clear it.
-
-	scd: Simplify inclusion of app-common.h.
-	+ commit 43dcf93407d6d2b87b6e7db74fd05fd237495bfe
-	* scd/scdaemon.h: Include app-common.h. Remove inclusion of that
-	header from all other files.
-	(card_t, app_t): Move typedef to ...
-	* scd/app-common.h: here. Use them in the defs.
-
-	gpg: Very minor code cleanup.
-	+ commit 4256e9f0f1bf27ed2e93ca3890003ead208ef6df
-	* g10/decrypt-data.c (decrypt_data): Remove superfluous test.
-
-	scd: Use enums for cardtype and apptype.
-	+ commit 9551275857c1f9a75fee5736fa6c3cf361364f22
-	* scd/app-common.h (cardtype_t): New.
-	(apptype_t): New.
-	(struct card_ctx_s): Change type of cardtype.
-	(struct app_ctx_s): Change type of apptype. Adjust all users.
-	* scd/app.c (struct app_priority_list_s): Add field apptype.
-	(strcardtype): New. Use as needed.
-	(strapptype): New. Use as needed.
-
-2019-06-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese Translation.
-	+ commit 0ccb5ddef18f04b86855530838af4cbb9b8aa30b
-
-
-	tools: Fix error handling for gpg-pair-tool.
-	+ commit d5287f43fd4def68901519a4c1d471b81ee86ed0
-	* tools/gpg-pair-tool.c (read_message): Initialize ERR.
-
-2019-06-19 Werner Koch <wk@gnupg.org>
-
-	scd: Split data structures into app and card related objects.
-	+ commit 5a5288d051a551a1a8f169225e62572f6ee8cb10
-	* scd/app-common.h (struct card_ctx_s): New.
-	(struct app_ctx_s): Factor card specific fields out to card_ctx_s.
-	(app_get_slot): New.
-	* scd/scdaemon.h (card_t): New.
-	(struct server_control_s): Rename field app_ctx to card_ctx and change
-	all users.
-	* scd/app-dinsig.c: Use app_get_slot and adjust for chang in card
-	related fields.
-	* scd/app-geldkarte.c: Ditto.
-	* scd/app-nks.c: Ditto.
-	* scd/app-openpgp.c: Ditto.
-	* scd/app-p15.c: Ditto.
-	* scd/app-sc-hsm.c: Ditto.
-	* scd/app.c: Lost of changes to adjust for the changed data
-	structures. Change all callers.
-	(app_list_lock): Rename to card_list_lock.
-	(app_top): Remove.
-	(card_top): New.
-	(lock_app): Rename to lock_card and change arg type.
-	(unlock_app): Rename to unlock_card.
-	(app_dump_state): Print card and app info.
-	(app_reset): Rename to card_reset.
-	(app_new_register): Change for the new data structure.
-	(deallocate_card): Dealloc card and all apps.
-	(app_ref): Rename to card_ref.
-	(app_unref): Rename to card_unref.
-	(app_unref_locked): Rename to card_unref_locked.
-	(card_get_serialno): New.
-	* scd/command.c (cmd_pkdecrypt): Actually use the looked up card and
-	former app object and not the standard one from the context.
-
-2019-06-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: KEYINFO: Send LF for --data.
-	+ commit c3dd53a65dc9ea2c4814e24079f0270c2fef14c6
-	* scd/command.c (send_keyinfo): Send LF for --data.
-
-2019-06-17 Werner Koch <wk@gnupg.org>
-
-	scd:piv: Add the do_with_keygrip feature.
-	+ commit e900bf29737b3f7a09f749a271f2c5d7b59c49eb
-	* scd/app-piv.c (do_with_keygrip): New.
-	(app_select_piv): Register function.
-
-	scd: Add explict functions for 'app' reference counting.
-	+ commit c594dcfc93486cd26e193aa5c82bb8a8f30ab57b
-	* scd/app.c (app_ref): New.
-	(app_unref): New.
-	(release_application): Renamed to ...
-	(app_unref_locked): this and remove arg locked_already. Change
-	callers to use this or app_ref.
-	* scd/command.c (open_card_with_request):
-	(cmd_pksign, cmd_pkauth, cmd_pkdecrypt): Use app_ref and app_unref
-	instead of accessing the counter directly.
-
-	scd: Slight change to app->fnc.do_with_keygrip.
-	+ commit 70f7b262877b1e751d8557dc04a09a420e9d8a8f
-	* scd/app-openpgp.c (do_with_keygrip): Return a real error code to
-	avoid misinterpretation of the result. Also fix the case for a too
-	small buffer.
-
-	scd: Use the correct gpg for the v1.0 OpenPGP card hack.
-	+ commit 479c2775d5df64432c1bf64faae7f9abd3042850
-	* scd/app-openpgp.c (get_public_key): Use gnupg_module_name instead of
-	just "gpg".
-
-2019-06-14 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	fix up 6562de7475b21cd03c7b1a83a591fa563c589f5b.
-	+ commit 6e46862abd2c2e82f245e381c3f08c5829fb61e6
-
-
-2019-06-11 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc/gpgsm: explain what "policy-file" refers to.
-	+ commit 6562de7475b21cd03c7b1a83a591fa563c589f5b
-	A new user who sees "policy-file" and searches naively through the
-	documentation to find it again won't be able to tell what this refers
-	to, since "policies.txt" doesn't otherwise match the search string
-	"policy". This gives them a fighting chance at finding the
-	documentation.
-
-2019-06-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpgparsemail: Die on parse error, printing errno thing.
-	+ commit 1e9d61fb95e4813225a40f720231196abdb83992
-	* tools/gpgparsemail.c (parse_message): Revert the change.
-	* tools/rfc822parse.c (transition_to_body): Set ERRNO.
-	(transition_to_header, insert_header): Likewise.
-
-2019-06-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Bring back --card-timeout option as deprecated.
-	+ commit 72fe8d652fce6cb9104bb07ef0fb811cbab3303a
-	* doc/scdaemon.texi (card-timeout): Add.
-	* scd/scdaemon.c (main): Revert the change.
-
-	gpgparsemail: Die on parse error (not abort).
-	+ commit c13e459ffeffb8c5387c44b3c04bb92b7111a75b
-	* tools/gpgparsemail.c (parse_message): Don't use ERRNO.
-	* tools/rfc822parse.c (transition_to_body): Return -1.
-	(transition_to_header, insert_header): Likewise.
-
-2019-06-04 Werner Koch <wk@gnupg.org>
-
-	sm: Print a better diagnostic for encryption certificate selection.
-	+ commit 9bf650db022b6b65bbfa74c311cdc3e6b73d3b44
-	* sm/certlist.c (gpgsm_add_to_certlist): Add diagnostic and fold two
-	similar branches.
-
-2019-06-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Block signals in g10_exit.
-	+ commit 537fbe13af6a70e105982c4b69c1bcc3908ffb08
-	* g10/gpg.c (g10_exit): Block all signals before calling
-	emergency_cleanup.
-
-	agent: Allow TERM="".
-	+ commit 0076bef2026a87c4c0e05bad7d322638b1de3f37
-	* agent/call-pinentry.c (start_pinentry): When TERM is none,
-	don't send OPTION ttytype to pinentry.
-
-	agent: Add pinentry_loopback_confirm declaration.
-	+ commit 3a1bb0081087c0604ed681642114934ffe607fa1
-	* agent/agent.h (pinentry_loopback_confirm): New.
-
-	scd: Remove unsupported --card-timeout option.
-	+ commit 4262933ef6f7530b4ad55646250a6763de9bf103
-	* doc/scdaemon.texi (card-timeout): Remove.
-	* scd/scdaemon.c (main): Remove oCardTimeout handling.
-
-	g10,agent: Support CONFIRM for --delete-key.
-	+ commit 20acc7c0226550530085a674ef1bb41ebfa39408
-	* agent/call-pinentry.c (agent_get_confirmation): Add call of
-	pinentry_loopback_confirm.
-	(agent_popup_message_start): Likewise.
-	(agent_popup_message_stop): Return if it's loopback mode.
-	* agent/command.c (pinentry_loopback_confirm): New.
-
-	* g10/call-agent.c (default_inq_cb): Support "CONFIRM" inquery
-	when PINENTRY_MODE_LOOPBACK mode.
-	(confirm_status_cb): New.
-	(agent_delete_key): Supply confirm_status_cb to set the description
-	string for confirmation.
-
-	doc: Add a section for gpg-check-pattern.
-	+ commit eaf3b89d11156cc055644fc50761e1692e791e84
-	* doc/Makefile.am: Add gpg-check-pattern.1.
-	* doc/tools.texi (GPG-CHECK-PATTERN): New.
-
-2019-06-03 Werner Koch <wk@gnupg.org>
-
-	Return better error code for some getinfo IPC commands.
-	+ commit f2ac6742d403a5a95d84ac7cdcf8913c39297bcb
-	* agent/command.c (cmd_getinfo): Return GPG_ERR_FALSE as boolean False.
-	* g13/server.c (cmd_getinfo): Ditto.
-	* sm/server.c (cmd_getinfo): Ditto.
-
-2019-05-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Add A-flag for KEYINFO output for card.
-	+ commit 6790eaf9529209e36099d9520821a3b8ad02ccef
-	* agent/command.c (do_one_keyinfo): Add ON_CARD argument to put
-	A-flag.
-	(cmd_keyinfo): Call agent_card_keyinfo to offer additional information
-	if it's on card.
-
-2019-05-28 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Allow for other hash algorithms than SHA-1 in OCSP.
-	+ commit 405f41007c35ef52bf85c7c2686dab01fdf2c950
-	* dirmngr/ocsp.c (do_ocsp_request): Remove arg md. Add args r_sigval,
-	r_produced_at, and r_md. Get the hash algo from the signature and
-	create the context here.
-	(check_signature): Allow any hash algo. Print a diagnostic if the
-	signature does not verify.
-
-	dirmngr: Improve finding OCSP cert.
-	+ commit 4699e294cc9e59f35262adca26ca291927acca9e
-	* dirmngr/certcache.c (find_cert_bysubject): Add better debug output
-	and try to locate by keyid.
-
-	agent: Make an MD encoding function more robust.
-	+ commit a2a90717466a88756bbdc6b11577cfee061fc1a8
-	* agent/pksign.c (do_encode_md): Use ascii_tolower and avoid
-	uninitalized TMP in the error case.
-
-2019-05-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Remove unused agent_show_message.
-	+ commit 19415a265253a5ab72e79493d2f40c7e4441d81e
-	* agent/call-pinentry.c (agent_show_message): Remove.
-	* agent/genkey.c (take_this_one_anyway): Rename from
-	take_this_one_anyway2. Remove a dead path calling agent_show_message.
-	(check_passphrase_constraints): Use take_this_one_anyway.
-
-2019-05-27 Werner Koch <wk@gnupg.org>
-
-	sm: Avoid confusing diagnostic for the default key.
-	+ commit 521e7d4644ed365ab2de3dfaa6c3728ca10ba79b
-	* sm/certlist.c (cert_usage_p): Add arg 'silent' and change all
-	callers.
-	(gpgsm_cert_use_sign_p): Add arg 'silent' and pass to cert_usage_p.
-	Change all callers.
-	* sm/sign.c (gpgsm_get_default_cert): Set SILENT when calling
-	gpgsm_cert_use_sign_p
-
-	gpg: Fixed i18n markup of some strings.
-	+ commit b6289af9738ddbc533defba0aefd950a9ca21ff1
-	* g10/tofu.c: Removed some translation markups which either make no
-	sense or are not possble.
-
-	gpg: Allow deletion of subkeys with --delete-secret-key.
-	+ commit cc6069ac6ecd57dcbb808f28d54fd9f89dc55014
-	* common/userids.c (classify_user_id): Do not set the EXACT flag in
-	the default case.
-	* g10/export.c (exact_subkey_match_p): Make static,
-	* g10/delkey.c (do_delete_key): Implement subkey only deleting.
-
-2019-05-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Stop scdaemon after reload when disable_scdaemon.
-	+ commit 7158a5696dc84e1ebd2b523ab83a43a32423181d
-	* agent/call-scd.c (agent_card_killscd): New.
-	* agent/gpg-agent.c (agent_sighup_action): Call agent_card_killscd.
-
-	g10: Copy expiredate from primary key when marked expired.
-	+ commit 265e6d670682e661cec89657c3330b0b388ca0a7
-	* g10/getkey.c (merge_selfsigs): Update ->expiredate of subkey.
-
-2019-05-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not bail on an invalid packet in the local keyring.
-	+ commit 4c7d63cd5b02ebfd09933bebd1312e01958b3e20
-	* g10/keydb.c (parse_keyblock_image): Treat invalid packet special.
-
-	gpg: Do not allow creation of user ids larger than our parser allows.
-	+ commit 156788a43c20e38cd52f4f725395aff2c72142ff
-	* g10/parse-packet.c: Move max packet lengths constants to ...
-	* g10/packet.h: ... here.
-	* g10/build-packet.c (do_user_id): Return an error if too data is too
-	large.
-	* g10/keygen.c (write_uid): Return an error for too large data.
-
-	gpg: Unify the the use of the print_pubkey_info functions.
-	+ commit 126caa34bbdb36f40514643b9d6f5ead3240c735
-	* g10/keylist.c (format_seckey_info): Remove.
-	(print_pubkey_info, print_seckey_info): Remove.
-	(format_key_info): New.
-	(print_key_info): New.
-	(print_key_info_log): New.
-	* g10/card-util.c (current_card_status): Use print_key_info and remove
-	the useless condition on KEYBLOCK.
-	* g10/delkey.c (do_delete_key): Replace print_pubkey_info and
-	print_seckey_info by print_key_info.
-	* g10/keyedit.c (menu_addrevoker): Replace print_pubkey_info by
-	print_key_info.
-	* g10/pkclist.c (do_we_trust_pre): Ditto.
-	* g10/revoke.c (gen_desig_revoke): Ditto.
-	(gen_revoke): Ditto. Also use print_key_info_log instead of separate
-	functions.
-
-2019-05-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for SCARD_IO_REQUEST structure.
-	+ commit 1eb93d9229c54baa5f1b7ccf7d105d3692c51a4d
-	* scd/apdu.c (struct pcsc_io_request_s): Use pcsc_dword_t for Windows.
-
-	agent: For SSH key, don't put NUL-byte at the end.
-	+ commit 479f7bf31ce405e558d844c3eb576b463a8697e5
-	* agent/command-ssh.c (ssh_key_to_protected_buffer): Update
-	the length by the second call of gcry_sexp_sprint.
-
-2019-05-20 Werner Koch <wk@gnupg.org>
-	 Matheus Afonso Martins Moreira
-
-	gpg: Do not delete any keys if --dry-run is passed.
-	+ commit 110a4550179fd1faeee8d2f17a33ed7807a397ae
-	* g10/delkey.c (do_delete_key): Don't delete the keyblock on dry runs.
-	Do not clear the ownertrust. Do not let the agent delete the key.
-
-2019-05-17 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix using --decrypt along with --use-embedded-filename.
-	+ commit 386bacd9741639d7f5e83c81628d3cad78407197
-	* g10/options.h (opt): Add flags.dummy_outfile.
-	* g10/decrypt.c (decrypt_message): Set this global flag instead of the
-	fucntion local flag.
-	* g10/plaintext.c (get_output_file): Ignore opt.output if that was
-	used as a dummy option aslong with --use-embedded-filename.
-
-	gpg: Improve the photo image viewer selection.
-	+ commit 7e5847da0f3d715cb59d05adcd9107b460b6411b
-	* g10/exec.c (w32_system): Add "!ShellExecute" special.
-	* g10/photoid.c (get_default_photo_command): Use the new ShellExecute
-	under Windows and fallbac to 'display' and 'xdg-open' in the Unix
-	case.
-	(show_photos): Flush stdout so that the output is shown before the
-	image pops up.
-
-2019-05-16 Werner Koch <wk@gnupg.org>
-
-	kbx: Fix an endless loop under Windows due to an incomplete fix.
-	+ commit 6fc5df1e10129f3171d80cf731f310b9e8d97c26
-	* kbx/keybox-search.c (keybox_search): We need to seek to the last
-	position in all cases not just when doing a NEXT.
-
-	gpgconf: Before --launch check that the config file is fine.
-	+ commit 50c2f76ae65d4ee793876865011fa97c85f38ac2
-	* tools/gpgconf-comp.c (gc_component_launch): Check the conf file.
-	* tools/gpgconf.c (gpgconf_failure): Call log_flush.
-
-	scd: Remove unused cruft from GnuPG 1.x.
-	+ commit 79c99921e35921140c83d7c101829d95f038f3da
-	* scd/apdu.c: Remove code used only by GnuPG 1.
-	* scd/app-openpgp.c: Ditto.
-	* scd/ccid-driver.c: Ditto.
-	* scd/iso7816.c: Ditto.
-
-2019-05-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent,scd: Scan and load all public keys for availability.
-	+ commit dc35b25195e564affdea7969a7c4ea4e200ab45f
-	* agent/divert-scd.c (ask_for_card): Scan by SERIALNO command.
-	* scd/app-openpgp.c (do_with_keygrip): Make sure to load pubkey.
-
-2019-05-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Support scdaemon operation using KEYGRIP.
-	+ commit 1091f22511e1a8259eb5c998f5c207ee95723a4a
-	* agent/agent.h (struct card_key_info_s): New.
-	(divert_pksign, divert_pkdecrypt): New API.
-	* agent/call-scd.c (card_keyinfo_cb): New.
-	(agent_card_free_keyinfo, agent_card_keyinfo): New.
-	* agent/divert-scd.c (ask_for_card): Having GRIP argument,
-	ask scdaemon with agent_card_keyinfo.
-	(divert_pksign, divert_pkdecrypt): Ditto.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Supply GRIP.
-	* agent/pksign.c (agent_pksign_do): Ditto.
-
-	scd: Don't put newline at the end of status.
-	+ commit 01730529f20882cd98882a61408e9bee960c86f1
-	* scd/command.c (send_keyinfo): Remove newline.
-
-2019-05-15 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: enable OpenPGP export of cleartext keys with comments.
-	+ commit 392e59a3d487e174edcea570e69a0f946c55a19a
-	* g10/export.c (cleartext_secret_key_to_openpgp): ignore trailing
-	sublists in private-key S-expression.
-
-2019-05-15 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Support --homedir for --launch.
-	+ commit a4be077abdbf286e3dcdeb0553ba0e74b7e2df5f
-	* tools/gpgconf-comp.c (gpg_agent_runtime_change): Simplify because
-	gnupg_homedir already returns abd absolute name.
-	(scdaemon_runtime_change): Ditto.
-	(dirmngr_runtime_change): Ditto.
-	(gc_component_launch): Support --homedir.
-
-	sm: Add a couple of debug calls to the keydb module.
-	+ commit 6e041b7b356c3adba714e98f4ecf0dd007375390
-	* sm/gpgsm.h (DBG_CLOCK_VALUE, DBG_CLOCK): New.
-	(DBG_LOOKUP_VALUE, DBG_LOOKUP): New.
-	* sm/gpgsm.c: new debug flags "lookup" and "clock"
-	* sm/keydb.c: Add log_clock calls to most functions.
-	(keydb_search_desc_dump): New.
-	(keydb_search) DBG_LOOKUP: Print descrh decription.
-	* sm/keylist.c (list_cert_std): Flush FP in debug mode to better
-	syncronize the output with the debug output
-
-2019-05-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix return value for KEYINFO command.
-	+ commit 62c29af63203400947569c5965a8cf05a22fcd4c
-	* scd/command.c (cmd_keyinfo): Return GPG_ERR_NOT_FOUND if none.
-
-2019-05-14 Werner Koch <wk@gnupg.org>
-
-	kbx: Fix deadlock in gpgsm on Windows due to a sharing violation.
-	+ commit 49b236af0ecbb6df67513feb4b63851f2e159ea2
-	* kbx/keybox-init.c (keybox_lock) W32: Use _keybox_close_file
-	instead of fclose so that a close is done if the file is opened by
-	another handle.
-	* kbx/keybox-search.c (keybox_search): Remember the last offset and
-	use that in NEXT search mode if we had to re-open the file.
-
-	sm: Change keydb code to use the keybox locking.
-	+ commit 22e274f839f9a6c9a511648f29cae497f6492c97
-	* kbx/keybox-init.c (keybox_lock): New arg TIMEOUT. Change all
-	callers to pass -1 when locking.
-	* sm/keydb.c (struct resource_item): Remove LOCKANDLE.
-	(struct keydb_handle): Add KEEP_LOCK.
-	(keydb_add_resource): Use keybox locking instead of a separate dotlock
-	for testing whether we can run a compress.
-	(keydb_release): Reset KEEP_LOCK.
-	(keydb_lock): Set KEEP_LOCK.
-	(unlock_all): Take care of KEEP_LOCK.
-	(lock_all): Use keybox_lock instead of dotlock fucntions.
-	(keydb_delete): Remove arg UNLOCK.
-	* sm/delete.c (delete_one): Adjust keydb_delete. Due to the KEEP_LOCK
-	the keydb_release takes care of unlocking.
-
-2019-05-14 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: correct length for uri and comment on 64-bit big-endian platforms
-	+ commit 5651b2c460a7898027c1765c2063c302606b5f85
-	* agent/findkey.c (agent_public_key_from_file): pass size_t as int to
-	gcry_sexp_build_array's %b.
-
-2019-05-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not print a hint to use the deprecated --keyserver option.
-	+ commit 7102d9b798b0985412007d3bf8b954959e4adec7
-	* g10/keyserver.c (keyserver_search): Remove a specialized error
-	message.
-
-2019-05-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix possible null dereference.
-	+ commit 802a2aa300bad3d4385d17a2deeb0966da4e737d
-	* g10/armor.c (armor_filter): Access ->d in the internal loop.
-
-2019-05-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Change update_keysig_packet to replace SHA-1 by SHA-256.
-	+ commit 484d6ba5896acfa3dcf73d9536bcf5e006579b5f
-	* g10/sign.c (update_keysig_packet): Convert digest algo when needed.
-
-	gpg: Cleanup use of make_keysig_packet.
-	+ commit d07666412d4317460c6f03b3ffd03edf4a715ef7
-	* g10/sign.c (make_keysig_packet): Remove obsolete arg diegst_algo
-	which was always passed as 0. Change all callers.
-
-	* g10/gpgcompose.c (signature): Warn when trying to set a digest algo.
-
-2019-05-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update m4/iconv.m4.
-	+ commit 1cd2aca03b8807c6f8e4929ace462bb606dcd53f
-	* m4/iconv.m4: Update from gettext 0.20.1.
-
-2019-05-10 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc: correct documentation for gpgconf --kill.
-	+ commit 9662538be6afc8beee0f2654f9a8f234c5dac016
-	* doc/tools.texi(gpgconf): Correct documentation for gpgconf --kill.
-
-2019-05-07 Werner Koch <wk@gnupg.org>
-
-	agent: If a Label is make sure that label is part of the prompt.
-	+ commit 69e0b080f06b66eee96327617c6fbffe8a88d586
-	* agent/findkey.c (has_comment_expando): New.
-	(agent_key_from_file): Modify DESC_TEXT.
-
-	agent: Allow the use of "Label:" in a key file.
-	+ commit 5388537806411c19ea84db8c4419f410be9ac616
-	* agent/findkey.c (linefeed_to_percent0A): New.
-	(read_key_file): Add optional arg 'keymeta' and change all callers.
-	(agent_key_from_file): Prefer "Label:" over the comment for protected
-	keys.
-
-	common: New functions nvc_delete_named and nvc_get_string.
-	+ commit b5985d0ca21ca376f22c050857bfda05592cebef
-	* common/name-value.c (nvc_delete_named): New.
-	(nvc_get_string): New.
-
-2019-05-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support direct use of app with PKSIGN/PKAUTH/PKDECRYPT.
-	+ commit c856ee7312c9eeb7d79a30189a49f70986420364
-	* scd/command.c (cmd_pksign, cmd_pkauth, cmd_pkdecrypt): When length
-	of keyidstr is 40, it is considered as a keygrip for direct use.
-
-2019-05-03 Werner Koch <wk@gnupg.org>
-
-	agent: Put Token lines into the key files.
-	+ commit bdf252e76ada0056bec2ee7940255f32552328c5
-	* agent/findkey.c (write_extended_private_key): Add args serialno and
-	keyref. Write a Token line if that does not yet exist.
-	(agent_write_private_key): Add args serialno and keyref and change all
-	callers.
-	(agent_write_shadow_key): Skip leading spaces.
-	* agent/keyformat.txt: Improve extended key format docs.
-
-	common: In private key mode write "Key:" always last in name-value.
-	+ commit c9fa28bfad297b17e76341ffb40383ce92da5d44
-	* common/name-value.c (nvc_write): Take care of Key. Factor some code
-	out to ...
-	(write_one_entry): new.
-
-	gpg: Use just the addrspec from the Signer's UID.
-	+ commit bd6ecbb8f8e92fe4a7fed40fcf470eb83bda0927
-	* g10/parse-packet.c (parse_signature): Take only rthe addrspec from a
-	Signer's UID subpacket.
-
-2019-04-30 Werner Koch <wk@gnupg.org>
-
-	sm: Add yet inactive options to support authenticode.
-	+ commit 5f3864fb647237f862bbe7e26763dffa0e945202
-	* sm/gpgsm.c (opts): New options --authenticode and --attribute.
-	* sm/gpgsm.h (opt): Add vars authenticode and attribute_list.
-	* sm/sign.c (add_signed_attribute): New but inactive.
-	(gpgsm_sign): Use new options.
-
-2019-04-29 Andre Heinecke <aheinecke@gnupg.org>
-
-	common,w32: Breakaway detached childs when in job.
-	+ commit 03df28b18b92b3fd3d2ba1000903c088dc5b0fcf
-	* common/exechelp-w32.c (gnupg_spawn_process_detached): Add
-	CREATE_BREAKAWAY_FROM_JOB creation flag if required.
-
-2019-04-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Add new command: KEYINFO.
-	+ commit 874bc970ba6ec243ff474ef090242e0f7be6a7bc
-	* scd/app-common.h (struct app_ctx_s): Add with_keygrip function.
-	* scd/app-openpgp.c (do_with_keygrip): New.
-	* scd/app.c (app_do_with_keygrip): New.
-	* scd/command.c (cmd_keyinfo): New.
-	(send_keyinfo): New.
-
-2019-04-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese Translation.
-	+ commit d5443b918dd3b8ccb3c4fdd8fe9d70d84aa312ff
-
-
-	scd: Allow KEYGRIP as KEYIDSTR.
-	+ commit e769609cd3c12d2e26955538399172016f78d2d4
-	* scd/app-openpgp.c (struct app_local_s): Add keygrip_str.
-	(store_keygrip): New.
-	(read_public_key): Call store_keygrip to hold keygrip.
-	(get_public_key): Likewise.
-	(send_keypair_info): Use stored keygrip_str.
-	(check_keyidstr): Allow use of KEYGRIP.
-	(do_check_pin): Allow use of KEYGRIP of signing slot.
-
-2019-04-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Factor out a function to check keyidstr.
-	+ commit b0f0791e4ade845b2a0e2a94dbda4f3bf1ceb039
-	* scd/app-openpgp.c (check_keyidstr): New.
-	(do_sign, do_auth, do_decipher, do_check_pin): Use check_keyidstr.
-
-2019-04-19 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpgconf: correct capitalization of "Tor"
-	+ commit ea7d85ff658c000f5f469e0a869af0e512e8c59f
-	* tools/gpgconf-comp.cb (gc_options_dirmngr): correct capitalization
-	of Tor.
-
-2019-04-18 Andre Heinecke <aheinecke@intevation.de>
-
-	g10: Fix double free when locating by mbox.
-	+ commit e57954ed278cb5e6e725005b1ecaf7ce70006ce0
-	* g10/getkey.c (get_best_pubkey_byname): Set new.uid always
-	to NULL after use.
-
-2019-04-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix a memory leak.
-	+ commit a861f9343d6e6d18064e4e54aeb914c5a10b2095
-	* g10/import.c (import): Care PNDING_PKT on error.
-
-2019-04-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix AWK portability.
-	+ commit b6f0b0efa19e0434024bc16e246032b613fd448a
-	* common/Makefile.am: Use pkg_namespace.
-	* common/mkstrtable.awk: Use pkg_namespace. Regexp fix.
-
-2019-04-13 Werner Koch <wk@gnupg.org>
-
-	gpg: New caching functions.
-	+ commit 64a5fd37271a3e454c0d59ac3500e1a1b232e4f7
-	* g10/objcache.c: New.
-	* g10/objcache.h: New.
-	* g10/Makefile.am (common_source): Add them.
-	* g10/gpg.c: Include objcache.h.
-	(g10_exit): Call objcache_dump_stats.
-	* g10/getkey.c: Include objcache.h.
-	(get_primary_uid, release_keyid_list): Remove.
-	(cache_user_id): Remove.
-	(finish_lookup): Call the new cache_put_keyblock instead of
-	cache_user_id.
-	(get_user_id_string): Remove code for mode 2.
-	(get_user_id): Implement using cache_get_uid_bykid.
-
-2019-04-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Cache a once computed fingerprint in PKT_public_key.
-	+ commit 60f384592144de53c9a5f5e11d7f73ce863aa94f
-	* g10/packet.h (PKT_public_key): Add fields fpr and fprlen.
-	* g10/keyid.c (do_fingerprint_md): Remove.
-	(compute_fingerprint): New.
-	(keyid_from_pk): Simplify.
-	(fingerprint_from_pk): Simplify.
-	(hexfingerprint): Avoid using extra array.
-
-2019-04-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Accept also armored data from the WKD.
-	+ commit 1b1f649deaeba963ed7240b27f848004db0b051f
-	* g10/keyserver.c (keyserver_import_wkd): Clear NO_ARMOR.
-
-	gpg: Set a limit of 5 to the number of keys imported from the WKD.
-	+ commit 40595b57936e39ee2a4d58b1dd19edea7537a471
-	* g10/import.c (import): Limit the number of considered keys to 5.
-	(import_one): Return the first fingerprint in case of WKD.
-
-2019-04-11 Andre Heinecke <aheinecke@gnupg.org>
-
-	speedo,w32: Install gpg-card.exe.
-	+ commit b30351496dd3056462c8db25c03fed6d2aa00e9b
-	* build-aux/speedo/w32/inst.nsi: Install gpg-card.exe
-
-2019-04-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix printing of the user id during import.
-	+ commit ea32842d5c2e2d262d32791130d7eae5c8c3edcf
-	* g10/getkey.c (struct keyid_list): Add field fprlen.
-	(cache_user_id): Set and test it.
-	(get_user_id_byfpr): Make static, add arg fprlen and use it.
-	(get_user_id_byfpr_native): Add arg fprlen and change all callers.
-
-2019-04-04 Werner Koch <wk@gnupg.org>
-
-	scd:piv: Fix RSA decryption.
-	+ commit 958172cc3acb7172bc5e1fa76efafe26695ed402
-	* scd/app-piv.c (do_decipher): Fixup leading zero byte.
-
-2019-04-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Better handling of timeout and time extension.
-	+ commit f1cf799a37f320d33cae445c74f3fc1936dd9995
-	* 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.
-
-2019-04-03 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve the code to decrypt using PIV cards.
-	+ commit 2c9b68f28de1ce9a6a18d091caba01ddd4707774
-	* g10/call-agent.c (agent_scd_keypairinfo): Add arg 'keyref'.
-	* g10/keygen.c (ask_algo): Adjust.
-	* g10/skclist.c (enum_secret_keys): Request the keyref directly.
-
-	scd: New options --info and --info-only for READKEY.
-	+ commit 679b8f1c045476bd6e0a1f1565379263143994ee
-	* scd/command.c (cmd_readkey): New options --info and --info-only.
-	* scd/app.c (app_readkey): New arg 'flags'.
-	* scd/app-common.h (APP_READKEY_FLAG_INFO): New.
-	(struct app_ctx_s): New args 'ctrl' and 'flags' for member readkey.
-	Change all implementers.
-	* scd/app-nks.c (do_readkey): Stub implementation of
-	APP_READKEY_FLAG_INFO.
-	* scd/app-openpgp.c (do_readkey): Implement APP_READKEY_FLAG_INFO.
-	* scd/app-piv.c (do_readkey): Ditto.
-
-	gpg: Allow decryption using PIV cards.
-	+ commit ec6a6779236a89d4784a6bb7de0def9cc0f9e8a4
-	* g10/call-agent.c (struct getattr_one_parm_s): New.
-	(getattr_one_status_cb): New.
-	(agent_scd_getattr_one): New.
-	* g10/pubkey-enc.c (get_it): Allow the standard leading zero byte from
-	pkcs#1.
-	* g10/skclist.c (enum_secret_keys): Handle non-OpenPGP cards.
-
-	scd: New standard attributes $ENCRKEYID and $SIGNKEYID.
-	+ commit 2b1135cf920cf3d863813d60f032d476dcccfb58
-	* g10/call-agent.c (agent_scd_keypairinfo): Use --keypairinfo.
-	* sm/call-agent.c (gpgsm_agent_scd_keypairinfo): Ditto.
-	* scd/app-openpgp.c (do_getattr): Add attributes "$ENCRKEYID" and
-	"$SIGNKEYID".
-	* scd/app-piv.c (do_getattr): Ditto.
-
-	gpg: Avoid endless loop if a card's serial number can't be read.
-	+ commit 1f688e0d1dba4dd7a311d416d06d654ed7b4290d
-	* g10/skclist.c (enum_secret_keys): Move list forward on error.
-
-	card: Allow card selection with LIST.
-	+ commit bcca3acb87c36213fef9311236ea949d006f759c
-	* tools/card-call-scd.c (start_agent): Request serialno only whean
-	started.
-	(scd_serialno): Allow NULL for r_serialno.
-	* tools/gpg-card.c (cmd_factoryreset): Use changed scd_serialno.
-	(cmd_list): New.
-	(dispatch_command): Use cmd_list for cmdLIST.
-	(interactive_loop): Ditto.
-
-	gpg: Print modern style key info for non-decryptable keys.
-	+ commit 2d3392c147a24e49ee4658d4a50fafd68599fba3
-	* g10/mainproc.c (print_pkenc_list): Simplify.
-
-2019-04-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow direct key generation from card with --full-gen-key.
-	+ commit a480182f9d7ec316648cb64248f7a0cc8f681bc3
-	* g10/call-agent.c (agent_scd_readkey): New.
-	* g10/keygen.c (ask_key_flags): Factor code out to ..
-	(ask_key_flags_with_mask): new.
-	(ask_algo): New mode 14.
-
-	common: Extend function pubkey_algo_string.
-	+ commit f952226043824cbbeb8517126b5266926121c4e8
-	* common/sexputil.c (pubkey_algo_string): Add arg R_ALGOID.
-	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Adjust.
-	* tools/gpg-card.c (list_one_kinfo): Ditto.
-
-	dirmngr: Improve domaininfo cache update algorithm.
-	+ commit e100ace7f8a729bbe30d9f4ed157a7a229a04eb0
-	* dirmngr/domaininfo.c (struct domaininfo_s): Add field keepmark.
-	(insert_or_update): Implement new update algorithm.
-
-2019-04-01 Werner Koch <wk@gnupg.org>
-
-	sm: Show the usage flags when generating a key from a card.
-	+ commit 9ed1aa56c4bbf44e00b731d6807ada9e95c91bd7
-	* g10/call-agent.c (scd_keypairinfo_status_cb): Also store the usage
-	flags.
-	* sm/call-agent.c (scd_keypairinfo_status_cb): Ditto.
-	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Print the usage flags.
-
-	gpg: Prepare card code to allow other than OpenPGP cards.
-	+ commit e47524c34a2a9f53c2507f67a0b41b460cee78b7
-	* g10/call-agent.c (start_agent): Use card app auto selection.
-	* g10/card-util.c (current_card_status): Print the Application type.
-	(card_status): Put empty line between card listings.
-
-	gpg: New card function agent_scd_keypairinfo.
-	+ commit 0fad61de159acf39e38a04f28f162f0beb0e77d6
-	* g10/call-agent.c (scd_keypairinfo_status_cb)
-	(agent_scd_keypairinfo): New. Taken from gpgsm.
-
-	gpg: Remove two unused card related functions.
-	+ commit 334b16b868e771b983263ed20c200869e7e51198
-	* g10/call-agent.c (inq_writekey_parms): Remove.
-	(agent_scd_writekey): Remove.
-	(agent_clear_pin_cache): Remove this stub.
-
-	gpg: Remove unused arg in a card related function.
-	+ commit 3a4534d82682f69788da3cf4a445e38fbaf6b98e
-	* g10/call-agent.c (agent_scd_setattr): Remove unused arg serialno.
-
-2019-03-29 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Better for error code for http status 413.
-	+ commit 21b674097442a54ae889a90d708639b257ba43db
-	* dirmngr/ks-engine-hkp.c (send_request): New case for 413.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-	* dirmngr/ocsp.c (do_ocsp_request): Ditto.
-
-2019-03-28 Werner Koch <wk@gnupg.org>
-
-	scd: New option --application-priority.
-	+ commit 97feef8ee94a5e1cb9daba82f108eb62122c7910
-	* scd/scdaemon.c (oApplicationPriority): New.
-	(opts): Add "application_priority".
-	(main): Process option.
-	* scd/app.c (app_update_priority_list): New.
-	(get_supported_applications): Take apps from global list.
-
-	* tools/gpgconf-comp.c (gc_options_scdaemon): Add option.
-
-	card: For passwd add a PIV menu and make the OpenPGP menu optional.
-	+ commit 80c069b5e1ad6fbd547de59f332eb3fabb68c572
-	* tools/gpg-card.c (get_selection): New.
-	(cmd_passwd): Reworked.
-
-	card: Allow "yubikey disable" only for Yubikey-5 and later.
-	+ commit 2f761251c5730a9ad113fa58466addc9c2372da8
-	* tools/card-yubikey.c (yubikey_commands): Add new arg INFO and test
-	for Yubikey-5.
-	* tools/gpg-card.c (cmd_yubikey): Pass info to yubikey_commands.
-
-2019-03-27 Werner Koch <wk@gnupg.org>
-
-	scd: Support reading the Yubikey 4 firmware version.
-	+ commit 5a3055eb722e61126748e83564e1bba42807d722
-	* scd/app.c (app_new_register): Detect yk4 version numbers.
-
-2019-03-27 Trevor Bentley <trevor@yubico.com>
-
-	gpg: Don't use EdDSA algo ID for ECDSA curves.
-	+ commit 4324560b2c0bb76a1769535c383424a042e505ae
-	* g10/keygen.c (ask_curve): Change algo ID to ECDSA if it changed from
-	an EdDSA curve.
-
-2019-03-26 Werner Koch <wk@gnupg.org>
-
-	sm: Allow decryption even if expired other keys are configured.
-	+ commit aa58d2a49b3d416d9d6a0691a89f2bc8bc8649ad
-	* sm/gpgsm.c (main): Add special handling for bad keys in decrypt
-	mode.
-
-	agent: Allow other ssh fingerprint algos in KEYINFO.
-	+ commit 3c7a1f3aea7f6e8137a93ef2166ff329688f5445
-	* agent/command.c (cmd_keyinfo): Allow for --ssh-fpr=ALGO. Default to
-	the standard algo.
-
-2019-03-25 Werner Koch <wk@gnupg.org>
-
-	wkd: New command --print-wkd-url for gpg-wks-client.
-	+ commit 70c97a862aa586c314a64190d1e489a272e552ea
-	* tools/gpg-wks-client.c (aPrintWKDURL): New.
-	(opts): Add option.
-	(main): Implement.
-	* tools/wks-util.c (wks_cmd_print_wkd_url): New.
-
-2019-03-25 Andre Heinecke <aheinecke@gnupg.org>
-
-	sm, w32: Translate logger and status fd to handles.
-	+ commit e4e0804ed123516fa00f8a876a862b2c6d34ba5c
-	* sm/gpgsm.c (main): Call translate_sys2libc_fd_int to
-	convert the FDs.
-
-2019-03-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	libdns: Don't use _A-Z which are reserved names.
-	+ commit 8d1b5982138c104f3c50663738892fa110193059
-	* dirmngr/dns.c: Use the identifiers of "*_instance" instead of
-	reserved "_A-Z".
-
-2019-03-22 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc: fix formatting error.
-	+ commit b30528f48780c9917ec8ba3b3d163fba5c740d92
-
-
-2019-03-22 Werner Koch <wk@gnupg.org>
-
-	wkd: New command --print-wkd-hash for gpg-wks-client.
-	+ commit e847cf1df7aa55ac2af7efd39ca05882258acbfe
-	* tools/gpg-wks-client.c (aPrintWKDHash): New.
-	(opts) : Add "--print-wkd-hash".
-	(main): Implement that command.
-	(proc_userid_from_stdin): New.
-	* tools/wks-util.c (wks_fname_from_userid): Add option HASH_ONLY.
-	(wks_cmd_print_wkd_hash): New.
-
-	scd: Refactor the app selection code.
-	+ commit 393269948c883afb770bb536f03045254d13b911
-	* scd/app.c (app_priority_list): New.
-
-2019-03-18 Andre Heinecke <aheinecke@gnupg.org>
-
-	speedo: Fix installer build with NSIS-3.
-	+ commit b98799ce964df1743478dc3d0cc503f51c4b6733
-	* build-aux/speedo.mk: Add charset for nsis 3.
-
-2019-03-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow import of PGP desktop exported secret keys.
-	+ commit 5205512fc092c53c0a52c8379ef2a129ce6e58a9
-	* g10/import.c (NODE_TRANSFER_SECKEY): New.
-	(import): Add attic kludge.
-	(transfer_secret_keys): Add arg only_marked.
-	(resync_sec_with_pub_keyblock): Return removed seckeys via new arg
-	r_removedsecs.
-	(import_secret_one): New arg r_secattic. Change to take ownership of
-	arg keyblock. Implement extra secret key import logic. Factor some
-	code out to ...
-	(do_transfer): New.
-	(import_matching_seckeys): New.
-
-2019-03-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid importing secret keys if the keyblock is not valid.
-	+ commit f799e9728bcadb3d4148a47848c78c5647860ea4
-	* g10/keydb.h (struct kbnode_struct): Replace unused field RECNO by
-	new field TAG.
-	* g10/kbnode.c (alloc_node): Change accordingly.
-	* g10/import.c (import_one): Add arg r_valid.
-	(sec_to_pub_keyblock): Set tags.
-	(resync_sec_with_pub_keyblock): New.
-	(import_secret_one): Change return code to gpg_error_t. Return an
-	error code if sec_to_pub_keyblock failed. Resync secret keyblock.
-
-	gpg: During secret key import print "sec" instead of "pub".
-	+ commit f64477db86568bdc28c313bfeb8b95d8edf05a3c
-	* g10/keyedit.c (show_basic_key_info): New arg 'print_sec'. Remove
-	useless code for "sub" and "ssb".
-	* g10/import.c (import_one): Pass FROM_SK to show_basic_key_info. Do
-	not print the first keyinfo in FROM_SK mode.
-	printing.
-
-	gpg: Simplify an interactive import status line.
-	+ commit f06b6fe47f56a15ac426665c3d9661d4b104696f
-	* g10/cpr.c (write_status_printf): Escape CR and LF.
-	* g10/import.c (print_import_check): Simplify by using
-	write_status_printf and hexfingerprint.
-
-	gpg: Fix recently introduced use after free.
-	+ commit 3e1f3df6183b2ed2cadf2af2383063891e2c53bd
-	* g10/mainproc.c (proc_plaintext): Do not use freed memory.
-
-2019-03-14 Werner Koch <wk@gnupg.org>
-
-	kbx: Unify the fingerprint search modes.
-	+ commit bdda31a26bc69b6ee72e964510db113645de76ef
-	* kbx/keybox-search-desc.h (KEYDB_SEARCH_MODE_FPR16)
-	(KEYDB_SEARCH_MODE_FPR20, KEYDB_SEARCH_MODE_FPR32): Remove. Switch
-	all users to KEYDB_SEARCH_MODE_FPR along with the fprlen value.
-
-	gpg: Make rfc4880bis the default.
-	+ commit caf4b3fc16e97eb175c46f45f5770d02becb862d
-	* g10/gpg.c (set_compliance_option, main): Change CO_GNUPG to include
-	rfc4880bis features.
-	(main): Change rfc4880bis warning to a note.
-
-	gpg: Implement v5 keys and v5 signatures.
-	+ commit 01c87d4ce23bc9fc44ec5301c2c6bf2ce615c375
-	* g10/build-packet.c (gpg_mpi_write): New optional arg
-	R_NWRITTEN. Allow NULL for OUT. Change all callers.
-	(do_key): Support v5 keys.
-	(build_sig_subpkt_from_sig): Support 32 byte fingerprints.
-	* g10/parse-packet.c (parse_signature): First try to set the keyid
-	from the issuer fingerprint.
-	(parse_key): Support v5 keys.
-	(create_gpg_control): Better make sure to always allocate the static
-	size of the struct in case future compilers print warnings.
-	* g10/keyid.c (hash_public_key): Add v5 support.
-	(keyid_from_pk): Ditto.
-	(keyid_from_fingerprint): Ditto.
-	(fingerprint_from_pk): Ditto.
-	* g10/keygen.c (KEYGEN_FLAG_CREATE_V5_KEY): New.
-	(pVERSION, pSUBVERSION): New.
-	(add_feature_v5): New.
-	(keygen_upd_std_prefs): Call it.
-	(do_create_from_keygrip): Add arg keygen_flags and support the v5
-	flag.
-	(common_gen): Support the v5 flag.
-	(parse_key_parameter_part): New flags v4 and v5.
-	(parse_key_parameter_string): Add args for version and subversion.
-	(read_parameter_file): New keywords "Key-Version" and
-	"Subkey-Version".
-	(quickgen_set_para): Add arg 'version'.
-	(quick_generate_keypair, generate_keypair): Support version parms.
-	(do_generate_keypair): Support v5 key flag.
-	(generate_subkeypair): Ditto.
-	(generate_card_subkeypair): Preparse for keyflags.
-	(gen_card_key): Ditto.
-	* g10/sig-check.c (check_signature2): Add args extrahash and
-	extrahashlen.
-	(check_signature_end): Ditto.
-	(check_signature_end_simple): Ditto. Use them.
-	* g10/mainproc.c (proc_plaintext): Put extra hash infor into the
-	control packet.
-	(do_check_sig): Add args extrahas and extrahashlen and pass them on.
-	(issuer_fpr_raw): Support 32 byte fingerprint.
-	(check_sig_and_print): get extra hash data and pass it on.
-
-	kbx: Add support for 32 byte fingerprints.
-	+ commit f40e9d6a528521d12795e1a6cc15c849b216be92
-	* common/userids.c (classify_user_id): Support 32 byte fingerprints.
-	* kbx/keybox-search-desc.h (KEYDB_SEARCH_MODE_FPR32): New.
-	(struct keydb_search_desc): Add field fprlen.
-	* kbx/keybox-defs.h (struct _keybox_openpgp_key_info): Add field
-	version and increase size of fpr to 32.
-	* kbx/keybox-blob.c: Define new version 2 for PGP and X509 blobs.
-	(struct keyboxblob_key): Add field fprlen and increase size of fpr.
-	(pgp_create_key_part_single): Allow larger fingerprints.
-	(create_blob_header): Implement blob version 2 and add arg want_fpr32.
-	(_keybox_create_openpgp_blob): Detect the need for blob version 2.
-	* kbx/keybox-search.c (blob_get_first_keyid): Support 32 byte
-	fingerprints.
-	(blob_cmp_fpr): Ditto.
-	(blob_cmp_fpr_part): Ditto.
-	(has_fingerprint): Add arg fprlen and pass on.
-	(keybox_search): Support KEYDB_SEARCH_MODE_FPR32 and adjust for
-	changed has_fingerprint.
-	* kbx/keybox-openpgp.c (parse_key): Support version 5 keys.
-	* kbx/keybox-dump.c (_keybox_dump_blob): Support blob version 2.
-
-	* g10/delkey.c (do_delete_key): Support KEYDB_SEARCH_MODE_FPR32.
-	* g10/export.c (exact_subkey_match_p): Ditto.
-	* g10/gpg.c (main): Ditto.
-	* g10/getkey.c (get_pubkey_byfprint): Adjust for changed
-	KEYDB_SEARCH_MODE_FPR.
-	* g10/keydb.c (keydb_search_desc_dump): Support
-	KEYDB_SEARCH_MODE_FPR32 and adjust for changed KEYDB_SEARCH_MODE_FPR.
-	(keydb_search): Add new arg fprlen and change all callers.
-	* g10/keyedit.c (find_by_primary_fpr): Ditto.
-	* g10/keyid.c (keystr_from_desc): Ditto.
-	* g10/keyring.c (keyring_search): Ditto.
-	* g10/keyserver.c (print_keyrec): Ditto.
-	(parse_keyrec): Ditto.
-	(keyserver_export): Ditto.
-	(keyserver_retrieval_screener): Ditto.
-	(keyserver_import): Ditto.
-	(keyserver_import_fprint): Ditto.
-	(keyidlist): Ditto.
-	(keyserver_get_chunk): Ditto.
-
-	* g10/keydb.c (keydb_search): Add new arg fprlen and change all
-	callers.
-
-	* sm/keydb.c (keydb_search_fpr): Adjust for changed
-	KEYDB_SEARCH_MODE_FPR.
-
-	gpg: Implemented latest rfc4880bis version 5 packet hashing.
-	+ commit a21ca3a1eff4722dea778cca4abe14a873ccebdf
-	* configure.ac (AC_CHECK_SIZEOF): Test size_t.
-	* g10/sig-check.c (check_signature_end_simple): Support v5 signatures
-	as per current rfc4880bis. For correctness also allow for N > 2^32.
-	* g10/sign.c (pt_extra_hash_data_t): New.
-	(hash_sigversion_to_magic): New arg EXTRAHASH.
-	(write_plaintext_packet): New arg R_EXTRAHASH.
-	(write_signature_packets): Pass EXTRAHASH.
-	(sign_file): Ditto.
-	(sign_symencrypt_file): Ditto.
-
-2019-03-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	Fix the previous commit.
-	+ commit f199b627ce512c8495af5c9bd1c81127ccde3ca0
-	* g10/ecdh.c (kek_params_table): Revert the change.
-	* scd/app-openpgp.c (ecdh_params): Use CIPHER_ALGO_AES256
-	for 384-bit key.
-
-2019-03-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix symmetric cipher algo constant for ECDH.
-	+ commit af3efd149f555d36a455cb2ea311ff81caf5124c
-	* g10/ecdh.c (kek_params_table): Use CIPHER_ALGO_AES192 for
-	ECC strength 384, according to RFC-6637.
-
-2019-03-11 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Avoid testing for Tor with --gpgconf-list.
-	+ commit 9f37e93dd741a5436ff412955628806ae84725ca
-	* dirmngr/dirmngr.c (post_option_parsing): Do not call set_tor_mode.
-	(dirmngr_sighup_action): Call it here.
-	(main): Call it here unless in --gpgconf-list mode.
-
-2019-03-07 Werner Koch <wk@gnupg.org>
-
-	common: Minor rework of tty_get.
-	+ commit b7de105e0a836bd4d7bd558f8e699d88ab0cafec
-	* common/ttyio.c (do_get): Re-indent and remove the checking for char
-	values larger than 0xa0. Use explicy control character checking.
-
-	dirmngr: Add CSRF protection exception for protonmail.
-	+ commit 134c3c16523b1a267ebdd2df6339240fd9e1e3b3
-	* dirmngr/http.c (same_host_p): Add exception table.
-
-2019-03-07 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpgv: Improve documentation for keyring choices.
-	+ commit 096c2aa705f85289ff8b610da1dd9181e4c904fd
-	* doc/gpgv.texi: Improve documentation for keyring choices
-
-2019-03-06 Werner Koch <wk@gnupg.org>
-
-	gpgtar: Make option -C work for archive creation.
-	+ commit b3a7a5140784b5a015107b5c5c73b15ae44e71dc
-	* tools/gpgtar-create.c (gpgtar_create): Switch to the -C directory.
-
-	agent: Re-introduce --enable-extended-key-format.
-	+ commit 91ae3e7fb66271691f6fe507262a62fc7e2663a3
-	* agent/gpg-agent.c (oEnableExtendedKeyFormat): Re-introduce.
-	(parse_rereadable_options): Handle it in a special way.
-	* agent/protect.c (agent_protect): Be safe and set use_ocb only to 1
-	or 0.
-	* tools/gpgconf-comp.c: Add --enable-extended-key-format again.
-
-	gpgtar: Improve error messages.
-	+ commit 72feb8fa8280aba674573a1afc955a92e8065242
-	* tools/gpgtar.h (struct tarinfo_s): New.
-	* tools/gpgtar.c (cmd, skip_crypto, files_from, null_names): Move
-	global vars more to the top.
-	(set_cmd): Rename 'cmd' to 'c'.
-	* tools/gpgtar-list.c (parse_header): Add arg 'info' and improve error
-	messages.
-	(read_header): Add arg 'info' and update counter.
-	(skip_data): Ditto.
-	(gpgtar_list): Pass info object to read functions.
-	(gpgtar_read_header): Add arg 'info'.
-	* tools/gpgtar-extract.c (gpgtar_extract): add arg 'info' and pass on.
-	(extract_regular): Add arg 'info' and update counter.
-
-	agent: Default to extended key format.
-	+ commit 05eff1f6623c272fcabd4e238842afc832710324
-	* agent/gpg-agent.c (oDisableExtendedKeyFormat, oNoop): New.
-	(oEnableExtendedKeyFormat): Remove.
-	(opts): Make --enable-extended-key-format a dummy option. Add
-	disable-extended-key-format.
-	(parse_rereadable_options): Implement oDisableExtendedKeyFormat.
-
-	card: Allow PEM encoded certificates in "writecert".
-	+ commit 4e1f04a4cd30859507218395e630e886801ae2b7
-	* tools/gpg-card.c (cmd_writecert): Convert from base64.
-
-	card: Print the keyref also for non-initialized slots.
-	+ commit 772bba34ea089b3a00f0b1ea5138ba7422c95180
-	* tools/gpg-card.c (list_one_kinfo): Add arg label_keyref and change
-	callers.
-
-2019-03-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix detection of exit of scdaemon.
-	+ commit 2abad7585a004586e27ead6ab8c9c57ce5ed1326
-	* agent/call-scd.c (start_scd): Acquire START_SCD_LOCK for
-	SCD_LOCAL_LIST. Move common case code to fast path.
-	Release START_SCD_LOCK before calling unlock_scd.
-	When new CTX is allocated, clear INVALID flag.
-	(agent_reset_scd): Serialize the access to SCD_LOCAL_LIST by
-	START_SCD_LOCK.
-
-2019-03-05 Werner Koch <wk@gnupg.org>
-
-	card: Print card version. Check for bad Yubikeys.
-	+ commit 8d4af54ddd039d47e9c4803559193fcca97f0a46
-	* scd/app.c (app_new_register): Set card version for Yubikeys.
-	(app_write_learn_status): Print CARDVERSION and APPVERSION.
-	* tools/card-call-scd.c (learn_status_cb): Detect them.
-	* tools/gpg-card.h (struct card_info_s): Add appversion and
-	cardversion.
-	* tools/gpg-card.c (list_openpgp): Remove version printing from serial
-	number.
-	(print_a_version): New.
-	(list_card): Print card and app version.
-	(cmd_generate): Do not allow broken Yubikeys.
-
-	scd: Rename a shared info field name.
-	+ commit 64caa6a08298119b10dc36ddd27b357cb47825b5
-	* scd/app-piv.c (app_select_piv):
-	* scd/app-common.h (struct app_ctx_s): Rename 'card_version' to
-	'cardversion'. Rename all users. Add 'appversion'.
-
-	scd:piv: Implement import of private keys for Yubikeys.
-	+ commit e897e1e255ef9870dfd1639d6f4e97bdf4e83b34
-	* scd/app-piv.c (concat_tlv_list): Add arg 'secure' and adjust
-	 callers.
-	(writekey_rsa, writekey_ecc): New.
-	(do_writekey): New.
-	(do_writecert): Provide a better error message for an empty cert.
-	(app_select_piv): Register do_writekey.
-	* scd/iso7816.c (iso7816_send_apdu): New.
-	* scd/app-common.h (APP_WRITEKEY_FLAG_FORCE): New.
-	* agent/command.c (cmd_keytocard): Make the timestamp optional.
-	* tools/card-call-scd.c (inq_writekey_parms): Remove.
-	(scd_writekey): Rewrite.
-	* tools/gpg-card.c (cmd_writekey): New.
-	(enum cmdids): Add cmdWRITEKEY.
-	(dispatch_command, interactive_loop): Call cmd_writekey.
-
-	gpg: Make invalid primary key algos obvious in key listings.
-	+ commit db87132b10664718b7db6ec1dad584b54d1fb265
-	* g10/keylist.c (print_key_line): Print a warning for invalid algos.
-
-	agent: Minor change to the KEYTOCARD command.
-	+ commit bcc89a6df24c79690436340f65c7ab13c65c2c45
-	* agent/command.c (cmd_keytocard): Make timestamp optional. Use
-	modern parser function.
-	* agent/call-scd.c (agent_card_writekey): Rename an arg and for
-	clarity return gpg_error_t instead of int.
-	* agent/divert-scd.c (divert_writekey): Ditto.
-
-2019-03-01 Werner Koch <wk@gnupg.org>
-
-	sm: Print Yubikey attestation extensions with --dump-cert.
-	+ commit 86c241a8c9a952ea8007066b70b04f435e2e483e
-	* sm/keylist.c (oidtranstbl): Add Yubikey OIDs.
-	(OID_FLAG_HEX): New.
-	(print_hex_extn): New.
-	(list_cert_raw): Make use of that flag.
-
-	scd:piv: Add feature to read Yubikey attestation certificates.
-	+ commit 51df13d9ec8e89c4236e2f4a9ae3647963c30783
-	* scd/app-piv.c (do_readcert): Add hack to read Yubikey attestaions.
-
-	scd:piv: Allow writecert to only write matching certs.
-	+ commit 696d4c290dd4945b693263721f606b5049b9569d
-	* scd/app-piv.c (do_readkey): Read the key from the cert here instead
-	of letting the upper layer do this.
-	(do_writecert): Check that the cert matches the key and that a key has
-	already been generated.
-
-	card: Remove the "admin" command.
-	+ commit 280baee72dcb0ca54ce99b524bc2125cbc38e0e4
-	* tools/gpg-card.c (cmd_passwd): Remove arg allow_admin.
-	(enum cmdids): Rename cmdAUTHENTICATE to cmdAUTH and cmdFACTORYRESET
-	to cmdFACTRST.
-	(cmds): Remove column 'admin_only'.
-	(interactive_loop): Remove admin_only stuff.
-
-2019-02-28 Werner Koch <wk@gnupg.org>
-
-	sm: Don't mark a cert as de-vs compliant if it leads to SHA-1 sigs.
-	+ commit 2c75af9f65d15653ed1bc191f1098ae316607041
-	* sm/keylist.c (print_compliance_flags): Also check the diges_also.
-
-2019-02-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: PKSIGN should return signature in same format for card.
-	+ commit 0173b249cfb7f02f94911ec759630d81f312e0bd
-	* agent/pksign.c (agent_pksign_do):
-
-2019-02-26 Werner Koch <wk@gnupg.org>
-
-	scd: Simplify the app_readkey parameters.
-	+ commit c2235d994dbb1d7ddba20f89a7c02f4a27b0610c
-	* scd/app-help.c (app_help_pubkey_from_cert): New.
-	* scd/command.c (cmd_readkey): Refactor to use that new function and
-	handle the --advanced flag only here.
-	* scd/app.c (app_readkey): Remove parm advanced.
-	* scd/app-common.h (struct app_ctx_s): Remove parm advanced from the
-	readkey member.
-	* scd/app-nks.c (do_readkey): Adjust for removed parm.
-	* scd/app-piv.c (do_readkey): Ditto.
-	* scd/app-openpgp.c (do_readkey): Ditto.
-
-	conf: New option --show-socket.
-	+ commit ac485b4f253ad6bbd2bc648650b56d60fc82f89d
-	* tools/gpgconf-comp.c (gc_component_t): Move this enum to ...
-	* tools/gpgconf.h: here.
-	* tools/gpgconf.c (oShowSocket): New.
-	(opts): Add new option.
-	(main): Implement new option.
-
-2019-02-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	libdns: Avoid using compound literals (8).
-	+ commit 371ae25f8f6f2d1ac030bf984bca479393a5ed43
-	* dirmngr/dns.h (dns_quietinit): Remove.
-	(dns_hints_i_new): Remove.
-
-	libdns: Avoid using compound literals (7).
-	+ commit d661acd483236d34720a4959fc816d05f89c2cb7
-	* dirmngr/dns.h (DNS_OPTS_INIT, dns_opts): Remove.
-	* dirmngr/dns-stuff.c (libdns_res_open): Use zero-ed, and initialized
-	automatic variable for opts.
-	* dirmngr/dns.c (send_query, resolve_query, resolve_addrinfo):
-	Likewise.
-
-	libdns: Avoid using compound literals (6).
-	+ commit 6501e59d3685bb58753c9caea729a4b0eca3942a
-	* dirmngr/dns.h (dns_rr_i_new): Remove.
-	(dns_rr_i_init): Remove unused second argument.
-	* dirmngr/dns.c (dns_p_dump, dns_hints_query, print_packet)
-	(parse_packet): Use automatic variable for struct dns_rr_i.
-	(dns_d_cname): No need to call dns_rr_i_init after memset 0.
-	(dns_rr_i_init): Remove unused second argument. Return nothing.
-	* dirmngr/dns-stuff.c (resolve_addr_libdns, get_dns_cert_libdns)
-	(getsrv_libdns): Follow the change of dns_rr_i_init.
-
-	libdns: Avoid using compound literals (5).
-	+ commit a1ccfe2b37847cce0db2fb94a7365c9fa501eda4
-	* dirmngr/dns.h (dns_rr_foreach): Don't use dns_rr_i_new.
-	Call dns_rr_grep with NULL.
-	* dirmngr/dns.c (dns_rr_grep): Support NULL for error_.
-
-	libdns: Avoid using compound literals (4).
-	+ commit 7313a112f9c7ada61d24285313d2e2d069a672e8
-	* dirmngr/dns.h (dns_d_new*): Remove.
-	* dirmngr/dns.c (parse_packet): Use dns_d_init with automatic
-	variable.
-	(parse_domain): Likewise.
-
-	libdns: Avoid using compound literals (3).
-	+ commit 72efb7840258808cd892b90d871ea1cc1c31d7f5
-	* dirmngr/dns.h (dns_p_new): Remove.
-	* dirmngr/dns.c (dns_hosts_query): Use dns_p_init with automatic
-	variable.
-	(dns_hints_query, dns_res_glue, parse_packet, query_hosts)
-	(send_query, show_hints, echo_port): Likewise.
-
-	libdns: Avoid using compound literals (2).
-	+ commit 455ef62d29a112de05897139716265d07e4c6ae3
-	* dirmngr/dns.h (dns_strsection1, dns_strsection3): Remove.
-	(dns_strclass1, dns_strclass3): Remove.
-	(dns_strtype1, dns_strtype3): Remove.
-	(dns_strsection, dns_strclass, dns_strtype): Directly use the
-	function.
-	* dirmngr/dns.c (dns_strsection): Use automatic variable.
-	(dns_strclass, dns_strtype): Likewise.
-
-	libdns: Avoid using compound literals.
-	+ commit 1c405499388fd5bed0968ab5c6c5d1b3373537b9
-	* dirmngr/dns.c (dns_inet_pton, dns_so_tcp_keep): Use automatic
-	variables.
-	(dns_poll, dns_send_nopipe): Likewise, adding const qualifier.
-
-2019-02-25 Werner Koch <wk@gnupg.org>
-
-	scd: PIV: Always require a PIN for signing with 9C.
-	+ commit a481d17432bf7cca19ca71b6aa5ccd9aee2b3baa
-	* scd/app-piv.c (verify_chv): Add arg 'force'.
-	(do_sign): Use force for 0x9c.
-
-	card: Rename gpg-card-tool to gpg-card.
-	+ commit 28de5c0ea53373c56a4405fe6b08d194682dd1de
-	* tools/card-tool-keys.c: Rename to card-keys.c.
-	* tools/card-tool-misc.c: Rename to card-misc.c.
-	* tools/card-tool-yubikey.c: Rename to card-yubikey.c.
-	* tools/card-tool.h: Rename to gpg-card.h.
-	* tools/gpg-card-tool-w32info.rc: Rename to gpg-card-w32info.rc
-	* doc/card-tool.texi: Rename top gpg-card.texi
-
-	agent: Fix for suggested Libgcrypt use.
-	+ commit a12c3a566e2e4b10bc02976a2819070877ee895c
-	* agent/divert-scd.c (divert_pkdecrypt): Skip a flags parameter.
-
-2019-02-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpgscm: Build well even if NDEBUG defined.
-	+ commit e140c6d4f581be1a60a34b67b16430452f3987e8
-	* gpgscm/scheme.c (gc_reservation_failure): Fix adding ";".
-	!NDEBUG (scheme_init_custom_alloc): Don't init seserved_lineno.
-
-2019-02-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: internal driver: Submit SET_INTERFACE control transfer.
-	+ commit 611faf1579a56925994d53eb08e1290a4b3958cf
-	* scd/ccid-driver.c (ccid_open_usb_reader): Alway submit SET_INTERFACE
-	control transfer.
-
-2019-02-21 Werner Koch <wk@gnupg.org>
-
-	sm: Fix certificate creation with key on card.
-	+ commit c1000c673814e552923cf1361346d7dfeee55608
-	* sm/certreqgen.c (create_request): Fix for certmode.
-
-	card: Print usage info for each key.
-	+ commit 7317aeb3f448c98dcfa9c04f49b9a69d81c26776
-	* tools/card-call-scd.c (learn_status_cb): Handle extended
-	KEYPARIRINFO.
-	* tools/card-tool.h (struct key_info_s): Add field 'usage'.
-	* tools/gpg-card-tool.c (list_one_kinfo): Show usage flags.
-
-	scd: Extend KEYPAIRINFO by key usage info.
-	+ commit 5e21ef2d556ca65b7869bf16ab465f3511601e1e
-	* scd/app-openpgp.c (send_keypair_info): Append usage string.
-	* scd/app-piv.c (struct data_object_s): Remove column 'binary'. Add
-	column 'usage'.
-	(dump_all_do): Adjust for removed 'binary'.
-	(send_keypair_and_cert_info): Append usage string.
-
-	card: Print the keyref in the listing.
-	+ commit 3384ba6c1c421cfa674dbd8294dc655d7320534e
-	* tools/gpg-card-tool.c (list_one_kinfo): Print the keyref.
-
-	scd: Don't let the "undefined" app cause a conflict error.
-	+ commit 5ecc7a02609dde65096ddb12e0ff8f6bce3b774a
-	* scd/app.c (check_conflict): Ignore "undefined".
-
-	sm: Prepare algo mapping to handle values > 255.
-	+ commit d7a54ca461ad75e4fab77a2f1b25986c7637762a
-	* sm/misc.c (transform_sigval): Allow for larger values of MDALGO and
-	PKALGO.
-
-2019-02-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Clear CHV status on timeout error.
-	+ commit 2013cb5ee667610de35f8b92c2f979f5caa09d4c
-	* scd/app-openpgp.c (clear_chv_status): New.
-	(do_change_pin): Use clear_chv_status.
-	(do_sign): Call clear_chv_status on GPG_ERR_TIMEOUT.
-	(do_auth, do_decipher): Likewise.
-
-	scd: Handle ack button timeout as GPG_ERR_TIMEOUT.
-	+ commit bd15aa34ab8ad10adbb7540a8845b4a2600437b6
-	* scd/apdu.h (SW_ACK_TIMEOUT): New.
-	* scd/iso7816.c (map_sw): Return GPG_ERR_TIMEOUT for SW_ACK_TIMEOUT.
-
-	tests: Add "disable-scdaemon" in gpg-agent.conf.
-	+ commit 64b7c6fd1945bc206cf56979633dfca8a7494374
-	* tests/openpgp/defs.scm: Add "disable-scdaemon". Remove
-	 "scdaemon-program".
-	* tests/gpgme/gpgme-defs.scm, tests/gpgsm/gpgsm-defs.scm: Likewise.
-	* tests/inittests, tests/pkits/inittests: Add "disable-scdaemon"
-
-2019-02-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Terminate pinentry process gracefully, by watching socket.
-	+ commit c395f8315362793409be54aca630ce6e903ea984
-	* agent/call-pinentry.c (watch_sock): New.
-	(do_getpin): Spawn the watching thread.
-
-	agent: Minor change for pinentry status handling.
-	+ commit 99aa54323f97937613e02d8c2da91544e1fe7bcf
-	* agent/call-pinentry.c (struct entry_parm_s): Add status.
-	(do_getpin): Use param->status.
-	(agent_askpin): Copy param->status. to pininfo.
-
-	agent: Factor out the getpin interaction.
-	+ commit ada797f477f923bee36d67c8e49f728ae7adb9e9
-	* agent/call-pinentry.c (do_getpin): New.
-	(agent_askpin, agent_get_passphrase): Use do_getpin.
-
-2019-02-18 Damien Goutte-Gattat via Gnupg-devel <gnupg-devel@gnupg.org>
-
-	sm: Support generation of card-based ed25519 CSR.
-	+ commit 3cbdf896e6919333b5423001ab58c01a04363386
-	* sm/call-agent.c (gpgsm_scd_pksign): Allow SHA512. Create proper
-	S-expression for EdDSA signature.
-	* sm/certreqgen.c (create_request): Force use of SHA512 when
-	using a ed25519 key.
-	* sm/misc.c (transform_sigval): Insert OID for ed25519.
-
-2019-02-15 Damien Goutte-Gattat via Gnupg-devel <gnupg-devel@gnupg.org>
-
-	sm: Support generation of card-based ECDSA CSR.
-	+ commit 74e9b579ca273fc07be090bb5fb7800a97b1b452
-	* sm/call-agent.c (gpgsm_scd_pksign): Identify type of signing key
-	and format resulting S-expression accordingly.
-	* sm/misc.c (transform_sigval): Support ECDSA signatures.
-
-2019-02-14 Ingvar Hagelund <ingvar@redpill-linpro.com>
-
-	po: Correct a simple typo in the Norwegian translation.
-	+ commit b89f1790e0b9f3196a2382a9b9ff5f461c58a449
-
-
-2019-02-13 Werner Koch <wk@gnupg.org>
-
-	card: New command "yubikey".
-	+ commit 7e1cd2cd416f852fc039af310e3df1ce395d89a9
-	* tools/card-tool-yubikey.c: New.
-	* tools/Makefile.am (gpg_card_tool_SOURCES): Add it.
-	* tools/card-call-scd.c (scd_apdu): Allow returning data.
-	* tools/card-tool-misc.c (send_apdu): New. Move from gpg-card-tool.c
-	and let it return data. Change all callers.
-
-	* tools/gpg-card-tool.c (cmd_writecert): Prepend the certref with the
-	current application type.
-	(cmd_yubikey): New.
-
-2019-02-11 Werner Koch <wk@gnupg.org>
-
-	scd: Implement decryption for PIV cards.
-	+ commit 43b14b4cc227311aa77b1fc1d9577c5f7d3eda86
-	* scd/app-piv.c (do_decipher): New.
-
-	scd: For PIV cards used NO_AUTH instead of BAD_PIN.
-	+ commit b2838694402ce0cfc2ef70451bf0e6677b875ca9
-	* common/util.h (GPG_ERR_NO_AUTH, GPG_ERR_BAD_AUTH): Add replacement
-	codes for gpgrt < 1.36.
-	* scd/app-piv.c (auth_adm_key):
-	(do_genkey, do_writecert): Use better error codes.
-
-2019-02-08 Werner Koch <wk@gnupg.org>
-
-	scd: Implement RSA signing for PIV cards.
-	+ commit 53beea56afecde76f0f4ca93fc50ca59298a093e
-	* scd/app-piv.c (concat_tlv_list): New.
-	(get_key_algorithm_by_dobj): Rename args for clarity.
-	(do_auth): factor all code out to ...
-	(do_sign): new. Implement RSA signing.
-
-	sm: In --gen-key with "key from card" show also the algorithm.
-	+ commit 0328976c94adc2c518c7a7763a35319a0000c5e2
-	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Get and show algo.
-
-	common: Provide function to get public key algo names in our format.
-	+ commit 03bf8e967adb2dd13329ba1089deb419d49e55c0
-	* tools/card-tool-misc.c (pubkey_algo_string): Move to ...
-	* common/sexputil.c (pubkey_algo_string): here.
-
-	card: Make "generate" work for PIV cards.
-	+ commit a1cb4a940f308ba21ecc002b044efccf0c547784
-	* tools/card-call-scd.c (scd_genkey_cb): Make createtime optional.
-	(scd_genkey_cb): Ditto. Add arg algo.
-	* tools/gpg-card-tool.c (cmd_generate): Add options and factor card
-	specific code out to ...
-	(generate_openpgp, generate_generic): new functions.
-
-	scd: Allow generating ECC curves on PIV cards.
-	+ commit b349adc5c0d00d2fc405a45bd078f1580b5610cc
-	* scd/app-piv.c (genkey_parse_ecc): New.
-	(get_keygrip_by_tag): Call that one.
-	(do_readkey): Call that one.
-	* scd/command.c (cmd_genkey): Add option --algo.
-
-	common: New functions get_option_value and ascii_strupr.
-	+ commit e2f18023b3b3b7e55b35218f65e37448d1011172
-	* common/server-help.c (get_option_value): New.
-	* common/stringhelp.c (ascii_strupr): New.
-
-2019-02-07 Werner Koch <wk@gnupg.org>
-
-	card: Print the used algorithm of all keys.
-	+ commit b79bc877f2ad4d08e7de377cf4bf616b981b3c5f
-	* tools/card-call-scd.c (scd_readkey): New.
-	* tools/card-tool-misc.c (pubkey_algo_string): New.
-	* tools/gpg-card-tool.c (list_one_kinfo): Print the algo.
-
-	card: Fix a NULL-ptr deref in key listings.
-	+ commit df6ba6dfd235fddb7645bc16573da1a6a7e6b49d
-	* tools/card-tool-keys.c (get_matching_keys): Fix segv.
-	* tools/gpg-card-tool.c (main): Init info.
-
-	scd: Store a new PIV public key in the certificate DO.
-	+ commit 5bf1212000f48243642ace0f708fd27446879b9e
-	* scd/app-piv.c (struct genkey_result_s): Remove type and all users.
-	(send_keypair_and_cert_info): Print certinfo only if we got a cert..
-	(readcert_by_tag): Add arg r_mechanism and implement reading of public
-	keys.
-	(get_keygrip_by_tag): Use a public key to compute the keygrip.
-	(do_readcert): Make sure to only return a certificate.
-	(do_readkey): Read public key from the DO if a certificate is missing.
-	(get_key_algorithm_by_dobj): Get the algorithm also from a public key.
-	(does_key_exist): String changes.
-	(do_genkey): Remove result caching and store public key in the DO.
-
-	card: Support reading and writing PIV certificates.
-	+ commit fcec5b40e589b2ef201efb89f22a952feb4a9069
-	* scd/app-piv.c (add_tlv): New.
-	(put_data): New.
-	(do_writecert): New.
-	(do_setattr): Remove usused special mode 0.
-	* tools/gpg-card-tool.c (cmd_writecert): Allow other cards than
-	OPENPGP.
-	(cmd_readcert): Ditto.
-
-2019-02-06 Werner Koch <wk@gnupg.org>
-
-	scd: Add genkey command to app-piv (rsa-only)
-	+ commit b5b1f721582df9d0379cb68b4faeceed32a56e49
-	* scd/app-piv.c (struct genkey_result_s): new.
-	(struct app_local_s): add member genkey_results.
-	(do_deinit): Free that one.
-	(flush_cached_data): Extend to delete all items.
-	(keyref_from_dobj): New.
-	(do_readkey): New.
-	(do_auth): Use keyref_from_dobj.
-	(does_key_exist): New.
-	(genkey_parse_rsa): New.
-	(do_genkey): New.
-
-	scd: Make app_genkey and supporting ISO function more flexible.
-	+ commit 9a9cb0257aebb1480b999fdf9d90904083eb8e3c
-	* scd/app.c (app_genkey): Add arg keytype.
-	* scd/app-common.h (struct app_ctx_s): Fitto for the genkey member.
-	* scd/command.c (cmd_genkey): Adjust for change.
-	* scd/iso7816.c (do_generate_keypair): Replace arg read_only by new
-	args p1 and p2.
-	(iso7816_read_public_key): Adjust for this.
-	(iso7816_generate_keypair): Add new args p1 and p2.
-	* scd/app-openpgp.c (do_genkey): Adjust for changes.
-
-	scd: Fix parameter name of app_change_key.
-	+ commit c26af8ac263ea006ed32e110a09271e4bfbf1f37
-	* scd/app-common.h (APP_GENKEY_FLAG_FORCE): New.
-	* scd/app.c (app_change_pin): Rename arg reset_mode to flags and
-	change from int to unsigned int.
-
-	scd: Implement PIN changing and unblocking for PIV cards.
-	+ commit e9e876cb5572670322aa1d3462d64c75c03974d9
-	* scd/app-piv.c: Some refactoring
-	(do_change_chv): Implement.
-
-2019-02-05 Werner Koch <wk@gnupg.org>
-
-	scd: Allow standard keyref scheme for app-openpgp.
-	+ commit 3231ecdafd71ac47b734469b07170756979ede72
-	* scd/app-openpgp.c (do_change_pin): Allow prefixing the CHVNO with
-	"OPENPGP."
-	* tools/card-call-scd.c (scd_change_pin): Change API to use strings.
-	* tools/gpg-card-tool.c (cmd_passwd): Adjust for change.
-	(cmd_unblock): Ditto.
-
-2019-01-31 Werner Koch <wk@gnupg.org>
-
-	card: Implement non-interactive mode.
-	+ commit 1c0fa3e6f74692d5e9b5f08cda523f0fcec305eb
-	* tools/card-tool.h (opt): Add field 'initialized'.
-	* tools/card-call-scd.c (scd_learn): Set it.
-	* tools/gpg-card-tool.c (main): Reworked.
-	(dispatch_command): New.
-
-	card: New command 'authenticate'.
-	+ commit da383257404cde9689bc58259ef3f46e9903bf34
-	* tools/card-tool-misc.c (hex_to_buffer): New.
-	* tools/gpg-card-tool.c (get_data_from_file): Change to allow returning
-	a string.
-	(cmd_authenticate): New.
-	(cmds): Add command "authenticate".
-
-	scd: Add DES authentication for PIV card.
-	+ commit 1d57450f3e71b198e66e155a8ebbfab452f58ffc
-	* scd/app-piv.c (flush_cached_data): New.
-	(auth_adm_key): New.
-	(set_adm_key): New.
-	(do_setattr): New.
-	* scd/command.c (MAXLEN_SETATTRDATA): New.
-	(cmd_setattr): Add an inquire option.
-
-2019-01-30 Werner Koch <wk@gnupg.org>
-
-	card: Cache the results from gpg and gpgsm.
-	+ commit 0107984f9f55f84e4842642bceefd2181ec09dab
-	* tools/card-tool-keys.c (keyblock_cache): New var.
-	(release_keyblock): Factor code out to a new do_release_keyblock. Add
-	a cache.
-	(flush_keyblock_cache): New.
-	(get_matching_keys): Use the cache.
-	* tools/gpg-card-tool.c (cmds): Add command "reset".
-	(interactive_loop): Implement reset.
-
-	card: Print matching OpenPGP and X.509 data.
-	+ commit 833f27a6a7e059e38bccaf360f05e72e4403545a
-	* tools/card-tool-keys.c: New.
-	* tools/Makefile.am (gpg_card_tool_SOURCES): Add file.
-	* tools/card-tool.h (struct pubkey_s, pubkey_t): New.
-	(struct userid_s, userid_t): New.
-	(struct keyblock_s, keyblock_t): New.
-	* common/util.h (GNUPG_PROTOCOL_): New const
-	* tools/gpg-card-tool.c (aTest): Add temporary command.
-	(list_one_kinfo): Print info from gpg and gpgsm.
-
-	gpg: Emit an ERROR status if no key was found with --list-keys.
-	+ commit 140fda8c61422ec055c3f7e214cc35706c4320dd
-	* g10/keylist.c (list_one): Emit status line.
-
-	common: Add kludge to allow silencing gnupg_exec_tool_stream.
-	+ commit 1fd3d864b4eceaf45b33e754e5d832b7ccc0d17f
-	* common/exectool.c (read_and_log_buffer_t): Take care of a --quiet
-	argument.
-	(gnupg_exec_tool_stream): Ditto.
-
-	gpg: Allow generating Ed25519 key from an existing key.
-	+ commit 346a98fabe03adf2e202e36fc2aa24b1c2571154
-	* g10/misc.c (map_pk_gcry_to_openpgp): Add EdDSA mapping.
-
-	common: New function decode_c_string.
-	+ commit 6ecedd0b25b6b1a33be63b99f2a8256370000521
-	* common/miscellaneous.c (decode_c_string): New.
-
-2019-01-29 Werner Koch <wk@gnupg.org>
-
-	gpg: Implement searching keys via keygrip.
-	+ commit c128667b3cba749dd14262e032d4c260a2b0acd3
-	* kbx/keybox-defs.h (struct _keybox_openpgp_key_info): Add field grip.
-	* kbx/keybox-openpgp.c (struct keyparm_s): New.
-	(keygrip_from_keyparm): New.
-	(parse_key): Compute keygrip.
-	* kbx/keybox-search.c (blob_openpgp_has_grip): New.
-	(has_keygrip): Call it.
-
-	common: Provide some convenient OpenPGP related constants.
-	+ commit f382984966a31a4cbe572bce5370590c5490ed1e
-	* common/openpgpdefs.h (OPENPGP_MAX_NPKEY): New.
-	(OPENPGP_MAX_NSKEY): New.
-	(OPENPGP_MAX_NSIG): New.
-	(OPENPGP_MAX_NENC): New.
-	* g10/packet.h: Define PUBKEY_MAX using the new consts.
-
-	common: New helper functions for OpenPGP curve OIDs.
-	+ commit 4a1558d0c7190cf13d35385e47291a7aa121be3e
-	* common/openpgp-oid.c (openpgp_oidbuf_to_str): Factor most code out
-	to ...
-	(openpgp_oidbuf_to_str): new.
-	(openpgp_oidbuf_is_ed25519): New.
-	(openpgp_oidbuf_is_cv25519): New.
-
-	card: Support factory reset for Yubikey PIV application.
-	+ commit 79bed504e51034d960fcb858fb643901cad85913
-	* scd/app-common.h (struct app_ctx_s): Add field cardtype.
-	* scd/app.c (app_new_register): Set cardtype for yubikey.
-	(app_getattr): Add CARDTYPE.
-	(app_write_learn_status): Emit new attribute.
-	* scd/app-piv.c (do_getattr): Add CHV-USAGE.
-	(do_learn_status): Emit it.
-	* tools/card-tool.h (struct card_info_s): Add field cardtype.
-	* tools/card-call-scd.c (learn_status_cb): Parse "CARDTYPE".
-
-	* tools/gpg-card-tool.c (list_piv): Print PIN usage policy.
-	(list_card): Print card type.
-	(cmd_factoryreset): Implement for Yubikey with PIV.
-
-	card: Print keyinfo for PIV cards.
-	+ commit 9325c92284bb346d11c3591bb2ea88095989361a
-	* scd/app-piv.c (do_learn_status): Print CHV-STATUS.
-	* tools/card-tool.h (struct card_info_s): Rename chvretry to chvinfo.
-	* tools/card-call-scd.c (learn_status_cb): Depend CHV-STATUS on app
-	type.
-	* tools/gpg-card-tool.c (list_piv): New.
-
-	card: Make printing of key information more flexible.
-	+ commit 237880175f59d372011cd2e20bb49726eeccf058
-	* tools/card-tool-misc.c: New.
-	* tools/card-tool.h: Rewored data structures for key infos.
-	* tools/gpg-card-tool.c: Ditto.
-	* tools/card-call-scd.c: Ditto.
-
-2019-01-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Clear bogus pinentry cache, when it causes an error.
-	+ commit 02a2633a7f0b7d91aa48ea615fb3a0edfd6ed6bb
-	* agent/agent.h (PINENTRY_STATUS_*): Expose to public.
-	(struct pin_entry_info_s): Add status.
-	* agent/call-pinentry.c (agent_askpin): Clearing the ->status
-	before the loop, let the assuan_transact set ->status. When
-	failure with PINENTRY_STATUS_PASSWORD_FROM_CACHE, it returns
-	soon.
-	* agent/findkey.c (unprotect): Clear the pinentry cache,
-	when it causes an error.
-
-2019-01-27 Werner Koch <wk@gnupg.org>
-
-	card: Implement the bulk of OpenPGP stuff into gpg-card-tool.
-	+ commit 1c9251004592415b27988064ae20504dd1c37f57
-	* tools/card-call-scd.c: New.
-	* tools/card-tool.h: new.
-	* tools/gpg-card-tool.c: Largely extended.
-
-2019-01-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix just changed agent_get_s2k_count.
-	+ commit 54f88afba4564e62e51fe6e22beabbdee75f91ac
-	* g10/call-agent.c (agent_get_s2k_count): Actually return the count.
-
-	gpg: Move S2K encoding function to a shared file.
-	+ commit ec13b1c562e34c0fcbc7b848ab6dc187b79cf2c1
-	* g10/passphrase.c (encode_s2k_iterations): Move function to ...
-	* common/openpgp-s2k.c: new file. Remove default intialization code.
-	* common/openpgpdefs.h (S2K_DECODE_COUNT): New to keep only one copy.
-	* g10/call-agent.c (agent_get_s2k_count): Change to return the count
-	and print an error.
-	* agent/protect.c: Include openpgpdefs.h
-	* g10/card-util.c (gen_kdf_data): Adjust for changes
-	* g10/gpgcompose.c: Include call-agent.h.
-	(sk_esk): Adjust for changes.
-	* g10/passphrase (passphrase_to_dek): Adjust for changes.
-	* g10/main.h (S2K_DECODE_COUNT): Remove macro.
-
-2019-01-25 Werner Koch <wk@gnupg.org>
-
-	scd: Improve app selection for app "undefined".
-	+ commit 0415b80227c52620bece3ae7502f38f24a23e59d
-	* scd/app.c (app_new_register): Don't bail out early in undefined
-	mode.
-
-	scd: Fix flushing of CA-FPR data objects.
-	+ commit c9f4c1f0de06672c6ae2b793d86cc001d131f9a6
-	* scd/app-openpgp.c (do_setattr): Add new table item to flush a
-	different tag.
-
-2019-01-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Support --mode=ssh option for CLEAR_PASSPHRASE.
-	+ commit ae966bbe9b16ed68a51391afdde615339755e22d
-	* agent/command.c (cmd_clear_passphrase): Add support for SSH.
-
-	dirmngr: Fix initialization of assuan's nPth hook.
-	+ commit 1f8817475f59ede3f28f57edc10ba56bbdd08b49
-	* dirmngr/dirmngr.c (main): Move assuan_set_system_hooks to...
-	(thread_init): ... here.
-
-2019-01-24 Werner Koch <wk@gnupg.org>
-
-	common: Extend function percent_data_escape.
-	+ commit 055f8854d3f49b8d06105d20f344f5ac10e4f6a6
-	* common/percent.c (percent_data_escape): Add new args prefix and
-	plus_escape.
-	* agent/command.c (cmd_put_secret): Adjust for changed function
-
-	* common/t-percent.c (test_percent_data_escape): Extend test for the
-	prefix.
-	(test_percent_data_escape_plus): new test for the plus escaping.
-
-2019-01-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support PASSWD --clear for OpenPGP card.
-	+ commit fec75a3868da72196f76aca95c7ab07debb7dc04
-	* scd/app-openpgp.c (do_change_pin): Implement handling
-	APP_CHANGE_FLAG_CLEAR.
-
-2019-01-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Stop early when trying to create a primary Elgamal key.
-	+ commit f97dc55ff1b041071bc3cbe98aa761bf77bb7ac8
-	* g10/misc.c (openpgp_pk_test_algo2): Add extra check.
-
-	card-tool: Add skeleton for new tool.
-	+ commit e6d613711a327d63511601dd42aeff34e09ec95a
-	* tools/gpg-card-tool.c: New.
-	* tools/gpg-card-tool-w32info.rc: New.
-	* tools/Makefile.am: Add new tool.
-
-	common: Add generic status print function.
-	+ commit 03cf23b43ec5fea8a355d3ba2200e86a8efc589b
-	* common/status.c (gnupg_set_status_fd): New.
-	(gnupg_status_printf): New.
-	* po/Makevars (XGETTEXT_OPTIONS): Add gnupg-status_printf.
-
-2019-01-21 Werner Koch <wk@gnupg.org>
-
-	scd: Support CHV-STATUS and CHECKPIN for PIV.
-	+ commit fa9d703de5c70ae925e8ca6604073506f24d641a
-	* scd/app-piv.c (parse_pin_keyref): New.
-	(get_chv_status): New.
-	(do_getattr): Add name CHV-STATUS.
-	(verify_pin): Add arg keyref to support other PINs.
-	(do_change_pin): New. Right now limited to --clear.
-	(do_check_pin): New.
-	(app_select_piv): Register new commands.
-
-	scd: Add option --clear to PASSWD.
-	+ commit 29929e65521279eabc98a67c766fe485057405a9
-	* scd/command.c (cmd_passwd): Add option --clear.
-	(send_status_printf): New.
-	* scd/app-common.h (APP_CHANGE_FLAG_CLEAR): New.
-	* scd/app-nks.c (do_change_pin): Return an error if that option is
-	used.
-	* scd/app-openpgp.c (do_change_pin): Ditto.
-
-2019-01-20 Werner Koch <wk@gnupg.org>
-
-	scd: Add very basic support for PIV cards.
-	+ commit ec56996029d95d4bd26e1badfe207232270c6247
-	* scd/app-piv.c: New.
-	* scd/Makefile.am (card_apps): Add app-piv.c
-	* scd/app.c (app_new_register): Try to get a Yubikey serial number.
-	Detect the PIV application.
-	(get_supported_applications): Add "piv".
-
-	scd: One new and one improved 7816 function.
-	+ commit 70bb5c7931598590b1acfae90bf4657f5911d2d3
-	* scd/apdu.c (apdu_send_direct): New arg R_SW.
-	* scd/command.c (cmd_apdu): Ditto.
-	* scd/iso7816.c (iso7816_apdu_direct): New arg R_SW.
-	(iso7816_general_authenticate): New.
-	* scd/app-nks.c (get_chv_status, get_nks_version): Pass NULL for new
-	arg.
-
-2019-01-17 Werner Koch <wk@gnupg.org>
-
-	ssh: Simplify the curve name lookup.
-	+ commit d93797c8a7892fe26672c551017468e9f8099ef6
-	* agent/command-ssh.c (struct ssh_key_type_spec): Add field
-	alt_curve_name.
-	(ssh_key_types): Add some alternate curve names.
-	(ssh_identifier_from_curve_name): Lookup also bey alternative names
-	and return the canonical name.
-	(ssh_key_to_blob): Simplify the ECDSA case by using gcry_pk_get_curve
-	instead of the explicit mapping.
-	(ssh_receive_key): Likewise. Use ssh_identifier_from_curve_name to
-	validate the curve name. Remove the reverse mapping because since
-	GnuPG-2.2 Libgcrypt 1.7 is required.
-	(ssh_handler_request_identities): Log an error message.
-
-2019-01-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Report STATUS_NO_SECKEY when it is examined.
-	+ commit dafffa95b2317bcb80fff1fd6d2bc7b4e6b1e206
-	* g10/packet.h (struct pubkey_enc_list): Add result.
-	* g10/mainproc.c (proc_pubkey_enc): Initialize ->result.
-	(proc_encrypted): Report STATUS_NO_SECKEY status.
-	* g10/pubkey-enc.c (get_session_key): Set ->result.
-
-2019-01-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for USB INTERRUPT transfer.
-	+ commit 5ab3bc422a5cc1a646c168b547f2b6538b3a4ffa
-	* scd/ccid-driver.c (intr_cb): When LIBUSB_TRANSFER_NO_DEVICE,
-	just handle this event as failure.
-
-2019-01-03 Werner Koch <wk@gnupg.org>
-
-	scd: Add two variants to the set of ISO7816 functions.
-	+ commit 405feca2bdeeb620dc406667a702035a123ae848
-	* scd/iso7816.c (iso7816_select_application_ext): New.
-	(iso7816_get_data_odd): New.
-
-	scd: Support "READKEY --advanced" for all cards.
-	+ commit cca2b87e79cda212a33c13efdd2b2830295d2efe
-	* scd/command.c (cmd_readkey): Reformat for advanced mode.
-
-2018-12-18 Werner Koch <wk@gnupg.org>
-
-	wks: Do not use compression for the encrypted data.
-	+ commit 70a8db0333e3c22403b3647f8b5f924f6dace719
-	* tools/gpg-wks-client.c (encrypt_response): Add arg -z0.
-	* tools/gpg-wks-server.c (encrypt_stream): Ditto.
-
-2018-12-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix description string.
-	+ commit e6b7e0ff9990813ac9f11b2d9d92596d6379ebfe
-	* scd/app-openpgp.c (data_objects): Capitalize the word for usage.
-
-2018-12-17 Werner Koch <wk@gnupg.org>
-
-	Silence a few compiler warnings new with gcc 8.
-	+ commit 40c307fa8d0e813f2aa57806f25b8b0063cc2be3
-	* dirmngr/dns.c: Include gpgrt.h. Silence -Warray-bounds also gcc.
-	* tools/gpg-pair-tool.c (command_respond): Init two vars to silence
-	gcc.
-
-2018-12-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	card: Suppress error message by agent_scd_cardlist.
-	+ commit ebf775eb16fef27bd1f27319a5483d04dcf95a9a
-	* g10/call-agent.c (agent_scd_cardlist): Add
-	FLAG_FOR_CARD_SUPPRESS_ERRORS.
-
-2018-12-11 Werner Koch <wk@gnupg.org>
-
-	agent: Make the S2K calibration time runtime configurabe.
-	+ commit cbcc8c19541fe8407f3b6588fce1535c64cf6b25
-	* agent/protect.c (s2k_calibration_time): New file global var.
-	(calibrate_s2k_count): Use it here.
-	(get_calibrated_s2k_count): Replace function static var by ...
-	(s2k_calibrated_count): new file global var.
-	(set_s2k_calibration_time): New function.
-	* agent/gpg-agent.c (oS2KCalibration): New const.
-	(opts): New option --s2k-calibration.
-	(parse_rereadable_options): Parse that option.
-
-	dirmngr: Retry another server from the pool on 502, 503, 504.
-	+ commit 05ef6282784495a77f4faf76c0de5bc85dfecf06
-	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Add arg
-	http_status and handle it.
-	(ks_hkp_search): Get http_status froms end_request and pass on to
-	handle_send_request_error.
-	(ks_hkp_get): Ditto.
-	(ks_hkp_put): Ditto.
-
-	dirmngr: New function http_status2string.
-	+ commit dc61f4ecea5c9815cb00aeb25439978337c1fd64
-	* dirmngr/http.c (http_status2string): New.
-
-	gpg: In search-keys return "Not found" instead of "No Data".
-	+ commit e7252ae57f3c9da557f23295268f74dd25fee3a1
-	* g10/keyserver.c (keyserver_search): Check for NO_DATA.
-
-2018-12-11 Tomi Leppänen <tomi.leppanen@jolla.com>
-
-	tools: Use POSIX compatible arguments for find.
-	+ commit 2c35e67e3475ec38ff49953d79bd0f734d6db542
-	* tools/addgnupghome (filelist): Remove bashism.
-
-2018-12-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix print_pubkey_info new line output.
-	+ commit e154fba30ba0d5f29040a33f5c1b5c25b441b69f
-	* g10/keylist.c (print_pubkey_info): Reverse the condition.
-
-2018-12-04 Werner Koch <wk@gnupg.org>
-
-	wks: Fix filter expression syntax flaw.
-	+ commit 0c36ec241d285545f286069843de4f663cd274a3
-	* tools/wks-util.c (wks_get_key, wks_filter_uid): The filter
-	expression needs a space before the value.
-	(install_key_from_spec_file): Replace es_getline by es_read_line and
-	remove debug output.
-
-	gpg: Prepare revocation keys for use with v5 keys.
-	+ commit c6e2ee020784de63edfa83c76095e086eae49eef
-	* g10/packet.h (struct revocation_key): Add field 'fprlen'.
-	* g10/parse-packet.c (parse_revkeys): Set fprlen and allow for v5
-	keys. Also fix reading of unitialized data at place where
-	MAX_FINGERPRINT_LEN is used.
-	* g10/revoke.c (gen_desig_revoke): Allow for v5 keys and use fprlen.
-	Do an explicit compare to avoid reading unitialized data.
-	* g10/sig-check.c (check_revocation_keys): Use the fprlen.
-	* g10/getkey.c (merge_selfsigs_main): Do an explicit copy to avoid
-	reading unitialized data.
-	* g10/import.c (revocation_present): Use fprlen.
-	* g10/keyedit.c (show_key_with_all_names): Use fprlen.
-	(menu_addrevoker): Use fprlen. Allow for v5 keys.
-	* g10/keygen.c (keygen_add_revkey): Use fprlen.
-	(parse_revocation_key): Allow for v5 keys.
-	* g10/keyid.c (keyid_from_fingerprint): Allow for v5 keys. Print a
-	better error message in case of bogus fingerprints.
-	* g10/keylist.c (print_revokers): Use fprlen.
-
-	wks: Allow reading of --install-key arguments from stdin.
-	+ commit ba46a359b9d6549b74ec8401ea39bad434d87564
-	* tools/wks-util.c (install_key_from_spec_file): New.
-	(wks_cmd_install_key): Call it.
-	* tools/gpg-wks-client.c (main): Allow --install-key w/o arguments.
-	* tools/gpg-wks-server.c (main): Ditto.
-
-	gpg: New list-option "show-only-fpr-mbox".
-	+ commit 0e8bf204791ebfd0c9a8e4b49fbadf998ec62e49
-	* g10/gpg.c (parse_list_options): Add option "show-only-fpr-mbox".
-	* g10/options.h (LIST_SHOW_ONLY_FPR_MBOX): New.
-	* g10/keylist.c (list_keyblock_simple): New.
-	(list_keyblock): Call it.
-	(list_all): Do not print the keyring name in LIST_SHOW_ONLY_FPR_MBOX
-	mode.
-
-	wks: Create sub-directories.
-	+ commit 73e5b0ec9b9ba5e04e55f8c42d81e23df7c3afe0
-	* tools/wks-util.c (wks_compute_hu_fname): Stat and create directory
-	if needed.
-
-	wks: Add new commands --install-key and --remove-key to the client.
-	+ commit 602b1909632925d5a2e0778c102d66109795c627
-	* tools/gpg-wks-client.c (aInstallKey, aRemoveKey, oDirectory): New.
-	(opts): Add "--install-key", "--remove-key" and "-C".
-	(parse_arguments): Parse them.
-	(main): Check that the given directory exists. Implement the new
-	commands.
-
-	wks: Move a few server functions to wks-util.
-	+ commit 99094c992c20dd22971beb3527cfda109cd1df89
-	* tools/gpg-wks-server.c (write_to_file): Move to ...
-	* tools/wks-util.c: here.
-	* tools/gpg-wks-server.c (compute_hu_fname): Move to ...
-	* tools/wks-util.c (wks_compute_hu_fname): here.
-	* tools/gpg-wks-server.c (fname_from_userid): Move to ...
-	* tools/wks-util.c (wks_fname_from_userid): here.
-	* tools/gpg-wks-server.c (command_install_key): Move to ...
-	* tools/wks-util.c (wks_cmd_install_key): here and change caller.
-	* tools/gpg-wks-server.c (command_remove_key): Move to ...
-	* tools/wks-util.c (wks_cmd_remove_key): here and change callers.
-
-2018-12-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Remove --with-*-prefix from configure_opts.
-	+ commit 802b23289cc9b43a56e5032c2681eb21d4014784
-	* autogen.rc (configure_opts): Remove --with-*-prefix.
-
-2018-12-01 Jussi Kivilinna <jussi.kivilinna@iki.fi>
-
-	g10/mainproc: disable hash contexts when --skip-verify is used.
-	+ commit 73e74de0e33bbb76300f96a4174024779047df06
-	* g10/mainproc.c (proc_plaintext): Do not enable hash contexts when
-	opt.skip_verify is set.
-
-	common/iobuf: fix memory wiping in iobuf_copy.
-	+ commit 654e353d9b20f10fa275e7ae10cc50480654f079
-	* common/iobuf.c (iobuf_copy): Wipe used area of buffer instead of
-	first sizeof(char*) bytes.
-
-	common/mischelp: use platform memory zeroing function for wipememory.
-	+ commit 2a650772b4e1c78a4fd20bc88433930e5551fe9c
-	* common/mischelp.h (wipememory): Replace macro with function
-	prototype.
-	(wipememory2): Remove.
-	* common/mischelp.c (wipememory): New.
-	* configure.ac (AC_CHECK_FUNCS): Check for 'explicit_bzero'.
-
-2018-11-30 Werner Koch <wk@gnupg.org>
-
-	scd: Add strerror to new error message.
-	+ commit 3a90efb7cf13532cc82b45c11a7abdadfe0c81f1
-	* agent/call-scd.c (wait_child_thread): Add %s.
-
-	gpg: Improve error message about failed keygrip computation.
-	+ commit cd64af003d4b6b46b69dbd575f73d53359ae0bcc
-	* g10/keyid.c (keygrip_from_pk): Print the fingerprint on failure.
-
-2018-11-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Serialize opening device by select_application.
-	+ commit 47106ac435e891ced67f0ad9bb6b2ee12098c880
-	* scd/app.c (app_new_register): Don't lock APP_LIST_LOCK here.
-	(select_application): Lock with APP_LIST_LOCK earlier.
-
-2018-11-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Better serialization for scdaemon access.
-	+ commit 483e63f9b5faead819ddd28308902ef43bf298ab
-	* agent/call-scd.c (unlock_scd): Move lock before accessing IN_USE.
-	(wait_child_thread): Add log_info for Windows, and fixed log_error
-	message.
-
-2018-11-26 Andre Heinecke <aheinecke@intevation.de>
-
-	w32: Fix linkage of gpg-pair-tool.
-	+ commit f12fcd907903742bde3ebb7ffef244c92d6d1611
-	* tools/Makefile.am (gpg_pair_tool_LDADD): Add W32SOCKLIBS.
-
-2018-11-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Have a thread to wait for the child process of scdaemon.
-	+ commit 40c7923ea881881a48de8f303b0870ec5910e13d
-	* agent/call-scd.c (wait_child_thread): New.
-	(start_scd): Create a thread for wait_child_thread.
-	(agent_scd_check_aliveness): Remove.
-
-	agent: Defer calling assuan_release when it's still in use.
-	+ commit 9fb3f0f3f79e74166cce8e0781e97043f25890cc
-	* agent/call-scd.c (struct scd_local_s): Remove LOCK, introduce IN_USE
-	and INVALID flags.
-	(unlock_scd): Call assuan_release when CTX is invalid.
-	(start_scd): Set IN_USE.
-	(agent_scd_check_aliveness): Don't call assuan_release when it's in use.
-
-	agent: Clean up SCDaemon management.
-	+ commit f45d6124696cc92ccdec09841b8182679c377997
-	* agent/call-scd.c (struct scd_local_s): Remove ctrl_backlink.
-	(start_scd): Don't assign to the field.
-	(agent_scd_check_aliveness): Fix typo in comment.
-
-2018-11-22 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Avoid possible CSRF attacks via http redirects.
-	+ commit fa1b1eaa4241ff3f0634c8bdf8591cbc7c464144
-	* dirmngr/http.h (parsed_uri_s): Add fields off_host and off_path.
-	(http_redir_info_t): New.
-	* dirmngr/http.c (do_parse_uri): Set new fields.
-	(same_host_p): New.
-	(http_prepare_redirect): New.
-	* dirmngr/t-http-basic.c: New test.
-	* dirmngr/ks-engine-hkp.c (send_request): Use http_prepare_redirect
-	instead of the open code.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-
-2018-11-16 Werner Koch <wk@gnupg.org>
-
-	gpg: Start using OCB mode by default with Libgcrypt 1.9.
-	+ commit 1e700961ddf4c54ec5a03a697fe00d7eb606fdff
-	* g10/main.h (GCRYPT_VERSION_NUMBER): Fix type in condition.
-
-2018-11-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	card: Display UIF setting.
-	+ commit e955ca245ea08e68ae2397f1583c8728d72acbd8
-	* g10/call-agent.h (agent_card_info_s): Add UIF fields.
-	* g10/call-agent.c (learn_status_cb): Put UIF DOs info.
-	* g10/card-util.c (current_card_status): Output for UIF.
-
-	scd: Make "learn" report about KDF data object.
-	+ commit 05d163aebc04db109ec5e004eb04a4b3796f6421
-	* scd/app-openpgp.c (do_learn_status): Report KDF attr.
-	* g10/card-util.c (current_card_status): Output KDF for with_colons.
-
-	card: Display if KDF is enabled or not.
-	+ commit a5542a4a702c2210facf58a98bc8d3d16089b6ab
-	* g10/call-agent.h (kdf_do_enabled): New field.
-	* g10/call-agent.c (learn_status_cb): Set kdf_do_enabled if available.
-	* g10/card-util.c (current_card_status): Inform the availability.
-
-2018-11-14 Werner Koch <wk@gnupg.org>
-
-	Remove the gpg-zip script.
-	+ commit 8b8ea802ca071c911158cab0203245a16a69125c
-	* tools/gpg-zip.in: Remove.
-	* m4/tar-ustar.m4: Remove.
-
-2018-11-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Simplify agent_popup_message_stop.
-	+ commit 804a77edd9472d44606641b7772550521e1ba271
-	* agent/call-pinentry.c (agent_popup_message_stop): Just kill it.
-
-2018-11-13 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Support the new WKD draft with the openpgpkey subdomain.
-	+ commit 914fa3be22bf8848a97a7dd405a040d6ef31e2fd
-	* dirmngr/server.c (proc_wkd_get): Implement new openpgpkey subdomain
-	method.
-
-2018-11-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update libgcrypt.m4 and ntbtls.m4.
-	+ commit d58fe697acefd435ec01503dae574d6c99dfedae
-	* m4/libgcrypt.m4: Update from master.
-	* m4/ntbtls.m4: Update from master.
-
-2018-11-12 Andre Heinecke <aheinecke@intevation.de>
-
-	dirmngr: Add FLUSHCRLs command.
-	+ commit 678e4706ee614a6b7e543e2a80072d75405dd4db
-	Summary:
-	* dirmngr/crlcache.c (crl_cache_flush): Also deinit the cache.
-	* dirmngr/server.c (hlp_flushcrls, cmd_flushcrls): New.
-	(register_commands): Add FLUSHCRLS.
-
-2018-11-12 Werner Koch <wk@gnupg.org>
-
-	common: Prepare for parsing mail sub-addresses.
-	+ commit 6b9f772914624cc673ba26d49b6e3adc32dd7e0a
-	* common/mbox-util.c (mailbox_from_userid): Add arg subaddress and
-	implement. Change all callers to pass false for it.
-
-	* common/t-mbox-util.c (run_mbox_no_sub_test): New.
-	(run_filter): Add arg no_sub.
-	(main): Call new test and add option --no-sub.
-
-2018-11-11 Werner Koch <wk@gnupg.org>
-
-	common: Add --filter option to t-mbox-util.
-	+ commit b3095c95ef9d2d76b49a6ad1b946fca590380dc9
-	* common/t-mbox-util.c (run_filter): New.
-	(main): Add option parser.
-
-2018-11-09 Jussi Kivilinna <jussi.kivilinna@iki.fi>
-
-	g10/mainproc: avoid extra hash contexts when decrypting AEAD input.
-	+ commit b46382dd47731231ff49b59c486110a25e08e985
-	* g10/mainproc.c (mainproc_context): New member
-	'seen_pkt_encrypted_aead'.
-	(release_list): Clear 'seen_pkt_encrypted_aead'.
-	(proc_encrypted): Set 'seen_pkt_encrypted_aead'.
-	(have_seen_pkt_encrypted_aead): New.
-	(proc_plaintext): Do not enable extra hash contexts when decryption
-	AEAD input.
-
-2018-11-08 Jussi Kivilinna <jussi.kivilinna@iki.fi>
-
-	g10/armor: optimize radix64 to binary conversion.
-	+ commit 643ec7c642dc75191e712963d2bb460ac247e09b
-	* g10/armor.c (asctobin): Larger look-up table for fast path.
-	(initialize): Update 'asctobin' initialization.
-	(radix64_read): Add fast path for radix64 to binary conversion.
-
-	g10/armor: optimize binary to radix64 conversion.
-	+ commit e8142cc69a2ae5a5d0a238bc9f88841067359af8
-	* g10/armor.c (bintoasc): Change to read-only.
-	(initialize): Use const pointer for 'bintoasc'.
-	(armor_output_buf_as_radix64): New function for faster binary to
-	radix64 conversion.
-	(armor_filter): Use new conversion function.
-
-	g10/armor: use libgcrypt's CRC24 implementation.
-	+ commit e486d4f0259f27906d2c2869cc01b3aa31aaa0a6
-	* g10/armor.c (CRCINIT, CRCPOLY, CRCUPDATE, crc_table): Remove.
-	(new_armor_context): Open libgcrypt CRC24 context.
-	(release_armor_context): Close CRC24 context.
-	(initialize): Remove CRC table generation.
-	(get_afx_crc): New.
-	(check_input, fake_packet, radix64_read, armor_filter): Update to use
-	CRC24 context.
-	* g10/filter.h (armor_filter_context_t): Replace crc intermediate value
-	with libgcrypt md context pointer.
-
-	common/iobuf: optimize iobuf_read_line.
-	+ commit 2b5718c1f76851160115f455c3a9383b04521347
-	* common/iobuf.c (iobuf_read_line): Add fast path for finding '\n'
-	character in buffer.
-
-	g10/armor: remove unused unarmor_pump code.
-	+ commit 47424881b27d4b3bae2925265b2008cda0c2933f
-	* g10/armor.c (unarmor_state_e, unarmor_pump_s, unarmor_pump_new)
-	(unarmor_pump_release, unarmor_pump): Remove.
-	* g10/filter.h (UnarmorPump, unarmor_pump_new, unarmor_pump_release)
-	(unarmor_pump): Remove.
-
-	g10/armor: fix eof checks in radix64_read.
-	+ commit a571bb8df52d6f2727876e086790dd037c9948ad
-	* g10/armor.c (radix64_read): Check EOF with '!afx->buffer_len' instead
-	of 'c == -1', as 'c' is never set to this value.
-
-	g10/decrypt-data: use iobuf_read for higher performance.
-	+ commit 5d6c080522e1666943b75c99124fb69b985b6941
-	* g10/decrypt-data.c (fill_buffer): Use iobuf_read instead of iobuf_get
-	for reading data.
-
-	g10/decrypt-data: use fill_buffer in more places.
-	+ commit e2b9095de35ac4d402b077d5484b4131700a9925
-	* g10/decrypt-data.c (mdc_decode_filter, decode_filter): Use
-	fill_buffer.
-
-2018-11-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpgcompose: Fix --sk-esk.
-	+ commit 69930f6884a934207f7aa523cf6d2b8e22dfe666
-	* g10/gpgcompose.c (sk_esk): Copy the result content correctly.
-	Don't forget to free the result.
-
-	g10: Fix log_debug formatting.
-	+ commit 7fc3decc2e038be905d47701c7ce196ed86a725b
-	* g10/cipher-aead.c (do_flush): No cast is correct.
-	* g10/decrypt-data.c (aead_underflow): No cast needed.
-	Use "%j" for uint64_t for chunklen.
-
-2018-11-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix print_keygrip for smartcard.
-	+ commit 01b77ebbb71d47ba276d3a1af9595fdcd9b48f5f
-	* g10/card-util.c (print_keygrip): Use tty_fprintf.
-
-2018-11-05 Werner Koch <wk@gnupg.org>
-
-	wks: New option --with-colons for gpg-wks-client.
-	+ commit e3a1e80d13487c9336640a99b2f6d385d7d6f55c
-	* tools/gpg-wks.h (opt): Add field with_colons.
-	* tools/gpg-wks-client.c (oWithColons): New const.
-	(opts, parse_arguments): Add option --with-colons.
-	(main): Change aSupported to take several domains in --with-colons
-	mode.
-	(command_send): Factor policy getting code out to ...
-	(get_policy_and_sa): New function.
-	(command_supported): Make use of new function.
-
-	speedo: Remove obsolete configure option of gpgme.
-	+ commit d7323bb2d957fbeb8192c0ecbd99b1d14d302912
-	* build-aux/speedo.mk (speedo_pkg_gpgme_configure): Remove
-	--disable-w32-qt option.
-
-	dirmngr: Fix LDAP port parsing.
-	+ commit a3a5a2451924640588e5ecc03a1d4ba6a6ba94a5
-	* dirmngr/misc.c (host_and_port_from_url): Fix bad port parsing and a
-	segv for a missing slash after the host name.
-
-2018-11-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update *.m4 from libraries.
-	+ commit 8e84efbe35633275e260712ba38a505e3f9d0898
-	* m4/gpg-error.m4: Update from master.
-	* m4/ksba.m4: Ditto.
-	* m4/libassuan.m4: Ditto.
-	* m4/libgcrypt.m4: Ditto.
-	* m4/npth.m4: Ditto.
-	* m4/ntbtls.m4: Ditto.
-
-2018-10-31 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Update *.m4 from libraries.
-	+ commit fd7aee6a97134fdf48a496841241f8ae25736e61
-	* m4/gpg-error.m4: Update from master.
-	* m4/ksba.m4: Ditto.
-	* m4/libassuan.m4: Ditto.
-	* m4/libgcrypt.m4: Ditto.
-	* m4/npth.m4: Ditto.
-	* m4/ntbtls.m4: Ditto.
-
-2018-10-26 Werner Koch <wk@gnupg.org>
-
-	build: By default build wks-tools on all Unix platforms.
-	+ commit b83fed64f8051279a8f36e024c1f12f7f13c4716
-
-
-	wkd: Add option --directory to the server.
-	+ commit f248416bc9792e80bb0785302058131de49d7639
-	* tools/gpg-wks-server.c (opts): Add '--directory',
-	(main): Explain how to set correct permissions.
-	(command_list_domains): Create an empty policy file and remove the
-	warning for an empty policy file.
-
-2018-10-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	kbx: Increase size of field for fingerprint.
-	+ commit 4249e9a2bf028f007d1ddaac730f636e5c6da20f
-	* kbx/keybox-search-desc.h (fpr): Increase the size.
-
-2018-10-25 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	all: fix more spelling errors.
-	+ commit a7c5d65eb50355274c1b5b047c02c653f518900a
-
-
-	headers: fix spelling.
-	+ commit b39ece7d35401302879062d9d4bec25b1249ae7e
-
-
-2018-10-25 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix out of scope use of a var in the keyserver LDAP code.
-	+ commit 2b57a8159cdc3b212a4efc68787b40cafcd91ebe
-	* dirmngr/ks-engine-ldap.c (extract_attributes): Don't use a variabale
-	out of scope and cleanup the entire pgpKeySize block.
-
-2018-10-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10,scd: Improve UIF support.
-	+ commit 0240345728a84d8f235ce05889e83963e52742eb
-	* g10/call-agent.c (learn_status_cb): Parse "bt" flag.
-	* g10/call-agent.h: New member field "bt".
-	* g10/card-util.c (uif): Limit its access only when it is supported.
-	* scd/app-openpgp.c (do_setattr): Allow access to UIF objects only
-	when there is a button.
-
-2018-10-24 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	all: fix spelling and typos.
-	+ commit 54eb375ff14e2a93cea70eab35719be4d25f51ca
-
-
-	doc: fix spelling mistakes.
-	+ commit ef540d1af0649ebf1add190d0ab095e957658b7e
-
-
-2018-10-24 Werner Koch <wk@gnupg.org>
-
-	agent: Fix possible uninitalized use of CTX in simple_pwquery.
-	+ commit bafcf7095159493a656382997f8b0d0bb11a20e8
-	* common/simple-pwquery.c (agent_open): Clear CTX even on early error.
-
-	agent: Fix possible release of unitialize var in a genkey error case.
-	+ commit 2bdc4b6ed97770ed15ec6c5afa02c2e44568a3bc
-	* agent/command.c (cmd_genkey): Initialize 'value'.
-
-	ssh: Fix possible infinite loop in case of an read error.
-	+ commit 7385e1babf6eef586c79ad23f8e541aaf608c4e5
-	* agent/command-ssh.c (ssh_handler_add_identity): Handle other errors
-	than EOF.
-
-	tools: Fix FILE memory leak in gpg-connect-agent.
-	+ commit 378719f25fe00d46393541f4a4f79e04484c3000
-	* tools/gpg-connect-agent.c (do_open): dup the fileno and close the
-	stream.
-
-	sm: Use the correct string in an error message.
-	+ commit 793fd8d876777c24c4d5072301fa530333d6e1d9
-	* sm/gpgsm.c (main): Fix error message.
-
-	gpg: Unfinished support for v5 signatures.
-	+ commit 64a1e86fc06d89c980a196c61d2b6d77d167565e
-	* g10/parse-packet.c (parse_signature): Allow for v5 signatures.
-	* g10/sig-check.c (check_signature_end_simple): Support the 64bit v5
-	byte count.
-	* g10/sign.c (hash_sigversion_to_magic): Ditto.
-	(write_signature_packets): Request v5 sig for v5 keys. Remove useless
-	condition.
-	(make_keysig_packet): Request v5 sig for v5 keys.
-
-2018-10-22 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Prepare for updated WKD specs with ?l= param.
-	+ commit 256a280c51f9ea862e4bfb0bb530c2a96f9088f9
-	* dirmngr/server.c (proc_wkd_get): Tack the raw local address to the
-	request.
-
-	agent: Fix build regression for Windows.
-	+ commit 68b8096b6617cdad09c99d7eda2035176807e78f
-	* agent/command-ssh.c (get_client_info): Turn client_uid into an int.
-	Fix setting of it in case of a failed getsocketopt.
-	* agent/command.c (start_command_handler): Fix setting of the pid and
-	uid for Windows.
-
-	dirmngr: In verbose mode print the OCSP responder id.
-	+ commit 0a7f446c189201ca6e527af08b44da756b343209
-	* dirmngr/ocsp.c (ocsp_isvalid): Print the responder id.
-
-2018-10-15 Werner Koch <wk@gnupg.org>
-
-	tools: Replace duplicated code in mime-maker.
-	+ commit f03928b16c4fb00077d22d8ec141575ef6d26913
-	* tools/rfc822parse.c (HEADER_NAME_CHARS): New. Taken from
-	mime-maker.c.
-	(rfc822_valid_header_name_p): New. Based on code from mime-maker.c.
-	(rfc822_capitalize_header_name): New. Copied from mime-maker.c.
-	(capitalize_header_name): Remove. Replace calls by new func.
-	(my_toupper, my_strcasecmp): New.
-	* tools/mime-maker.c: Include rfc822parse.h.
-	(HEADER_NAME_CHARS, capitalize_header_name): Remove.
-	(add_header): Replace check and capitalization by new functions.
-
-2018-10-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix signing authentication status.
-	+ commit 78f542e1f4495195db2e668f9cd41657fb1afc77
-	* scd/app-openpgp.c (do_sign): Clear DID_CHV1 after signing.
-
-2018-10-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix message for ACK button.
-	+ commit 4ed941ff26783c4fabfe2079029f8e436eb7e340
-	* agent/divert-scd.c (getpin_cb): Display correct message.
-
-2018-10-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support "acknowledge button" feature.
-	+ commit 7a5a4c4cac8709f7c413e94cd0b40f4123baa1e5
-	* scd/apdu.c (set_prompt_cb): New member function.
-	(set_prompt_cb_ccid_reader): New function.
-	(open_ccid_reader): Initialize with set_prompt_cb_ccid_reader.
-	(apdu_set_prompt_cb): New.
-	* scd/app.c (lock_app, unlock_app): Add call to apdu_set_prompt_cb.
-	* ccid-driver.c (ccid_set_prompt_cb): New.
-	(bulk_in): Call ->prompt_cb when timer extension.
-	* scd/command.c (popup_prompt): New.
-
-	agent: Support --ack option for POPUPPINPADPROMPT.
-	+ commit 827529339a4854886dbb5625238e7e01013efdcd
-	* agent/divert-scd.c (getpin_cb): Support --ack option.
-
-2018-10-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Don't take the a TOFU trust model from the trustdb,
-	+ commit 150a33df41944d764621f037038683f3d605aa3f
-	* g10/tdbio.c (tdbio_update_version_record): Never store a TOFU model.
-	(create_version_record): Don't init as TOFU.
-	(tdbio_db_matches_options): Don't indicate a change in case TOFU is
-	stored in an old trustdb file.
-
-2018-10-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix extra check for sign usage of a data signature.
-	+ commit b6275f3bda8edff34274c5b921508567f491ab9c
-	* g10/sig-check.c (check_signature_end_simple):
-
-	gpg: Make --skip-hidden-recipients work again.
-	+ commit 79f165d7a8bcc26972712bb0f0cc554d5c3d4e42
-	* g10/pubkey-enc.c (get_session_key): Take care of
-	opt.skip_hidden_recipients.
-
-2018-10-02 Werner Koch <wk@gnupg.org>
-
-	gpg: New options import-drop-uids and export-drop-uids.
-	+ commit 8e83493dae426fe36a0e0081198b10db1e103ff1
-	* g10/options.h (IMPORT_DROP_UIDS): New.
-	(EXPORT_DROP_UIDS): New.
-	* g10/import.c (parse_import_options): Add option "import-drop-uids".
-	(import_one): Don't bail out with that options and no uids found.
-	Also remove all uids.
-	(remove_all_uids): New.
-	* g10/export.c (parse_export_options): Add option "export-drop-uids".
-	(do_export_one_keyblock): Implement option.
-
-2018-10-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix gnupg_reopen_std.
-	+ commit 50b02dba2060a8969da47b18d9c0ecdccbd30db4
-	* common/sysutils.c (gnupg_reopen_std): Use fcntl instead of fstat.
-
-2018-09-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10,scd: Support UIF changing command.
-	+ commit 0cb65564e022fface5ada4de8e0c2c4c3d0ac8ad
-	* g10/card-util.c (uif, cmdUIF): New.
-	(card_edit): Add call to uif by cmdUIF.
-	* scd/app-openpgp.c (do_getattr): Support UIF-1, UIF-2, and UIF-3.
-	(do_setattr): Likewise.
-	(do_learn_status): Learn UIF-1, UIF-2, and UIF-3.
-
-2018-09-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix memory leak for --card-status.
-	+ commit fe8b6339542f3b1228b5fd56fc710ea3b07a3a2b
-	* g10/card-util.c (card_status): Release memory of serial number.
-
-2018-09-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix another memory leak.
-	+ commit 60c880bda5c9b821fd2968cf89c38c37be3c1a7b
-	* g10/skclist.c (enum_secret_keys): Use SK_LIST instead of pubkey_t.
-
-	g10: Fix memory leak (more).
-	+ commit 2eb481e8cc1c37378cf68a06557c4a7a625d315c
-	* g10/skclist.c (enum_secret_keys): Free SERIALNO on update.
-
-	g10: Fix memory leak in enum_secret_keys.
-	+ commit 64c5c45e2aa4a12d939680b9d51c8b26d61c5e9d
-	* g10/skclist.c (enum_secret_keys): Don't forget to call
-	free_public_key in the error return paths.
-
-2018-09-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	Revert "dirmngr: hkp: Avoid potential race condition when some hosts die."
-	+ commit 69bab1cba07a8259b85a7911c2824724667803a4
-	This reverts commit 04b56eff118ec34432c368b87e724bce1ac683f9.
-
-	dirmngr: Serialize access to hosttable.
-	+ commit 995aded58724a1a07704493b311be5222b3f82a2
-	* dirmngr/dirmngr.h (ks_hkp_init): New.
-	* dirmngr/dirmngr.c (main): Call ks_hkp_init.
-	* dirmngr/ks-engine-hkp.c (ks_hkp_init): New.
-	(ks_hkp_mark_host): Serialize access to hosttable.
-	(ks_hkp_print_hosttable, make_host_part): Likewise.
-	(ks_hkp_housekeeping, ks_hkp_reload): Likewise.
-
-2018-09-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Use iobuf_get_noeof to avoid undefined behaviors.
-	+ commit f80346f42df4bdc7d0a9741c3922129aceae4f81
-	* common/iobuf.c (block_filter): Use iobuf_get_noeof.
-
-	agent: Fix error code check from npth_mutex_init.
-	+ commit adce73b86fd49d5bbb8884231a26cc7533d400e2
-	* agent/call-pinentry.c (initialize_module_call_pinentry): It's an
-	error when npth_mutex_init returns non-zero.
-
-2018-09-07 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Emit SOURCE status also on NO_DATA.
-	+ commit bee65edfbc8cc2c369e5941cc9d1a01a0519b388
-	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Send SOURCE status also on
-	NO DATA error.
-	(ks_hkp_get): Ditto.
-	* g10/call-dirmngr.c (gpg_dirmngr_ks_search): Print "data source" info
-	also on error.
-	(gpg_dirmngr_ks_get): Ditto.
-
-2018-09-07 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	dirmngr: hkp: Avoid potential race condition when some hosts die.
-	+ commit 04b56eff118ec34432c368b87e724bce1ac683f9
-	* dirmngr/ks-engine-hkp.c (select_random_host): Use atomic pass
-	through the host table instead of risking out-of-bounds write.
-
-2018-09-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix memory leak.
-	+ commit 7c96cc67e108f3a9514a4222ffac2f9f9a2ab19e
-	* g10/import.c (read_block): Call free_packet to skip the packet.
-
-2018-09-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpgscm: Suppress warnings for GCC > 6.
-	+ commit 99c17b970bc0ca7e0cff7fe031c6f9feb05af3ff
-	* tests/gpgscm/scheme.c (CASE): Use unused attribute for GCC > 6.
-	(FALLTHROUGH): New for fallthrough.
-	(Eval_Cycle): Use FALLTHROUGH. Remove not-needed comment of
-	fallthrough.
-
-	Fix use of strncpy, which is actually good to use memcpy.
-	+ commit 625ced6e672daa892d334323cce6b3d42a6f929f
-	* common/ssh-utils.c (get_fingerprint): Use memcpy.
-	* g10/build-packet.c (string_to_notation): Use memcpy.
-
-2018-09-05 Werner Koch <wk@gnupg.org>
-
-	kbx: Add framework for a public key daemon.
-	+ commit 512be1d04b98a9d6a9067bd34c16513089a0db9f
-	* kbx/keyboxd.c: New.
-	* kbx/keyboxd.h: New.
-	* kbx/kbxserver.c: New.
-	* kbx/keyboxd-w32info.rc: New.
-	* kbx/Makefile.am (EXTRA_DIST): Add new rc file.
-	(resource_objs): Ditto.
-	(libexec_PROGRAMS): New.
-	(common_libs, commonpth_libs): New.
-	(kbxutil_LDADD): Use here.
-	(keyboxd_SOURCES): New.
-	(keyboxd_CFLAGS): New.
-	(keyboxd_LDADD): New.
-	(keyboxd_LDFLAGS): New.
-	(keyboxd_DEPENDENCIES): new.
-	($(PROGRAMS)): Extend.
-
-	common: New function status_printf.
-	+ commit d4489be467e7229e17fb17a0489bf711d6ce66d6
-	* common/asshelp2.c (set_assuan_context_func): New.
-	(status_printf): New.
-	* po/Makevars (XGETTEXT_OPTIONS): Add status_printf
-
-2018-08-29 Werner Koch <wk@gnupg.org>
-
-	gpg: Explain error message in key generation with --batch.
-	+ commit 1bfe766bcf3959135333900934f1a15c9b96c3cf
-	* g10/keygen.c (generate_keypair): Show more info.
-
-	gpg: Remove unused function get_pubkeys.
-	+ commit ed8fe21e6612401846fc4af8631f0136dc633c67
-	* g10/getkey.c (get_pubkeys): Remove.
-	(pubkey_free): Remove and use code directly ...
-	(pubkeys_free): ... here.
-
-	gpg: New option --known-notation.
-	+ commit 3da835713fb6220112d988e1953f3d84beabbf6a
-	* g10/gpg.c (oKnownNotation): New const.
-	(opts): Add option --known-notation.
-	(main): Set option.
-	* g10/parse-packet.c (known_notations_list): New local var.
-	(register_known_notation): New.
-	(can_handle_critical_notation): Rewrite to handle the new feature.
-	Also print the name of unknown notations in verbose mode.
-
-2018-08-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Refresh expired keys originating from the WKD.
-	+ commit 7f172404bfcf719b9b1af4a182d4803525ebff7c
-	* g10/getkey.c (getkey_ctx_s): New field found_via_akl.
-	(get_pubkey_byname): Set it.
-	(only_expired_enc_subkeys): New.
-	(get_best_pubkey_byname): Add support to refresh expired keys from the
-	WKD.
-
-	gpg: Remove unused arg from a function.
-	+ commit db67ccb759426c1173761574b14bdfe6a76394c2
-	* g10/getkey.c (get_best_pubkey_byname): Remove unused arg 'no_akl'.
-	Change both callers.
-
-2018-08-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Prepare for longer card fingerprints.
-	+ commit 108702ccae8ff1e5fec3b8e710f06a03637244c7
-	* g10/call-agent.h (agent_card_info_s): Rename the "*valid" fields to
-	"*len".
-	* g10/call-agent.c (unhexify_fpr): Change to take a FPRLEN and to
-	return the actual length.
-	(agent_release_card_info): Adjust for these changes.
-	* g10/card-util.c (print_sha1_fpr): Rename to print_shax_fpr and add
-	arg FPRLEN. Change all callers to pass the length.
-	(print_sha1_fpr_colon): Rename to print_shax_fpr_colon and add arg
-	FPRLEN. Change all callers to pass the length.
-	(fpr_is_zero): Add arg FPRLEN.
-	(fpr_is_ff): Ditto.
-	(show_card_key_info): Use the new functions.
-	* g10/skclist.c (enum_secret_keys): Use MAX_FINGERPRINT_LEN.
-
-2018-08-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix enum_secret_keys for card keys.
-	+ commit b823788d200902f34c632026934cf0e43152b73e
-	* g10/skclist.c (enum_secret_keys): Since "KEY-FPR" returns
-	fingerprint in binary, change it to hex string.
-
-	g10: Prefer to available card keys for decryption.
-	+ commit 84cc55880a5815155328229beb309326472bfd82
-	* g10/skclist.c (enum_secret_keys): Add logic to prefer
-	decryption keys on cards.
-
-	g10: Move enum_secret_keys to skclist.c.
-	+ commit 03a8de7def4195b9accde47c1dcb84279361936d
-	* g10/getkey.c (enum_secret_keys): Move to...
-	* g10/skclist.c (enum_secret_keys): ... here.
-
-	g10: Fix comment of enum_secret_keys.
-	+ commit 6bb93fc295e712ddf9b461dfe650211caf16a844
-	* g10/getkey.c (enum_secret_keys): Fix comment for usage of
-	enum_secret_keys, following the previous change.
-
-	g10: Enumerated keys for decryption should be unique.
-	+ commit 30153c65f0875f9a62838f6347bcdcedd6114d35
-	* g10/getkey.c (enum_secret_keys): Collecting keys in the context,
-	check duplicate to make sure returning only unique keys.
-	* g10/pubkey-enc.c (get_session_key): Now, it's the responsibility of
-	enum_secret_keys to free keys.
-
-	g10: Change decryption key selection for public key encryption.
-	+ commit ce2f71760155b71a71418fe145a557c99bd52290
-	* g10/mainproc.c (struct mainproc_context): It's now pubkey_enc_list.
-	(do_proc_packets): Remove the first arg CTRL. Fix call of
-	proc_pubkey_enc.
-	(release_list): Handle pubkey_enc_list.
-	(proc_pubkey_enc): Remove the first arg CTRL. Simply put the packet
-	to pubkey_enc_list.
-	(print_pkenc_list): Remove the last arg FAILED.
-	(proc_encrypted): Only call print_pkenc_list once.
-	Handle DEK here.
-	(proc_packets, proc_signature_packets, proc_signature_packets_by_fd)
-	(proc_encryption_packets): Fix call of do_proc_packets.
-	* g10/packet.h (struct pubkey_enc_list): Define.
-	* g10/pubkey-enc.c (get_it): Change the second argument K.
-	(get_session_key): Select session key by LIST, using enum_secret_keys.
-	* g10/gpgv.c (get_session_key): Change the second argument K.
-	* g10/test-stubs.c (get_session_key): Likewise.
-
-2018-08-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix undefined behavior when EOF in parsing packet for S2K.
-	+ commit 1b309d9f6199a91caa0ca0b97b92d599e00b736e
-	* g10/parse-packet.c (parse_symkeyenc): Use iobuf_get_noeof.
-	(parse_key): Likewise.
-
-2018-07-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Set a limit for a WKD import of 256 KiB.
-	+ commit e88f56f1937ac92f6a3b94e50b6db2649ec0be41
-	* g10/call-dirmngr.c (MAX_WKD_RESULT_LENGTH): New.
-	(gpg_dirmngr_wkd_get): Use it.
-
-	dirmngr: Validate SRV records in WKD queries.
-	+ commit ebe727ef596eefebb5eff7d03a98649ffc7ae3ee
-	* dirmngr/server.c (proc_wkd_get): Check the returned SRV record names
-	to mitigate rogue DNS servers.
-
-	common: New function to validate domain names.
-	+ commit ddee9f9409fb5a089883eab0fadef7b9b7e61e72
-	* common/mbox-util.c (is_valid_domain_name): New.
-	* common/t-mbox-util.c (run_dns_test): New test.
-
-2018-07-26 Jiří Keresteš <jiri.kerestes@trustica.cz>
-
-	scd: Add support for Trustica Cryptoucan.
-	+ commit 967d3649d24aba623133808e8d01675dff389fbb
-
-
-2018-07-25 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Print a WARNING status for DNS config problems.
-	+ commit bd4048c533165fd82340354d7229fcc2220db5a5
-	* dirmngr/dirmngr-status.h: New.
-	* dirmngr/dirmngr.h: Include dirmngr-status.h and move some prototypes
-	to that file.
-	* dirmngr/t-support.c: New.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add dirmngr-status.h.
-	(t_common_src): Add t-support.c.
-	* dirmngr/server.c (dirmngr_status_printf): Bypass if CTRL is NULL.
-	* dirmngr/dns-stuff.c: Include dirmngr-status.h.
-	(libdns_init): Print WARNING status line. Change call callers to take
-	and pass a CTRL argument.
-	* g10/call-dirmngr.c (ks_status_cb): Print info for new WARNING
-	status.
-
-2018-07-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Use 128 MiB as default AEAD chunk size.
-	+ commit 9aa1b368efd4edf51b6d056339bffb726de5162b
-	* g10/gpg.c (oDebugAllowLargeChunks): New.
-	(opts): New option --debug-allow-large-chunks.
-	(main): Implement that option.
-
-2018-07-09 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove multiple subkey bindings during export-clean.
-	+ commit 76989d5bd89ed11f5b3656dc4748fcfc939a46dc
-	* g10/key-clean.c (clean_one_subkey_dupsigs): New.
-	(clean_all_subkeys): Call it.
-
-	gpg: Let export-clean remove expired subkeys.
-	+ commit c2fd65ec8498a08ee36ca52d99b6b014f6db8d93
-	* g10/key-clean.h (KEY_CLEAN_NONE, KEY_CLEAN_INVALID)
-	(KEY_CLEAN_ENCR, KEY_CLEAN_AUTHENCR, KEY_CLEAN_ALL): New.
-	* g10/key-clean.c (clean_one_subkey): New.
-	(clean_all_subkeys): Add arg CLEAN_LEVEL.
-	* g10/import.c (import_one): Call clean_all_subkeys with
-	KEY_CLEAN_NONE.
-	* g10/export.c (do_export_stream): Call clean_all_subkeys depedning on
-	the export clean options.
-
-	gpg: Split key cleaning function for clarity.
-	+ commit 6c3567196f7e72552f326ce07dccbcce31926e5d
-	* g10/key-clean.c (clean_key): Rename to clean_all_uids and split
-	subkey cleaning into ...
-	(clean_all_subkeys): new. Call that always after the former clean_key
-	invocations.
-
-2018-07-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Move key cleaning functions to a separate file.
-	+ commit 135e46ea480d749b8a9692f71d4d0bfdadd8ee2f
-	* g10/trust.c (mark_usable_uid_certs, clean_sigs_from_uid)
-	(clean_uid_from_key, clean_one_uid, clean_key): Move to ...
-	* g10/key-clean.c: new file.
-	* g10/key-clean.h: New.
-	* g10/Makefile.am (gpg_sources): Add new files.
-	* g10/export.c, g10/import.c, g10/keyedit.c, g10/trustdb.c: Include
-	new header.
-	* g10/trustdb.h (struct key_item, is_in_klist): Move to ...
-	* g10/keydb.h: here.
-
-2018-07-05 Werner Koch <wk@gnupg.org>
-
-	po: Add flag options for xgettext.
-	+ commit cb71573f376235036c98143155e964a15cfcb250
-	* po/Makevars (XGETTEXT_OPTIONS): Add --flag options.
-
-	gpg: Prepare for signatures with ISSUER_FPR but without ISSUER.
-	+ commit f7526c7bc754acf68bde0b79c785e875a9365d60
-	* g10/getkey.c (get_pubkey_for_sig): New.
-	(get_pubkeyblock_for_sig): New.
-	* g10/mainproc.c (issuer_fpr_raw): Give global scope.
-	(check_sig_and_print): Use get_pubkeyblock_for_sig.
-	* g10/pkclist.c (check_signatures_trust): Use get_pubkey_for_sig.
-	* g10/sig-check.c (check_signature2): Ditto.
-	(check_signature_over_key_or_uid): Ditto.
-
-	tools: Add experimental code for a pairing protocol.
-	+ commit faf3c70c7715ba86eb56fdccc6cf831bf87b2ee0
-	* configure.ac (GNUPG_CACHE_DIR): New const.
-	* tools/Makefile.am (libexec_PROGRAMS): Add gpg-pair-tool.
-	(gpg_pair_tool_SOURCES, gpg_pair_tool_CFLAGS)
-	(gpg_pair_tool_LDADD): New.
-	* tools/gpg-pair-tool.c: New.
-
-2018-07-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Ignore too large user ids during import.
-	+ commit 01cd66f9faf1623833e6afac84164de5a136ecff
-	* g10/import.c (read_block): Add special treatment for bad user ids
-	and comment packets.
-
-	gpg: Extra check for sign usage when verifying a data signature.
-	+ commit 214b0077264e35c079e854a8b6374704aea45cd5
-	* g10/sig-check.c (check_signature_end_simple): Check sign usage.
-
-2018-07-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix memory leak for PKT_signature.
-	+ commit 996febbab21eb9283b0634e51303a36b318734a6
-	* g10/getkey.c (buf_to_sig): Free by free_seckey_enc.
-	* g10/gpgcompose.c (signature): Likewise.
-	* g10/sign.c (write_signature_packets): Likewise.
-
-2018-07-02 Werner Koch <wk@gnupg.org>
-
-	agent: New commands PUT_SECRET and GET_SECRET.
-	+ commit 8a915cd9faf052b4faa3c415f2ac5aa8d6ea1efe
-	* agent/agent.h (CACHE_MODE_DATA): New const.
-	* agent/cache.c (DEF_CACHE_TTL_DATA): new.
-	(housekeeping): Tweak for CACHE_MODE_DATA.
-	(cache_mode_equal): Ditto.
-	(agent_get_cache): Ditto.
-	(agent_put_cache): Implement CACHE_MODE_DATA.
-	* agent/command.c (MAXLEN_PUT_SECRET): New.
-	(parse_ttl): New.
-	(cmd_get_secret): New.
-	(cmd_put_secret): New.
-	(register_commands): Register new commands.
-
-	common: New function percent_data_escape.
-	+ commit 58baf40af641f8cbf597e508a292e85ae94688f1
-	* common/percent.c (percent_data_escape): New.
-	* common/t-percent.c (test_percent_data_escape): New.
-
-	agent: Fix segv running in --server mode.
-	+ commit 3978df943dc7a4781a23382be2d3b4a96a04f71f
-	* agent/command.c (start_command_handler): Do not write to
-	CLIENT_CREDS after an error.
-
-2018-07-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	libdns: For SOCKS connection, just fails.
-	+ commit 1aacd12471935a354cfd85ee1805edc7eb16e6c5
-	* dirmngr/dns.c (dns_res_exec): If it's DNS_SO_SOCKS_CONN, don't
-	iterate to other server, but return the error immediately.
-
-2018-06-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Print revocation reason for "rev" records.
-	+ commit 592deeddb9bf4ae9b3e236b439e2f39644eb6d46
-	* g10/main.h: Add prototype.
-	* g10/keylist.c (list_keyblock_print): Print revocation info.
-	(list_keyblock_colon): Ditto.
-
-	* g10/test-stubs.c (get_revocation_reason): New stub.
-	* g10/gpgv.c (get_revocation_reason): New stub.
-
-	gpg: Print revocation reason for "rvs" records.
-	+ commit b7cd2c2093ae1b47645be50fa1d431a028187cad
-	* g10/import.c (get_revocation_reason): New.
-	(list_standalone_revocation): Extend function.
-
-	gpg: Let --show-keys print revocation certificates.
-	+ commit 386b9c4f25b28fd769d7563f2d86ac3a19cc3011
-	* g10/import.c (list_standalone_revocation): New.
-	(import_revoke_cert): Call new function.
-
-	build: Remove duplicates from AC_CHECK_FUNCS.
-	+ commit 7e9aa307f76cdf2f624d43a35a8266e8b4e473f9
-	* configure.ac (AC_CHECK_FUNCS): Fold most calls into one.
-
-2018-06-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	libdns: Let kernel to decide the local port.
-	+ commit 861f1da0731bf29dcb9221c4f22c76b40ec15a78
-	* dirmngr/dns.c (LEAVE_SELECTION_OF_PORT_TO_KERNEL): New.
-	(dns_socket): Don't select ephemeral port in user space.
-
-2018-06-19 Werner Koch <wk@gnupg.org>
-
-	wks: Take name of sendmail from configure.
-	+ commit 08147f8bbdca40c98c2a094fa48fab15b8339c80
-	* configure.ac (NAME_OF_SENDMAIL): New ac_define.
-	* tools/send-mail.c (run_sendmail): Use it.
-
-2018-06-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	libdns: Fix for non-FQDN hostname.
-	+ commit a4a054bf14fa855715faee01a152755c4e2a74f7
-	* dirmngr/dns.c (dns_resconf_open): Clear search0 for non-FQDN
-	hostname.
-
-2018-06-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	libdns: Fix connect and try next nameserver when ECONNREFUSED.
-	+ commit bcdbf8b8ebe9d61160e0b007dabe1b6462ffbc93
-	* dirmngr/dns.c (dns_so_check): When EINVAL, release the association
-	by connect with AF_UNSPEC and try again. Also try again for
-	ECONNREFUSED.
-	(dns_res_exec): Try next nameserver when ECONNREFUSED.
-
-	libdns: Clear struct sockaddr_storage by zero.
-	+ commit 1c0b6681e4f322b88ac35d1f21c03d3cfc35fc23
-	* dirmngr/dns.c (dns_resconf_pton): Clear SS.
-	(dns_resconf_setiface): Clear ->IFACE.
-	(dns_hints_root, send_query): Clear SS.
-
-2018-06-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	libdns: Sync to upstream.
-	+ commit 3e6ad302eaf3a4a9f3e60379133b3dfdbe0e1b2d
-	* dirmngr/dns.c (dns_nssconf_loadfile): Handle exclamation mark.
-
-	dirmngr: Fix recursive resolver mode.
-	+ commit 5b40338f12762cd74238c2d2b3101c33dd2d0ed3
-	* dirmngr/dns-stuff.c (libdns_init): Initialize options.recurse.
-
-2018-06-12 Werner Koch <wk@gnupg.org>
-
-	Some preparations to eventuallt use gpgrt_argparse.
-	+ commit cb52eb76b3ba0269742c5322e10a2b5151dafaf2
-	* configure.ac (GNUPG_DEF_COPYRIGHT_LINE: New.
-	* tools/watchgnupg.c (print_version): USe this macro.
-	* common/init.c (_init_common_subsystems): Register argparse
-	functions.
-
-	Require libgpg-error 1.29 and remove internal logging functions.
-	+ commit 440472663d608660343c54f09172c851f5127c9c
-	* configure.ac (NEED_GPG_ERROR_VERSION): Set to 1.29
-	* common/util.h: Remove replacement error codes.
-	* common/logging.h: Remove fallback to internal logging functions.
-	* common/logging.c: Remove.
-	* common/Makefile.am (common_sources): Remove logging.c
-
-	gpg: Do not import revocations with --show-keys.
-	+ commit fe621cc64b13b00914633630f28b4b417892d629
-	* g10/import.c (import_revoke_cert): Add arg 'options'. Take care of
-	IMPORT_DRY_RUN.
-
-2018-06-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	card: Fix memory leak for fetch-url sub command.
-	+ commit 8f99299a54a0ac09f9c90c1085b704db78973fda
-	* g10/card-util.c (fetch_url): Release INFO.
-
-2018-06-12 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: Add new usage option for drop-subkey filters.
-	+ commit 2ddfb5bef920919443309ece9fa2930282bbce85
-	* g10/import.c (impex_filter_getval): Add new "usage" property for
-	drop-subkey filter.
-
-2018-06-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Set some list options with --show-keys.
-	+ commit d2bc66f241a66cc95140cbb3a07555f6301290ed
-	* g10/gpg.c (main): Set some list options.
-
-2018-06-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Sanitize diagnostic with the original file name.
-	+ commit 13f135c7a252cc46cff96e75968d92b6dc8dce1b
-	* g10/mainproc.c (proc_plaintext): Sanitize verbose output.
-
-2018-06-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve import's repair-key duplicate signature detection.
-	+ commit 26746fe65d14a00773473c2d0d271406a5105bca
-	* g10/key-check.c (key_check_all_keysigs): Factor some code out to ...
-	(remove_duplicate_sigs): new.
-	(key_check_all_keysigs): Call remove_duplicate_sigs again after
-	reordering.
-
-	gpg: Fix import's repair-key duplicate signature detection.
-	+ commit 26bce2f01d2029ea2b8a8dbbe36118e3c83c5cba
-	* g10/packet.h (PKG_siganture): Add field 'help_counter'.
-	* g10/key-check.c (sig_comparison): Take care of HELP_COUNTER.
-	(key_check_all_keysigs): De-duplicate on a per-block base.
-
-	gpg: Improve verbose output during import.
-	+ commit 1bc6b5174248ba4d83d648ef6d6f4550540d1f20
-	* g10/import.c (chk_self_sigs): Print the subkeyid in addition to the
-	keyid.
-	(delete_inv_parts): Ditto.
-
-2018-06-06 Werner Koch <wk@gnupg.org>
-
-	agent: Add DBUS_SESSION_BUS_ADDRESS et al. to the startup list.
-	+ commit 7ffc1ac7dd95d4cc1897a4c36d5cd628741c12f2
-	* agent/gpg-agent.c (agent_copy_startup_env): Replace explicit list
-	with the standard list.
-
-	gpg: Also detect a plaintext packet before an encrypted packet.
-	+ commit 344b548dc71657d0285d93f78f17a2663b5e586f
-	* g10/mainproc.c (proc_encrypted): Print warning and later force an
-	error.
-
-	gpg: New command --show-keys.
-	+ commit 257661d6ae0ca376df758c38fabab2316d10e3a9
-	* g10/gpg.c (aShowKeys): New const.
-	(opts): New command --show-keys.
-	(main): Implement command.
-	* g10/import.c (import_keys_internal): Don't print stats in show-only
-	mode.
-	(import_one): Be silent in show-only mode.
-
-2018-06-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Remove bogus comment.
-	+ commit d2e6b3ea1d70db1039a828fb3a978a4504f8f0c5
-	* g10/mainproc.c (proc_pubkey_enc): Remove a comment.
-
-2018-05-31 Werner Koch <wk@gnupg.org>
-
-	gpg: Print a hint on how to decrypt a non-mdc message anyway.
-	+ commit 874e391665405fc413a69f2ffacdb94bb08da7ff
-	* g10/mainproc.c (proc_encrypted): Print a hint for legacy ciphers w/o
-	MDC. Also print a dedicated status error code
-
-2018-05-30 Werner Koch <wk@gnupg.org>
-
-	gpg: Ignore the multiple message override options.
-	+ commit d3d41146b33040eb65eaaaffcfc7b4211e60bd95
-	* g10/gpg.c (oAllowMultisigVerification)
-	(oAllowMultipleMessages, oNoAllowMultipleMessages): Remove.
-	(opts): Turn --allow-multisig-verification, --allow-multiple-messages
-	and --no-allow-multiple-messages into NOPs
-	* g10/options.h (struct opt): Remove flags.allow_multiple_messages.
-	* g10/mainproc.c (proc_plaintext): Assume allow_multiple_messages is
-	false.
-
-	gpg: Detect multiple literal plaintext packets more reliable.
-	+ commit 97183b5c0fae05fcda942caa7df14ee6a133d846
-	* g10/mainproc.c (proc_encrypted): Bump LITERALS_SEEN.
-
-2018-05-29 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove PGP6 compliance mode.
-	+ commit b2c05d691247a79fb46f75b653cbc4bf518c1c2a
-	* g10/gpg.c: Make --pgp6 an alias for --pgp7.
-	* common/compliance.h (gnupg_compliance_mode): Remove CO_PGP6.
-	* g10/options.h (PGP6): Remove. Adjust all users.
-
-	gpg: Remove MDC options.
-	+ commit 253e8bdd9014cbe6dc06adce9d9dd2f8f4b31709
-	* g10/gpg.c: Tuen options --force-mdc, --no-force-mdc, --disable-mdc
-	and --no-disable-mdc into NOPs.
-	* g10/encrypt.c (use_mdc): Simplify. MDC is now almost always used.
-	(use_aead): Ignore MDC options. Print warning for missing MDC feature
-	flags.
-	* g10/pkclist.c (warn_missing_mdc_from_pklist): Rename to ...
-	(warn_missing_aead_from_pklist): this and adjust.
-
-	gpg: Fix detection of the AEAD feature flag.
-	+ commit af4a5dbe575f304838db358aaeb45741f149d0a7
-	* g10/getkey.c (fixup_uidnode): Use bitmask 0x02.
-
-2018-05-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Hard fail on a missing MDC even for legacy algorithms.
-	+ commit d1431901f0143cdc7af8d1a23387e0c6b5bb613f
-	* g10/mainproc.c (proc_encrypted): Require an MDC or AEAD
-	* tests/openpgp/defs.scm (create-gpghome): Use --ignore-mdc-error to
-	allow testing with the current files.
-
-	gpg: Turn --no-mdc-warn into a NOP.
-	+ commit 96350c5d5afcbc7f66c535e38b9fcc7355622855
-	* g10/gpg.c (oNoMDCWarn): Remove.
-	(opts): Make --no-mdc-warn a NOP.
-	(main): Don't set var.
-	* g10/options.h (struct opt): Remove 'no_mdc_var'.
-	* g10/cipher-cfb.c (write_header): Assume opt.no_mdc_warn is false.
-	* g10/mainproc.c (proc_encrypted): Ditto.
-
-2018-05-07 Ineiev <ineiev@gnu.org>
-
-	doc: Update description of displayed trust values.
-	+ commit ed12a1dabaf928e8620fc26ca426c935e1a8a880
-	* doc/trust-values.texi: New file.
-	* doc/Makefile.am (EXTRA_DIST): Add trust-values.texi.
-	* doc/gnupg.texi (Trust Values): New chapter.
-	* doc/gpg.texi (OpenPGP Key Management): Update the description
-	of how trust values are displayed, replace table with a reference
-	to Trust Values.
-	* doc/gpg.texi (GPG Examples): Add @mansect trust values.
-
-2018-05-02 Werner Koch <wk@gnupg.org>
-
-	Release 2.2.7.
-	+ commit d31d149196832ed6b8849017d8bcd0852c6ca96c
-
-
-	gpg: Fix minor memory leak in the compress filter.
-	+ commit d26363e4f1933781c86cbe87077fbf1b9a2b64d8
-	* g10/compress.c (push_compress_filter2): Return an error if no filter
-	was pushed.
-	(push_compress_filter): Ditto.
-	(handle_compressed): Free CFX if no filter was pushed.
-	* g10/import.c (read_block): Ditto.
-
-	gpg: Fix "Too many open files" when using --multifile.
-	+ commit f7f3043653abe699602f910ddd09c1405675c7f6
-	* common/miscellaneous.c (is_file_compressed): Don't cache the file.
-
-	dirmngr: Implement timeout for dirmngr_ldap under Windows.
-	+ commit 007dde93cc3971cb51d08e8c082e172506ae7f80
-	* dirmngr/dirmngr_ldap.c (alarm_thread) W32: New.
-	(set_timeout): Implement for W32.
-
-	build: New configure option to help with nPth debugging.
-	+ commit ddfd39e91a532fd31cd0c20c5d4cf9643acc58bd
-	* configure.ac: Add option --enable-npth-debug
-
-2018-05-02 Andre Heinecke <aheinecke@intevation.de>
-
-	common,w32: Hide spawned processes by default.
-	+ commit 3bd793256e2e4be52075d50ccf2df70c4a2e1a0f
-	* common/exechelp-w32.c (gnupg_spawn_process): Use SW_HIDE
-	instead of SW_MINIMIZE.
-
-2018-04-30 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Sleep in the ldap wrapper thread.
-	+ commit a598bbeeafa30f7854230eed212b76d5c5c77f86
-	* dirmngr/ldap-wrapper.c (wrapper_list): Rename to reaper_list.
-	(ldap_reaper_thread): Protect all list modification with a mutex. Use
-	a condition var to wake up the reaper thread.
-
-2018-04-27 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Use the LDAP wrapper process also for Windows.
-	+ commit f9fbfc64e402bd41815a68426f55565fa6d5c726
-	* dirmngr/ldap-wrapper.c: Revamp module to make use of es_poll for
-	portability.
-	* configure.ac: Always use the ldap wrapper.
-
-	dirmngr: Silence log output from dirmngr_ldap.
-	+ commit d22506a343cec61b7d1a48c970b63a8458b267ab
-	* dirmngr/dirmngr_ldap.c: Remove assert.h.
-	(main): Replace assert by log_assert.
-	* dirmngr/ldap.c (run_ldap_wrapper): Use debug options to pass
-	verbose options to dirmngr_ldap.
-	(start_cert_fetch_ldap): Ditto.
-
-2018-04-26 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Lower the dead host resurrection time to 1.5h.
-	+ commit 5789afc840cf79ba2a8cebd9d772ef9c3868c5e9
-	* dirmngr/ks-engine-hkp.c (RESURRECT_INTERVAL): Decrease.
-	(INITIAL_HOSTTABLE_SIZE): Increase because the old values was likely
-	for development.
-
-	dirmngr: Fix handling of CNAMEed keyserver pools.
-	+ commit cc66108253c58583d6bad3d1e2da2b004701d0f0
-	* dirmngr/ks-engine-hkp.c (map_host): Don't use the cname for HTTPHOST.
-	* dirmngr/server.c (make_keyserver_item): Map keys.gnupg.net.
-
-2018-04-25 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Add the used TLS library to the debug output.
-	+ commit bb8894760fe87cf46a42599f11eab7e7c7a8eb71
-	* dirmngr/http.c (send_request): Print the used TLS library in debug
-	mode.
-
-	dirmngr: Allow redirection from https to http for CRLs.
-	+ commit 1de4462974113ac18cf98f903e97cd1127fa842f
-	* dirmngr/ks-engine.h (KS_HTTP_FETCH_NOCACHE): New flag.
-	(KS_HTTP_FETCH_TRUST_CFG): Ditto.
-	(KS_HTTP_FETCH_NO_CRL): Ditto.
-	(KS_HTTP_FETCH_ALLOW_DOWNGRADE): Ditto.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Replace args send_no_cache
-	and extra_http_trust_flags by a new flags arg. Allow redirectiong
-	from https to http it KS_HTTP_FETCH_ALLOW_DOWNGRADE is set.
-	* dirmngr/loadswdb.c (fetch_file): Call with KS_HTTP_FETCH_NOCACHE.
-	* dirmngr/ks-action.c (ks_action_get): Ditto.
-	(ks_action_fetch): Ditto.
-	* dirmngr/crlfetch.c (crl_fetch): Call with the appropriate flags.
-
-	dirmngr: Implement CRL fetching via https.
-	+ commit 705d8e9cf0d109005b3441766270c0e584f7847d
-	* dirmngr/http.h (HTTP_FLAG_TRUST_CFG): New flag.
-	* dirmngr/http.c (http_register_cfg_ca): New.
-	(http_session_new) HTTP_USE_GNUTLS: Implement new trust flag.
-	* dirmngr/certcache.c (load_certs_from_dir): Call new function.
-	(cert_cache_deinit): Ditto.
-	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Ditto.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Add new args
-	'send_no_cache' and 'extra_http_trust_flags'. Change all callers to
-	provide the default value.
-	* dirmngr/crlfetch.c (crl_fetch): Rewrite to make use of
-	ks_http_fetch.
-
-2018-04-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix printing the keygrip with --card-status.
-	+ commit 71903eee89496e3f1d0a24536bced6ff16df6783
-	* g10/card-util.c (current_card_status): Keygrip for Auth is 3.
-
-2018-04-24 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fallback to CRL if no default OCSP responder is configured.
-	+ commit 460e3812be711bd18195053d74aa736215f21eee
-	* dirmngr/server.c (cmd_isvalid): Use option second arg to trigger
-	OCSP checkibng. Fallback to CRL if no default OCSP responder has been
-	configured.
-	* sm/call-dirmngr.c (gpgsm_dirmngr_isvalid): Adjust accordingly.
-
-2018-04-20 Andre Heinecke <aheinecke@intevation.de>
-
-	dirmngr: More binary I/O on Windows for CRLs.
-	+ commit 64c1fddb253061a9773c6c4ed2a9c5a54702d21b
-	* dirmngr/crlcache.c (lock_db_file, crl_cache_insert): Open cache
-	file in binary mode.
-
-	doc: Remove unneccesary empty flags in vsndf.prf.
-	+ commit a44ed3d9a1ad5bd96694f10ea5523c517982017e
-	* doc/examples/vsnfd.prf (max-cache-ttl): Remove empty flags.
-
-2018-04-16 emma peel <emma.peel@aktivix.org>
-
-	po: more updates to Spanish translation.
-	+ commit acd6d5ff7436bb7fba171ced3294046a14fb777d
-
-
-	po: correct attribution for Spanish translation.
-	+ commit 21b2e88a7e6c3d7313773c9ffb3e0d1fb2af45df
-
-
-	po: correct label tags in Polish translation.
-	+ commit a5290dace7f85d66272af3e14f9f2bc43d2a4af8
-
-
-	po: correct label tags in Finnish translation.
-	+ commit e12475429578add12a53fb2232cb45dc9e2aae1b
-
-
-2018-04-15 Werner Koch <wk@gnupg.org>
-
-	build: New target "release" to automate the release process.
-	+ commit 3b1ee413a65bf566aa8e5f29a5a2cd5a94e66faa
-	* Makefile.am (RELEASE_ARCHIVE_DIR): New.
-	(RELEASE_SIGNING_KEY): New.
-	(AM_DISTCHECK_CONFIGURE_FLAGS): Remove removed --enable-gpg2-is-gpg,
-	(RELEASE_NAME, RELEASE_W32_STEM_NAME): New.
-	(release, sign-release): New.
-
-2018-04-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix memory leak in check_sig_and_print.
-	+ commit f747b8f0734338baa1e608b193b213aca2c577e8
-	* g10/mainproc.c (check_sig_and_print): Free the public key.
-
-	g10: Push compress filter only if compressed.
-	+ commit c31abf84659dbda5503dd9f3aa3449520bcd1b84
-	* g10/compress.c (handle_compressed): Fix memory leak.
-
-2018-04-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Extend the "sig" record in --list-mode.
-	+ commit 69c3e7acb744e1e5606a4d946e3b948704cfbbae
-	* g10/getkey.c (get_user_id_string): Add arg R_NOUID. Change call
-	callers.
-	(get_user_id): Add arg R_NOUID. Change call callers.
-	* g10/mainproc.c (issuer_fpr_string): Make global.
-	* g10/keylist.c (list_keyblock_colon): Print a '?' for a missing key
-	also in --list-mode. Print the "issuer fpr" field also if there is an
-	issuer fingerprint subpacket.
-
-	gpg: Extend the ERRSIG status line with a fingerprint.
-	+ commit 23a714598c247d78cfda46a6dc338b17e17cc194
-	* g10/mainproc.c (issuer_fpr_raw): New.
-	(issuer_fpr_string): Re-implement using issuer_fpr_rtaw.
-	(check_sig_and_print): Don't free ISSUER_FPR. Use ISSUER_FPR_RAW.
-	Use write_status_printf. Extend ERRSIG status.
-
-	gpg: Relax printing of STATUS_FAILURE.
-	+ commit e2bd152a928d79ddfb95fd2f7911c80a1a8d5a21
-	* g10/gpg.c (g10_exit): Print STATUS_FAILURE only based on passed
-	return code and not on the presence of any call to log_error.
-
-	agent,dirmngr: Add "getenv" to the getinfo command.
-	+ commit bbb5bfacc0d1f179cfec94fd32fee01a09df0f1d
-	* agent/command.c (cmd_getinfo): Add sub-command getenv.
-	* dirmngr/server.c (cmd_getinfo): Ditto.
-
-2018-04-12 Andre Heinecke <aheinecke@intevation.de>
-
-	build: Update getswdb version check to 2.2.
-	+ commit 327fece0aed2c9974659c72304f9fd1f461d460c
-	* build-aux/getswdb.sh: Check for gnupg22_ver gnupg21_ver no
-	longer exists.
-
-2018-04-11 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --no-symkey-cache.
-	+ commit 789d240cb40ab36406a7c57ad49897e0bafbb41e
-	* g10/gpg.c (oNoSymkeyCache): New.
-	(opts): Add that option.
-	(main): Set var.
-	* g10/options.h (struct opt): New field no_symkey_cache.
-	* g10/passphrase.c (passphrase_to_dek): Implement that feature.
-
-2018-04-10 Werner Koch <wk@gnupg.org>
-
-	agent: Improve the unknown ssh flag detection.
-	+ commit 9f69dbeb902ac447adbc92937cd451c4e909f234
-	* agent/command-ssh.c (ssh_handler_sign_request): Simplify detection
-	of flags.
-
-2018-04-10 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: unknown flags on ssh signing requests cause an error.
-	+ commit 381c46818ffa4605d0ca39818fe317de445eb6de
-	* agent/command-ssh.c (ssh_handler_sign_request): if a flag is passed
-	during an signature request that we do not know how to apply, return
-	GPG_ERR_UNKNOWN_OPTION.
-
-	agent: change documentation reference for ssh-agent protocol.
-	+ commit 55435cdd4fe4fbfbcba1098bb715ecd6171ba2d8
-	* agent/command-ssh.c: repoint documentation reference.
-
-2018-04-09 Werner Koch <wk@gnupg.org>
-
-	Release 2.2.6.
-	+ commit 6fbe2ddbaf5123ae444c95fdf8da67840f794c76
-
-
-	gpg,w32: Fix empty homedir when only a drive letter is used.
-	+ commit 6da7aa1e7c80d214bd9dccb21744919ae191f2c8
-	* common/homedir.c (copy_dir_with_fixup): New.
-	(default_homedir): Use here.
-	(gnupg_set_homedir): And here .
-
-	doc: Document --key-edit:change-usage.
-	+ commit a4e26f2ee852003707857ab0635b783acb89a2f8
-	* g10/keyedit.c (menu_changeusage): Make strings translatable.
-
-2018-04-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Check that a key may do certifications.
-	+ commit 1a5d95e7319e7e6f0dd11064a26cbbc371b05214
-	* g10/sig-check.c (check_signature_end_simple): Check key usage for
-	certifications.
-	(check_signature_over_key_or_uid): Request usage certification.
-
-	gpg: Emit FAILURE stati now in almost all cases.
-	+ commit 0336e5d1a7b9d46e06c838e6a98aecfcc9542882
-	* g10/cpr.c (write_status_failure): Make it print only once.
-	* g10/gpg.c (wrong_args): Bump error counter.
-	(g10_exit): Print a FAILURE status if we ever did a log_error etc.
-	(main): Use log_error instead of log_fatal at one place. Print a
-	FAILURE status for a bad option. Ditto for certain exit points so
-	that we can see different error locations.
-
-	gpg: Re-indent sig-check.c and use signature class macros.
-	+ commit 5ba74a134db431530884f03eea5410a68dbfe0f5
-	* g10/keydb.h (IS_BACK_SIG): New.
-	* g10/sig-check.c: Re-indent and use macros.
-
-2018-04-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Support SSH signature flags.
-	+ commit 80b775bdbb852aa4a80292c9357e5b1876110c00
-	* agent/command-ssh.c (SSH_AGENT_RSA_SHA2_256): New.
-	(SSH_AGENT_RSA_SHA2_512): New.
-	(ssh_handler_sign_request): Override SPEC when FLAGS
-	is specified.
-
-2018-04-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Let card-edit/key-attr show message when change.
-	+ commit 870527df0dd704c994928348c8c2910030776680
-	* g10/card-util.c (ask_card_rsa_keysize): Don't show message here.
-	(ask_card_keyattr): Show message when change, also for ECC.
-
-2018-04-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests: Fix no gpg-agent upon removal of GNUPGHOME.
-	+ commit 83529e1bd14a6d39f2a8ecab9fb6aa4c1f344c73
-	* tests/gpgscm/gnupg.scm (with-ephemeral-home-directory): Add
-	teadown-fn.
-	* tests/gpgsm/export.scm: Use -no-atexit version and stop-agent.
-	* tests/openpgp/decrypt-session-key.scm: Likewise.
-	* tests/openpgp/decrypt-unwrap-verify.scm: Likewise.
-	* tests/openpgp/defs.scm (have-opt-always-trust): Likewise.
-	(setup-environment-no-atexit): New.
-	(start-agent): Support no use of atexit.
-	* tests/gpgsm/gpgsm-defs.scm (setup-gpgsm-environment-no-atexit): New.
-	* tests/migrations/common.scm (untar-armored): Follow the change
-	of with-ephemeral-home-directory.
-
-2018-04-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Writing KDF resets auth state.
-	+ commit cb1731c23cddfa524d3f51cfd82029bff853a073
-	* scd/app-openpgp.c (do_setattr): Clear auth state.
-
-2018-04-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix filtering by PK->REQ_USAGE.
-	+ commit a17d2d1f690ebe5d005b4589a5fe378b6487c657
-	* g10/getkey.c (get_pubkey_byfprint): Filter by PK->REQ_USAGE.
-
-2018-03-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix card-edit/kdf-setup for single salt.
-	+ commit 130ad98240c066383fa0a99bcf5e0ec72bc0dff9
-	* g10/card-util.c (gen_kdf_data): Use SALT_USER.
-
-	g10,scd: Support single salt for KDF data object.
-	+ commit 0c097575a9cd923f648fb5bb695893d46400c3ad
-	* g10/card-util.c (gen_kdf_data): Support single salt.
-	(kdf_setup): Can have argument for single salt.
-	* scd/app-openpgp.c (pin2hash_if_kdf): Support single salt.
-
-	g10: Add "key-attr" command for --card-edit.
-	+ commit 820380335a20391e0998fb1ba32ebfb9accedc5b
-	* g10/card-util.c (key_attr): New explicit command.
-	(generate_card_keys, card_generate_subkey): Don't ask key attr change.
-	(card_edit): Add for cmdKEYATTR.
-
-	scd: Support changing key attribute back to RSA.
-	+ commit 29692718768c28c524be6306081ab1852e75fe07
-	* scd/app-openpgp.c (change_rsa_keyattr): Try usual RSA.
-
-2018-03-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Support key attribute change at --card-edit/generate.
-	+ commit a1515b3bbc10a210040dda3b482bcdb933fa8d7c
-	* g10/card-util.c (ask_card_rsa_keysize): Drop support for magic
-	number 25519 for ed25519/cv25519. Rename from ask_card_keyattr.
-	(ask_card_keyattr): Support ECC, as well as RSA.
-	(do_change_keyattr): Support ECC dropping magical number 25519.
-	* g10/keygen.c (ask_curve): Allow call from outside, adding last arg
-	of CURRENT.
-	(generate_keypair): Follow the change of ask_curve.
-	(generate_subkeypair): Likewise.
-
-	g10: check_pin_for_key_operation should be just before genkey.
-	+ commit 02d7bb819ff44cc90212568dd6ce24ae1dc5d17f
-	* g10/card-util.c (generate_card_keys): Check PIN later.
-	(card_generate_subkey): Likewise.
-
-2018-03-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Change ask_curve so that it can be used outside.
-	+ commit e610d51f0de11154050915b951bcc5c53c940f5e
-	* g10/call-agent.h (struct key_attr): New.
-	* g10/keygen.c (ask_curve): Return const char *. No allocation.
-	(quick_generate_keypair): Follow the change.
-	(generate_keypair, generate_subkeypair): Likewise.
-	(parse_algo_usage_expire): Return const char *.
-
-2018-03-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent,scd: Use pointer to represent HANDLE.
-	+ commit 96918346beeca7a46de9f03f19502373994c21bc
-	* agent/call-scd.c HAVE_W32_SYSTEM (start_scd): Format with %p.
-	* scd/command.c HAVE_W32_SYSTEM (option_handler): Use void *.
-
-2018-03-27 Werner Koch <wk@gnupg.org>
-
-	agent: Make the request origin a part of the cache items.
-	+ commit 02dce8c0cc57deb2095a9b06aeb8f4dea34eef7e
-	* agent/cache.c (agent_put_cache): Add arg 'ctrl' and change all
-	callers to pass it.
-	(agent_get_cache): Ditto.
-
-	* agent/cache.c (struct cache_items_s): Add field 'restricted'.
-	(housekeeping): Adjust debug output.
-	(agent_flush_cache): Ditto.
-	(agent_put_cache): Ditto. Take RESTRICTED into account.
-	(agent_get_cache): Ditto.
-
-2018-03-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Auto-fix a broken trustdb with just the version record.
-	+ commit eb68c2d3d1b03a18cd24406fa46d4c30cb13d9f7
-	* g10/tdbio.c (get_trusthashrec): Create hashtable on error.
-
-	gpg: Pass CTRL arg to get_trusthashrec.
-	+ commit a750ebebf35a392f1c72d6aee5618df0d9f25ff7
-	* g10/tdbio.c (get_trusthashrec): Add arg CTRL.
-	(tdbio_search_trust_byfpr): Ditto.
-	(tdbio_search_trust_bypk): Ditto.
-
-	gpg: Return better error codes in case of a too short trustdb.
-	+ commit 403aa70c52e56614d65490dea9344113f9cf3d29
-	* g10/tdbio.c (tdbio_read_record): Return GPG_ERR_EOF.
-	(tdbio_new_recnum): Never return on error.
-	(lookup_hashtable): Print a more descriptive error in case of !TABLE.
-
-	gpg: Fix trustdb updates without lock held.
-	+ commit 456a3a8e93ea14f821e0e98fb515f284ece98685
-	* g10/tdbio.c (is_locked): Turn into a counter.
-	(take_write_lock, release_write_lock): Implement recursive locks.
-
-	gpg: Disable unused code parts in tdbio.c.
-	+ commit 5f00531463ebc0e606c502696962426007545bb7
-	* g10/tdbio.c (in_transaction): Comment this var.
-	(put_record_into_cache): Comment the transaction code.
-	(tdbio_sync): Ditto
-
-2018-03-23 Werner Koch <wk@gnupg.org>
-
-	sm: Add OPTION request-origin.
-	+ commit 137644c9cb58deaaba6850f2763d9c5f9241cb0b
-	* sm/server.c: Include shareddefs.h.
-	(option_handler): Add option.
-
-	gpg,sm: New option --request-origin.
-	+ commit 2cd35df5db3c4dfe37616dcfb1fcc644959449ef
-	* g10/gpg.c (oRequestOrigin): New const.
-	(opts): New option --request-origin.
-	(main): Parse that option.
-	* g10/options.h (struct opt): Add field request_origin.
-	* g10/call-agent.c (start_agent): Send option to the agent.
-	* sm/gpgsm.c (oRequestOrigin): New const.
-	(opts): New option --request-origin.
-	(main): Parse that option.
-	* sm/gpgsm.h (struct opt): Add field request_origin.
-	* sm/call-agent.c (start_agent): Send option to the agent.
-
-	agent: New OPTION pretend-request-origin.
-	+ commit 05c55ee260edc07cd19da56dfd00347bfe3f529c
-	* common/shareddefs.h (request_origin_t): New.
-	* common/agent-opt.c (parse_request_origin): New.
-	(str_request_origin): New.
-	* agent/command.c (option_handler): Implement new option.
-
-2018-03-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	build: Fix the manual source field.
-	+ commit 5400a5bb77bddcb14c94d9405312d6181322b090
-
-
-2018-03-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Implement --dry-run for --passwd.
-	+ commit 165bc38cefbc03515403b60b704cabf4dc0b71f4
-	* g10/keyedit.c (change_passphrase): Take care of --dry-run.
-
-2018-03-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support KDF DO setup.
-	+ commit 0152ba7c987443d641ce1091c79f90ef2cc46498
-	* g10/call-agent.c (learn_status_cb): Parse the capability for KDF.
-	* g10/card-util.c (gen_kdf_data, kdf_setup): New.
-	(card_edit): New admin command cmdKDFSETUP to call kdf_setup.
-	* scd/app-openpgp.c (do_getattr): Emit KDF capability.
-
-2018-03-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix out-of-bound read in subpacket enumeration.
-	+ commit 983f7b2acbd1e7580652bbeb0c3d64f9dd19d9e4
-	* g10/parse-packet.c (enum_sig_subpkt): Check buflen before reading
-	the type octet. Print diagnostic.
-
-	Change license of argparse.c back to LGPLv2.1.
-	+ commit fa0ed1c7e2eee7c559026696e6b21acc882a97aa
-	* common/argparse.c, common/argparse.h: Change license
-
-2018-03-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: signal mask should be set just after npth_init.
-	+ commit 11bbd99477ef5ba5b7db0c17607b10af03c68afb
-	* scd/scdaemon.c (setup_signal_mask): New.
-	(main): Call setup_signal_mask.
-	(handle_connections): Remove signal mask setup.
-
-2018-03-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Better user interaction for factory-reset.
-	+ commit 2c85e202bc30231b9555100dec0c490c60d7b88c
-	* g10/card-util.c (factory_reset): Dummy PIN size is now 32-byte.
-	Connect the card again at the last step.
-
-2018-03-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix suspend/resume handling for CCID driver.
-	+ commit fd23a0524d8060ed12d87c679b7823686614aaee
-	* scd/ccid-driver.c (intr_cb): Try submitting INTERRUPT urb
-	to see if it's suspend/resume.
-
-2018-03-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: After fatal error, shutdown a reader.
-	+ commit c84bae69e9e02923f7180e09d161cb0b13257436
-	* scd/apdu.c (pcsc_send_apdu): Notify main loop after
-	fatal errors.
-
-	scd: Fix for GNU/Linux suspend/resume.
-	+ commit 71e5282c25ba812c7091e587edd721839bc4c2ac
-	* configure.ac (require_pipe_to_unblock_pselect): Default is "yes".
-	* scd/scdaemon.c (scd_kick_the_loop): Minor clean up.
-
-2018-03-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix typo in previous commit.
-	+ commit 655f0b9ad0138e6f960bf4befaf0eea569256614
-
-
-2018-03-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: More fix with PC/SC for Windows.
-	+ commit 1e27c0e04cd3280d498dc8b72d2e410f6287f656
-	* scd/apdu.c (pcsc_get_status): Return status based on CURRENT_STATUS.
-	Add debug log.
-
-2018-03-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix status check when using PC/SC.
-	+ commit f8b8b6aac2ca1cb34d7a346aee1d874e7650557b
-	* scd/apdu.c (struct reader_table_s): Add field of current_state.
-	(new_reader_slot): Initialize current_state.
-	(pcsc_get_status): Keep the status in READER_TABLE array.
-	Return SW_HOST_NO_READER when PCSC_STATE_CHANGED.
-	* scd/scdaemon.c (handle_connections): Silence a warning.
-
-2018-03-06 Werner Koch <wk@gnupg.org>
-
-	agent: Also evict cached items via a timer.
-	+ commit f060cb5c63923d6caec784f65f3bb0aadf52f795
-	* agent/cache.c (agent_cache_housekeeping): New func.
-	* agent/gpg-agent.c (handle_tick): Call it.
-
-2018-03-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Print the keygrip with --card-status.
-	+ commit fd595c9d3642dba437fbe0f6e25d7aaaae095f94
-	* g10/call-agent.h (agent_card_info_s): Add fields grp1, grp2 and
-	grp3.
-	* g10/call-agent.c (unhexify_fpr): Allow for space as delimiter.
-	(learn_status_cb): Parse KEYPARIINFO int the grpX fields.
-	* g10/card-util.c (print_keygrip): New.
-	(current_card_status): Print "grp:" records or with --with-keygrip a
-	human readable keygrip.
-
-2018-02-28 Andre Heinecke <aheinecke@intevation.de>
-
-	gpgconf, w32: Allow UNC paths.
-	+ commit e43844c3b0b9ec93b7f2a88752bcd6b6244aacfb
-	* tools/gpgconf-comp.c (get_config_filename): Allow UNC paths.
-
-2018-02-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid writing a zero length last chunk in AEAD mode.
-	+ commit f2c09203b98b83669a460dc8161283de96022536
-	* g10/cipher-aead.c (write_header): Do not call set_nonce_and_ad.
-	(write_final_chunk): Do not increase chunkindex.
-	(do_flush): Call set_nonce_and_ad immediately before the first
-	encryption of a chunk. Bump up the chunkindex after writing the tag.
-	(do_free): Do not insert a zero length last chunk.
-	* g10/decrypt-data.c (aead_underflow): Fix the corresponding bug.
-
-	gpg: Merge two functions in cipher-aead.c.
-	+ commit 047506a03d21739b5b922f6b3fd9f059b0b137c5
-	* g10/cipher-aead.c (set_nonce, set_additional_data): Merge into ...
-	(set_nonce_and_ad): new function.
-	(write_auth_tag): Print error message here.
-	(do_flush): Rename var newchunk to finalize.
-
-2018-02-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Simplify the AEAD decryption function.
-	+ commit 618b86325f776f7250ad2bb09680e4bb427d7e50
-	* g10/decrypt-data.c (aead_set_nonce, aead_set_ad): Merge into ...
-	(aead_set_nonce_and_ad): new single function. Change callers.
-	(decrypt_data): Do not set the nonce and ad here.
-	(aead_underflow): Get rid of the LAST_CHUNK_DONE hack.
-
-	gpg: Factor common code out of the AEAD decryption function.
-	+ commit ad989373f1a46139ed0fbc4d4a91069b78617ad9
-	* g10/decrypt-data.c (aead_underflow): Factor reading and checking
-	code code out to ...
-	(fill_buffer, aead_checktag): new functions.
-
-	gpg: Rename cipher.c to cipher-cfb.c.
-	+ commit b703ba725dadca8298a0c69365225f9a7ff60ae2
-	* g10/cipher.c: Rename to ...
-	* g10/cipher-cfb.c: this.
-
-	gpg: Fix corner cases in AEAD encryption.
-	+ commit ebb0fcf6e0bd6997eff4097ddda94955134212af
-	* g10/cipher-aead.c (write_final_chunk): Do not bump up the chunk
-	index if the previous chunk was empty.
-	* g10/decrypt-data.c (aead_underflow): Likewise. Also handle a other
-	corner cases. Add more debug output.
-
-2018-02-23 Werner Koch <wk@gnupg.org>
-
-	gpg: Try to mitigate the problem of wrong CFB symkey passphrases.
-	+ commit cbc7bacf2ff95aebb427bb244c719143a9001f3c
-	* g10/mainproc.c (symkey_decrypt_seskey): Check for a valid algo.
-
-2018-02-22 Michał Górny <mgorny@gentoo.org>
-
-	dirmngr: Handle failures related to missing IPv6 gracefully.
-	+ commit ecfc4db3a2f8bc2652ba4ac4de5ca1cd13bfcbec
-	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Handle two more
-	error codes.
-
-2018-02-22 Werner Koch <wk@gnupg.org>
-
-	build: Update swdb tags and include release info from 2.2.5.
-	+ commit 7853190cfe2953fdac066b4f3256edc206896144
-
-
-	Release 2.2.5.
-	+ commit 9581a65ccc10daededc05c55391a04022f794a4a
-
-
-	gpg: Don't let gpg return failure on an invalid packet in a keyblock.
-	+ commit b375d50ee4ce52c9b0f0855ec155be027642fb05
-	* g10/keydb.c (parse_keyblock_image): Use log_info instead of
-	log_error for skipped packets.
-	* g10/keyring.c (keyring_get_keyblock): Ditto.
-
-2018-02-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Select a secret key by checking availability under gpg-agent.
-	+ commit 88e766d3915c2919e9968148ebb30463d4a673e4
-	* g10/getkey.c (finish_lookup): Add WANT_SECRET argument to confirm
-	by agent_probe_secret_key.
-	(get_pubkey_fromfile, lookup): Supply WANT_SECRET argument.
-
-2018-02-20 Werner Koch <wk@gnupg.org>
-
-	wks: Add special mode to --install-key.
-	+ commit 685a5e1558b2252ac895637fb857f6f7bb85ea7b
-	* tools/gpg-wks-client.c (get_key_status_parm_s)
-	(get_key_status_cb, get_key): Move to ...
-	* tools/wks-util.c: ...here.
-	(get_key): Rename to wks_get_key.
-	* tools/gpg-wks-server.c: Include userids.h.
-	(command_install_key): Allow use of a fingerprint.
-
-	wks: Implement server command --install-key.
-	+ commit ee474856ec16ff11d922d8503fb3ede77129c4aa
-	* tools/wks-util.c (wks_filter_uid): Add arg 'binary'.
-	* tools/gpg-wks-server.c (main): Expect 2 args for --install-key.
-	(write_to_file): New.
-	(check_and_publish): Factor some code out to ...
-	(compute_hu_fname): ... new.
-	(command_install_key): Implement.
-
-	wks: Support alternative submission address.
-	+ commit 1877603761911ea5b1c15f4aef11a2cf86a8682c
-	* tools/gpg-wks.h (policy_flags_s): Add field 'submission_address'.
-	* tools/wks-util.c (wks_parse_policy): Parse that field.
-	(wks_free_policy): New.
-	* tools/gpg-wks-client.c (command_send): Also try to take the
-	submission-address from the policy file. Free POLICY.
-	* tools/gpg-wks-server.c (process_new_key): Free POLICYBUF.
-	(command_list_domains): Free POLICY.
-
-2018-02-15 Werner Koch <wk@gnupg.org>
-
-	kbx: Fix detection of corrupted keyblocks on 32 bit systems.
-	+ commit 5e3679ae395e7a7e44f218f07bbe487429f1b279
-	* kbx/keybox-search.c (blob_cmp_fpr): Avoid overflow in OFF+LEN
-	checking.
-	(blob_cmp_fpr_part): Ditto.
-	(blob_cmp_name): Ditto.
-	(blob_cmp_mail): Ditto.
-	(blob_x509_has_grip): Ditto.
-	(keybox_get_keyblock): Check OFF and LEN using a 64 bit var.
-	(keybox_get_cert): Ditto.
-
-2018-02-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Fix reversed messages for --only-sign-text-ids.
-	+ commit ca138d5bf36accde2fd755249b470a8dc8743c95
-	* g10/keyedit.c (keyedit_menu): Fix messages.
-
-2018-02-14 Katsuhiro Ueno <uenobk@gmail.com>
-
-	agent: Avoid appending a '\0' byte to the response of READKEY.
-	+ commit df97fe24807826ddc2af0e45e416fb81c5666f88
-	* agent/command.c (cmd_readkey): Set pkbuflen to the length of the output
-	without an extra '\0' byte.
-
-2018-02-14 Werner Koch <wk@gnupg.org>
-
-	sm: Fix minor memory leak in --export-p12.
-	+ commit 80719612b7e92aff5887f2a68d550a24f350722c
-	* sm/export.c (gpgsm_p12_export): Free KEYGRIP.
-
-2018-02-14 Katsuhiro Ueno <uenobk@gmail.com>
-
-	sm: Fix a wrong key parameter in an exported private key file.
-	+ commit 29aac7798085ee38da5107698618890ae7593c96
-	* sm/export.c (sexp_to_kparms): Fix the computation of array6,
-	which must be 'd mod (q-1)' but was 'p mod (q-1)'.
-
-2018-02-14 Werner Koch <wk@gnupg.org>
-
-	common: Use new function to print status strings.
-	+ commit f19ff78f0fbfc2793d8a9ab0173486bf712871ac
-	* common/asshelp2.c (vprint_assuan_status_strings): New.
-	(print_assuan_status_strings): New.
-	* agent/command.c (agent_write_status): Replace by call to new
-	function.
-	* dirmngr/server.c (dirmngr_status): Ditto.
-	* g13/server.c (g13_status): Ditto.
-	* g13/sh-cmd.c (g13_status): Ditto.
-	* sm/server.c (gpgsm_status2): Ditto.
-	* scd/command.c (send_status_info): Bump up N.
-
-2018-02-13 Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
-
-	scd: Improve KDF-DO support.
-	+ commit 25f3b69129015c54392636818c8846e236f5cb2c
-	* scd/app-openpgp.c (pin2hash_if_kdf): Check the content of KDF DO.
-
-2018-02-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix handling for Data Object with no data.
-	+ commit 0a3bec2c2525935362f87dce93d7df2c8d498498
-	* scd/app-openpgp.c (get_cached_data): Return NULL for Data Object
-	with no data.
-
-2018-02-09 Andre Heinecke <aheinecke@intevation.de>
-
-	doc: Add compliance de-vs to gpgsm in vsnfd.prf.
-	+ commit e0658b19d93b38ed9ebd07734c4678acdde1607d
-	* doc/examples/vsnfd.prf: Set complaince mode for gpgsm.
-
-2018-02-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Use pipe to kick the loop on NetBSD.
-	+ commit 015fe1c47b91da340e9df6bed908e0747ae8c60b
-	* configure.ac (HAVE_PSELECT_NO_EINTR): New.
-	* scd/scdaemon.c (scd_kick_the_loop): Write to pipe.
-	(handle_connections): Use pipe.
-
-2018-02-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix packet length checking in symkeyenc parser.
-	+ commit 8305739fe857ed3378f885bb43777fd518dd1060
-	* g10/parse-packet.c (parse_symkeyenc): Move error printing to the
-	end. Add additional check to cope for the 0je extra bytes needed for
-	AEAD.
-
-2018-01-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests: Fix for NetBSD with __func__.
-	+ commit 64aa98c8a05513d9c00f53a2b880d80f9035333e
-	* tests/asschk.c: Don't define __func__ if available.
-
-2018-01-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Rename a misnomed arg in open_outfile.
-	+ commit 303310d05e708dd58dcf7b7d8e8634cd5085bc7e
-	* g10/openfile.c (open_outfile): Rename inp_fd to out_fd.
-
-2018-01-27 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Improve assuan error comment for cmd keyserver.
-	+ commit f8e868d9dfb6fc1390e421e7993a1d076309ed83
-	* dirmngr/server.c: Add error comment in case --resolve fails in
-	ensure_keyserver.
-
-2018-01-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix sending connecting process uid to pinentry.
-	+ commit 660eafa3a9f68e116e9b0597edc317d8ff90f9b2
-	* agent/command-ssh.c (get_client_info): Use LOCAL_PEERCRED.
-
-	agent: Fix last commit.
-	+ commit d7207b39b71d1b07c4cddac602f29ec583f6d1ad
-	* configure.ac: Check ucred.h as well as sys/ucred.h.
-	* agent/command-ssh.c: Add inclusion of ucred.h.
-
-	agent: More fix for get_client_pid for portability.
-	+ commit 08e686a6a6d5bcb5410228b388745d09686b260c
-	 * configure.ac: Check sys/ucred.h instead of ucred.h.
-	 * agent/command-ssh.c: Include sys/ucred.h.
-
-2018-01-24 Werner Koch <wk@gnupg.org>
-
-	gpg: New maintainer option --debug-set-iobuf-size.
-	+ commit db7661b5a297a58c95fa9873d43f31d697b8feb3
-	* g10/gpg.c (opts): Add new option.
-	(opt_set_iobuf_size): New var.
-	(set_debug): Set the option.
-	* tests/openpgp/armor.scm: Use this option to revert the buffer size
-	to the one which used to exhibit the tested bugs.
-
-	iobuf: Increase the size of the buffer. Add iobuf_set_buffer_size.
-	+ commit bfc11816444512b4ebcc6617d3c3b5988e753de3
-	* common/iobuf.c (IOBUF_BUFFER_SIZE): Rename to
-	DEFAULT_IOBUF_BUFFER_SIZE and increase to 64k.
-	(iobuf_buffer_size): New var. Always use this instead of the macro.
-	(iobuf_set_buffer_size): New.
-	(struct file_filter_ctx_t): Add field delayed_rc.
-	(file_filter) !W32: Try to fill the supplied buffer.
-
-	gpg: Fix AEAD encryption for chunk sizes other than 64 KiB.
-	+ commit ff1bdc23d9f1693c1add7c1fe8d218b7bf743e31
-	* g10/cipher-aead.c (do_flush): Init ERR. Fix remaining chunklen
-	computation.
-	(do_free): Add dummy encryption. Close the cipher handle.
-	* g10/decrypt-data.c (aead_underflow): Rewrite.
-
-	gpg: Rename a variable in decrypt-data for clarity.
-	+ commit 83a15fa88e91d277811b6d030c4aa40c4fb3e6ad
-	* g10/decrypt-data.c (decode_filter_context_s): Rename field 'defer'
-	to 'holdback' and replace 'defer_filled' flag into 'holdbacklen'.
-	Change all users.
-
-2018-01-23 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --chunk-size.
-	+ commit f3ef8b0dcaede1c85da0dff8eeceda6a994f0b28
-	* g10/gpg.c (opts): New option --chunk-size.
-	(oChunkSize): New const.
-	(build_list_aead_test_algo, build_list_aead_algo_name): New.
-	(my_strusage): List AEAD algos.
-	(main): Implement --chunk-size..
-	* g10/options.h (struct opt): Add field 'chunk_size'.
-	(DBG_IPC): Remove duplicated macro.
-	* g10/main.h (DEFAULT_AEAD_ALGO): Depend on Libgcrypt version.
-	* g10/misc.c (openpgp_aead_test_algo): Ditto.
-
-	* g10/cipher-aead.c: Silence if not in debug mode.
-	* g10/decrypt-data.c: Ditto.
-
-	gpg: Copy the AEAD prefs to the user ID struct.
-	+ commit 112e02ee89b78369c1c50e672873e726cbfeb994
-	* g10/getkey.c (fixup_uidnode): Copy the AEAD prefs.
-
-	gpg: Clear the symmetric passphrase cache for encrypted session keys.
-	+ commit 278d87465685e0aa415e0333de1d27e79d1608f0
-	* g10/mainproc.c (proc_symkey_enc): Clear the symmetric key cache on
-	error.
-	(proc_encrypted): Need to take are of the checksum error.
-
-	gpg: Implement AEAD for SKESK packets.
-	+ commit 9aab9167bca38323973e853845ca95ae8e9b6871
-	* g10/packet.h (PKT_symkey_enc): Add field aead_algo.
-	* g10/build-packet.c (do_symkey_enc): Support version 5 packets.
-	* g10/parse-packet.c (parse_symkeyenc): Ditto.
-	* g10/encrypt.c (encrypt_symmetric): Force using a random session
-	key in AEAD mode.
-	(encrypt_seskey): Add and support arg aead_algo.
-	(write_symkey_enc): Ditto.
-	(encrypt_simple): Adjust accordingly.
-	(encrypt_filter): Ditto.
-	* g10/gpgcompose.c (sk_esk): For now call encrypt_seskey without AEAD
-	support.
-	* g10/mainproc.c (symkey_decrypt_seskey): Support AEAD. Nver call BUG
-	but return an error.
-	(proc_symkey_enc): Call symkey_decrypt_seskey in a bug compatible way.
-
-	* g10/import.c (check_prefs): Check AEAD preferences.
-	* g10/keyedit.c (show_prefs): Print AEAD preferences.
-
-2018-01-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Unify AEAD parameter retrieval.
-	+ commit da3015e3c05030fe709c8f922486e73d06d1d16a
-	* g10/pkclist.c (select_aead_from_pklist): Return the AEAD_algo.
-	* g10/encrypt.c (use_aead): Return the AEAD algo.
-	(encrypt_simple): Adjust for this change.
-	(encrypt_crypt): Ditto.
-	(encrypt_filter): Ditto.
-	* g10/sign.c (sign_symencrypt_file): Ditto.
-
-	* g10/misc.c (MY_GCRY_CIPHER_MODE_EAX): New.
-	(openpgp_aead_algo_info): New.
-	* g10/cipher-aead.c (MY_GCRY_CIPHER_MODE_EAX): Remove.
-	(write_header): Use new fucntion.
-	* g10/decrypt-data.c (MY_GCRY_CIPHER_MODE_EAX): Remove.
-	(decrypt_data): Use new function. Also allow for chunkbytes other
-	than 10.
-
-	gpg: Refactor function encrypt_seskey.
-	+ commit 0131d4369a81a51bf7bb328cc81a3bb082ed1a94
-	* g10/encrypt.c (encrypt_seskey): Allocate the buffer for the
-	encrypted key and returns that buffer and its length.
-	(encrypt_simple): Adjust for above change.
-	(write_symkey_enc): Ditto.
-
-2018-01-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support KDF Data Object of OpenPGPcard V3.3.
-	+ commit 91303b7df9c3e810cfcd4920f78bac6f8b7df2b2
-	* scd/app-openpgp.c (do_getattr, do_setattr): Add KDF support.
-	(pin2hash_if_kdf): New.
-	(verify_a_chv): Add PINLEN arg. Use pin2hash_if_kdf.
-	(verify_chv2, do_sign): Follow the change of verify_a_chv.
-	(verify_chv3, do_change_pin): Use pin2hash_if_kdf.
-
-2018-01-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Support EAX if for latest Libgcrypt.
-	+ commit 7356d6ec50ea24bc9449187e1c2b3ecd717b789f
-	* g10/cipher-aead.c (MY_GCRY_CIPHER_MODE_EAX): New.
-	(write_header): Use it.
-	* g10/decrypt-data.c (MY_GCRY_CIPHER_MODE_EAX): New.
-	(decrypt_data): Use it.
-	* g10/misc.c (openpgp_aead_test_algo): Allow EAX.
-
-	gpg: First take on PKT_ENCRYPTED_AEAD.
-	+ commit 3f4ca85cb0cf58006417f4f7faafaa9a1f1bdf22
-	* common/openpgpdefs.h (PKT_ENCRYPTED_AEAD): New const.
-	* g10/dek.h (DEK): Increase size of use_aead to 4 bits.
-	* g10/filter.h (cipher_filter_context_t): Add new fields for AEAD.
-	* g10/packet.h (PKT_encrypted): Add fields aead_algo, cipher_algo, and
-	chunkbyte.
-	* g10/build-packet.c (do_encrypted_aead): New.
-	(build_packet): Call it.
-	* g10/parse-packet.c (dump_sig_subpkt): Handle SIGSUBPKT_PREF_AEAD.
-	(parse_one_sig_subpkt, can_handle_critical): Ditto.
-	(parse_encrypted): Clear new PKT_ENCRYPTED fields.
-	(parse_encrypted_aead): New.
-	(parse): Call it.
-	* g10/gpg.c (main): Take care of --rfc4880bis option when checking
-	compliance.
-	* g10/cipher-aead.c: Replace the stub by real code.
-	* g10/decrypt-data.c (decode_filter_ctx_t): Add fields for use with
-	AEAD.
-	(aead_set_nonce): New.
-	(aead_set_ad): New.
-	(decrypt_data): Support AEAD.
-	(aead_underflow): New.
-	(aead_decode_filter): New.
-	* g10/encrypt.c (use_aead): Make that new fucntion work.
-	(encrypt_simple): Use default_aead_algo() instead of EAX.
-	* g10/mainproc.c (proc_encrypted): Support AEAD.
-	(do_proc_packets): Support PKT_ENCRYPTED_AEAD.
-
-2018-01-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix the use of future-default with --quick-add-key.
-	+ commit e1e35db510c9222e7a7dc208c2e49df556954170
-	* g10/keygen.c (parse_key_parameter_part): Add arg clear_cert.
-	(parse_key_parameter_string): Add arg suggested_use and implement
-	fallback. Change callers to pass 0 for new arg.
-	(parse_algo_usage_expire): Pass the parsed USAGESTR to
-	parse_key_parameter_string so that it can use it in case a subkey is
-	to be created.
-
-2018-01-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Add stub function for encrypting AEAD.
-	+ commit 81d71818d054a5faa9153fd52a4b79bbbb71e9d5
-	* g10/cipher.c (cipher_filter): Rename to cipher_filter_cfb.
-	* g10/cipher-aead.c: New. Right now only with a stub function.
-	* g10/Makefile.am (gpg_sources): Add file.
-	* g10/encrypt.c (encrypt_simple): Push either cipher_filter_cfb or
-	cipher_filter_aead.
-	(encrypt_crypt): Ditto.
-	(encrypt_filter): Ditto.
-	* g10/sign.c (sign_symencrypt_file): Ditto.
-
-	gpg: New option --force-aead.
-	+ commit 4e2ba546cdccbbc6d3e29867ee5671fd44d74e67
-	* g10/dek.h (DEK): Turn fields use_mdc, algo_printed and symmetric
-	into single bit vars. Make sure they are always set to 1 or 0.
-	(DEK): New field use_aead.
-	* g10/options.h (struct opt): New field force_aead.
-	* g10/pkclist.c (select_aead_from_pklist): New.
-	* g10/gpg.c (oForceAEAD): New const.
-	(opts): New options "--force-aead".
-	(main): Set new option.
-	* g10/encrypt.c (use_aead): New.
-	(encrypt_simple): Implement new flags DEK.use_aead.
-	(encrypt_crypt): Ditto.
-	(encrypt_filter): Ditto.
-	* g10/sign.c (sign_symencrypt_file): Ditto.
-
-	gpg: Add option and preference framework for AEAD.
-	+ commit 8217cd49364b9f81b390f7ca6a608dd946f93efc
-	* common/openpgpdefs.h (aead_algo_t): New.
-	(SIGSUBPKT_PREF_AEAD): New.
-	* g10/gpg.c (oAEADAlgo, oPersonalAEADPreferences): New.
-	(opts): New options --aead-algo and --personal-aead-preferences.
-	(set_compliance_option): Clar aead algo.
-	(main): Parse and check the new options
-	* g10/options.h (struct opt): Add fields def_aead_algo and
-	personal_aead_prefs.
-	* g10/packet.h (PREFTYPE_AEAD): New enum value.
-	(PKT_user_id): Add field flags.aead.
-	(PKT_public_key): Add field flags.aead.
-	* g10/pkclist.c (select_algo_from_prefs): Support PREFTYPE_AEAD.
-	* g10/getkey.c (fixup_uidnode): Set AEAD flag.
-	(merge_selfsigs): Ditto.
-	* g10/kbnode.c (dump_kbnode): Show aead flag.
-	* g10/keyedit.c (show_prefs): Ditto.
-	(show_key_with_all_names_colon): Ditto.
-	* g10/keygen.c (aead_presf, n_aead_prefs): New vars.
-	(set_one_pref): Suppport PREFTYPE_AEAD.
-	(keygen_set_std_prefs): Parse AEAD preferences.
-	(keygen_get_std_prefs): Ditto.
-	(add_feature_aead): New.
-	(keygen_upd_std_prefs): Call that and build AEAD pref packet.
-	* g10/main.h (DEFAULT_AEAD_ALGO): New const.
-	* g10/misc.c (openpgp_aead_test_algo): New.
-	(openpgp_aead_algo_name): New.
-	(string_to_aead_algo): New.
-	(default_aead_algo): New.
-
-2018-01-09 Andre Heinecke <aheinecke@intevation.de>
-
-	doc: Note pinentry-mode for passphrase opts.
-	+ commit 6fb5713f4a6976900cc70c140e61043b6ef688d1
-	* doc/gpg.texi (--passphrase, --passphrase-file, --passphrase-fd):
-	Note that pinentry-mode needs to be loopback.
-
-2018-01-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Print all keys with --decrypt --list-only.
-	+ commit 339b3301ee8410fe3bbdebb66a6e83801d79d40d
-	* g10/mainproc.c (proc_pubkey_enc): Use dedicated error code for
-	list-only and put the key into PKENC_LIST.
-	(print_pkenc_list): Take care of the new error code.
-
-2018-01-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow "futuredefault" as alias for "future-default".
-	+ commit 4d3c500f4793eb263940ff5ef87ec4ead63c9b4b
-	* g10/keygen.c (parse_key_parameter_string): Allow "futuredefault" and
-	use case-insensitive matching
-	(quick_generate_keypair): Ditto.
-	(parse_algo_usage_expire): Ditto.
-
-2017-12-29 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow the use of "cv25519" and "ed25519" in the keygen parms.
-	+ commit 412bb7a801f242d47a82712080cce6ddbb843166
-	* g10/keygen.c (gen_ecc): Map curve names.
-
-2017-12-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for inactive card at start by internal CCID driver.
-	+ commit 4f88b0f56134af2ce56d434b7acd47fcf9b6f7cf
-	* scd/ccid-driver.c (do_close_reader): Set NULL on close.
-	(bulk_in): Move DEBUGOUT and check by EP_INTR.
-	(ccid_get_atr): Clear powered_off flag after initial status check.
-
-2017-12-22 Werner Koch <wk@gnupg.org>
-
-	kbx: Simplify by removing custom memory functions.
-	+ commit f3ba66781a07af2e32f5887e6e15acdd4822a431
-	* kbx/keybox-util.c (keybox_set_malloc_hooks): Remove.
-	(_keybox_malloc, _keybox_calloc, keybox_realloc)
-	(_keybox_free): Remove.
-	(keybox_file_rename): Remove. Was not used.
-	* sm/gpgsm.c (main): Remove call to keybox_set_malloc_hooks.
-	* kbx/kbxutil.c (main): Ditto.
-	* kbx/keybox-defs.h: Remove all separate includes. Include util.h.
-	remove convenience macros.
-	* common/logging.h (return_if_fail): New. Originally from
-	keybox-defs.h but now using log_debug.
-	(return_null_if_fail): Ditto.
-	(return_val_if_fail): Ditto.
-	(never_reached): Ditto.
-
-2017-12-20 Werner Koch <wk@gnupg.org>
-
-	common: Use larger buffer for homedir in case of 64 bit UIDs.
-	+ commit 290348e349e8d56a856f187a08e913f2ed525b3c
-	* common/homedir.c (_gnupg_socketdir_internal): Enlarge PREFIX by 6
-	bytes for "/gnupg".
-
-	Release 2.2.4.
-	+ commit 558b17593ae97b8a07d06bf0d6af1a626b304501
-
-
-2017-12-19 Petr Pisar <petr.pisar@atlas.cz>
-
-	po: Update Czech translation.
-	+ commit 43aaf60449036e870cc25b77fbb7312cf3fb534c
-
-
-2017-12-19 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit c7b8ec6c8e57797f0b77dbf7fca85fb600323328
-
-
-2017-12-19 Werner Koch <wk@gnupg.org>
-
-	wks: New server options --check, --with-dir, with-file.
-	+ commit 7449063b1af2eef73d621a69cdb2fb713ab1ae6c
-	* tools/gpg-wks-server.c (aCheck, oWithDir, oWithFile): New const.
-	(opts): New options --check, --with-dir, and --with-file.
-	(main): Call command_check_key.
-	(command_list_domains): Implement option --with-dir.
-	(fname_from_userid): New.
-	(command_check_key): New.
-	(command_remove_key): Implement existsing command.
-	(command_revoke_key): Call command_remove_key as a simple
-	implementation.
-
-2017-12-18 Werner Koch <wk@gnupg.org>
-
-	conf: New option --status-fd.
-	+ commit 482e000b8a7e336f342a7fac3b7379257e944b6e
-	* tools/gpgconf.c (oStatusFD): New const.
-	(opts): New option --status-fd.
-	(statusfp): New var.
-	(set_status_fd): New.
-	(gpgconf_write_status): New.
-	(gpgconf_failure): New.
-	(main): Set status fd and replace exit by gpgconf_failure.
-	* tools/gpgconf-comp.c: Repalce exit by gpgconf_failure.
-	(gc_process_gpgconf_conf): Print a few warning status messages.
-
-	gpgconf: Show --compliance in expert mode.
-	+ commit d74c40cef0a97cd98aa05f13b1541a94eda502a6
-	* tools/gpgconf-comp.c (gc_options_gpg): Set compliance to expert.
-	(gc_options_gpgsm): Ditto.
-
-	sm: Allow explicit setting of the default --compliance=gnupg.
-	+ commit 8c878ae4c9dfa9fe26aa15f4f9db3e86833575e9
-	* sm/gpgsm.c (main): Allow setting of the default compliance.
-	* tools/gpgconf-comp.c (gc_options_gpgsm): Add "compliance".
-
-2017-12-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit e3ddeff66e8c08a37ddf8b6510d69579c245e192
-	* po/ja.po: Fix message with no "%s".
-
-	po: Update Japanese translation.
-	+ commit 77e2fcb4ffbad8577a2cf41f17bf92dec6a93ad8
-	* po/ja.po: Fix message with no "%s".
-
-2017-12-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Print a warning for too much data encrypted with 3DES et al.
-	+ commit 416cf9e9be5d2daf0ef629208031989699b3653f
-	* g10/filter.h (cipher_filter_context_t): Remove unused filed
-	'create_mdc'. Turn field 'header' into a bit field. Add new fields
-	'short_blklen_warn' and 'short_blklen_count'.
-	* g10/cipher.c (write_header): Print a warning if MDC is not used.
-	(cipher_filter): Print a warning for long messages encrypted with a
-	short block length algorithm.
-
-	gpg: Simplify cipher:write_header.
-	+ commit b5333e13cbc9db354ed90762190bf70605a02d1f
-	* g10/cipher.c (write_header): Use write_status_printf.
-
-	gpg: Simplify default_recipient().
-	+ commit 9f641430dcdecbd7ee205d407cb19bb4262aa95d
-	* g10/pkclist.c (default_recipient): Use hexfingerprint.
-
-	gpg: Return an error from hexfingerprint on malloc error.
-	+ commit cd26c5482b10bee7658959ae913f2ddb83190587
-	* g10/keyid.c (hexfingerprint): Return NULL on malloc failure. Chnage
-	all callers.
-
-	gpg: Remove some xmallocs.
-	+ commit 29119a6492eda5dd7920e45e7f2faa043d436591
-	* g10/getkey.c (get_pubkeys): Do not use xmalloc.
-
-2017-12-12 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: default-preference-list: prefer SHA512.
-	+ commit 8ede3ae29a39641a2f98ad9a4cf61ea99085a892
-	* g10/keygen.c (keygen_set_std_prefs): when producing default internal
-	personal-digest-preferences, keep the same order. When publishing
-	external preferences, state preference for SHA512 first.
-
-2017-12-12 Werner Koch <wk@gnupg.org>
-
-	Change backlog from 5 to 64 and provide option --listen-backlog.
-	+ commit c81a447190d2763ac4c64b2e74e22e824da8aba3
-	* agent/gpg-agent.c (oListenBacklog): New const.
-	(opts): New option --listen-backlog.
-	(listen_backlog): New var.
-	(main): Parse new options.
-	(create_server_socket): Use var instead of 5.
-	* dirmngr/dirmngr.c: Likewise.
-	* scd/scdaemon.c: Likewise.
-
-	build: New configure option --enable-run-gnupg-user-socket.
-	+ commit 17efcd2a2acdc3b7f00711272aa51e5be2476921
-	* configure.ac: (USE_RUN_GNUPG_USER_SOCKET): New ac_define.
-	* common/homedir.c (_gnupg_socketdir_internal): Add extra directories.
-
-2017-12-11 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Check for WKD support at session end.
-	+ commit 20b52be9ca29b0bc843fc68a279cb72728ede72f
-	* dirmngr/domaininfo.c (insert_or_update): Copy the name.
-	* dirmngr/misc.c (copy_stream): Allow arg OUT to be NULL.
-	* dirmngr/server.c (set_error): Protect CTX.
-	(dirmngr_status): Protect against missing ASSUAN_CTX.
-	(dirmngr_status_help): Ditto.
-	(dirmngr_status_printf): Ditto.
-	(cmd_wkd_get): Factor code out to ...
-	(proc_wkd_get): new func. Support silent operation with no CTX.
-	(task_check_wkd_support): New.
-
-	dirmngr: Add a background task framework.
-	+ commit f2997adee0455c8c0fa391a853ec1b0c9fc43342
-	* dirmngr/workqueue.c: New.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add new file.
-	* dirmngr/server.c (server_local_s): New field session_id.
-	(cmd_wkd_get): Add a task.
-	(task_check_wkd_support): New stub function.
-	(cmd_getinfo): New sub-commands "session_id" and "workqueue".
-	(start_command_handler): Add arg session_id and store it in
-	SERVER_LOCAL.
-	(dirmngr_status_helpf): New.
-	* dirmngr/dirmngr.h (wqtask_t): New type.
-	* dirmngr/dirmngr.c (main): Pass 0 as session_id to
-	start_command_handler.
-	(start_connection_thread): Introduce a session_id and pass it to
-	start_command_handler. Run post session tasks.
-	(housekeeping_thread): Run global workqueue tasks.
-
-	dirmngr: Limit the number of cached domains for WKD.
-	+ commit 7a663c296e687f12ccd9a21d414de780feb4dfcf
-	* dirmngr/domaininfo.c (MAX_DOMAINBUCKET_LEN): New.
-	(insert_or_update): Limit the length of a bucket chain.
-	(domaininfo_print_stats): Print just one summary line.
-
-	(cherry picked from commit 26f08343fbccdbaa177c3507a3c5e24a5cf94a2d)
-
-	dirmngr: Keep track of domains used for WKD queries.
-	+ commit 6c1dcd79cf0977844179d9a7b189c10af5e42a7e
-	* dirmngr/domaininfo.c: New file.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add file.
-	* dirmngr/server.c (cmd_wkd_get): Check whether the domain is already
-	known and tell domaininfo about the results.
-
-	Adjust for changed macro names in libgpg-error master.
-	+ commit 34defc9bce91d66fa8c9481ebe6e78b612e570dc
-	* common/logging.h (GPGRT_LOGLVL_): New replacement macros for older
-	libgpg-error versions.
-
-2017-12-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix description of shadow format.
-	+ commit 5c121d44443b0a96ec6ea82b90717e3dbafd2cc5
-	* agent/keyformat.txt, agent/protect.c, agent/t-protect.c: Fix.
-
-2017-12-07 Werner Koch <wk@gnupg.org>
-
-	build: Do not define logging.h constants for libgpg-error dev versions.
-	+ commit 2fedf8583bcc493f587c90bc9632d25dfd10bd10
-	* common/logging.h GPGRT_LOG_WITH_PREFIX: Do not define the log
-	constants.
-
-2017-12-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Change intialization of assuan socket system hooks.
-	+ commit b9677ba16f6b386896781a751e4b2fc839e3ec81
-	* agent/gpg-agent.c (initialize_modules): Add hook again.
-	(main): Remove setting of the system houk but add scoket system hook
-	setting after assuan initialization.
-
-2017-12-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Set assuan system hooks before call of assuan_sock_init.
-	+ commit 1524ba9656f0205d8c6ef504f773b832a7a12ab9
-	* agent/gpg-agent.c (initialize_modules): Move assuan_set_system_hooks.
-	(main): ... here, just before assuan_sock_init.
-
-2017-12-04 NIIBE Yutaka <gniibe@fsij.org>
-	 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	g10: Fix regexp sanitization.
-	+ commit 0d0b9eb0d4f99e8d293a4ce4b90921a879905115
-	* g10/trustdb.c (sanitize_regexp): Only escape operators.
-
-2017-11-27 Werner Koch <wk@gnupg.org>
-
-	Use the gpgrt log functions if possible.
-	+ commit b56dfdfc1865ceb7c3c025d79996e049faee7fdf
-	* common/logging.c: Do not build any code if we can use the gpgrt_log
-	functions.
-	(log_logv_with_prefix): Rename to log_logv_prefix and change order of
-	args so that this function matches its printf like counterpart
-	gpgrt_logv_prefix. Change all callers.
-	(log_debug_with_string): Rename to log_debug_string. Change all
-	callers.
-	(log_printhex): Move first arg to end so that this function matches
-	its printf like counterpart gpgrt_log_printhex. Change all callers.
-	* common/logging.h: Divert to gpgrt/libgpg-error if we can use the
-	gpgrt_log functions.
-	(bug_at): Add inline versions if we can use the gpgrt_log functions.
-	* configure.ac (GPGRT_ENABLE_LOG_MACROS): Add to AH_BOTTOM.
-	(mycflags): Add -Wno-format-zero-length.
-
-2017-11-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not read from uninitialized memory with --list-packets.
-	+ commit 4cf3cc6e3d48c8400466ca29c3f1c22ed2da6c2c
-	* g10/parse-packet.c (parse_plaintext): Fill up the allocated NAME.
-
-2017-11-24 Werner Koch <wk@gnupg.org>
-
-	agent: New option --auto-expand-secmem.
-	+ commit 18af15249de5f826c3fa8d1d40e876734adcd0cf
-	* agent/gpg-agent.c (oAutoExpandSecmem): New enum value.
-	(opts): New option --auto-expand-secmem.
-	(main): Implement that option.
-
-2017-11-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix memory leaking for long inputs via --command-fd.
-	+ commit ea28ea18f3ee6c9f5e69986f39848398b58e242e
-	* g10/cpr.c (do_get_from_fd): Free the old buffer.
-
-2017-11-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Enable card removal check after select_application.
-	+ commit 0bb7fd0cab2d53cd0d44b21301b23edfe817e66b
-	* scd/apdu.c (open_ccid_reader): Fix error handling of ccid_get_atr.
-	* scd/app.c (select_application): Always kick the loop if new APP.
-	* scd/ccid-driver.c (ccid_open_usb_reader): Don't setup at open.
-	(ccid_slot_status): Setup interrupt transfer when !ON_WIRE.
-
-2017-11-20 Werner Koch <wk@gnupg.org>
-
-	Release 2.2.3.
-	+ commit 97f4feaaca8da4dcf1ca09a2016693155016f06b
-
-
-	build: Use -Werror only for the check.
-	+ commit 04d9833e71cc9d0c087faec091c29b0b6cf69488
-	* configure.ac: Do not add -Werror to mycflags.
-
-	gpg-agent: Avoid getting stuck in shutdown pending state.
-	+ commit 7ffedfab8909a45a4b0347a5f7b52222e8439f1d
-	* agent/gpg-agent.c (handle_connections): Always check inotify fds.
-
-2017-11-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Use clock or clock_gettime for calibration.
-	+ commit 760aa8aadafb747f33a1461ab0c2570b5ae43716
-	* agent/protect.c (calibrate_get_time): Use clock or clock_gettime.
-
-	build: Check -Wlogical-op flag availability with -Werror.
-	+ commit 3ecd1a41be7c880976987d13e88342c98f37e064
-	* configure.ac: Use -Werror.
-
-	build: BSD make support for yat2m.
-	+ commit e1984969cac06a88c7e6f5e49e5c3104d10a847d
-	* configure.ac (YAT2M): Only define when found.
-	* doc/Makefile.am: Portability fix.
-
-2017-11-17 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix double free of a hash context in the error case.
-	+ commit 2aa106d6a4e2b09c257e8d769895d93ebb7f7edf
-	* dirmngr/crlcache.c: Clearly document that this fucntions takes
-	ownership of MD.
-	(abort_sig_check): Allow NULL for MD.
-	(crl_parse_insert): Immediately set MD to NULL. Remove check for md
-	before a calling abort_sig_check.
-
-2017-11-15 Werner Koch <wk@gnupg.org>
-
-	assuan: Fix exponential decay for first second.
-	+ commit 0cfdd3b57d592fb6baa7dafe8fde124e8a6c7798
-	* common/asshelp.c (wait_for_sock): Round SECSLEFT.
-	* dirmngr/dirmngr.c (main): Take care of --debug-wait also in dameon
-	mode.
-	* common/sysutils.c (gnupg_usleep) HAVE_NANOSLEEP: Fix nanosleep use.
-
-	common: Change log_clock to printf style.
-	+ commit 8704304699bcbc1c10d0315ec7d25a1ae05c9905
-	* common/logging.c (log_clock): Use do_logv.
-
-	common: Tweak new code to keep already translated strings.
-	+ commit 4a7fe9a596b639a0edb08502f20cb293129e5a33
-	* common/asshelp.c (wait_for_sock): Replace NAME by WHICH and adjust
-	caller. Revert to use the former strings.
-
-2017-11-15 Andre Heinecke <aheinecke@intevation.de>
-
-	w32: Fix default registry path.
-	+ commit 4f5afaf1fdb5cb13859aca390ccb5a1ba1dba00c
-	* configure.ac (GNUPG_REGISTRY_DIR): Remove leading backslash.
-
-2017-11-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Repurpose the ISO defined DO "sex" to "salutation".
-	+ commit 166f3f9ec40888e10cb0c51017944bfc57503fc1
-	* g10/card-util.c (current_card_status): String changes.
-	(change_sex): Description change.
-	(cmds): Add "salutation"; keep "sex" as an alias.
-
-2017-11-15 Andre Heinecke <aheinecke@intevation.de>
-
-	gpgtar: Prefer --set-filename over implicit name.
-	+ commit 878b8bfdcc3a8becfc46b9287a2d14cd3c875f28
-	* tools/gpgtar-extract.c: Prefer opt.filename over filename
-	for the directory prefix.
-
-2017-11-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Print AKL info only in verbose mode.
-	+ commit b062ea5bc25157c942047b3fe7f5182a06106340
-	* g10/getkey.c (get_pubkey_byname): Print info only in verbose mode.
-
-2017-11-14 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Check for WKD support at session end.
-	+ commit d4e2302d8f4a1ff52d56da4f8e3a5d1c6303822d
-	* dirmngr/domaininfo.c (insert_or_update): Copy the name.
-	* dirmngr/misc.c (copy_stream): Allow arg OUT to be NULL.
-	* dirmngr/server.c (set_error): Protect CTX.
-	(dirmngr_status): Protect against missing ASSUAN_CTX.
-	(dirmngr_status_help): Ditto.
-	(dirmngr_status_printf): Ditto.
-	(cmd_wkd_get): Factor code out to ...
-	(proc_wkd_get): new func. Support silent operation with no CTX.
-	(task_check_wkd_support): New.
-
-	dirmngr: Add a background task framework.
-	+ commit 96a4fbecd1acf946dcde20bef4752c539dae196b
-	* dirmngr/workqueue.c: New.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add new file.
-	* dirmngr/server.c (server_local_s): New field session_id.
-	(cmd_wkd_get): Add a task.
-	(task_check_wkd_support): New stub function.
-	(cmd_getinfo): New sub-commands "session_id" and "workqueue".
-	(start_command_handler): Add arg session_id and store it in
-	SERVER_LOCAL.
-	(dirmngr_status_helpf): New.
-	* dirmngr/dirmngr.h (wqtask_t): New type.
-	* dirmngr/dirmngr.c (main): Pass 0 as session_id to
-	start_command_handler.
-	(start_connection_thread): Introduce a session_id and pass it to
-	start_command_handler. Run post session tasks.
-	(housekeeping_thread): Run global workqueue tasks.
-
-2017-11-14 Andre Heinecke <aheinecke@intevation.de>
-
-	sm, w32: Fix initial keybox creation.
-	+ commit 5ecef193bc2144e6d51a6bd5727bfd08a0d28b66
-	* sm/keydb.c (maybe_create_keybox): Open new keybox in bin mode.
-
-2017-11-14 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Limit the number of cached domains for WKD.
-	+ commit 26f08343fbccdbaa177c3507a3c5e24a5cf94a2d
-	* dirmngr/domaininfo.c (MAX_DOMAINBUCKET_LEN): New.
-	(insert_or_update): Limit the length of a bucket chain.
-	(domaininfo_print_stats): Print just one summary line.
-
-2017-11-13 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Keep track of domains used for WKD queries.
-	+ commit 65038e6852185c20413d8f6602218ee636413b77
-	* dirmngr/domaininfo.c: New file.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add file.
-	* dirmngr/server.c (cmd_wkd_get): Check whether the domain is already
-	known and tell domaininfo about the results.
-
-	gpg-agent: Avoid getting stuck in shutdown pending state.
-	+ commit 5d83eb9226c0ce608ec284d8c9bc22ce84a00c25
-	* agent/gpg-agent.c (handle_connections): Always check inotify fds.
-
-2017-11-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests: Handle the case with DISABLE_REGEX.
-	+ commit 80b904543486a2f12087bc34a6049ede4eb75940
-	* tests/openpgp/Makefile.am DISABLE_REGEX (EXTRA_DIST, XTESTS):
-	 Conditionalize.
-	* tests/openpgp/all-tests.scm (all-tests): Input file is Makefile.
-
-2017-11-13 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	tests: Run the trust-pgp-4 test again.
-	+ commit a1fe3708d0894c138f6dd75d2a6bd22c64359172
-	* tests/openpgp/Makefile.am (XTESTS): Add trust-pgp-4.scm.
-	(EXTRA_DIST): Remove the test file from EXTRA_DIST.
-
-2017-11-09 NIIBE Yutaka <gniibe@fsij.org>
-	 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	g10: Fix regexp sanitization.
-	+ commit ccf3ba92087e79abdeaa0208795829b431c6f201
-	* g10/trustdb.c (sanitize_regexp): Only escape operators.
-
-2017-11-08 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	assuan: Use exponential decay for first 1s of spinlock.
-	+ commit 149041b0b917f4298239fe18b5ebd5ead71584a6
-	* common/asshelp.c (wait_for_sock): instead of checking the socket
-	every second, we check 10 times in the first second (with exponential
-	decay).
-
-	assuan: Reorganize waiting for socket.
-	+ commit 0471ff9d3bf8d6b9a359f3c426d70d0935066907
-	* common/asshelp.c (wait_for_sock): New function, collecting
-	codepaths from...
-	(start_new_gpg_agent) here and...
-	(start_new_dirmngr) here.
-
-2017-11-07 Werner Koch <wk@gnupg.org>
-
-	Release 2.2.2.
-	+ commit 5bd515005032f9340bd73e4346bbd0aef8518074
-
-
-	dirmngr: Reduce default LDAP timeout to 15 seconds.
-	+ commit 30f21f8b0fa6844a9bba3f24dc41b3ac32170109
-	* dirmngr/dirmngr.c (DEFAULT_LDAP_TIMEOUT): Change to 15.
-	* dirmngr/dirmngr_ldap.c (DEFAULT_LDAP_TIMEOUT): Ditto.
-
-	(cherry picked from commit ab7ac827041b5cd97bbca7a75b0930072dd6611f)
-
-	dirmngr: Reduce default LDAP timeout to 15 seconds.
-	+ commit ab7ac827041b5cd97bbca7a75b0930072dd6611f
-	* dirmngr/dirmngr.c (DEFAULT_LDAP_TIMEOUT): Change to 15.
-	* dirmngr/dirmngr_ldap.c (DEFAULT_LDAP_TIMEOUT): Ditto.
-
-	speedo: Include software versions in the W32 README.
-	+ commit 23bfac6d1a8bd2d0af5a6fac3ba3a6e986d6c9e8
-	(cherry picked from commit f9f72ffbfa9fd7d1a7a1823697d116d76155b407)
-
-2017-11-07 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit 1941287c9d2c9e666bad1bd330db169f0e3d6b6c
-
-
-2017-11-07 Werner Koch <wk@gnupg.org>
-
-	speedo: Include software versions in the W32 README.
-	+ commit f9f72ffbfa9fd7d1a7a1823697d116d76155b407
-
-
-2017-11-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit 96d441b315ec5c9f329596cfda28ac13a8bfa21a
-
-
-	agent: Use clock or clock_gettime for calibration.
-	+ commit 380bce13d94ff03c96e39ac1d834f382c5c730a1
-	* agent/protect.c (calibrate_get_time): Use clock or clock_gettime.
-
-2017-11-06 Werner Koch <wk@gnupg.org>
-
-	tests: Minor imporvement in agent invocation.
-	+ commit 42308224d1fce64c666aed2be5eb4ef42e8aced4
-	* tests/openpgp/defs.scm (create-gpghome): Add s2k-count.
-
-	agent: New GETINFO sub-commands "s2k_count_cal" and "s2k_time".
-	+ commit 3607ab2cf382296cb398a92d5ec792239960bf7b
-	* agent/command.c (cmd_getinfo): New sub-commands.
-	* agent/protect.c (get_standard_s2k_count): Factor some code out to ...
-	(get_calibrated_s2k_count): new.
-	(get_standard_s2k_time): New.
-
-	(cherry picked from commit 52d41c8b0f4af6278d18d8935399ddad16a26856)
-
-	agent: New option --s2k-count.
-	+ commit 78a6d0ce88ae14d8324fbab3aee3286b17e49259
-	* agent/agent.h (opt): New field 's2k_count'.
-	* agent/gpg-agent.c (oS2KCount): New enum value.
-	(opts): New option --s2k-count.
-	(parse_rereadable_options): Set opt.s2k_count.
-
-	agent: New GETINFO sub-commands "s2k_count_cal" and "s2k_time".
-	+ commit 52d41c8b0f4af6278d18d8935399ddad16a26856
-	* agent/command.c (cmd_getinfo): New sub-commands.
-	* agent/protect.c (get_standard_s2k_count): Factor some code out to ...
-	(get_calibrated_s2k_count): new.
-	(get_standard_s2k_time): New.
-
-	agent: New option --s2k-count.
-	+ commit f7212f1d11aad5d910d2c77b2e5c6ab31a0e786e
-	* agent/agent.h (opt): New field 's2k_count'.
-	* agent/gpg-agent.c (oS2KCount): New enum value.
-	(opts): New option --s2k-count.
-	(parse_rereadable_options): Set opt.s2k_count.
-
-2017-11-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Unattended key generation "Key-Grip" and "Subkey-Grip".
-	+ commit 680161647ad56d1ca92988f80bcc4d6fcb20b1eb
-	* g10/keygen.c (pSUBKEYGRIP): New.
-	(read_parameter_file): Add "Key-Grip" and "Subkey-Grip".
-	(do_generate_keypair): Support pSUBKEYGRIP.
-
-	g10: Simplify "factory-reset" procedure.
-	+ commit f183b9768b42a6792c55a6129488bd8fbf5e8e6d
-	* g10/card-util.c (factory_reset): Simplify.
-
-2017-11-02 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit 6070f5a61d4d17ff437c69e1b708d49d107c22dc
-
-
-2017-11-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Introduce magic value 25519 to switch a card to ECC.
-	+ commit acb300543422c660c87ac2f0211a42f792a65cc4
-	* g10/card-util.c (ask_card_keyattr): Handle special value 25519.
-	(do_change_keyattr): Allow changing to cv25519/ed25519.
-	(generate_card_keys): Ditto.
-	(card_generate_subkey): Ditto.
-
-	gpg: Rename two card related functions in card-util.
-	+ commit de3a740c2e1156e58d2f94faa85c051740c8988e
-	* g10/card-util.c (ask_card_rsa_keysize): Rename to ask_card_keyattr.
-	(do_change_rsa_keysize): Rename to do_change_keyattr.
-
-	gpg: Unifiy the message for re-configuring cards.
-	+ commit 922bae8082f2f8d696ea0e7d7e9e4d986789bdfc
-	* g10/card-util.c (ask_card_keyattr): Print "rsaNNNN".
-
-	gpg: Introduce magic value 25519 to switch a card to ECC.
-	+ commit ea09b6cded9d31a8ebd91878553c3eaa2b76e817
-	* g10/card-util.c (show_keysize_warning): Slightly change the text.
-	(ask_card_keyattr): Handle special value 25519.
-	(do_change_keyattr): Allow changing to cv25519/ed25519.
-	(generate_card_keys): Ditto.
-	(card_generate_subkey): Ditto.
-
-2017-11-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix returning GPG_ERR_NOT_FOUND wrongly.
-	+ commit 3da47d19df89d302c0ea25921f4bd8ce55705afe
-	* agent/learncard.c (agent_handle_learn): Find SERIALNO.
-
-	agent: Fix returning GPG_ERR_NOT_FOUND wrongly.
-	+ commit 5e96fe72e477d09e35ccee48af0fd9ab2b3ae409
-	* agent/learncard.c (agent_handle_learn): Find SERIALNO.
-
-2017-11-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Accept the Z-suffix for yymmddThhmmssZ format.
-	+ commit 0e5bd473a07f188615c4fce26b73bb452d689d68
-	* common/gettime.c (isotime_p): Accept the Z suffix.
-
-2017-11-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Rename two card related functions in card-util.
-	+ commit f795f4529d8ab5a05db1cc1960abd34390bfae1b
-	* g10/card-util.c (ask_card_rsa_keysize): Rename to ask_card_keyattr.
-	(do_change_rsa_keysize): Rename to do_change_keyattr.
-
-2017-11-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Unattended key generation "Key-Grip" and "Subkey-Grip".
-	+ commit 6c63a04569c07c9c2817c7c530a92ccfa58155cc
-	* g10/keygen.c (pSUBKEYGRIP): New.
-	(read_parameter_file): Add "Key-Grip" and "Subkey-Grip".
-	(do_generate_keypair): Support pSUBKEYGRIP.
-
-2017-10-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Simplify "factory-reset" procedure.
-	+ commit d63b7966cdd72548c60466c620de5cd6104a779e
-	* g10/card-util.c (factory_reset): Simplify.
-
-2017-10-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Clean up pinentry access locking.
-	+ commit 3924e1442c6625a2b57573a1a634a5ec56b09a29
-	* agent/agent.h (struct server_control_s): Rename PINENTRY_ACTIVE.
-	* agent/call-pinentry.c (entry_owner): Remove.
-	(agent_reset_query): Use thread private object of PINENTRY_ACTIVE.
-	(unlock_pinentry): Add CTRL to arguments to access thread private.
-	Check and decrement PINENTRY_ACTIVE for recursive use.
-	(start_pinentry): Check and increment PINENTRY_ACTIVE for recursion.
-	(agent_askpin): Follow the change of unlock_pinentry API.
-	(agent_get_passphrase, agent_get_confirmation): Likewise.
-	(agent_show_message, agent_popup_message_start): Likewise.
-	(agent_popup_message_stop, agent_clear_passphrase): Likewise.
-
-	agent: Allow recursive use of pinentry.
-	+ commit 4738256f2e0d22302377c9ec7b2ae3999338e6c6
-	* agent/agent.h (struct server_control_s): Add pinentry_level.
-	* agent/call-pinentry.c (agent_popup_message_stop): Not clear
-	ENTRY_CTX here.
-	(unlock_pinentry): Handle recursion. Clear ENTRY_CTX here.
-	(start_pinentry): Allow recursive use.
-
-	agent: Clean up pinentry access locking.
-	+ commit fb7828676cc2c01047498898378711e049f73fee
-	* agent/agent.h (struct server_control_s): Rename PINENTRY_ACTIVE.
-	* agent/call-pinentry.c (entry_owner): Remove.
-	(agent_reset_query): Use thread private object of PINENTRY_ACTIVE.
-	(unlock_pinentry): Add CTRL to arguments to access thread private.
-	Check and decrement PINENTRY_ACTIVE for recursive use.
-	(start_pinentry): Check and increment PINENTRY_ACTIVE for recursion.
-	(agent_askpin): Follow the change of unlock_pinentry API.
-	(agent_get_passphrase, agent_get_confirmation): Likewise.
-	(agent_show_message, agent_popup_message_start): Likewise.
-	(agent_popup_message_stop, agent_clear_passphrase): Likewise.
-
-2017-10-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Allow recursive use of pinentry.
-	+ commit 3b66a256e3760e88066ca11b7b49d924e42aa46b
-	* agent/agent.h (struct server_control_s): Add pinentry_level.
-	* agent/call-pinentry.c (agent_popup_message_stop): Not clear
-	ENTRY_CTX here.
-	(unlock_pinentry): Handle recursion. Clear ENTRY_CTX here.
-	(start_pinentry): Allow recursive use.
-
-	agent, tests: Support --disable-scdaemon build case.
-	+ commit 05cb87276c21c3a47226c75026fa46a955553dd9
-	* agent/command.c (cmd_scd): Support !BUILD_WITH_SCDAEMON.
-	* tests/openpgp/defs.scm (create-gpghome): Likewise.
-	* tests/gpgsm/gpgsm-defs.scm (create-gpgsmhome): Likewise.
-
-	Fix comment of configure.
-	+ commit b13972dfbf7224478652038725ab0d2cb41b7303
-	* configure.ac (BUILD_WITH_DIRMNGR): Comment fix.
-
-	agent, tests: Support --disable-scdaemon build case.
-	+ commit bf26c08b95389718ba07f12789d372c6f438134f
-	* agent/command.c (cmd_scd): Support !BUILD_WITH_SCDAEMON.
-	* tests/openpgp/defs.scm (create-gpghome): Likewise.
-	* tests/gpgsm/gpgsm-defs.scm (create-gpgsmhome): Likewise.
-
-	Fix comment of configure.
-	+ commit 3549dce4f5a726f5350ac2f20d83ba9f84cc23b4
-	* configure.ac (BUILD_WITH_DIRMNGR): Comment fix.
-
-2017-10-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid superfluous sig check info during import.
-	+ commit 84af859e391a757877c9a1d78e35face983e6d23
-	* g10/key-check.c (print_info): New.
-	(key_check_all_keysigs): Print sig checking results only in debug
-	mode. Prettify the stats info and suppress them in quiet mode.
-
-	build: New configure option --enable-werror.
-	+ commit 812fe29bff42cf7dbd07e0becc55b2ada340dd97
-	* configure.ac: Implement that option.
-
-	build: Do not mess with CFLAGS in configure.
-	+ commit e417aaf69817fcb4a73c38077853dc940a2deabc
-	* configure.ac: Do not mess with the user provided CFLAGS.
-
-2017-10-24 Rainer Perske <rainer.perske@uni-muenster.de>
-
-	sm: Do not expect X.509 keyids to be unique.
-	+ commit 1067403c8a7fb51decf30059e46901b5ee9f5b37
-	* sm/certlist.c (gpgsm_find_cert): Add arg allow_ambiguous and use it.
-	* sm/call-dirmngr.c (inq_certificate): Pass true to ALLOW_AMBIGUOUS
-	(run_command_inq_cb): Ditto.
-	* sm/gpgsm.c (main): Pass false.
-	* sm/server.c (cmd_passwd): Pass false.
-
-2017-10-24 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Ignore non-installed components with --apply-profile.
-	+ commit 6e808ae4700dc5e95bf4cc2d5c063df582c234d0
-	* tools/gpgconf-comp.c (retrieve_options_from_program): Add arg
-	only_installed.
-	(gc_component_retrieve_options): Use this if we want to process all
-	components.
-
-	gpg: Improve the "secret key available" notice in keyedit.c.
-	+ commit 560d85ecff4246133d185dc29395f07c918b5556
-	* g10/keyedit.c (KEYEDIT_NEED_SUBSK): New.
-	(cmds): Add this flag to keytocard, bkuptocard, expire, and passwd.
-	(keyedit_menu): Check whether only subkeys are available and take care
-	of that in the command check and in the HELP listing. Also print a
-	different notice if only subkeys are available.
-
-	gpg: Remove unused flags from keyedit.c.
-	+ commit 016538d82867c40a21bc7cbf44ec386f4699077f
-	* g10/keyedit.c (KEYEDIT_NOT_SK, KEYEDIT_ONLY_SK): Remove.
-	(cmds): Remove them.
-
-2017-10-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix creating on-disk subkey with on-card primary key.
-	+ commit 44fb3fbc85b32552c91f32f099b6b246c12ce0cc
-	* g10/keygen.c (generate_subkeypair): Ignore error code issued for
-	trying to verify a card based key.
-
-	gpg: Print sec/sbb with --import-option import-show or show-only.
-	+ commit 2c7dccca9b617780a3ea760adf460bb3b77f90f3
-	* g10/import.c (import_one): Pass FROM_SK to list_keyblock_direct.
-
-	gpg: Make --dry-run and show-only work for secret keys.
-	+ commit 68c8619114fd5f24cb6bfb9e0f25c428a8805323
-	* g10/import.c (import_secret_one): Check for dry-run before
-	transferring keys.
-
-2017-10-19 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	dirmngr: Do not follow https-to-http redirects.
-	+ commit 1ba308aa0356a57c21c4c8c2dac75b4d62b8aac3
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Forbid redirects from
-	a https URI to a http URI.
-
-2017-10-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix find_and_check_key for multiple keyrings.
-	+ commit d07de3862710d88bc80d6f6c5ca8da5cf38ff0eb
-	* g10/pkclist.c (find_and_check_key): Call get_validity on a specific
-	keyblock.
-
-2017-10-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Keep a lock during the read-update/insert cycle in import.
-	+ commit 7c73db3d31c6457dfbdc82a8dc89951c023f0603
-	* g10/keydb.c (keydb_handle): New field 'keep_lock'.
-	(keydb_release): Clear that flag.
-	(keydb_lock): New function.
-	(unlock_all): Skip if KEEP_LOCK is set.
-	* g10/getkey.c (get_keyblock_byfprint_fast): Call keep_lock if
-	requested.
-
-	gpg: Improve keydb handling in the main import function.
-	+ commit 8448347b5bdee56e6f9938a93ea92fe4d3c8800c
-	* g10/getkey.c (get_pubkey_byfprint_fast): Factor most code out to ...
-	(get_keyblock_byfprint_fast): .. new function.
-	* g10/import.c (revocation_present): s/int rc/gpg_error_t err/.
-	(import_one): Use get_keyblock_byfprint_fast to get the keyblock and a
-	handle. Remove the now surplus keyblock fetch in the merge branch.
-
-	gpg: Simplify keydb handling of the main import function.
-	+ commit 752cae6dd2ee8982a34c796a3f168ae538f7938c
-	* g10/import.c (import_keys_internal): Return gpg_error_t instead of
-	int. Change var names.
-	(import_keys_es_stream): Ditto.
-	(import_one): Ditto. Use a single keydb_new and simplify the use of
-	of keydb_release.
-
-	sm: Fix colon listing of fields > 12 in crt records.
-	+ commit 1bf5cbd3ef01b7f5fdcfa30c882047b924dcf3f0
-	* sm/keylist.c (print_capabilities): Move colon printing ...
-	(list_cert_colon): to here.
-
-2017-10-19 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: Send pinentry the uid of connecting process where possible.
-	+ commit 28aa6890588cc108639951bb4bef03ac17743046
-	* agent/agent.h (server_control_s): Add field 'client_uid'.
-	* agent/call-pinentry.c (start_pinentry): Add uid field to assuan
-	option "owner" sent to pinentry.
-	* agent/command-ssh.c (peer_info_s): New static struct.
-	(get_client_pid): Rename to...
-	(get_client_info): Here, and extract uid in addition to pid.
-	(start_command_handler_ssh): Use get_client_info() instead of
-	get_client_pid().
-	* agent/command.c (start_command_handler): Try assuan_get_peercred,
-	and only fall back to assuan_get_pid when assuan_get_peercred fails.
-
-2017-10-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix find_and_check_key for multiple keyrings.
-	+ commit 995c46ea77cff5b99b2fca17b547d6525a4f227e
-	* g10/pkclist.c (find_and_check_key): Call get_validity on a specific
-	keyblock.
-
-2017-10-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Keep a lock during the read-update/insert cycle in import.
-	+ commit 645f30ad310a518a863eb7bd3e11251a7e7f2eca
-	* g10/keydb.c (keydb_handle): New field 'keep_lock'.
-	(keydb_release): Clear that flag.
-	(keydb_lock): New function.
-	(unlock_all): Skip if KEEP_LOCK is set.
-	* g10/getkey.c (get_keyblock_byfprint_fast): Call keep_lock if
-	requested.
-
-	gpg: Improve keydb handling in the main import function.
-	+ commit 3bb06531d38b85be295308e826a50a1a7ba935ec
-	* g10/getkey.c (get_pubkey_byfprint_fast): Factor most code out to ...
-	(get_keyblock_byfprint_fast): .. new function.
-	* g10/import.c (revocation_present): s/int rc/gpg_error_t err/.
-	(import_one): Use get_keyblock_byfprint_fast to get the keyblock and a
-	handle. Remove the now surplus keyblock fetch in the merge branch.
-
-	gpg: Simplify keydb handling of the main import function.
-	+ commit d353287f721ffb56627d55bef04cc770ff0a8681
-	* g10/import.c (import_keys_internal): Return gpg_error_t instead of
-	int. Change var names.
-	(import_keys_es_stream): Ditto.
-	(import_one): Ditto. Use a single keydb_new and simplify the use of
-	of keydb_release.
-
-	gpg: Fix wrong Tofu DB consistency check.
-	+ commit 18e5946aef458cd95fdce4a04e144747b52b0472
-	* g10/tofu.c (build_conflict_set): Do not assume MAX_FINGERPRINT_LEN
-	is the size of the fingerprint.
-
-2017-10-17 Werner Koch <wk@gnupg.org>
-
-	gpg,sm: New option --with-key-screening.
-	+ commit 825abec0e7f38667a34dce3025fc2f3a05001dde
-	* common/pkscreening.c: New.
-	* common/pkscreening.h: New.
-	* common/Makefile.am (common_sources): Add them.
-	* g10/gpg.c (opts): New option --with-key-screening.
-	* g10/options.h (struct opt): New field with_key_screening.
-	* g10/keylist.c: Include pkscreening.h.
-	(print_pk_screening): New.
-	(list_keyblock_print): Call it.
-	(print_compliance_flags): Call it.
-	* sm/gpgsm.c (opts): New option --with-key-screening.
-	* sm/gpgsm.h (scruct opt): New field with_key_screening.
-	* sm/keylist.c: Include pkscreening.h.
-	(print_pk_screening): New.
-	(print_compliance_flags): Call it. Add new arg cert.
-	(list_cert_colon): Pass arg cert
-	(list_cert_std): Call print_pk_screening.
-	* sm/fingerprint.c (gpgsm_get_rsa_modulus): New.
-
-	sm: Fix colon listing of fields > 12 in crt records.
-	+ commit 69e579d78545aee5096a5d170e1cb9e511a09a90
-	* sm/keylist.c (print_capabilities): Move colon printing ...
-	(list_cert_colon): to here.
-
-2017-10-06 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix comparison.
-	+ commit 1ed21eee79749b976b4a935f2279b162634e9c5e
-	* g10/gpgcompose.c (literal_name): Complain if passed zero arguments,
-	not one or fewer.
-
-2017-09-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Workaround for junk after --trusted-key.
-	+ commit b509d81cab030cca6abf0d878e1fc884eda344e6
-	* g10/trust.c (register_trusted_key): Cut off everthing starting as a
-	hash sign.
-
-2017-09-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Prepare for a longer fingerprint.
-	+ commit ecbbafb88d920e713439b6b1b8e1b41a6f8d0e38
-	* g10/card-util.c (change_cafpr): Use MAX_FINGERPRINT_LEN.
-	* g10/cipher.c (write_header): Use snprintf.
-	* g10/gpg.h (MAX_FINGERPRINT_LEN): Change to 32.
-	(MAX_FORMATTED_FINGERPRINT_LEN): Change to 59
-	* g10/keyid.c (format_hexfingerprint): Add v5 fingerprint format.
-	* g10/tofu.c (get_policy): Use MAX_FINGERPRINT_LEN for the buffer but
-	keep the raw length for now.
-
-	common: Add constant KEYGRIP_LEN.
-	+ commit 76c80021d4da0755dbb04bd5d42f32015cba0b9a
-	* common/util.h (KEYGRIP_LEN): New.
-	* g10/call-agent.c (agent_probe_any_secret_key): Use that constant.
-	* g10/keyid.c (keygrip_from_pk): Ditto.
-
-	gpg: Let --debug clock time sign and verify.
-	+ commit 6aa4478c78cb34cf3d0ae5c752525110947bd247
-	* configure.ac (ENABLE_LOG_CLOCK): New ac_define and option.
-	* common/logging.c (log_clock): Use ENABLE_LOG_CLOCK to enable
-	timestamp printing.
-	* g10/call-agent.c (agent_pksign): Time signing.
-	* g10/sig-check.c (check_signature_end_simple): Time verification.
-
-2017-09-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Select a secret key by checking availability under gpg-agent.
-	+ commit 0a76611294998ae34b9d9ebde484ef8ad3a9a3a6
-	* g10/getkey.c (finish_lookup): Add WANT_SECRET argument to confirm
-	by agent_probe_secret_key.
-	(get_pubkey_fromfile, lookup): Supply WANT_SECRET argument.
-
-2017-09-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix cancellation handling for scdaemon.
-	+ commit 9f5e50e7c85aa8b847d38010241ed570ac114fc3
-	* agent/call-scd.c (cancel_inquire): Remove.
-	(agent_card_pksign, agent_card_pkdecrypt, agent_card_writekey)
-	(agent_card_scd): Don't call cancel_inquire.
-
-	scd: Distinguish cancel by user and protocol error.
-	+ commit 2396055c096884d521c26b76f26263a146207c24
-	* scd/apdu.h (SW_HOST_CANCELLED): New.
-	* scd/apdu.c (host_sw_string): Support SW_HOST_CANCELLED.
-	(pcsc_error_to_sw): Return SW_HOST_CANCELLED for PCSC_E_CANCELLED.
-	* scd/iso7816.c (map_sw): Return GPG_ERR_INV_RESPONSE for
-	SW_HOST_ABORTED and GPG_ERR_CANCELED for SW_HOST_CANCELLED.
-
-2017-09-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Accept the Z-suffix for yymmddThhmmssZ format.
-	+ commit ba8afc4966cca1f6aaf9b2a9bfc3220782306c2b
-	* common/gettime.c (isotime_p): Accept the Z suffix.
-
-2017-09-19 Werner Koch <wk@gnupg.org>
-
-	Release 2.2.1.
-	+ commit 355ca9e9498740fb6294eec451507b4891ae01ec
-
-
-2017-09-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix gnupg_wait_processes.
-	+ commit eeb3da6eb717ed6a1a1069a7611eb37503e8672d
-	* common/exechelp-posix.c (gnupg_wait_processes): Loop for r_exitcodes
-	even if we already see an error.
-
-2017-09-18 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Use system certs if --hkp-cacert is not used.
-	+ commit df692a6167be5486f9a29da003a00292fd895176
-	* dirmngr/certcache.c (any_cert_of_class): New var.
-	(put_cert): Set it.
-	(cert_cache_deinit): Clear it.
-	(cert_cache_any_in_class): New func.
-	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Add hack to
-	override empty list of HKP certs.
-
-	wks: Create a new user id if provider wants mailbox-only.
-	+ commit 50c8b6c88f5d9f4b6c4e9c03aee31fe29afa94b8
-	* tools/gpg-wks-client.c (get_key): Add arg 'exact'.
-	(add_user_id): New.
-	(command_send): Create new user id.
-
-	wks: Send only the newest UID to the server.
-	+ commit 7f7f5d06fa5aa3a3c5ab8d2e59ee76207bfdeaa0
-	* tools/wks-util.c (list_key_status_cb): Rename to key_status_cb.
-	(wks_filter_uid): New.
-	(wks_list_key): Allow FPR to be NULL. Return an error if no
-	fingerprint was found.
-	* tools/gpg-wks-server.c (process_new_key)
-	(check_and_publish): Remove now useless extra check for FPR.
-	* tools/gpg-wks-client.c (command_check): Ditto.
-	(command_send): Filter out the newest uid.
-
-	wks: Print the UID creation time with gpg-wks-client --check.
-	+ commit a0035986a8615df056182bb9af775b8b7b22003d
-	* tools/gpg-wks.h (uidinfo_list_s): Add field 'created'.
-	* tools/wks-util.c (append_to_uidinfo_list): Add arf 'created'.
-	(wks_list_key): Pass timestamp to append_to_uidinfo_list.
-	* tools/gpg-wks-client.c (command_check): Print UID creation time.
-
-	wks: Use dedicated type to convey user ids.
-	+ commit 4e0696de897cac6a34d55a69d8889faf26f1a923
-	* tools/gpg-wks.h (uidinfo_list_s, uidinfo_list_t): New.
-	* tools/wks-util.c (append_to_uidinfo_list): New.
-	(free_uidinfo_list): New.
-	(wks_list_key): Change arg r_mboxes to uidinfo_list_t. Use
-	append_to_uidinfo_list.
-	* tools/gpg-wks-server.c (sserver_ctx_s): Replace strlist_t by
-	uidinfo_list_t.
-	(process_new_key): Ditto.
-	(check_and_publish): Ditto.
-	(command_receive_cb): Replace free_strlist by free_uidinfo_list.
-	* tools/gpg-wks-client.c (command_check): Replace strlist_t by
-	uidinfo_list_t. Also print user id in verbose mode.
-
-2017-09-13 Werner Koch <wk@gnupg.org>
-
-	gpgv: Initialize compliance checker.
-	+ commit 006ca124ed95845d43af8c14d7ab2bc085b47b4c
-	* g10/gpgv.c (main): Call gnupg_initialize_compliance.
-
-2017-09-12 Werner Koch <wk@gnupg.org>
-
-	wks: Add hack for the broken posteo system.
-	+ commit a821b4f5567d02c3329c2b94a73dcbe12e6699a2
-	* tools/gpg-wks-client.c (command_send): Additional hack for posteo.
-	Check the protocol-version flag.
-
-	wks: Add new policy flag protocol-version.
-	+ commit 332c9eaa2a3c7cae90b389cdaa2c149c5595fb4d
-	* tools/gpg-wks.h (policy_flags_s): Add field protocol_version.
-	* tools/wks-util.c (wks_parse_policy): Add new policy flag.
-
-	gpg: Fix "Fix key generation with only an email part".
-	+ commit 8b5a2474f21dd4f1aa2a283e2f57d75e42742af5
-	* g10/keygen.c (proc_parameter_file): Don't check the result of
-	stpcpy.
-
-	wks: Use unencrypted draft-1 mode for posteo.de.
-	+ commit c65a7bba7331975d20910f90cf648b6ecc5410f0
-	* tools/gpg-wks-client.c (command_send): Allow sending in draft-1
-	mode.
-
-	tools: New function mime_maker_add_body_data.
-	+ commit 7d15ee88980f88ca62fc7de9492dd08e54d0f0f1
-	* tools/mime-maker.c (mime_maker_add_body_data): New.
-
-2017-09-11 Alon Bar-Lev <alon.barlev@gmail.com>
-
-	sm: Move qualified.txt from datadir into sysconfdir.
-	+ commit 384a3748d9022b7ae3f629c13f92e204565fea3d
-	* doc/Makefile.am: Move qualified.txt into examples.
-	* doc/qualified.txt: Move into examples, remove trailing spaces.
-	* doc/examples/README: Document qualified.txt.
-	* doc/gpgsm.texi: Move qualified.txt from datadir into sysconfdir.
-	* sm/qualified.c (read_list): Move qualified.txt from datadir into
-	sysconfdir.
-
-2017-09-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests: Fix a test which specifies expiration date.
-	+ commit a172759b5088ae086c0caa2e7d4d0ea346b28a90
-	* tests/openpgp/quick-key-manipulation.scm: Fix expiration time
-	comparison.
-
-	scd: Fix for large ECC keys.
-	+ commit 827abe01a72a50eab1cdcde78985b42a4a8480fb
-	* scd/app-openpgp.c (do_decipher): Support larger length.
-
-2017-09-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix key generation with only an email part.
-	+ commit 7089dcc54099a4909ce7d386c07ab87e1398e2eb
-	* g10/keygen.c (proc_parameter_file): Special case the email only
-	case.
-
-2017-09-08 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: compile-time configuration of s2k calibration.
-	+ commit 926d07c5fa05de05caef3a72b6fe156606ac0549
-	* configure.ac: add --with-agent-s2k-calibration=MSEC, introduces
-	AGENT_S2K_CALIBRATION (measured in milliseconds)
-	* agent/protect.c (calibrate_s2k_count): Calibrate based on
-	AGENT_S2K_CALIBRATION.
-
-	gpg: default to AES-256.
-	+ commit 73ff075204df09db5248170a049f06498cdbb7aa
-	* g10/main.h (DEFAULT_CIPHER_ALGO): Prefer AES256 by default.
-
-	gpg: default to 3072-bit RSA keys.
-	+ commit 909fbca19678e6e36968607e8a2348381da39d8c
-	* 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.
-
-	gpgsm: default to 3072-bit keys.
-	+ commit 7955262151a5c755814dd23414e6804f79125355
-	* doc/gpgsm.texi, doc/howto-create-a-server-cert.texi: : update
-	default to 3072 bits.
-	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): update default to
-	3072 bits.
-	* sm/certreqgen.c (proc_parameters): update default to 3072 bits.
-	* sm/gpgsm.c (main): print correct default_pubkey_algo.
-
-2017-09-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests: Fix a test which specifies expiration date.
-	+ commit 17f764dd4972a063fe09c4b9d2846e8efcb25c7a
-	* tests/openpgp/quick-key-manipulation.scm: Fix expiration time
-	comparison.
-
-2017-08-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for large ECC keys.
-	+ commit ff7ccd284c327a5b1c89603f157089177dac9d13
-	* scd/app-openpgp.c (do_decipher): Support larger length.
-
-2017-08-28 Werner Koch <wk@gnupg.org>
-
-	Release 2.2.0.
-	+ commit 9d80fb8e000189e61c173c39f1e1ca417566a7fc
-
-
-2017-08-27 Werner Koch <wk@gnupg.org>
-	 Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
-
-	scd: Convey the correct length for Le.
-	+ commit 45d5f5800afe6613f338a26f361cb5e03e861129
-	* scd/app-openpgp.c (determine_rsa_response): Round bits up.
-
-2017-08-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix memory leak while running --check-trustdb.
-	+ commit 13821e15fb9bdddfce79d88731c0f151724b2371
-	* g10/trustdb.c (update_min_ownertrust): Free PK.
-
-	gpg: Fix memory leak in sig-check.
-	+ commit b065a696344eac3007dbd5642143ecaaeebab43a
-	* g10/sig-check.c (check_signature_over_key_or_uid): Remove useless
-	condition. Actually free when SIGNER was allocated by us.
-
-	build: Remove obsolete option from autogen.rc.
-	+ commit 02a5df614a369519ad7781f95dc977e24a0d4277
-	* autogen.rc: Remove --enable-gpg2-is-gpg.
-
-2017-08-23 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Swap "auto-key-retrieve" and "no-auto-key-retrieve".
-	+ commit 565e486b8028f9e3cc51ebc5202666b598042175
-	* g10/gpg.c (gpgconf_list): Announce "auto-key-retrieve".
-	(main): Simplify setting of KEYSERVER_AUTO_KEY_RETRIEVE.
-	* tools/gpgconf-comp.c: Make "no-auto-key-retrieve" invisible. Make
-	"auto-key-retrieve" an expert option.
-
-	tests: Do not run trust-pgp-4.scm.
-	+ commit b917cb66b79597520788cd9264889942247a3377
-	* tests/openpgp/Makefile.am (XTESTS): Remove test.
-	(EXTRA_DIST): Add test file.
-
-	build: Change SWDB tag "gnupg21" to "gnupg22".
-	+ commit 008ae0bd868cb49ad4d67fc8c71707cd2a162137
-	* configure.ac (GNUPG_SWDB_TAG): New ac_define. Set it to "gnupg22".
-	* tools/gpgconf.c (query_swdb): Use it.
-	* build-aux/speedo.mk: Change tag "gnupg21" to "gnupg22".
-	* Makefile.am (distcheck-hook): Ditto.
-
-2017-08-23 Åka Sikrom <a4@hush.com>
-
-	po: Update Norwegian translation.
-	+ commit fd0e5b60bed1cfc2aed7b2e13cc449f355eac051
-
-
-2017-08-23 Andre Heinecke <aheinecke@intevation.de>
-
-	agent: Fix string translation for Windows.
-	+ commit 6158811304937b592601ef30c29c5a5cdbaa88ea
-	* agent/agent.h (L_): Define agent_Lunderscore when simple
-	gettext is used.
-
-2017-08-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit e6fa6b0ce823effd721c807b2b292287af91c642
-
-
-2017-08-21 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	tests: Add tests for the PGP trust model.
-	+ commit c23a69970ba38edae9d3b2603825d18fbb732423
-	* tests/openpgp/trust-pgp-1.scm: New file.
-	* tests/openpgp/trust-pgp-2.scm: New file.
-	* tests/openpgp/trust-pgp-3.scm: New file.
-	* tests/openpgp/trust-pgp-4.scm: New file.
-	* tests/openpgp/trust-pgp/common.scm: New file.
-	* tests/openpgp/trust-pgp/scenario1.asc: New file.
-	* tests/openpgp/trust-pgp/scenario2.asc: New file.
-	* tests/openpgp/trust-pgp/scenario3.asc: New file.
-	* tests/openpgp/trust-pgp/scenario4.asc: New file.
-	* tests/openpgp/trust-pgp/alice.sec.asc: New file.
-	* tests/openpgp/trust-pgp/bobby.sec.asc: New file.
-	* tests/openpgp/trust-pgp/carol.sec.asc: New file.
-	* tests/openpgp/trust-pgp/david.sec.asc: New file.
-	* tests/openpgp/trust-pgp/frank.sec.asc: New file.
-	* tests/openpgp/trust-pgp/grace.sec.asc: New file.
-	* tests/openpgp/trust-pgp/heidi.sec.asc: New file.
-	* tests/openpgp/Makefile.am (XTESTS): Add new tests.
-	(TEST_FILES): Add new files.
-	(EXTRA_DIST): Add new common file.
-
-	tests: Move some functions into a common module.
-	+ commit cbe54b28bf3610204e12c50c0606df37337a1156
-	* tests/openpgp/tofu.scm (gettrust): Moved to the common defs.scm
-	module.
-	(checktrust): Likewise.
-	* tests/openpgp/defs.scm (gettrust): New function.
-	(checktrust): Likewise.
-
-	gpgconf: Make WoT settings configurable by gpgconf.
-	+ commit 0161225457e0609509d0d5f4b80a60a1071b4b48
-	* tools/gpgconf-comp.c (gc_options_gpg): Add max-cert-depth,
-	completes-needed, and marginals-needed options.
-	* g10/gpg.c (gpgconf_list): Likewise.
-
-2017-08-21 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fix -Wimplicit-fallthrough warnings.
-	+ commit 6e596b2a745ae7a75a69038cf00ab4bbae1cebaa
-	* tests/gpgscm/scheme.c (CASE): Rearrange so that the case statement
-	is at the front.
-	(Eval_Cycle): Improve fallthrough annotations.
-
-2017-08-11 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: default to --no-auto-key-retrieve.
-	+ commit e6f84116abca2ed49bf14b2e28c3c811a3717227
-	* g10/gpg.c (main): remove KEYSERVER_AUTO_KEY_RETRIEVE from the
-	default keyserver options.
-	* doc/gpg.texi: document this change.
-
-2017-08-10 Justus Winter <justus@g10code.com>
-
-	tests: Improve documentation.
-	+ commit 23107ba20f8b4eb5482b480ad6a8af6b39d2bfeb
-	* tests/openpgp/README: Add quickstart instructions, how to use
-	shell.scm, remove no longer used MKDATA.
-
-2017-08-09 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	g10: Write status error on error of --quick-revoke-uid.
-	+ commit 977fc5f0eb9fdee19e66bea8cd2eb5414789b485
-	* g10/keyedit.c (keyedit_quick_revuid): Write status error on error.
-
-2017-08-09 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.23.
-	+ commit e8ffa9a6ca5d76660b67207cd1157068e48483de
-
-
-	po: Update German translation.
-	+ commit 2059dbf201963c6f229698ae80c6c774b1f686c8
-
-
-2017-08-08 Werner Koch <wk@gnupg.org>
-
-	build: New configure option --enable-all-tests.
-	+ commit fb21aa8b50367e2afa13bad73fc21d6f01a97e18
-	* configure.ac: New option --enable-all-tests.
-	* tests/gpgscm/ffi.c (ffi_init): New gloabl var *run-all-tests*.
-	* tests/openpgp/all-tests.scm (all-tests): Use that var instead
-	of *maintainer-mode*.
-	* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Add --enable-all-tests.
-
-	gpgscm: Make the test summary stand out.
-	+ commit 0bd19dae1161a71053d794e4f75e66f70445f9f0
-	* tests/gpgscm/tests.scm (test-pool): Add delimiter lines.
-
-	sm: Always print the keygrip in colon mode.
-	+ commit 0a8e20c4c639f0c491e2af5ac5fb97005196422b
-	* sm/keylist.c (list_cert_colon): Always print the keygrip as
-	described in the manual.
-
-2017-08-08 Justus Winter <justus@g10code.com>
-
-	gpg: Add option '--disable-dirmngr'.
-	+ commit c4506f624ed6854aa0ba1629aa2d1d43eb26900d
-	* doc/gpg.texi: Document new option.
-	* g10/call-dirmngr.c (create_context): Fail if option is given.
-	* g10/gpg.c (cmd_and_opt_values): New value.
-	(opts): New option.
-	(gpgconf_list): Add new option.
-	(main): Handle new option.
-	* g10/options.h (struct opt): New field 'disable_dirmngr'.
-	* tools/gpgconf-comp.c (gc_options_gpg): New option.
-
-2017-08-07 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	systemd-user: Drop redundant After=*.socket.
-	+ commit 81074c3b0211854a2dc94600dc892224201536f5
-	* doc/examples/systemd-user/*.service: Drop redundant After=*.socket
-	directive.
-
-	systemd-user: Drop RefuseManualStart=true.
-	+ commit 407da18254dfebcacfaee16952ef0b617b1626ea
-	* doc/examples/systemd-user/*.service: drop RefuseManualStart=true
-
-2017-08-07 Justus Winter <justus@g10code.com>
-
-	tests: Do not run all tests unless in maintainer mode.
-	+ commit b0112dbca91e720a4ff622ad0e88d99eba56203a
-	* configure.ac: Leak the maintainer mode flag into 'config.h'.
-	* tests/gpgscm/ffi.c: Pass it into the scheme environment.
-	* tests/openpgp/all-tests.scm: Only run tests against non-default
-	configurations (keyring, extended-key-format) in maintainer mode.
-
-2017-08-07 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	Fix spelling.
-	+ commit a611cba142470c52f3303c512f77ae7d195cc41f
-	* doc/gpg.texi: s/occured/occurred/
-
-	Simple typo fix.
-	+ commit f011d8763a009612c858a287cf7cc6a1f1a6d32a
-	* agent/gpg-agent.c: Correct spelling in comment.
-
-2017-08-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Install gpg by default under the name gpg.
-	+ commit a69464b0b6dac88b360a13d3faf19dd7f2a0e02b
-	* configure.ac: Remove option --enable-gpg2-is-gpg. Add option
-	--enable-gpg-is-gpg2.
-	* build-aux/speedo.mk (speedo_pkg_gnupg_configure): Remove
-	--enable-gpg2-is-gpg.
-
-	gpg: gpgconf needs to support the now default --auto-key-retrieve.
-	+ commit 69e97d909d586160cc0631c9a6f4d3f24bb0c682
-	* tools/gpgconf-comp.c (gc_options_gpg): Re-add "auto-key_retrieve".
-
-2017-08-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix memory leak in parse_auto_key_locate.
-	+ commit b70e86fd1050fc6da07a177ed142ae9882b4dd0d
-	* g10/getkey.c (parse_auto_key_locate): Fix freeing of OPTIONS.
-
-	tests: Adjust tests for changed --auto-key-locate default.
-	+ commit 0767eada1479c0fa9d4b75781a8c2afb67bdbf90
-	* tests/openpgp/defs.scm (create-gpghome): Disable new defaults.
-
-	gpg: Make --no-auto-key-retrieve gpgconf-igurable.
-	+ commit 9bb13a0e819334681caca38c9074bd7bfc04e45e
-	* g10/gpg.c (gpgconf_list): Print no-auto-key-retrieve instead of
-	auto-key-retrieve.
-	* tools/gpgconf-comp.c (gc_options_gpg): Replace auto-key-retrieve by
-	no-auto-key-retrieve and chnage level from invisible to advanced.
-
-	gpg: Default to --auto-key-locate "local,wkd" and --auto-key-retrieve.
-	+ commit 7e1fe791d188b078398bf83c9af992cb1bd2a4b3
-	* g10/gpg.c (main): Add KEYSERVER_AUTO_KEY_RETRIEVE to the default
-	keyserver options. Set the default for --auto-key-locate to
-	"local,wkd". Reset that default iff --auto-key-locate has been given
-	in the option file or in the commandline.
-	* g10/getkey.c (parse_auto_key_locate): Work on a copy of the arg.
-
-	agent: Make --no-grab the default.
-	+ commit 3d78ae4d3de08398fabae5821045a3a1da6dadbe
-	* agent/gpg-agent.c (oGrab): New const.
-	(opts): New option --grab. Remove description for --no-grab.
-	(parse_rereadable_options): Make --no-grab the default.
-	(finalize_rereadable_options): Allow --grab to override --no-grab.
-	(main) <gpgconflist>: Add "grab".
-	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add "grab".
-
-	gpg: Avoid double fingerprint printing with import-show.
-	+ commit b54d75fb1dcfa2cebb3a2497b81ffb49acac2056
-	* g10/import.c (import_one) <IMPORT_SHOW>: Take care of fingerprint
-	options.
-
-	gpg: New import option show-only.
-	+ commit d9fabcc1989d7235ea0294874803295a30f8711b
-	* g10/options.h (IMPORT_DRY_RUN): New.
-	* g10/import.c (parse_import_options): Add "show-only".
-	(import_one): use that as alternative to opt.dry_run.
-
-2017-08-03 Werner Koch <wk@gnupg.org>
-
-	wks: Allow gpg-wks-client --supported with just the domain name.
-	+ commit 6cba56d436b56ea5e60042144a8a75a2e80007c8
-	* tools/gpg-wks-client.c (command_supported): Hack for missing local
-	part.
-
-2017-08-02 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	g10: Always save standard revocation certificate in file.
-	+ commit dcfb01959802b27869528dda1d9a4f5e79574bb5
-	* g10/revoke.c (gen_standard_revocation): Set opt.outfile to NULL
-	temporarily to create certificate in right place.
-
-2017-08-01 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	Revert "g10: Always save standard revocation certificate in file."
-	+ commit 624cd2d0bf6cc6dd1b79654295dc76f5b2d6d70b
-	This reverts commit ebc65ff459e6c228fb7406e375819a9fe5637abe.
-
-	g10: Always save standard revocation certificate in file.
-	+ commit ebc65ff459e6c228fb7406e375819a9fe5637abe
-	* g10/main.h (open_outfile): New parameter NO_OUTFILE.
-	* g10/openfile.c (open_outfile): New parameter NO_OUTFILE. If given,
-	never use opt.outfile.
-	* g10/revoke.c (create_revocation): If FILENAME is true, also set
-	NO_OUTFILE to true (for standard revocation certificates).
-	* g10/dearmor.c, g10/encrypt.c, g10/export.c, g10/revoke.c,
-	g10/sign.c: Adjust all other callers.
-
-	artwork: Add icons.
-	+ commit a8d0b8d2333ddab703d1e346e06c106eeeedfd53
-	* artwork/icons/index.css: New file.
-	* artwork/icons/index.html: New file.
-	* artwork/icons/lock-12.png: New file.
-	* artwork/icons/lock-128.png: New file.
-	* artwork/icons/lock-16.png: New file.
-	* artwork/icons/lock-24.png: New file.
-	* artwork/icons/lock-256.png: New file.
-	* artwork/icons/lock-32.png: New file.
-	* artwork/icons/lock-48.png: New file.
-	* artwork/icons/lock-64.png: New file.
-	* artwork/icons/lock-wing-12.png: New file.
-	* artwork/icons/lock-wing-128.png: New file.
-	* artwork/icons/lock-wing-16.png: New file.
-	* artwork/icons/lock-wing-24.png: New file.
-	* artwork/icons/lock-wing-256.png: New file.
-	* artwork/icons/lock-wing-32.png: New file.
-	* artwork/icons/lock-wing-48.png: New file.
-	* artwork/icons/lock-wing-64.png: New file.
-	* artwork/icons/lock-wing.svg: New file.
-	* artwork/icons/lock.svg: New file.
-	* artwork/icons/wing-12.png: New file.
-	* artwork/icons/wing-128.png: New file.
-	* artwork/icons/wing-16.png: New file.
-	* artwork/icons/wing-24.png: New file.
-	* artwork/icons/wing-256.png: New file.
-	* artwork/icons/wing-32.png: New file.
-	* artwork/icons/wing-48.png: New file.
-	* artwork/icons/wing-64.png: New file.
-	* artwork/icons/wing.svg: New file.
-
-2017-08-01 Werner Koch <wk@gnupg.org>
-
-	gpg,sm: Error out on compliance mismatch while decrypting.
-	+ commit 4e117f206beb38287ddcd3251fb7baabadfbddbb
-	* g10/pubkey-enc.c (get_session_key): Bail out if the algo is not
-	allowed in the current compliance mode.
-	* sm/decrypt.c (gpgsm_decrypt): Ditto.
-
-2017-08-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	Simple typo fix.
-	+ commit fde9a8cc6c849fb21f3e6782dbd5c6bc863357eb
-	* tools/rfc822parse.c: Fix.
-
-	po: Update Japanese translation.
-	+ commit 02b571947b9442604faa7509478cd8577c2c0b9c
-
-
-2017-07-31 Werner Koch <wk@gnupg.org>
-
-	dirmngr,w32: Fix http connection timeout problem.
-	+ commit 482fd5758c1b7e1b33c4cb50656e586a3ae16815
-	* dirmngr/http.c (connect_with_timeout) W32: Take care of EAGAIN.
-
-	Explain the "server is older than xxx warning".
-	+ commit 4ad5bc1b6d72483123963c894ee1412b2ceb99b4
-	* g10/call-agent.c (warn_version_mismatch): Print a note on how to
-	restart the servers.
-	* g10/call-dirmngr.c (warn_version_mismatch): Ditto.
-	* sm/call-agent.c (warn_version_mismatch): Ditto.
-	* sm/call-dirmngr.c (warn_version_mismatch): Ditto.
-
-2017-07-28 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.22.
-	+ commit 7d335ff496b129ee6f33c4ca25bd7a6631a4b590
-
-
-	po: Update German translation.
-	+ commit 339f672dad94b4e0000fd2d3a1f272a4861c91c3
-
-
-	agent: Make --ssh-fingerprint-digest re-readable.
-	+ commit 6c9899bede6ecb2ccf7336d12724090f36a6aa3d
-	* agent/gpg-agent.c (main): Move oSSHFingerprintDigest to ...
-	(parse_rereadable_options): here.
-	(opts): Change its description.
-	(main) <aGPGConfList>: Include this option.
-	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add option at expert
-	level.
-
-	gpg,sm: String changes for compliance diagnostics.
-	+ commit efe187e8a2b583defdcd9d4b96e3dc83f95bef0d
-
-
-	agent: For OCB key files return Bad Passprase instead of Checksum Error.
-	+ commit 5cf95157c5db88dd599ac4d48f619782179b1438
-	* agent/protect.c (do_decryption): Map error checksum to bad
-	passpharse protection
-
-	* agent/call-pinentry.c (unlock_pinentry): Don't munge the error
-	source for corrupted protection.
-
-	gpg: Minor rework for better readibility of get_best_pubkey_byname.
-	+ commit 1c35e29af95c46475f297d2bd70a5f3bd49d45b1
-	* g10/getkey.c (get_best_pubkey_byname): Change return type to
-	gpg_error_t. Use var name err instead of rc. Move a
-	gpg_error_from_syserror closer to the call.
-
-	gpg: Fix segv in get_best_pubkey_byname.
-	+ commit 6496dc1f9d2aef3bf8cf950da2434c96f7a0145c
-	* g10/getkey.c (get_best_pubkey_byname): Init NEW.
-
-	agent: Minor cleanup (mostly for documentation).
-	+ commit 5516ef47a22dfdf9cdf56107f34d2bda9e46deec
-	* agent/command.c (cmd_pksign): Change var name 'rc' to 'err'.
-	* agent/findkey.c (read_key_file): Ditto. Change return type to
-	gpg_error_t. On es_fessk failure return a correct error code.
-	(agent_key_from_file): Change var name 'rc' to 'err'.
-	* agent/pksign.c (agent_pksign_do): Ditto. Change return type to
-	gpg_error_t. Return a valid erro code on malloc failure.
-	(agent_pksign): Ditto. Change return type to gpg_error_t. replace
-	xmalloc by xtrymalloc.
-	* agent/protect.c (calculate_mic): Change return type to gpg_error_t.
-	(do_decryption): Ditto. Do not init RC.
-	(merge_lists): Change return type to gpg_error_t.
-	(agent_unprotect): Ditto.
-	(agent_get_shadow_info): Ditto.
-
-2017-07-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Tweak compliance checking for verification.
-	+ commit 6502bb0d2af5784918ebb74242fff6f0a72844bf
-	* common/compliance.c (gnupg_pk_is_allowed): Rework to always allow
-	verification.
-	* g10/mainproc.c (check_sig_and_print): Print a con-compliant warning.
-	* g10/sig-check.c (check_signature2): Use log_error instead of
-	log_info.
-
-	gpg,sm: Allow encryption (with warning) to any key in de-vs mode.
-	+ commit 1bd22a85b4f06324037b3500d2fa8af62733c926
-	* g10/encrypt.c (encrypt_crypt): Do not abort for a non-compliant key.
-	* sm/encrypt.c (gpgsm_encrypt): Ditto.
-
-	gpg,sm: Fix compliance checking for decryption.
-	+ commit a0d0cbee7654ad7582400efaa92d493cd8e669e9
-	* common/compliance.c (gnupg_pk_is_compliant): Remove the Elgamal
-	signing check. We don't support Elgamal signing at all.
-	(gnupg_pk_is_allowed) <de-vs>: Revert encryption/decryption for RSA.
-	Check the curvenames for ECDH.
-	* g10/pubkey-enc.c (get_session_key): Print only a warning if the key
-	is not compliant.
-	* sm/decrypt.c (gpgsm_decrypt): Ditto. Use the same string as in gpg
-	so that we have only one translation.
-
-	gpg: Avoid output to the tty during import.
-	+ commit fcb62fe20f45290bf95703ec3bf4d0b361fa4339
-	* g10/key-check.c (key_check_all_keysigs): Add arg mode and change all
-	output calls to use it.
-	* g10/keyedit.c (keyedit_print_one_sig): Add arg fp and chnage all
-	output calls to use it.
-	(keyedit_menu): Adjust for changes.
-	* g10/gpgcompose.c (keyedit_print_one_sig): Add dummy arg fp.
-	* g10/import.c (import_one): Call key_check_all_keysigs with output to
-	the log stream.
-
-2017-07-26 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	g10: Make sure exactly one fingerprint is output with --quick-gen-key.
-	+ commit 94eea0ed2c8b47cb0fe02b22cbe668705a5fe0d0
-	* g10/keygen.c (do_generate_keypair): Only set fpr in
-	list_keyblock_direct invocation if neither --fingerprint nor
-	--with-fingerprints are given.
-
-2017-07-26 Werner Koch <wk@gnupg.org>
-
-	doc: Add man pages form gpg-wks-server and gpg-wks-client.
-	+ commit be636c3cfca178927b09ef4154c3e555d6f5b1c4
-	* doc/wks.texi: New.
-	* doc/gnupg.texi: Include wks.texi.
-	* doc/Makefile.am (gnupg_TEXINFOS): Add wks.texi.
-	(myman_pages): Add new man pages.
-
-	wks: Fix program names in the usage diagnostics.
-	+ commit c76398da5b15df2086f68bc26b7fde75219976c7
-	* tools/gpg-wks-client.c (my_strusage): Add case 12.
-	* tools/gpg-wks-server.c (my_strusage): Add case 12:
-
-2017-07-26 Andre Heinecke <aheinecke@intevation.de>
-
-	doc: Update vsnfd profile example.
-	+ commit 4f569c69075fddbaea588544a6625c28cb4cb8f4
-	* doc/examples/vsnfd.prf: Use rsa3072
-
-2017-07-26 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Do not use a blocking connect in Tor mode.
-	+ commit c5e5748480952e5bcedb16f6ce6ef7e435acb3c7
-	* dirmngr/http.c (http_raw_connect): Disable the timeout in Tor mode.
-	(send_request): Ditto.
-
-	dirmngr: Auto-enable Tor on startup or reload.
-	+ commit fd68bdb61ec4f8441da6d3023a8da4315df54cec
-	* dirmngr/dirmngr.c (dirmngr_use_tor): Test for Tor availibility.
-
-	agent,dirmngr: Check for homedir removal also using stat(2).
-	+ commit d50c2eff8d6931586c527edb3dea98dbc6facdec
-	* agent/gpg-agent.c (have_homedir_inotify): New var.
-	(reliable_homedir_inotify): New var.
-	(main): Set reliable_homedir_inotify.
-	(handle_tick): Call stat on the homedir.
-	(handle_connections): Mark availibility of the inotify watch.
-	* dirmngr/dirmngr.c (handle_tick): Call stat on the homedir.
-	(TIMERTICK_INTERVAL_SHUTDOWN): New.
-	(handle_connections): Depend tick interval on the shutdown state.
-
-	agent: Lengthen timertick interval on Unix to 4 seconds.
-	+ commit f4ec7697a9c2d7587794d3bd75efbb0b51d6562f
-	* agent/gpg-agent.c (TIMERTICK_INTERVAL): Same value for Windows and
-	Unix.
-
-2017-07-25 Werner Koch <wk@gnupg.org>
-
-	common: Strip trailing slashes from the homedir.
-	+ commit 24c7aa0d58e3768690dd8ebef0e8e01af7e80f83
-	* common/homedir.c (default_homedir): Strip trailing slashes.
-	(gnupg_set_homedir): Ditto.
-
-	w32: Also change the directory on daemon startup.
-	+ commit 0ef50340ef68b2541d9a1aafa71f5400aef4dc7e
-	* agent/gpg-agent.c (main): Always to the chdir.
-	* dirmngr/dirmngr.c (main): Ditto.
-	* scd/scdaemon.c (main): Ditto.
-
-	common: New functions gnupg_daemon_rootdir and gnupg_chdir.
-	+ commit 226f143ca01cf335c7c4e3e94c96fb9d271eccc9
-	* common/sysutils.c (gnupg_chdir): New.
-	* common/homedir.c (gnupg_daemon_rootdir): New.
-	* agent/gpg-agent.c (main): Use these functions instead chdir("/").
-	* dirmngr/dirmngr.c (main): Ditto.
-	* scd/scdaemon.c (main): Ditto.
-
-	gpg: Update key origin info during import merge.
-	+ commit 166d0d7a2439f30c0a250faadc16ce3453447d71
-	* g10/import.c (update_key_origin): New.
-	(merge_blocks): Add arg curtime.
-	(import_one): Pass curtime to merge_blocks. Call update_key_origin.
-
-	gpg: Store key origin for new userids during import merge.
-	+ commit 84c993d9325fc000acac7950b2dfeefa5976df3b
-	* g10/import.c (apply_meta_data): Rename to ...
-	(insert_key_origin): this. Factor code out to ...
-	(insert_key_origin_pk, insert_key_origin_uid): new funcs.
-	(import_one): Move insert_key_origin behind clean_key.
-	(merge_blocks): Add args options, origin, and url.
-	(append_uid): Rename to ...
-	(append_new_uid): this. Add args options, curtime, origin, and url.
-	Call insert_key_origin_uid for new UIDs.
-
-2017-07-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Add annotation for fallthrough.
-	+ commit d40b4a41a8d60292fd4b5b951a19883e31090179
-	* dirmngr/dns.c: Add /* FALL THROUGH */ to clarify.
-
-2017-07-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Extend --key-origin to take an optional URL arg.
-	+ commit 87b5421ca84bbea68217c9ed771ee8c0a98a4d0c
-	* g10/getkey.c (parse_key_origin): Parse appended URL.
-	* g10/options.h (struct opt): Add field 'key_origin_url'.
-	* g10/gpg.c (main) <aImport>: Pass that option to import_keys.
-	* g10/import.c (apply_meta_data): Extend for file and url.
-	* g10/keyserver.c (keyserver_fetch): Pass the url to
-	import_keys_es_stream.
-
-	gpg: Store key origin info for new keys from a keyserver.
-	+ commit 2ca0381d077d766593db26f4215b8eddee8d7963
-	* g10/keyserver.c (keyserver_get_chunk): Use KEYORG_KS if request was
-	done by fingerprint.
-	* g10/import.c (apply_meta_data): Implement that.
-
-	gpg: Store key origin info for new DANE and WKD retrieved keys.
-	+ commit e7068bf92ec5ca5d440346d43a382c1f625b924d
-	* g10/import.c (apply_meta_data): Remove arg 'merge'. Add arg 'url'.
-	Implement WKD and DANE key origin.
-	(import_keys_internal): Add arg 'url' and change all callers.
-	(import_keys_es_stream): Ditto.
-	(import): Ditto.
-	(import_one): Ditto.
-	* g10/keylist.c (list_keyblock_print): Fix update URL printing.
-	* g10/call-dirmngr.c (gpg_dirmngr_wkd_get): Add arg 'r_url' to return
-	the SOURCE. Pass ks_status_cb to assuan_transact.
-	* g10/keyserver.c (keyserver_import_wkd): Get that URL and pass it to
-	the import function.
-
-	gpg: Filter keys received via DANE.
-	+ commit f6f0dd4d5ea85e0b16e96d7678b1d508182049a8
-	* g10/keyserver.c (keyserver_import_cert): Use an import filter in
-	DANE mode.
-
-	dirmngr: Print a SOURCE status for WKD requests.
-	+ commit e97548223948222a5c22acdf3775c7f93c1e17a9
-	* dirmngr/server.c (cmd_wkd_get): Print a SOURCE status.
-
-	dirmngr: New function dirmngr_status_printf.
-	+ commit 9b88cfa0962f28894658cff8777fe7a217c6f700
-	* dirmngr/server.c (dirmngr_status_printf): New.
-
-2017-07-24 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	g10: Make sure to emit NEED_PASSPHRASE on --import of secret key.
-	+ commit 872137b5921dd297e7d2c1def6e3868b7595feb5
-	* call-agent.h (agent_import_key): Add keyid parameters.
-	* call-agent.c (agent_import_key): Set keyid parameters.
-	* import.c (transfer_secret_keys): Pass keyid parameters.
-
-	w32: Change directory on daemon startup.
-	+ commit 78ebc62604d77600b9865950610717d28c6027a2
-	* agent/gpg-agent.c HAVE_W32_SYSTEM: Include <direct.h>.
-	(main) HAVE_W32_SYSTEM: Change working directory to \.
-	* dirmngr/dirmngr.c HAVE_W32_SYSTEM: Include <direct.h>.
-	(main) HAVE_W32_SYSTEM: Change working directory to \.
-	* scd/scdaemon.c HAVE_W32_SYSTEM: Include <direct.h>.
-	(main) HAVE_W32_SYSTEM: Change working directory to \.
-
-	g10: Make sure to emit NEED_PASSPHRASE on --export-secret-key.
-	+ commit d8e46f10698da0bee4cd58d95f1f9832bdda0c5f
-	* call-agent.h (agent_export_key): Add keyid parameters.
-	* call-agent.c (agent_export_key): Set keyid parameters.
-	* export.c (receive_seckey_from_agent): Pass keyid parameters.
-
-2017-07-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Use unsigned int for fields.
-	+ commit 45e40487fb7bb51228c96c8966e38c643a9b9ba5
-	* scd/app-openpgp.c (data_objects): Use unsigned ints.
-
-	dirmngr: More minor fix.
-	+ commit ade4b2744c848e07b87afa4f186256c2a2ef1d13
-	* dirmngr/http.c (send_request): Care the case of !USE_TLS.
-
-	dirmngr: More minor fixes.
-	+ commit 789401e9557db13422f47a8c09e693f3cee0132b
-	* dirmngr/http.c (http_verify_server_credentials): Duplicated const.
-	* dirmngr/ldap.c (parse_one_pattern): Add comment.
-
-	dirmngr: Minor fix for Windows.
-	+ commit 274602820cfbb15c7cdb4525acd9793bdb472e78
-	* dirmngr/http.c (connect_with_timeout): Use FD2INT.
-
-	agent: Minor fix for Windows.
-	+ commit 328fca187253c069e3630bd387a71f6d16e9820a
-	* agent/command-ssh.c (serve_mmapped_ssh_request): Add const
-	qualifier.
-
-2017-07-21 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	g10: Avoid caching passphrase for failed symmetric encryption.
-	+ commit e4c720fa3b31ebd3e9d764c6eab02729cf06124c
-	* g10/mainproc.c (proc_encrypted): If error code is GPG_ERR_CIPHER_ALGO,
-	assume the symmetric passphrase was wrong and invalidate the cache.
-
-2017-07-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Extend --quick-set-expire to allow subkey expiration setting.
-	+ commit b55b72bb815ad5870456b89c3a011fa00991b4a8
-	* g10/keyedit.c (keyedit_quick_set_expire): Add new arg subkeyfprs.
-	(menu_expire): Rename arg force_mainkey to unattended and allow
-	unattended changing of subkey expiration.
-	* g10/gpg.c (main): Extend --quick-set-expire.
-
-	gpg: Fix possible double free of the card serialno.
-	+ commit e888f7af6571ecd3994fd55cc18c9e2df7fd0c60
-	* g10/free-packet.c (copy_public_key): Copy fields serialno and
-	updateurl.
-
-	gpg: Use macros to check the signature class.
-	+ commit 5818ff0ae314af08548fcc23df2b807736144a00
-	* g10/import.c: Use the extistin macros for better readability.
-
-2017-07-21 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	g10: Clean keyblock on initial commit.
-	+ commit 609bbdf3614fbadeba7a6cbdfdf5004b23516a64
-	* g10/import.c (import_one): If option import-clean is set,
-	also clean on initial import, not only for merge.
-
-2017-07-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix SEGV in CCID driver.
-	+ commit d8a55da715ce8447b0686f321fa43d00be34a467
-	* scd/ccid-driver.c (intr_cb): Only kick the loop for removal.
-	(bulk_in): Don't set POWERED_OFF when interrupt transfer is enabled.
-
-	g10: Don't limit at the frontend side for card capability.
-	+ commit a76b6cf9709c0a2a89fa2887075491b80f3d9608
-	* g10/card-util.c (MAX_GET_DATA_FROM_FILE): New.
-	(get_data_from_file): Use MAX_GET_DATA_FROM_FILE.
-	(change_url, change_login, change_private_do): Don't limit.
-
-	scd: Add debug message for v3 card.
-	+ commit 892e86b0dc69193ddff018bf9b3938509dd72cb3
-	* scd/app-openpgp.c (show_caps): Output more messages.
-
-2017-07-20 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	doc: Clarify wording of export-attributes.
-	+ commit cea4313644b531ef87b8c8e4bfddde4388cbbe0d
-	* doc/gpg.texi: Clarify wording of export-attributes.
-
-2017-07-20 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --with-key-origin.
-	+ commit 165cdd8121bbf80bfe2da071539d3578630f198f
-	* g10/getkey.c (parse_key_origin): Factor list out as ...
-	(key_origin_list): new struct.
-	(key_origin_string): New.
-	* g10/gpg.c (oWithKeyOrigin): New const.
-	(opts): New option --with-key-origin.
-	(main): Implement option.
-	* g10/options.h (struct opt): New flag with_key_origin.
-	* g10/keylist.c (list_keyblock_print): Print key origin info.
-	(list_keyblock_colon): Ditto.
-
-	common: New function print_utf9_string.
-	+ commit bddc2e04f1ddc18be20efc0f0508be401b345f42
-	* common/miscellaneous.c (print_utf8_string): New.
-
-	gpg: Make function mk_datestr public.
-	+ commit 3ee314dde16d1d69ddf840cdb8b5aa186c592262
-	* g10/keydb.h (MK_DATESTR_SIZE): New.
-	* g10/keyid.c (mk_datestr): Make public. Add arg bufsize and use
-	snprintf. Change arg atime to u32.
-	(datestr_from_pk): Simplify.
-	(datestr_from_sig): Ditto.
-	(expirestr_from_pk): Ditto.
-	(expirestr_from_sig): Ditto.
-	(revokestr_from_pk): Ditto.
-
-2017-07-20 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	g10: Return proper error when gpg-agent fails to start during probe.
-	+ commit 9998b162b47931fb8a8ed961d53418d505358888
-	* g10/getkey.c (lookup): Return immediately on any other error than
-	GPG_ERR_NO_SECKEY from agent_probe_any_secret_key.
-
-2017-07-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support longer data length for special DOs for v3 card.
-	+ commit 69614d55018ddb8678d8904a52e648931f480d72
-	* scd/app-openpgp.c (data_objects): Special DOs like "Login Data",
-	"URL", "Private DO N" can be longer size >= 256.
-	(struct app_local_s): Define bits for v3 card.
-	(get_cached_data): Use extcap.max_special_do for special DOs.
-	(app_select_openpgp): Detect if extcap_v3, kdf_do, and other bits.
-
-	common: logstream fix.
-	+ commit 84146b3ec44943f06c66a603de19094b930ad446
-	* common/logging.c (set_file_fd): Don't close es_stderr.
-
-	dnsmngr: Fix use of CPP.
-	+ commit cc12cf386b620e658fa93a0bd40477bc16d85d98
-	* dirmngr/dns.c (HAVE_STATIC_ASSERT, HAVE___ATOMIC_FETCH_ADD)
-	(DNS_HAVE_SOCKADDR_UN, HAVE_SOCK_NONBLOCK): Don't use defined
-	to be expanded for expression evaluation.
-
-2017-07-19 Justus Winter <justus@g10code.com>
-
-	dirmngr: Forbid redirects from .onion to clearnet URIs.
-	+ commit e7fc6e3bf0eb6ffe53e1f099d28ce45cef4a8a87
-	* dirmngr/ks-engine-hkp.c (send_request): Forbid redirects from .onion
-	to clearnet URIs.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Likewise.
-
-2017-07-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid asking by fpr and then by keyid during auto-key-retrieve.
-	+ commit 2e5459457473eb4b3e7b2b14815cb94faa66e8bb
-	* g10/mainproc.c (check_sig_and_print): Track key server request via
-	fingerprint.
-
-2017-07-19 Justus Winter <justus@g10code.com>
-
-	dirmngr: Implement TLS over http proxies.
-	+ commit da91d2106a17c796ddb066a34db92d33b21c81f7
-	* dirmngr/http.c (send_request): If a http proxy is to be used, and we
-	want to use TLS, try to use the CONNECT method to get a connection to
-	the target server.
-
-	dirmngr: Log http response in debug mode.
-	+ commit e7eabe66b6409c1f5225b751ea5c2d456a3856e6
-	* dirmngr/http.c (parse_response): Log http response in debug mode.
-
-	dirmngr: Amend TLS handling.
-	+ commit 1ba220e68149fdb197accf4a15b0a11126c8b431
-	* dirmngr/http.c (http_wait_response): Get the 'use_tls' flag from the
-	write cookie, not from the URI.
-
-	dirmngr: Fix connecting to http proxies.
-	+ commit 46a4a0c0e77e19f9589088bb87357c33142c3f04
-	* dirmngr/http.c (send_request): Do not use the 'srvtag' intended for
-	the target host to connect to the http proxy.
-
-	dirmngr: Fix handling of proxy URIs.
-	+ commit 73d4781e4595634548269bafe46aeb7674c5b219
-	* dirmngr/http.c (send_request): We do not support socks4.
-
-2017-07-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpgconf: Make vars read-only explicitly.
-	+ commit 99791184ac4c7486ccdefc150b9921cd923428b9
-	* tools/gpgconf-comp.c (gc_backend, gc_arg_type, gc_level, gc_flag)
-	(gc_component): Add const qualifier.
-
-	Fix usage of ARGPARSE_OPTS.
-	+ commit fa63db89f9581186ed758c502d4e69914b774157
-	* agent/gpg-agent.c, agent/preset-passphrase.c,
-	dirmngr/dirmngr-client.c, dirmngr/dirmngr_ldap.c, kbx/kbxutil.c,
-	tools/gpg-check-pattern.c, tools/gpgconf.c, tools/gpgsplit.c,
-	tools/symcryptrun.c: Use ARGPARSE_end.
-
-2017-07-18 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	common: Allow abbreviations of standard options.
-	+ commit f17862d47d184d7f6ef883778cf63801365599a0
-	* argparse.h (ARGPARSE_SHORTOPT_HELP, ARGPARSE_SHORTOPT_VERSION,
-	ARGPARSE_SHORTOPT_WARRANTY, ARGPARSE_SHORTOPT_DUMP_OPTIONS): New
-	macros.
-	(ARGPARSE_end): Add some placeholders for standard options.
-	* argparse.c (arg_parse): Fill in missing standard options so
-	default machinery works. Check for standard options in new way.
-	Do not write out standard options for --dump-options.
-
-2017-07-18 Justus Winter <justus@g10code.com>
-
-	gpgscm,w32: Fix testing for absolute paths.
-	+ commit 2e1342b78b020f5b28359b08a4f63cf11479602f
-	* tests/gpgscm/main.c (path_absolute_p): New function.
-	(load): Use new function.
-
-	dirmngr: Honor http keyserver URLs.
-	+ commit b231959728a0056094134e0fca8cc916c24ef37e
-	* dirmngr/http.c (parse_uri): Keep an unmodified copy of the URI.
-	* dirmngr/http.h (struct parsed_uri_s): New field 'original'.
-	* dirmngr/ks-action.c (ks_action_get): Properly handle http and https
-	URLs.
-
-	dirmngr: Fix memory leak.
-	+ commit ebb35ed7110d1a29061dfb4ccb9038645b20d7f4
-	* dirmngr/http.c (parse_uri): Properly free partial results.
-
-	dirmngr: Fix memory leak.
-	+ commit 3d670fa973a03ea88b5f9459b3222a951136dd7a
-	* dirmngr/http.c (http_release_parsed_uri): Free 'params'.
-
-2017-07-17 Werner Koch <wk@gnupg.org>
-
-	gpg,sm: Check compliance of the RNG.
-	+ commit a149afe338d61d86985c533cde5e7dbcd31e8698
-	* common/compliance.c (gnupg_rng_is_compliant): New.
-	* g10/call-agent.c (start_agent) W32: Check rng compliance.
-	* sm/call-agent.c (start_agent) W32: Ditto.
-	* g10/encrypt.c (encrypt_simple, encrypt_crypt): Check that the RNG is
-	compliant.
-	* sm/encrypt.c (gpgsm_encrypt): Ditto.
-	* g10/sign.c (do_sign): Ditto.
-	* sm/sign.c (gpgsm_sign): Ditto.
-
-	agent: New GETINFO sub-command jent_active.
-	+ commit bbbd0db34b4e387f8dc089fb7d69fdcf2ed91a01
-	* agent/command.c (cmd_getinfo): Implement it for gcrypt >= 1.8.
-
-	common: New function split_fields_colon.
-	+ commit 849467870ee1c10e0a7b1e89cfc9e8214e4963fe
-	* common/stringhelp.c (split_fields_colon): New.
-	* common/t-stringhelp.c (test_split_fields_colon): New test.
-	(main): Call that test.
-
-2017-07-14 Justus Winter <justus@g10code.com>
-
-	tests: Improve 'shell.scm' script.
-	+ commit 58eafd11ed5501c0b72fcb553eb3e097ad29b3c6
-	* tests/openpgp/defs.scm (create-file): Unlink file first.
-	* tests/openpgp/shell.scm: Ask whether to import legacy test keys or
-	not, and whether to drop 'batch' from the configuration. Add paths to
-	all the programs to 'PATH'.
-
-	gpgscm: Library improvements.
-	+ commit b4d25082fd4502ec01d511c22fecd60d513b81f4
-	* tests/gpgscm/repl.scm (prompt-yes-no?): New function.
-	* tests/gpgscm/tests.scm (pathsep-split): Likewise.
-	(pathsep-join): Likewise.
-	(with-path): Use the new function.
-
-	gpgscm: Fail early if the test setup fails.
-	+ commit 7a6e6ad2880bbff54a75ff608d0ec97d6c405733
-	* tests/gpgscm/tests.scm (make-environment-cache): Check status code
-	of setup script.
-
-	gpg: Fix importing keys.
-	+ commit 956da89193370d5aa970cff5b77f605534481a02
-	* g10/import.c (import_one): Fix error handling.
-
-2017-07-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Pass key origin values to import functions.
-	+ commit 330212efb927c119bb5135856f8582c0e4e2e6b7
-	* g10/import.c (import_keys_stream): Remove this unused function.
-	(import_keys_internal): Add arg origin.
-	(import_keys): Ditto.
-	(import_keys_es_stream): Ditto.
-	(import): Ditto.
-	(import_one): Ditto.
-	(apply_meta_data): New stub.
-	(import_secret_one): Pass 0 for ORIGIN.
-	* g10/keyserver.c (keyserver_get_chunk): For now pass 0 for ORIGIN.
-	(keyserver_fetch): Add arg origin.
-	(keyserver_import_cert): Pass KEYORG_DANE for ORIGIN.
-	(keyserver_import_wkd): Pass KEYORG_WKD for ORIGIN.
-	* g10/gpg.c (main): Pass OPT.KEY_ORIGIN to import_keys and
-	keyserver_fetch.
-	* g10/card-util.c (fetch_url): Pass KEYORG_URL for ORIGIN.
-
-	gpg: New option --key-origin.
-	+ commit fa1155e89ebb4b16ee95549b8ab72672df3a0c54
-	* g10/keydb.h (KEYORG_): Rename to KEYORG_.
-	* g10/packet.h (PKT_user_id): Rename field keysrc to keyorg. Adjust
-	users.
-	(PKT_public_key): Ditto.
-	(PKT_ring_trust): Ditto.
-	* g10/options.h (struct opt): Add field key_origin.
-	* g10/getkey.c (parse_key_origin): New.
-	* g10/gpg.c (oKeyOrigin): New.
-	(opts): Add "keys-origin".
-	(main): Set option.
-
-2017-07-13 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	doc: Document gnupg version requirement for gpg-preset-passphrase.
-	+ commit 877a321d011deb3e8501aa9cc5e9f9cd0b19dddf
-
-
-2017-07-13 Justus Winter <justus@g10code.com>
-
-	gpgscm: Make loading of modules less verbose.
-	+ commit f78fe1a4ec9d343199e1f424dd09e2937c913412
-	* tests/gpgscm/main.c (load): Increase logging threshold.
-
-	gpgscm: Make it impossible to catch '*interpreter-exit*'.
-	+ commit bce02a8b0f0e51775a4ee5536ccf35efc1f15ca6
-	* tests/gpgscm/init.scm (throw'): Make it impossible to catch
-	'*interpreter-exit*'. This fixes 'exit' (and with it 'fail') inside
-	'catch' statements.
-
-2017-07-10 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	tofu: Compare squares instead of square roots.
-	+ commit d24594976686983c7186cbe4e78153888a13b6e4
-	* g10/Makefile.am (tofu_source) USE_TOFU: Remove sqrtu32.h and
-	sqrtu32.c.
-	* g10/sqrtu32.h, g10/sqrtu32.c: Removed files.
-	* g10/tofu.c: Compare squares instead of square roots.
-
-	speedo: Provide a vagrantfile to test speedo in an isolated VM.
-	+ commit 1455b406e63dd262938e49da5f83c05c17c60a8d
-	* build-aux/Vagrantfile: New file.
-
-2017-07-06 Neal H. Walfield <neal@g10code.com>
-
-	doc: Improve TOFU documentation.
-	+ commit 243b2a570c30586e19b8c88e43b282d62d8eb77c
-	* doc/gpg.texi: Improve TOFU documentation.
-
-2017-07-05 Werner Koch <wk@gnupg.org>
-
-	agent: Use MAX_PASSPHRASE_LEN (255) also for the loopback.
-	+ commit 3681ee7dc1e9d8c94fdb046d7be0bbcfeba1cfe9
-	* agent/call-pinentry.c (agent_get_passphrase): Reduce maximum
-	passphrase length as conveyed to the loopback to MAX_PASSPHRASE_LEN.
-	* agent/genkey.c (agent_ask_new_passphrase): Extend the maximum
-	passphrase as conveyed to the loopback to MAX_PASSPHRASE_LEN.
-
-	doc: Update yat2m to take care of SOURCE_DATE_EPOCH.
-	+ commit 139de02b93773615bdd95e04a7f0c1ad73b4f6fb
-	* doc/yat2m.c (main): Set a default for OPT_DATE.
-
-	doc: Prefer an installed version of yat2m.
-	+ commit f6faa058749846de18cb34f1cc79867bb0029922
-	* configure.ac (YAT2M): Check for tool.
-	* doc/Makefile.am (yat2m-stamp): Use installed tool if possible.
-
-2017-07-01 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	doc: Document obsolete option in gpgsm. Closes T2231.
-	+ commit 7fb724c61655c6f75c61572d65a46e21ae112574
-	* doc/gpgsm.texi: Mark --prefer-system-dirmngr as obsolete.
-
-2017-06-28 Werner Koch <wk@gnupg.org>
-
-	agent: Fix option --debug-wait.
-	+ commit ecd6c0160f49ae83001dfd150df6b1238fc479d5
-	* agent/gpg-agent.c (opts): Typo fix.
-
-2017-06-26 Justus Winter <justus@g10code.com>
-
-	agent: Support unprotected ssh keys.
-	+ commit 273964798592cd479c111f47e8ce46d5b1999d6a
-	* agent/command-ssh.c (ssh_key_to_protected_buffer): If the empty
-	passphrase is supplied, do not protect the key.
-
-	tests: Improve test.
-	+ commit b49b1a87ac2695e3892fb001878da59fbc92fa37
-	* tests/openpgp/ssh-export.scm: Split output at any whitespace.
-
-2017-06-23 Werner Koch <wk@gnupg.org>
-
-	agent: Shutdown on removal of the home directory.
-	+ commit 1ead1ca818bddabc3bca22c195be667993eb3e2e
-	* common/sysutils.c (gnupg_inotify_watch_delete_self): New.
-	* agent/gpg-agent.c (handle_connections): Rename my_inotify_fd to
-	sock_inotify_fd.
-	(handle_connections): Add home_inotify_fd to watch the home directory.
-
-	build: Add missing LIBASSUAN_CFLAGS to dirmngr/.
-	+ commit 815ecdf08a4285c75892cf9ab72feb13f3bcf590
-	* dirmngr/Makefile.am (t_http_CFLAGS): Add LIBASSUAN_CFLAGS.
-	(t_ldap_parse_uri_CFLAGS): Ditto.
-	(t_dns_stuff_CFLAGS): Ditto.
-
-	gpg,gpgsm: Emit status code ENCRYPTION_COMPLIANCE_MODE.
-	+ commit f31dc2540acf7cd7f09fd94658e815822222bfcb
-	* common/status.h (STATUS_ENCRYPTION_COMPLIANCE_MODE): New.
-	* g10/encrypt.c (encrypt_crypt): Emit new status code.
-	* sm/encrypt.c (gpgsm_encrypt): Ditto.
-
-2017-06-21 Justus Winter <justus@g10code.com>
-
-	gpg: Close cached keydb handle in gpgv.
-	+ commit a68a98233ab83f0c7b90e6e588b882085fe59d91
-	* g10/gpgv.c (main): Close cached handle.
-
-	tests: Add test for gpgv.
-	+ commit 62274d3c309d8948405c2f966bef507638b4d5c6
-	* tests/openpgp/Makefile.am (XTESTS): Add the new test.
-	* tests/openpgp/gpgv.scm: New file.
-	* tests/openpgp/signed-messages.scm: Likewise.
-	* tests/openpgp/verify.scm: Move the signed messages to the new file
-	and load it.
-
-	gpg: Fix printing keyserver URLs and notation data.
-	+ commit 890a3a70f2e1340d90c7f499358467979b182719
-	* g10/keylist.c (show_keyserver_url): Print to 'fp', not to 'stdout'.
-	(show_notation): Likewise.
-
-2017-06-20 Justus Winter <justus@g10code.com>
-
-	dirmngr: Properly handle SRV records.
-	+ commit 48aae8167dcae80d43b08167a88d9eb170781a04
-	* dirmngr/ks-engine-hkp.c (enum ks_protocol): New type.
-	(struct hostinfo_s): New flags indicating whether we already did a
-	A lookup, or a SRV lookup per protocol. Turn 'port' into an array.
-	(create_new_hostinfo): Initialize new fields.
-	(add_host): Update the port for the given protocol.
-	(map_host): Simplify hosttable lookup misses. Check the SRV records
-	for both protocols on demand, do the A lookup just once. Return the
-	correct port.
-
-	dirmngr: Refactor variable-sized array code.
-	+ commit fc4834d213af031b456c49c1ba5b5ef8873d1f18
-	* dirmngr/ks-engine-hkp.c (struct hostinfo_s): Add explicit length and
-	size fields.
-	(MAX_POOL_SIZE): New macro.
-	(create_new_hostinfo): Initialize new fields.
-	(host_in_pool_p): Adapt.
-	(select_random_host): Likewise.
-	(add_host): Likewise. Move the resizing logic here.
-	(hostinfo_sort_pool): New function.
-	(map_host): Simplify. Move the resizing logic away from here.
-	(ks_hkp_mark_host): Adapt.
-	(ks_hkp_print_hosttable): Likewise.
-
-	gpg: Fix error handling.
-	+ commit badc1cdae52bd434e5fac2e4275575afeccc2837
-	* g10/keygen.c (generate_subkeypair): Handle errors from pinentry.
-
-2017-06-19 Werner Koch <wk@gnupg.org>
-
-	gpg,gpgsm: Fix compliance check for DSA and avoid an assert.
-	+ commit 3621dbe52584bc8b417f61b5370ebaa5598db956
-	* common/compliance.c (gnupg_pk_is_compliant): Swap P and Q for DSA
-	check. Explicitly check for allowed ECC algos.
-	(gnupg_pk_is_allowed): Swap P and Q for DSA check.
-	* g10/mainproc.c (proc_encrypted): Simplify SYMKEYS check. Replace
-	assert by debug message.
-
-2017-06-19 Justus Winter <justus@g10code.com>
-
-	gpgscm: Limit the number of parallel jobs.
-	+ commit 61ef43546ba9f0209692a1569d2f033436566a02
-	* ffi.c (do_wait_processes): Suppress the timeout error.
-	* tests.scm (semaphore): New definition.
-	(test-pool): Only run a bounded number of tests in parallel.
-	(test::started?): New function.
-	(run-tests-parallel): Do not report results, do not start the tests.
-	(run-tests-sequential): Adapt.
-	(run-tests): Parse the number of parallel jobs.
-
-	gpgscm: Improve option parsing.
-	+ commit e555e7ed7de20fbbb1e3b005c32e292f29cc4a58
-	* tests/gpgscm/tests.scm (flag): Accept arguments of the form
-	'--foo=bar'.
-
-	gpgscm: Improve error handling of foreign functions.
-	+ commit 6639aedaee051e8104d7f63b9a5812abf79440ed
-	* tests/gpgscm/ffi.scm (ffi-fail): Do not needlessly join the error
-	message.
-
-	gpgscm: Improve error reporting.
-	+ commit 4c8be58fd46bb16332e84ab8ce978087dc5c68a3
-	* tests/gpgscm/init.scm (throw'): Guard against 'args' being atomic.
-	* tests/gpgscm/scheme.c (Eval_Cycle): Remove any superfluous colons in
-	error messages.
-
-	tests: Run the OpenPGP tests using the new extended key format.
-	+ commit b766d3d1034e6068a91755ada68f7f7dbe2943b6
-	* tests/openpgp/all-tests.scm: Generalize a bit, and also add a
-	variant that uses the new extended key format.
-	* tests/openpgp/defs.scm (create-gpghome): Conditionally enable the
-	new extended key format.
-
-2017-06-19 Werner Koch <wk@gnupg.org>
-
-	Change license of some files to LGPLv2.1.
-	+ commit 3419a339d9c4e800bf30e9021e05982d8c1021c1
-	* COPYING.LIB: Rename to COPYING.LGPL3.
-	* COPYING.LGPL21: New.
-	* COPYING.GPL2: New.
-	* Makefile.am: Distribute them.
-	* AUTHORS: Update license pointers. Add BSI as copyright holder.
-	* common/compliance.c, common/compliance.h: Add BSI copyright notice.
-	Break overlong lines.
-	* dirmngr/loadswdb.c: Add BSI copyright notices.
-	* dirmngr/server.c: Ditto.
-	* tools/call-dirmngr.c: Change license to LGPLv2.1. Add BSI
-	copyright notice.
-	* tools/call-dirmngr.h: Ditto.
-	* tools/gpg-wks-client.c: Ditto.
-	* tools/gpg-wks-server.c: Ditto.
-	* tools/gpg-wks.h: Ditto.
-	* tools/mime-maker.c: Ditto.
-	* tools/mime-maker.h: Ditto.
-	* tools/mime-parser.c: Ditto.
-	* tools/mime-parser.h: Ditto.
-	* tools/send-mail.c: Ditto.
-	* tools/send-mail.h: Ditto.
-	* tools/wks-receive.c: Ditto.
-	* tools/wks-util.c: Ditto.
-	* tools/rfc822parse.c, tools/rfc822parse.h: Change license to LGPLv2.1.
-
-2017-06-19 Justus Winter <justus@g10code.com>
-
-	gpg: Disable compliance module for other GnuPG components.
-	+ commit 6e23416fe61d4130918f2d1bf6e1f98d102c4610
-	* common/compliance.c (gnupg_{pk,cipher,digest}_is_compliant): Return
-	false if the module is not initialized.
-	(gnupg_{pk,cipher,digest}_is_allowed): Return true if the module is
-	not initialized.
-	(gnupg_status_compliance_flag): Do not assert that the module is
-	initialized.
-	(gnupg_parse_compliance_option): Likewise.
-	(gnupg_compliance_option_string): Likewise.
-
-2017-06-14 Justus Winter <justus@g10code.com>
-
-	gpg: Check and fix keys on import.
-	+ commit 9b12b45aa5e67d4d422bf75a3879df1d52dbe67f
-	* doc/gpg.texi: Document the new import option.
-	* g10/gpg.c (main): Make the new option default to yes.
-	* g10/import.c (parse_import_options): Parse the new option.
-	(import_one): Act on the new option.
-	* g10/options.h (IMPORT_REPAIR_KEYS): New macro.
-
-	gpg: Refactor key checking and fixing.
-	+ commit 404fa8211b6188a0abe83ef43a4b44d528c0b035
-	* g10/Makefile.am (gpg_sources): Add new files.
-	* g10/gpgcompose.c (keyedit_print_one_sig): New stub.
-	* g10/keyedit.c (sig_comparison): Move to new module.
-	(check_all_keysigs): Likewise.
-	(fix_keyblock): Adapt callsite.
-	(keyedit_menu): Likewise.
-	* g10/key-check.c: New file.
-	* g10/key-check.h: Likewise.
-
-2017-06-13 Justus Winter <justus@g10code.com>
-
-	gpg: Refactor keyedit module.
-	+ commit 8095d16b3ef6b5f01ec351824855708149f1c1c3
-	* g10/Makefile.am (gpg_SOURCES): Add new file.
-	* g10/keyedit.c (NODFLG_*): Move flags to the new header file.
-	(print_one_sig): Export symbol and rename accordingly.
-	(print_and_check_one_sig): Adapt accordingly.
-	(check_all_keysigs): Likewise.
-	* g10/keyedit.h: New file.
-	* g10/main.h: Drop declarations, include new header.
-
-	dirmngr: Implement querying nameservers over IPv6.
-	+ commit 15d2a009931f44a60b9df6325f837add208459d6
-	* dirmngr/dns.c (dns_so_check): Reinitialize sockets on address family
-	mismatch.
-	(enum dns_res_state): New states for querying over IPv6.
-	(dns_res_exec): Implement the new states by copying and modifying the
-	IPv4 variants. Branch to their respective counterparts if the current
-	list of resolvers using the current address family is exhausted.
-
-2017-06-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Disable keydb handle caching only for W32.
-	+ commit e80925171ddb20c7e76c1db88c15ce2d9b09db86
-	* g10/getkey.c (getkey_end) !W32: Re-enable caching.
-
-	common: Fix -Wswitch warning.
-	+ commit 7c91b48f0e80266cf7491c2bb7d8aabc12362643
-	* common/compliance.c (gnupg_digest_is_allowed): Don't include
-	GCRY_MD_WHIRLPOOL because it is not a digest_algo_t.
-
-2017-06-11 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Send gpgcompose --help output to stdout, not stderr.
-	+ commit 7aeac20f12ed257d3d159b304afeeac7f406c9d2
-	* g10/gpgcompose.c (show_help): Send gpgcompose --help output to
-	stdout, not stderr.
-
-	gpg: Improve some output of gpgcompose.
-	+ commit cb0484e0762a1ce05d00d949f4b70162e2f7b82c
-
-
-	gpg: Support 'gpgcompose --encrypted-pop --help'
-	+ commit 4ddf4e114c8df06d89144e857b7601de0b7e5a7c
-	* g10/gpgcompose.c (encrypted_pop_options): New variable.
-	(encrypted_pop): Support the --help option.
-
-	gpg: Remove dead code.
-	+ commit 8a9066865688cf17594b2bdde4b260b0ef36d68e
-	* g10/gpgcompose.c (filter_pop): F->PKTTYPE will never be
-	PKT_ENCRYPTED_MDC.
-	(encrypted_pop): Likewise and there is no option --encrypted-mdc-pop.
-
-2017-06-08 Marcus Brinkmann <mb@g10code.com>
-
-	artwork: Add new banner.
-	+ commit bc5503b2bf273b51d5dc59617e596f1cfb742fbc
-	* artwork/banner/banner-full.png: New file.
-	* artwork/banner/banner-rectangle.png: New file.
-	* artwork/banner/banner.svg: New file.
-	* artwork/banner/Bungee-Regular.ttf: New file.
-	* artwork/banner/Raleway-license.txt: New file.
-	* artwork/banner/banner-half.png: New file.
-	* artwork/banner/banner-skyscraper.png: New file.
-	* artwork/banner/Bungee-license.txt: New file.
-	* artwork/banner/Raleway-ExtraBold.ttf: New file.
-	* artwork/banner/Raleway-SemiBold.ttf: New file.
-
-2017-06-08 Justus Winter <justus@g10code.com>
-
-	common,gpg,sm: Restrict the use of algorithms according to CO_DE_VS.
-	+ commit a64a55e10420cf11e00062b590dffe5d0c3e8192
-	* common/compliance.c (gnupg_pk_is_allowed): New function.
-	(gnupg_cipher_is_allowed): Likewise.
-	(gnupg_digest_is_allowed): Likewise.
-	* common/compliance.h (enum pk_use_case): New definition.
-	(gnupg_pk_is_allowed): New prototype.
-	(gnupg_cipher_is_allowed): Likewise.
-	(gnupg_digest_is_allowed): Likewise.
-	* g10/decrypt-data.c (decrypt_data): Restrict use of algorithms using
-	the new predicates.
-	* g10/encrypt.c (encrypt_crypt): Likewise.
-	* g10/gpg.c (main): Likewise.
-	* g10/pubkey-enc.c (get_session_key): Likewise.
-	* g10/sig-check.c (check_signature2): Likewise.
-	* g10/sign.c (do_sign): Likewise.
-	* sm/decrypt.c (gpgsm_decrypt): Likewise.
-	* sm/encrypt.c (gpgsm_encrypt): Likewise.
-	* sm/gpgsm.c (main): Likewise.
-	* sm/sign.c (gpgsm_sign): Likewise.
-	* sm/verify.c (gpgsm_verify): Likewise.
-
-	gpg: Fix computation of compliance with CO_DE_VS.
-	+ commit b03fab09e188f7bb10237d4f20455e4026737e4e
-	* g10/mainproc.c (proc_encrypted): Symmetric encryption is also in
-	compliance with CO_DE_VS.
-
-2017-06-08 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Implement HTTP connect timeouts of 15 or 2 seconds.
-	+ commit 9b43220b8ad1a5c1cd51de3bbfff7ccbcc3fa877
-	* dirmngr/dirmngr.c (oConnectTimeout, oConnectQuickTimeout): New
-	enums.
-	(opts): New options --connect-timeout and --connect-quick-timeout.
-	(DEFAULT_CONNECT_TIMEOUT): New.
-	(DEFAULT_CONNECT_QUICK_TIMEOUT): New.
-	(parse_rereadable_options): Handle new options.
-	(post_option_parsing): New. Use instead of direct calls to
-	set_debug() and set_tor_mode ().
-	(main): Setup default timeouts.
-	(dirmngr_init_default_ctrl): Set standard connect timeout.
-	* dirmngr/dirmngr.h (opt): New fields connect_timeout and
-	connect_quick_timeout.
-	(server_control_s): New field timeout.
-	* dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass timeout to
-	http_raw_connect.
-	* dirmngr/ks-engine-hkp.c (send_request): Call
-	http_session_set_timeout.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-	* dirmngr/server.c (cmd_wkd_get, cmd_ks_search, cmd_ks_get)
-	(cmd_ks_fetch): Implement --quick option.
-
-	dirmngr: Allow a timeout for HTTP and other TCP connects.
-	+ commit 5b9025cfa1f9b1c67ddf2f6bf87d863e780cf157
-	* dirmngr/http.c: Include fcntl.h.
-	(http_session_s): Add field 'connect_timeout'.
-	(http_session_new): Clear that.
-	(http_session_set_timeout): New function.
-	(my_wsagetlasterror) W32: New.
-	(connect_with_timeout): New function.
-	(connect_server): Add arg 'timeout' and call connect_with_timeout.
-	(send_request): Add arg 'timeout' and pass it to connect_server.
-	(http_raw_connect): Add arg 'timeout'.
-	(http_open): Pass TIMEOUT from the session to connect_server.
-
-	gpg: Avoid failure exit when scdaemon is disabled but not needed.
-	+ commit 17e5afd80f247c356f03c71e8b61da424ffedabb
-	* g10/call-agent.c (warn_version_mismatch): Use log_info if error is
-	"not supported".
-
-2017-06-07 Justus Winter <justus@g10code.com>
-
-	common: Add cipher mode to compliance predicate.
-	+ commit e051e396156211449568afa0ca7505dc13eaa3b4
-	* common/compliance.c (gnupg_cipher_is_compliant): Add mode parameter.
-	* common/compliance.h (gnupg_cipher_is_compliant): Likewise.
-	* g10/mainproc.c (proc_encrypted): Adapt callsite.
-	* sm/decrypt.c (gpgsm_decrypt): Likewise.
-
-	common,gpg,sm: Initialize compliance module.
-	+ commit 21fc2508c979a8202dd8ca7fa7b801e0d62a5ceb
-	* common/compliance.c (gnupg_initialize_compliance): New function.
-	* common/compliance.h (gnupg_initialize_compliance): New prototype.
-	* g10/gpg.c (main): Use the new function.
-	* sm/gpgsm.c (main): Likewise.
-
-	common,gpg: Move the compliance option printer.
-	+ commit f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc
-	* common/compliance.c (gnupg_compliance_option_string): New function.
-	* common/compliance.h (gnupg_compliance_option_string): New prototype.
-	* g10/encrypt.c (write_pubkey_enc_from_list): Update callsite.
-	* g10/gpg.c (main): Likewise.
-	* g10/keyedit.c (keyedit_menu): Likewise.
-	* g10/pkclist.c (build_pk_list): Likewise.
-	* g10/main.h (compliance_option_string): Remove prototype.
-	* g10/misc.c (compliance_option_string): Remove function.
-
-	common,gpg,sm: Move the compliance option parser.
-	+ commit 842d233d408457cfa9a8473a6748472956f44e84
-	* common/compliance.c (gnupg_parse_compliance_option): New function.
-	* common/compliance.h (struct gnupg_compliance_option): New type.
-	(gnupg_parse_compliance_option): New prototype.
-	* g10/gpg.c (parse_compliance_option): Remove function.
-	(compliance_options): New variable.
-	(main): Adapt callsite.
-	* sm/gpgsm.c (main): Use the new common function.
-	* sm/gpgsm.h (opt): New field 'compliance'.
-
-	gpg: Improve compliance with CO_DE_VS.
-	+ commit 027ce4ba37be1d052bca2f6109fe810ef57f4038
-	* g10/gpg.c (set_compliance_option): The specification, section 4.1.1,
-	forbids the use of encryption without integrity protection.
-
-2017-06-07 Andre Heinecke <aheinecke@intevation.de>
-
-	speedo: Fix a minor memleak in the installer.
-	+ commit 13dc75a4e7cc2959003c08940fc53c6ece7b77e4
-	* build-aux/speedo/w32/g4wihelp.c (path_remove): Free path_new on
-	early return.
-
-2017-06-06 Andre Heinecke <aheinecke@intevation.de>
-
-	speedo: Fix source tar call ambiguity.
-	+ commit 96acbdd7265f504d06783adfd6322a6675c41c0a
-	* build-aux/speedo.mk (dist-source): Expand exclude-vc to
-	exclude-vcs.
-
-2017-06-01 Justus Winter <justus@g10code.com>
-
-	gpg: Report compliance with CO_DE_VS.
-	+ commit be8ca8852629786266db4d3d69b2c2fb03bd6365
-	* common/compliance.c (gnupg_pk_is_compliant): Add DSA with certain
-	parameters.
-	(gnupg_cipher_is_compliant): New function.
-	(gnupg_digest_is_compliant): Likewise.
-	* common/compliance.h (gnupg_cipher_is_compliant): New prototype.
-	(gnupg_digest_is_compliant): Likewise.
-	* common/status.h (STATUS_DECRYPTION_COMPLIANCE_MODE): New status.
-	(STATUS_VERIFICATION_COMPLIANCE_MODE): Likewise.
-	* doc/DETAILS: Document the new status lines.
-	* g10/mainproc.c (proc_encrypted): Compute compliance with CO_DE_VS
-	and report that using the new status line.
-	(check_sig_and_print): Likewise.
-	* sm/decrypt.c (gpgsm_decrypt): Likewise.
-	* sm/verify.c (gpgsm_verify): Likewise.
-
-	common: Improve checking for compliance with CO_DE_VS.
-	+ commit 3b70f62423041e614332b90d782576ee6868a030
-	* common/compliance.c (gnupg_pk_is_compliant): Only certain RSA key
-	sizes are compliant.
-
-	gpg,common: Move the compliance framework.
-	+ commit 8a012280e0f0a462c094d106355aa436fceb1b76
-	* common/Makefile.am (common_sources): Add new files.
-	* common/compliance.c: New file. Move 'gnupg_pk_is_compliant' here,
-	and tweak it to not rely on types private to gpg.
-	* common/compliance.h: New file. Move the compliance enum here.
-	* g10/keylist.c (print_compliance_flags): Adapt callsite.
-	* g10/main.h (gnupg_pk_is_compliant): Remove prototype.
-	* g10/misc.c (gnupg_pk_is_compliant): Remove function.
-	* g10/options.h (opt): Use the new compliance enum.
-	* sm/keylist.c (print_compliance_flags): Use the common functions.
-
-2017-05-31 Justus Winter <justus@g10code.com>
-
-	gpg: Fix compliance computation.
-	+ commit 02af509dfc2b893720aa0c7b380fd7736b2bafd0
-	* g10/misc.c (gnupg_pk_is_compliant): Compare against CO_RFC2440, not
-	RFC2440 which is actually a predicate.
-
-	sm: Simplify code.
-	+ commit f9cb15b385f64f7c9403670f03632f81a874f213
-	* sm/verify.c (gpgsm_verify): Simplify by using a newer gcrypt
-	interface.
-
-	doc: Improve documentation.
-	+ commit 485b5a6e6dfe7aa545afa926e060d516ae911e42
-	* doc/gpgsm.texi: Mention that '--with-key-data' implies
-	'--with-colons'.
-
-2017-05-31 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix error from do_encryption.
-	+ commit c03e0eb01dc4632432d0472a6f8051142082bea4
-	* agent/protect.c (do_encryption): Don't mask failure of OUTBUF
-	allocation.
-
-	scd: Fix error code on failure at usb_init.
-	+ commit 8defb21d34410d000c8b776e0e3a1edd04762638
-	* scd/ccid-driver.c (ccid_dev_scan): Return GPG_ERR_ENODEV.
-
-	scd: Handle a failure of libusb_init.
-	+ commit 5c33649782bf255af5a55f16eac5e85f059b00bf
-	* scd/ccid-driver.c (ccid_get_reader_list, ccid_dev_scan): Handle
-	failure.
-
-2017-05-30 Andre Heinecke <aheinecke@intevation.de>
-
-	gpg: Disable keydb handle caching.
-	+ commit d3d640b9cc98dd0d06b49a2e4d46eb67af96fe29
-	* g10/getkey.c (getkey_end): Disable caching of the open keydb
-	handle.
-
-2017-05-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix memory leaks.
-	+ commit 996544626ea416c173a940db47f47f9e5cbd844c
-	* agent/divert-scd.c (ask_for_card): Free WANT_KID and WANT_SN_DISP.
-	* agent/gpg-agent.c (create_server_socket): Free UNADDR.
-
-2017-05-25 Werner Koch <wk@gnupg.org>
-
-	dirmngr: This towel should better detect a changed resolv.conf.
-	+ commit de3a0988ef9addccd6b5c7950fb8797afbc3978d
-	* dirmngr/dns-stuff.c (resolv_conf_changed_p): Fix initialization time
-	issue.
-
-	dirmngr: Re-init libdns resolver on towel change of resolv.conf.
-	+ commit b5f356e9fba2d99909f8f54d7b7e6836bed87b68
-	* dirmngr/dns-stuff.c: Include sys/stat.h.
-	(RESOLV_CONF_NAME): New macro to replace a string.
-	(resolv_conf_changed_p): New.
-	(libdns_init): Call new function
-	(libdns_res_open): Ditto.
-
-2017-05-24 Justus Winter <justus@g10code.com>
-
-	agent: Make digest algorithms for ssh fingerprints configurable.
-	+ commit 525f2c482abb6bc2002eb878b03558fb43e6b004
-	* agent/agent.h (opt): New field 'ssh_fingerprint_digest'.
-	* agent/command-ssh.c (data_sign, ssh_identity_register): Honor the
-	option for strings used to communicate with the user.
-	* agent/findkey.c (agent_modify_description): Likewise.
-	* agent/gpg-agent.c (cmd_and_opt_values): New value.
-	(opts): New option '--ssh-fingerprint-digest'.
-	(parse_rereadable_options): Set the default to MD5 for now.
-	(main): Handle the new option.
-	* doc/gpg-agent.texi: Document the new option.
-
-	agent: Write both ssh fingerprints to 'sshcontrol' file.
-	+ commit a5f046d99a084b6a95268f03c1b588e8b78083cb
-	* agent/command-ssh.c (add_control_entry): Hand in the key, write both
-	the MD5- and the SHA256-based fingerprint to the 'sshcontrol' file
-	when adding ssh keys.
-	(ssh_identity_register): Adapt callsite.
-
-	common: Correctly render SHA256-based ssh fingerprints.
-	+ commit 3a07a69dfc87b4fff610740d3dde8e23f0d2f8bc
-	* common/ssh-utils.c (dummy_realloc): New function.
-	(dummy_free): Likewise.
-	(get_fingerprint): Prepend the fingerprint with the name of the digest
-	algorithm. Correctly render SHA256-based ssh fingerprints.
-	* common/t-ssh-utils.c (sample_keys): Add SHA256 hashes for the keys.
-	(main): Add an option to dump the keys to gather fingerprints, also
-	print the SHA256 fingerprint for keys given as arguments, and check
-	the SHA256 fingerprints of the test keys.
-
-	common: Support different digest algorithms for ssh fingerprints.
-	+ commit 3ac1a9d3a018816233a855faff059b4e0657a0f1
-	* common/ssh-utils.c (get_fingerprint): Add and honor 'algo' parameter.
-	(ssh_get_fingerprint{,_string}): Likewise.
-	* common/ssh-utils.h (ssh_get_fingerprint{,_string}): Update prototypes.
-	* common/t-ssh-utils.c (main): Adapt accordingly.
-	* agent/command-ssh.c (agent_raw_key_from_file): Likewise.
-	(ssh_identity_register): Likewise.
-	* agent/command.c (do_one_keyinfo): Likewise.
-	* agent/findkey.c (modify_description): Likewise.
-
-2017-05-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Add const qualifier for read-only table.
-	+ commit 509e4a4d7491daf496b21e5892f4f63ab90e8e21
-	* agent/call-pinentry.c (start_pinentry): Add const to tbl.
-	* agent/command-ssh.c (request_specs): Add const.
-	(ssh_key_types): Likewise.
-	(request_spec_lookup): Add const to the return value and SPEC.
-	(ssh_request_process): Likewise.
-	* agent/protect.c (protect_info): Add const.
-	(agent_unprotect): Add const to algotable.
-
-	g10: Fix default-key selection for signing, possibly by card.
-	+ commit fbb2259d22e6c6eadc2af722bdc52922da348677
-	* g10/call-agent.c (warn_version_mismatch): Revert.
-	(start_agent): Suppress version mismatch if relevant.
-	* g10/getkey.c (get_seckey_default_or_card): New.
-	* g10/skclist.c (build_sk_list): Use get_seckey_default_or_card.
-
-2017-05-18 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc: Fix spellings.
-	+ commit 3713f67026467f63f80649c92ac4cc7973589855
-
-
-	docs: Point to https://dev.gnupg.org/ .
-	+ commit 705da1eb23aef92c42d6d657b20a0984b104f72f
-	Replace mentions of bugs.gnupg.org with https://dev.gnupg.org/. Since
-	the project has transitioned to a better workflow for supporting
-	contributions, we should ensure that our documentation points to the
-	right place.
-
-2017-05-17 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fix checking for opcode arguments.
-	+ commit aae50e0b6a61549e226e0c7785260ad517f0ffff
-	* tests/gpgscm/scheme.c (Eval_Cycle): Update 'pcd' after dispatching
-	an instruction.
-
-	tests: Fix agent teardown in release builds.
-	+ commit 0e1729bb993648deca84a2664ae78edc848d7003
-	* tests/openpgp/defs.scm (start-agent,stop-agent): Use gpg-conf which
-	will properly use the '--build-prefix' argument to make gpgconf use
-	tools from the build directory.
-
-2017-05-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix gpgcompose.c.
-	+ commit ae95a7f5335e605fcd71fbe4a18ed384c88d590a
-	* g10/gpgcompose.c (show_help): Check return value.
-
-	g10: Suppress error for card availability check.
-	+ commit a8dd96826f8484c0ae93c954035b95c2a75c80f2
-	* g10/call-agent.c (start_agent): Add semantics for card; Suppress
-	error for card check.
-	(warn_version_mismatch): Ignore an error for scdaemon.
-	(agent_scd_serialno): Call start_agent with
-	FLAG_FOR_CARD_SUPPRESS_ERRORS.
-
-2017-05-16 Justus Winter <justus@g10code.com>
-
-	tests: Configure the environments to use scdaemon from build tree.
-	+ commit 386a7bbb245dd3ab7c4156a554adbe75d82bdf49
-	* tests/gpgme/gpgme-defs.scm: Use the scdaemon from the build tree
-	when writing a 'gpg-agent.conf'.
-	* tests/gpgsm/gpgsm-defs.scm: Likewise.
-	* tests/openpgp/defs.scm: Likewise.
-
-2017-05-15 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.21.
-	+ commit 9574820329128f0ea8a98f9bfc0e77c73c3e0ec0
-
-
-	po: Update German translation.
-	+ commit 4bd079dbdb44067688377156413dd32a82a89d22
-
-
-	gpg: Do not mark ", " translatable.
-	+ commit 2d381b0f0ba97657e9fb2971eca6648bb77dd2cc
-	* g10/tofu.c (ask_about_binding): Remove useless translation markers.
-
-2017-05-15 Andre Heinecke <aheinecke@intevation.de>
-
-	dirmngr,w32: Fix ldap crl read on windows.
-	+ commit abe3a9043f86b48b92ddcec47197e032e35a6f4f
-	Summary:
-	* dirmngr/ldap-wrapper-ce.c (outstream_cookie_s): Add buffer_read_pos.
-	(buffer_get_data): Use seperate read pos.
-
-2017-05-15 Werner Koch <wk@gnupg.org>
-
-	common: Let format_text return an error.
-	+ commit 00b7767bc6fe309aa20375c859ebf708cfc7b9ea
-	* common/stringhelp.c (format_text): Return NULL on error.
-	* common/t-stringhelp.c (test_format_text): Adjust for change.
-	* g10/gpgcompose.c (show_help): Abort on out of core.
-	* g10/tofu.c (ask_about_binding): Abort on format_text error.
-	(show_statistics): Ditto.
-	(show_warning): Ditto.
-
-2017-05-11 Justus Winter <justus@g10code.com>
-
-	tests: Also run all OpenPGP tests using keyrings.
-	+ commit bc01d62dc5d520e138499df5d80fb50f9e87e3e8
-	* tests/openpgp/all-tests.scm: Run each test twice, once with public
-	keys stored in a keybox, once with a keyring.
-	* tests/openpgp/defs.scm (create-gpghome): Create a public keyring to
-	make GnuPG use that instead of creating a keybox if '--use-keyring' is
-	given.
-	* tests/openpgp/setup.scm: Fix flag handling and usage.
-
-	tests: Make it possible to run all tests using our infrastructure.
-	+ commit f4365790daa1d1400c7f0fe73ac9a6d25f0c6d0a
-	* Makefile.am (TESTS_ENVIRONMENT): New variable.
-	(check-all): New phony target to run all tests.
-	* tests/gpgme/gpgme-defs.scm (have-gpgme?): New function that tests
-	whether the GPGME test suite is available instead of exiting the
-	process.
-	* tests/gpgscm/init.scm (export): New macro.
-	* tests/gpgscm/tests.scm (run-tests): New function.
-	(load-tests): Likewise.
-	* tests/gpgme/run-tests.scm: Simplify and move the parsing of the list
-	of tests to 'all-tests.scm'.
-	* tests/gpgsm/run-tests.scm: Likewise.
-	* tests/migrations/run-tests.scm: Likewise.
-	* tests/openpgp/run-tests.scm: Likewise.
-	* tests/gpgme/Makefile.am: To select the tests to run, use the
-	variable 'TESTS'. This harmonizes the interface with the automake
-	test suite.
-	* tests/gpgsm/Makefile.am: Likewise.
-	* tests/migrations/Makefile.am: Likewise.
-	* tests/openpgp/Makefile.am: Likewise.
-	* tests/openpgp/README: Likewise.
-	* agent/all-tests.scm: New file.
-	* common/all-tests.scm: Likewise.
-	* g10/all-tests.scm: Likewise.
-	* g13/all-tests.scm: Likewise.
-	* tests/gpgme/all-tests.scm: Likewise.
-	* tests/gpgsm/all-tests.scm: Likewise.
-	* tests/migrations/all-tests.scm: Likewise.
-	* tests/openpgp/all-tests.scm: Likewise.
-	* tests/run-tests.scm: Likewise.
-
-	tests: Move the makefile parser.
-	+ commit 78d6a25a2db22ad2ae30d57ca980c0400cfef726
-	* tests/gpgme/gpgme-defs.scm (parse-makefile, parse-makefile-expand):
-	Move...
-	* tests/gpgscm/makefile.scm: ... here.
-	* tests/gpgscm/Makefile.am (EXTRA_DIST): Add new file.
-
-	gpgscm: Make it possible to set the logfile name.
-	+ commit 29ef34cc4cb23e7b743dbf4cc8e5761f06076b9a
-	* tests/gpgscm/tests.scm (test): Only set the default log filename
-	when it has not been set before.
-
-2017-05-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10, sm, dirmngr, common: Add comment for fall through.
-	+ commit 0ce94a9698104d9bfc73d5a37478189564c96eb4
-	* common/b64dec.c (b64dec_proc): Comment to clarify.
-	* dirmngr/cdblib.c (cdb_make_put): Use same pattern to clarify.
-	* dirmngr/dirmngr-client.c (read_pem_certificate): Likewise.
-	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Likewise.
-	* g10/armor.c (unarmor_pump): Likewise.
-	* g10/gpg.c (main): Likewise.
-	* g10/import.c (read_block): Likewise.
-	* g10/keygen.c (make_backsig): Likewise.
-	* g10/pkclist.c (check_signatures_trust): Likewise.
-	* sm/gpgsm.c (main): Likewise.
-
-	g10: Stop compiler warning for t-stutter.
-	+ commit 98b759119c81c5b39f34f8a9a7b6a57e91ad6470
-	* g10/t-stutter.c (do_test): Refer current_test_group_failed.
-
-2017-05-08 Justus Winter <justus@g10code.com>
-
-	gpg: Properly account for ring trust packets.
-	+ commit 22739433e98be80e46fe7d01d52a9627c1aebaae
-	* g10/keyring.c (keyring_get_keyblock): Use the parser's packet count
-	instead of counting ourself.
-	* g10/packet.h (struct parse_packet_ctx_s): New field
-	'n_parsed_packets'.
-	(init_parse_packet): Initialize new field.
-	* g10/parse-packet.c (parse): Count packets.
-
-2017-05-04 Justus Winter <justus@g10code.com>
-
-	tests: Support tests that are expected to fail.
-	+ commit d6b46462f8c5c705ffb7cf8af03465a926aa11d3
-	* tests/gpgscm/tests.scm (test-pool): Rework reporting. Filter using
-	the computed test status instead of the return value. Also print the
-	new categories 'failed expectedly' and 'passed unexpectedly'.
-	(test): If a test ends with a bang (!), it is expected to fail. Adapt
-	status, status-string, and xml accordingly.
-
-	tests: Add function to dump packets.
-	+ commit eab0138e3179f247180a639a91570e5ee2c6ad0e
-	* tests/openpgp/defs.scm (gpg-dump-packets): New function.
-
-2017-05-03 Andre Heinecke <aheinecke@intevation.de>
-
-	speedo,w32: Fix silent user mode installation.
-	+ commit d378cc34a8d3d5053cf0c5ac7aa731c1bcefee22
-	* build-aux/speedo/w32/inst.nsi (AddToPath): Move account
-	check here.
-	(PrintNonAdminWarning): Remove is_user_install variable.
-
-2017-05-03 Justus Winter <justus@g10code.com>
-
-	gpgscm: Create and re-use frame objects.
-	+ commit 8a168a6d4052ec31fed77c79bb96ffdd32bf9646
-	* tests/gpgscm/scheme-private.h (struct scheme): New field
-	'frame_freelist'.
-	* tests/gpgscm/scheme.c (enum scheme_types): New type 'T_FRAME'.
-	(type_to_string): Handle new type.
-	(settype): New macro.
-	(gc_disable): Make sure there is at least one frame in the free list.
-	(mark): Handle frame objects.
-	(finalize_cell): Likewise.
-	(dump_stack_initialize): Initialize free list.
-	(dump_stack_free): Simplify.
-	(frame_length): New variable.
-	(dump_stack_make_frame): New function.
-	(frame_slots): Likewise.
-	(frame_payload): New macro.
-	(dump_stack_allocate_frame): New function.
-	(dump_stack_deallocate_frame): Likewise.
-	(dump_stack_preallocate_frame): Likewise.
-	(_s_return): Unpack frame object and deallocate it.
-	(s_save): Wrap state in an frame object.
-	(dump_stack_mark): Mark the free list.
-
-	gpgscm: Merge opexe_0.
-	+ commit 9c6407d17e0cb9f4a370b1b83e7816577ec7d29d
-	* tests/gpgscm/scheme-private.h (struct scheme): Remove field 'op'.
-	* tests/gpgscm/scheme.c (opexe_0): Inline into 'Eval_Cycle'.
-	(_Error_1): Return the opcode to evaluate next.
-	(Error_1): Do not return, but set the opcode and goto dispatch.
-	(Error_0): Likewise.
-	(s_goto): Likewise.
-	(s_return): Likewise.
-	(s_return_enable_gc): Likewise.
-	(s_thread_to): Remove superfluous cast.
-	(_s_return): Return the opcode to evaluate next.
-	(scheme_init_custom_alloc): Adapt to removal of field 'op'.
-
-2017-05-03 Andre Heinecke <aheinecke@intevation.de>
-
-	speedo,w32: Allow installation as normal user.
-	+ commit cacfd4bce94704b531f68ee76fb40789e44fde67
-	* build-aux/speedo/w32/g4wihelp.c (ENV_HK_USER, ENV_REG_USER):
-	New defines.
-	(path_add): Handle is_user_install variable. Don't abort
-	if Path reg key does not exist. Fix crash if Path reg key
-	does not contain a semicolon.
-	(path_remove): Handle is_user_install variable. Fix crash
-	if Path reg key does not exist.
-	* build-aux/speedo/w32/inst.nsi: Remove obsolete HAVE_STARTMENU
-	this was double guarded with WITH_GUI. Add Multiuser plugin and
-	defines for this. Use SHCTX instead of HKLM / HKCU.
-	(PrintNonAdminWarning): Only Warn and don't abort.
-
-2017-05-02 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	g10: Remove skeleton options files.
-	+ commit 201f86803017c1db373023f7b506d4a0dc644bbc
-	* build-aux/speed/w32/inst.nsi: stop installing skeleton files.
-	* doc/gpg.texi: stop documenting skeleton files.
-	* g10/Makefile.am: stop installing skeleton files.
-	* g10/openfile.c (copy_options_file): Remove.
-	(try_make_homedir): do not call copy_options_file.
-
-2017-04-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: For signing, prefer available card key when no -u option.
-	+ commit 97a2394ecafaa6f58e4a1f70ecfd04408dc15606
-	* g10/skclist.c (build_sk_list): Ask gpg-agent if card is available.
-	Then, use the card key if any.
-
-2017-04-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Minor clean up.
-	+ commit 2262a80c5f44433a08bc0e21b77d9efe51596f21
-	* g10/main.h (complete_sig): Remove declaration.
-	* g10/sign.c (complete_sig): Make it static.
-
-2017-04-25 NIIBE Yutaka <gniibe@fsij.org>
-	 Tomas Mraz
-
-	dirmngr: Fix aliasing problem in dns.c.
-	+ commit 247932f367f856e7ce91528e14f0aaf838150857
-	* dirmngr/dns.c (dns_ai_setent): Care about aliasing.
-
-2017-04-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests: Remove *.conf.tmpl from Makefile.
-	+ commit 7851d73fd7f424f9a649690e1cb3055feb792c51
-	* tests/openpgp/Makefile.am (TEST_FILES): Remove gpg.conf.tmpl
-	and gpg-agent.conf.tmpl.
-
-	g10: invalidate the fd cache for keyring.
-	+ commit 116cfd60779fbb3540da629db54dc2e148f4a3a2
-	* g10/keyring.c (keyring_search_reset): Don't keep the FD cache.
-
-2017-04-24 Andre Heinecke <aheinecke@intevation.de>
-
-	w32: Enable wildcard expansion with mingw-w64.
-	+ commit 2e71bf30f038ca0e142acbb6f650ce029105f8a2
-	* g10/gpg.c: Define _dowildcard = -1;
-
-2017-04-24 Justus Winter <justus@g10code.com>
-
-	tests: Fix Python detection.
-	+ commit ef1922b3b19df0aa7f8c15d503c603f76fc13f82
-	* tests/gpgme/gpgme-defs.scm (python): Fix Python detection.
-
-	gpgscm: Refactor cell finalization.
-	+ commit d2f6798621d751cd6ae6f091c4a2af4569c5b8aa
-	* tests/gpgscm/scheme.c (finalize_cell): Use switch, return whether
-	the cell may be freed.
-	(gc): Update callsite.
-
-	gpgscm: Tweak error message display.
-	+ commit 78547bfe8a885579438a17abadca02b62cce2844
-	* tests/gpgscm/init.scm (throw'): If the first argument to the error
-	is a string, display it as such.
-
-	tests: Deduplicate and simplify code.
-	+ commit 06a177ceea529269a7404740c60416bd6a4567b1
-	* tests/gpgme/gpgme-defs.scm (create-file): Move...
-	* tests/gpgsm/gpgsm-defs.scm (create-file): ... likewise...
-	* tests/openpgp/defs.scm (create-file): Here.
-	(create-gpghome): Use 'create-file'.
-	* tests/openpgp/gpg-agent.conf.tmpl: Delete file.
-	* tests/openpgp/gpg.conf.tmpl: Likewise.
-
-	gpgscm: Fix test.
-	+ commit 9ae63b9caefdf3e925c5928667fcd9227132d27f
-	* tests/gpgscm/t-child.scm: Use 'string-length' on the string.
-
-	gpgscm: Improve syntax checking.
-	+ commit 4aab0e6ac7f2887a6f38f0cb95365dd7c30b4b18
-	* tests/gpgscm/scheme.c (opexe_0): Make sure closure arguments are
-	symbols.
-
-	gpgscm: Emit JUnit-style XML reports.
-	+ commit ee715201ae784e840b6136393289e6dbd6f4c540
-	* tests/gpgscm/Makefile.am (EXTRA_DIST): Add new file.
-	* tests/gpgscm/lib.scm (string-translate): New function.
-	* tests/gpgscm/main.c (main): Load new file.
-	* tests/gpgscm/tests.scm (dirname): New function.
-	(test-pool): Record execution times, emit XML report.
-	(test): Record execution times, record log file name, emit XML report.
-	(run-tests-parallel): Write XML report.
-	(run-tests-sequential): Likewise.
-	* tests/gpgscm/xml.scm: New file.
-	* tests/gpgme/Makefile.am (CLEANFILES): Add 'report.xml'.
-	* tests/gpgsm/Makefile.am: Likewise.
-	* tests/migrations/Makefile.am: Likewise.
-	* tests/openpgp/Makefile.am: Likewise.
-
-	gpgscm: Make logging less verbose and more useful.
-	+ commit 679920781a25ae5c0e49d4bd78e6926fd661778f
-	* tests/gpgscm/tests.scm (call-with-io): When being verbose, include
-	the pid in the output, and avoid duplicating the command arguments.
-
-	gpgscm: Make test framework less functional.
-	+ commit a71f4142e13e2cc26ef0cd62f56a1ccb7ce678ee
-	* tests/gpgscm/tests.scm (test-pool, tests): Previously, these methods
-	updated objects by creating new updated copies of the object being
-	manipulated. This made the code awkward without any benefit,
-	therefore I change it to just update the object.
-
-	gpgscm: Move 'trace' and 'stringify'.
-	+ commit f03d6897be904da58cad76b4bd07729922b47616
-	* tests/gpgscm/tests.scm (trace, stringify): Move...
-	* tests/gpgscm/lib.scm: ... here.
-
-	gpgscm: Avoid fruitless garbage collection cycles.
-	+ commit 245860ecaf8b9e82ca577385abd453ac92ffcd26
-	* tests/gpgscm/scheme-private.h (CELL_MINRECOVER): New macro.
-	* tests/gpgscm/scheme.c (_get_cell): Move the heuristic to get more
-	cells...
-	(gc): ... here where every caller benefits from the optimization.
-
-2017-04-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	g13: Fix for Solaris.
-	+ commit 10519270d36586c536bfb6c4cda8ac17c01f4976
-	* configure.ac: Check sys/mkdev.h.
-	* g13/sh-dmcrypt.c: Include sys/mkdev.h.
-
-2017-04-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix final close of LISTEN_FD.
-	+ commit 4b2581dc0ea1d03e70023bb0748aa0c21c0a2173
-	* dirmngr/dirmngr.c (handle_connections): Close LISTEN_FD.
-
-	dirmngr: Fix API difference for Windows.
-	+ commit 0d0a7efa8fa0accc1da851917376e2328ef33c96
-	* dirmngr/http.c (read_server, write_server): Use assuan_fd_t.
-	(http_wait_response): Use FD2INT to get unsigned integer fd.
-	(read_server, write_server): Likewise.
-	(simple_cookie_read, simple_cookie_write): Use assuan_fd_t.
-
-2017-04-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: More minor change.
-	+ commit 9296aed4bd2ad09d23339e658264e557c5312585
-	* agent/command.c (cmd_pksign): Remove redundant assignment.
-
-	agent: Minor cleanup.
-	+ commit 45c52cca1401b930878a8f901b63cfbb22e9e327
-	* agent/command-ssh.c (ssh_key_to_protected_buffer): Not touch ERR.
-	* agent/command.c (cmd_genkey, cmd_import_key): Clean up.
-
-	tests: Minor memory fix.
-	+ commit b9440aa3693a4bb91e1ba8ff09e2d93ff22dd70a
-	* tests/openpgp/fake-pinentry.c (get_passphrase): Free the memory.
-
-	g10: Fix parse_ring_trust.
-	+ commit 256e861bce3dc9aba8fab4df47a40cae3bede175
-	* g10/parse-packet.c (parse_ring_trust): Fix condition.
-
-	g10: Minor fixes.
-	+ commit 0dec0cc281dfa26db89f8cc5ee002dea5c2b2e81
-	* g10/export.c (cleartext_secret_key_to_openpgp): No initialization.
-	(do_export_one_keyblock): Initialize with GPG_ERR_NOT_FOUND.
-	* g10/getkey.c (get_best_pubkey_byname): Add non-null check.
-	* g10/tofu.c (tofu_set_policy): ERR initialize to 0.
-
-	g10: Fix import/export filter property match.
-	+ commit af5f8ecf51f5e1f33e832d4946d02313b78a0536
-	* g10/import.c (impex_filter_getval): Fix to "else if".
-
-2017-04-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Clean up error initialize/return.
-	+ commit 36c4e540f1a4992675ee6e0acca1231325457079
-	* agent/call-pinentry.c (start_pinentry): Return RC.
-	* agent/command-ssh.c (ssh_handler_request_identities): Don't set ERR.
-	* agent/findkey.c (try_unprotect_cb): Return ERR.
-	(unprotect): Don't set RC.
-	* agent/gpg-agent.c (handle_connections): Don't set fd.
-
-	dirmngr: More fix for test program.
-	+ commit adb77d095b3958482863a17c83746f33945638dc
-	* dirmngr/t-http.c (main): Care about no TLS.
-
-	dirmngr: More fix for Windows.
-	+ commit 4771bad610eb59e701fe8e53468e2af22d45eeb0
-	* dirmngr/http.c (simple_cookie_read, simple_cookie_write): Only
-	valid with HTTP_USE_NTBTLS.
-	(_my_socket_new): Simply cast to int since it's for debug.
-	(_my_socket_ref, _my_socket_unref): Likewise.
-
-2017-04-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix http.c for sockaddr_storage.
-	+ commit 86dcb03134fd4957d51ebaa06b7991239f9ee56a
-	dirmngr/http.c (use_socks): Use sockaddr_storage.
-	(my_sock_new_for_addr, connect_server): Likewise.
-
-	dirmngr: Fix alignment of ADDR.
-	+ commit 892b33bb2c57785927ea6652091191da2deed464
-	* dirmngr/dns-stuff.h (dns_addrinfo_s): Use struct sockaddr_storage
-	for size and alignment.
-	* dirmngr/dns-stuff.c (resolve_name_libdns): Follow the change.
-	(resolve_dns_name): Use struct sockaddr_storage.
-	(resolve_addr_standard, resolve_dns_addr): Likewise.
-	(resolve_dns_addr): Likewise.
-
-	dirmngr: Fix thread key type.
-	+ commit 37018adce6ea4920b34d59afcfe4f55f716b3086
-	* dirmngr/dirmngr.c (my_tlskey_current_fd): Use npth_key_t.
-
-	common, g10: Fix enumeration types.
-	+ commit 74258278efacd7069e8c1df8ff6fc3f4675d713e
-	* common/openpgpdefs.h (CIPHER_ALGO_PRIVATE10, PUBKEY_ALGO_PRIVATE10)
-	(DIGEST_ALGO_PRIVATE10, COMPRESS_ALGO_PRIVATE10): New.
-	* g10/misc.c (map_pk_gcry_to_openpgp): Add type conversion.
-	(map_cipher_openpgp_to_gcry, openpgp_cipher_algo_name)
-	(openpgp_pk_test_algo2, map_md_openpgp_to_gcry)
-	(pubkey_get_npkey): Add default handling.
-
-	dirmngr: More fix for Windows.
-	+ commit 5af104b541ed430a54eb0163a1d29e1d043f9377
-	* dirmngr/dns.c (socket_fd_t, STDCALL): New.
-	(dns_te_initname): Use.
-
-2017-04-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix type of sock.
-	+ commit 6755b3b505f79a5a233b18e85f57a0d3a455e664
-	* dirmngr/http.c (send_request): Use assuan_fd_t for SOCK.
-
-	tools: Fix condition for gpg-connect-agent.
-	+ commit f52f6af834cc488d11612e349e4af023d69a45f4
-	* tools/gpg-connect-agent.c (start_agent): Add paren.
-
-	dirmngr: Fix possible null reference.
-	+ commit 7ae1857c90ab43ad9e31f0fb6dbd37f25cc37278
-	* dirmngr/dns.c (dns_error_t dns_trace_fput): Check NULL.
-
-	common: Simplify format_text.
-	+ commit 7b4edf14bb16fbe786e55b829a208960396ce8df
-	* common/stringhelp.c (format_text): Don't allow IN_PLACE formatting.
-	* common/stringhelp.h: Change the API with no IN_PLACE.
-	* common/t-stringhelp.c (test_format_text): Follow the change.
-	* g10/gpgcompose.c (show_help): Likewise.
-	* g10/tofu.c (format_conflict_msg_part1, ask_about_binding)
-	(show_statistics, show_warning): Likewise.
-
-	gpgscm: Fix test program.
-	+ commit 7f9032d4a8ce53ce1a972bd3c1f8d20b3776756b
-	* tests/gpgscm/t-child.c (main): Fix for setmode.
-
-	dirmngr: Fix plus1_ns.
-	+ commit 60d9a9e6b4ae3af029596d14732c02f49203326d
-	* dirmngr/dns.c (plus1_ns): Fix the initial implementation.
-
-	scd: Handle unexpected suspend/resume by CCID driver.
-	+ commit f053f99ed0b0c6de7b7c4a07cbd7f7d213ddf0db
-	* scd/ccid-driver.c (bulk_in): Handle unexpected failure.
-
-	dirmngr: Fix dns-stuff.c in another way.
-	+ commit bd0c94939faf8ccfc117fb595e9bc0105edcafa4
-	* dirmngr/dns-stuff.c (T_CERT): Define our own.
-
-	Revert "dirmngr: Fix dns-stuff.c."
-	+ commit 0b904ddea8bddaa2fd7893a9dce1df1cb5e36b00
-	This reverts commit 1538523156be568046f632d1775eae30ea8bd556.
-
-	dirmngr: Fix dns-stuff.c.
-	+ commit 1538523156be568046f632d1775eae30ea8bd556
-	* dirmngr/dns-stuff.c: Don't include arpa/nameser.h.
-
-	agent: Simplify stream_read_cstring.
-	+ commit c64763c3a74ecc61c2f6c5edb679a2a3879d79e7
-	* agent/command-ssh.c (stream_read_cstring): Just call
-	stream_read_string.
-
-	dirmngr: Use a function to increment network short.
-	+ commit 64904ce627b6b0661acf15b5b70103c4842bb0f3
-	* dirmngr/dns.c (plus1_ns): New.
-	(dns_p_push): Use it.
-
-	g10: Minor clean up for export.c.
-	+ commit 05218829589f6d4b09933fa19f568c2019367d5c
-	* g10/export.c (export_ssh_key): Check IDENTIFIER for error.
-	Release base64 thing on error of get_membuf.
-
-2017-04-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	g13: Include sys/sysmacros.h if available.
-	+ commit c3cc9551dcc89cc25c0a0ec16d8eb12c1c221638
-	* configure.ac: Add test for sys/sysmacros.h.
-	* g13/sh-dmcrypt.c: Include sys/sysmacros.h.
-
-2017-04-11 Justus Winter <justus@g10code.com>
-
-	tests: Fix distcheck.
-	+ commit 00be2a92625e832e8dd621f2a8f72b124c6d50ca
-	* tests/gpgscm/Makefile.am (EXTRA_DIST): Add 'gnupg.scm'.
-
-	tests: Avoid relying on implicit gpg commands.
-	+ commit cde626e7f7349a73d58ec3236ab3b43dec852bb5
-	* tests/openpgp/armdetach.scm: Always use an explicit command instead
-	of relying on gpg to guess what we want.
-	* tests/openpgp/armdetachm.scm: Likewise.
-	* tests/openpgp/armencrypt.scm: Likewise.
-	* tests/openpgp/armencryptp.scm: Likewise.
-	* tests/openpgp/armor.scm: Likewise.
-	* tests/openpgp/armsignencrypt.scm: Likewise.
-	* tests/openpgp/armsigs.scm: Likewise.
-	* tests/openpgp/clearsig.scm: Likewise.
-	* tests/openpgp/compression.scm: Likewise.
-	* tests/openpgp/conventional-mdc.scm: Likewise.
-	* tests/openpgp/conventional.scm: Likewise.
-	* tests/openpgp/decrypt-dsa.scm: Likewise.
-	* tests/openpgp/decrypt.scm: Likewise.
-	* tests/openpgp/detach.scm: Likewise.
-	* tests/openpgp/detachm.scm: Likewise.
-	* tests/openpgp/ecc.scm: Likewise.
-	* tests/openpgp/encrypt-dsa.scm: Likewise.
-	* tests/openpgp/encrypt-multifile.scm: Likewise.
-	* tests/openpgp/encrypt.scm: Likewise.
-	* tests/openpgp/encryptp.scm: Likewise.
-	* tests/openpgp/seat.scm: Likewise.
-	* tests/openpgp/signencrypt-dsa.scm: Likewise.
-	* tests/openpgp/signencrypt.scm: Likewise.
-	* tests/openpgp/sigs-dsa.scm: Likewise.
-	* tests/openpgp/sigs.scm: Likewise.
-
-	tests: Make tests more robust.
-	+ commit 1b28d9dbe0260b2a4645c4b5caae11d9f375c942
-	* tests/openpgp/defs.scm (have-opt-always-trust): Execute in empty
-	ephemeral home directory. This prevents gpg from picking up the
-	configuration from the current gnupghome (if any).
-	* tests/migrations/common.scm (untar-armored): Likewise.
-
-	tests: Move common functionality.
-	+ commit ccd2187212c12b84c86a10fd4417a16536243179
-	* tests/openpgp/defs.scm (with-home-directory,
-	with-ephemeral-home-directory): Move...
-	* tests/gpgscm/gnupg.scm: ... to this new file.
-	* tests/gpgscm/main.c (main): Load the new file.
-
-2017-04-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix build for Windows.
-	+ commit 3133402241167ccad70fa888a47ffcbe04e7b4c5
-	* dirmngr/ldap-wrapper-ce.c (outstream_cookie_writer): Use
-	gpgrt_ssize_t.
-
-	g10,tools: Fix bzlib.h include order.
-	+ commit 03d77b60befa4e2f8437a80ac429cca3e54688f8
-	* g10/compress-bz2.c: Include bzlib.h after gcrypt.h.
-	* tools/gpgsplit.c: Likewise.
-
-	g10: Minor clean up for TOFU.
-	+ commit f079822b2ce06c18b7ea45efed2d29b54e38f04d
-	* g10/tofu.c (ask_about_binding): Fix for qualifier.
-
-	common: Portability fix for logging.c.
-	+ commit 456c5cdb2d72bba77e2a30c8fdb1c1cebbe9b1d2
-	* common/logging.c (S_IRGRP, S_IWGRP, S_IROTH, S_IWOTH): Avoid
-	duplicated definition.
-
-	tools: Portability fix for gpgparsemail.
-	+ commit a1446163d584cdc3003c7d5b5fc6d74737c1732d
-	* tools/rfc822parse.c (my_stpcpy): Rename from stpcpy.
-
-2017-04-10 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fix opcode dispatch.
-	+ commit 1b6adab41d386b587f65e5c6f14a63859ac1226b
-	* tests/gpgscm/scheme.c (opexe_0): Consider 'op', not 'sc->op'. The
-	former is the opcode we are currently executing.
-
-	gpgscm: Mmap script files.
-	+ commit c7f0d90592fd0348a3818ac897f91e6859584146
-	* tests/gpgscm/main.c (load): Try to mmap the script.
-	* tests/gpgscm/scheme.c (scheme_load_memory): New function, a
-	generalization of 'scheme_load_string'.
-	* tests/gpgscm/scheme.h (scheme_load_memory): New prototype.
-
-	gpgscm: Refactor checking for opcode arguments.
-	+ commit f3d1f6867792deeb9a2a63744ee9b076c41c58f3
-	* tests/gpgscm/scheme.c (op_code_info): Fix type, add forward
-	declaration.
-	(check_arguments): New function.
-	(Eval_cycle): Use the new function.
-
-	gpgscm: Improve syntax dispatch.
-	+ commit b628e62b5b9f7ed5cbb1bfe34727b5ee8129f7d4
-	* tests/gpgscm/scheme.c (assign_syntax): Add opcode parameter, store
-	opcode in the tag.
-	(syntaxnum): Add sc parameter, retrieve opcode from tag.
-	(opexe_0): Adapt callsite.
-	(scheme_init_custom_alloc): Likewise.
-
-	gpgscm: Make tags mandatory.
-	+ commit a1ad5d6a30cf72d9b7e7bb449985dc69d5e01c4b
-	* tests/gpgscm/opdefines.h: Make tags mandatory.
-	* tests/gpgscm/scheme.c: Likewise.
-	* tests/gpgscm/scheme.h: Likewise.
-
-	gpgscm: Add and use opcode for reversing a list in place.
-	+ commit e1bb9326dc381ae2711a81ab621e21a66388bcbd
-	* tests/gpgscm/lib.scm (string-split-pln): Use 'reverse!'.
-	(string-rtrim): Likewise.
-	* tests/gpgscm/opdefines.h (reverse!): New opcode.
-	* tests/gpgscm/scheme.c (opexe_0): Handle new opcode.
-
-	gpgscm: Deduplicate code.
-	+ commit 3e91019a92b9bb3bb5a8cd62336b4cf65964e45b
-	* tests/gpgscm/scheme.c (oblist_add_by_name): Deduplicate.
-	(new_slot_spec_in_env): Likewise.
-
-	gpgscm: Move dispatch table into rodata.
-	+ commit 7dff6248bddd5583988ac562318cf0d76a409d0e
-	* tests/gpgscm/opdefines.h: Use 0 instead of NULL.
-	* tests/gpgscm/scheme.c (op_code_info): Use char arrays instead of
-	pointers, make arity parameters smaller.
-	(INF_ARG): Adapt.
-	(_OP_DEF): Likewise.
-	(dispatch_table): Likewise.
-	(procname): Likewise.
-	(Eval_cycle): Likewise.
-	(scheme_init_custom_alloc): Likewise.
-
-	gpgscm: Use more threaded code.
-	+ commit 6f217d116d1a12c6093bb253dbfa349bc81bc90b
-	* tests/gpgscm/scheme.c (opexe_0): Use 's_thread_to' instead of
-	's_goto' wherever possible.
-
-	gpgscm: Remove now obsolete dispatcher function from the opcodes.
-	+ commit e7ed9822e20ee4bbb4cdd9eca8121b4ade87e5ce
-	* tests/gpgscm/opdefines.h: Remove now obsolete dispatcher function
-	from the opcodes.
-	* tests/gpgscm/scheme-private.h (_OP_DEF): Adapt.
-	* tests/gpgscm/scheme.c (dispatch_func): Remove type declaration.
-	(op_code_info): Remove 'func'.
-	(_OP_DEF): Adapt.
-	(Eval_Cycle): Always call 'opexe_0'.
-
-	gpgscm: Merge 'opexe_6'.
-	+ commit ddf444828b9b3f75d964473a2c0e77f75f094cf4
-	* tests/gpgscm/scheme.c (opexe_6): Merge into 'opexe_0'.
-	* tests/gpgscm/opdefines.h: Adapt.
-
-	gpgscm: Merge 'opexe_5'.
-	+ commit 1379df44537b67b7c2fbc0fb5bc6f7945a5d7ebb
-	* tests/gpgscm/scheme.c (opexe_5): Merge into 'opexe_0'.
-	* tests/gpgscm/opdefines.h: Adapt.
-
-	gpgscm: Merge 'opexe_4'.
-	+ commit 4f835104b9475e7d585d859b85e7d0d4cfe9aab3
-	* tests/gpgscm/scheme.c (opexe_4): Merge into 'opexe_0'.
-	* tests/gpgscm/opdefines.h: Adapt.
-
-	gpgscm: Merge 'opexe_3'.
-	+ commit d591ab65d37ee467ca91ad851ab236f2985c1ee2
-	* tests/gpgscm/scheme.c (opexe_3): Merge into 'opexe_0'.
-	* tests/gpgscm/opdefines.h: Adapt.
-
-	gpgscm: Merge 'opexe_2'.
-	+ commit 6cad38228f6ebfdc8e52960223b492597aff26a0
-	* tests/gpgscm/scheme.c (opexe_2): Merge into 'opexe_0'.
-	* tests/gpgscm/opdefines.h: Adapt.
-
-	gpgscm: Merge 'opexe_1'.
-	+ commit 154af876f05b773bf3a860fcb4cc41066da27beb
-	* tests/gpgscm/scheme.c (opexe_1): Merge into 'opexe_0'.
-	* tests/gpgscm/opdefines.h: Adapt.
-
-2017-04-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Use "ll" length specifier when time_t is larger.
-	+ commit 170660ed11b56145dea4865e751ae5aff1681fe2
-	* agent/command.c (cmd_keytocard): Use KEYTOCARD_TIMESTAMP_FORMAT.
-
-	scd: Relax a condition for p15 driver.
-	+ commit 7501f2e9c4e6fd94a191b381d52ec2fe1d103e29
-	* scd/app-p15.c (read_ef_aodf): Fix.
-
-	scd: Relax a condition for p15 driver.
-	+ commit 3c1ad96f1ce838daf2d861b33e6611f6d3043d25
-	* scd/app-p15.c (read_ef_aodf): Remove possibly redundant condition.
-
-	scd: Remove "special transport" support.
-	+ commit 34199ef677bb40eadf0da696a111f7036bc3187e
-	* scd/ccid-driver.c (transports, my_sleep, prepare_special_transport)
-	(writen): Remove.
-	(ccid_dev_scan, ccid_dev_scan_finish, ccid_get_BAI): Only for USB.
-	(ccid_open_reader, do_close_reader, bulk_out, bulk_in, abort_cmd)
-	(ccid_poll, ccid_transceive): Likewise.
-
-2017-04-07 Justus Winter <justus@g10code.com>
-
-	gpgscm: Allocate small integers in the rodata section.
-	+ commit 8640fa880d7050917f4729f2c0cb506e165ee446
-	* tests/gpgscm/Makefile.am (gpgscm_SOURCES): Add new file.
-	* tests/gpgscm/scheme-private.h (struct cell): Move number to the top
-	of the union so that we can initialize it.
-	(struct scheme): Remove 'integer_segment'.
-	* tests/gpgscm/scheme.c (initialize_small_integers): Remove function.
-	(small_integers): New variable.
-	(MAX_SMALL_INTEGER): Compute.
-	(mk_small_integer): Adapt.
-	(mark): Avoid marking objects already marked. This allows us to run
-	the algorithm over objects in the rodata section if they are already
-	marked.
-	(scheme_init_custom_alloc): Remove initialization.
-	(scheme_deinit): Remove deallocation.
-	* tests/gpgscm/small-integers.h: New file.
-
-	gpgscm: Make global data constant when possible.
-	+ commit c9c3fe883271868d3b2dd287d295cf6a8f8ffc05
-	* tests/gpgscm/scheme-private.h (struct scheme): Make 'vptr' const.
-	* tests/gpgscm/scheme.c (num_zero): Statically initialize and turn
-	into constant.
-	(num_one): Likewise.
-	(charnames): Change type so that it can be stored in rodata.
-	(is_ascii_name): Adapt slightly.
-	(assign_proc): Make argument const char *.
-	(op_code_info): Make some fields const char *.
-	(tests): Make const.
-	(dispatch_table): Make const. At least it can be made read-only after
-	relocation.
-	(Eval_Cycle): Adapt slightly.
-	(vtbl): Make const.
-
-	gpgscm: Remove arbitrary limit on number of cell segments.
-	+ commit 56638c28adc1bbe9fc052b92549a50935c0fe99c
-	* tests/gpgscm/scheme-private.h (struct scheme): Remove fixed-size
-	arrays for cell segments, replace them with a pointer to the new
-	'struct cell_segment' instead.
-	* tests/gpgscm/scheme.c (struct cell_segment): New definition.
-	(_alloc_cellseg): Allocate the header within the segment, return a
-	pointer to the header.
-	(_dealloc_cellseg): New function.
-	(alloc_cellseg): Insert the segments into a list.
-	(_get_cell): Allocate a new segment if less than a quarter of
-	CELL_SIGSIZE is recovered during garbage collection.
-	(initialize_small_integers): Adapt callsite.
-	(gc): Walk the list of segments.
-	(scheme_init_custom_alloc): Remove initialization of removed field.
-	(scheme_deinit): Adapt deallocation.
-
-	gpgscm: Fix compact vector encoding.
-	+ commit bf8b5e9042b3d86d419b2ac1987a9298c9d21500
-	* tests/gpgscm/scheme-private.h (struct cell): Use uintptr_t for
-	'_flags'. This way, '_flags' has the size of a machine word.
-
-2017-04-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix printing of offline taken subkey.
-	+ commit 547bc01d57528ecc27b3b5e16797967a7f88fecf
-	* g10/keylist.c (list_keyblock_print): Set SECRET to 2 and not 0x32.
-
-2017-04-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Internal CCID reader cleanup.
-	+ commit cc420d34880e2a050b39f969873974cfc35fa5c3
-	* scd/ccid-reader.c (scan_usb_device): Only for scan mode, so, rename
-	from scan_or_find_usb_device.
-	(scan_devices): Likewise. Remove support of special transport types.
-	(ccid_get_reader_list): Simplify.
-	(abort_cmd): Fix error return.
-	(send_escape_cmd): Fix for RESULTLEN == NULL.
-	(ccid_transceive_secure): Remove unnecessary var updates.
-
-	scd: Don't keep CCID reader open when card is not available.
-	+ commit 3c93595d701c59cbc9b67a7fd0bcde7ee0fada1a
-	* scd/apdu.c (open_ccid_reader): Fail if no ATR.
-
-	agent: Serialize access to passphrase cache.
-	+ commit ebe12be034f052cdec871f0d8ad1bfab85d7b943
-	* agent/cache.c (encryption_lock): Remove.
-	(cache_lock): New. Now, we have coarse grain lock to serialize
-	entire cache access.
-	(initialize_module_cache): Use CACHE_LOCK.
-	(init_encryption, new_data): Remove ENCRYPTION_LOCK.
-	(agent_flush_cache, agent_put_cache, agent_get_cache): Lock the cache.
-
-2017-04-06 Justus Winter <justus@g10code.com>
-
-	gpgscm: Avoid mutating integer.
-	+ commit f1dc34f502a68673e7a29f3fcf57b8dc6a4fac89
-	* tests/gpgscm/scheme.c (opexe_5): Do not modify the integer in-place
-	while printing an vector. Integer objects may be shared, so they must
-	not be mutated.
-
-	gpgscm: Initialize unused slots in vectors.
-	+ commit b83903f59ec5d49ac579f263da70ebc8dc3645b5
-	* tests/gpgscm/scheme.c (get_vector_object): Initialize unused slots
-	at the end of vectors.
-
-	tests: Fix distcheck.
-	+ commit 23f00f109ddba595db4f73a6182750177c7dd75d
-	* tests/Makefile.am (SUBDIRS): Add 'pkits' again. Simply dropping it
-	makes 'make distcheck' unhappy.
-	* tests/pkits/Makefile.am (TESTS): Remove all tests.
-
-	tests: Disable 'pkits' test suite.
-	+ commit af1c1a57e46a00a32d83c1a58c5f3ef6f4a1c1d1
-	* tests/Makefile.am (SUBDIRS): Drop 'pkits'.
-	* tests/pkits/common.sh: Fix locating 'PKITS_data.tar.bz2'.
-	* tests/pkits/inittests: Likewise.
-
-	tests: Make test more robust.
-	+ commit 94645311f8a3e9ae33643512f87fbef41bf0556f
-	* tests/openpgp/4gb-packet.scm: Skip if we do not have BZIP2.
-	* tests/openpgp/defs.scm (have-compression-algo?): New function.
-
-2017-04-05 Justus Winter <justus@g10code.com>
-
-	tests: Fix setup of ephemeral home directories.
-	+ commit 01e84d429aeeb1450012ff0576a6a24de50693c6
-	* tests/openpgp/defs.scm (with-ephemeral-home-directory): Set
-	GNUPGHOME and cwd to the ephemeral directory before calling the setup
-	function.
-
-2017-04-04 Justus Winter <justus@g10code.com>
-
-	tests: Fix setup of ephemeral home directories.
-	+ commit 32b75fb7743f35936d7014fce33c90ba97dfa374
-	* tests/openpgp/defs.scm (with-ephemeral-home-directory): Create
-	configuration files when we enter the context.
-	* tests/openpgp/setup.scm: Do not use an ephemeral home directory.
-	Tests should always use the cwd.
-	* tests/gpgsm/setup.scm: Likewise.
-	* tests/gpgsm/export.scm: Add explicit constructor function.
-	* tests/openpgp/decrypt-session-key.scm: Likewise.
-	* tests/openpgp/decrypt-unwrap-verify.scm: Likewise.
-
-	gpgscm: Fix copying values.
-	+ commit 6261611d3786f19fd84ccc79f45a89cadac518e8
-	* tests/gpgscm/scheme.c (copy_value): New function.
-	(mk_tagged_value): Use new function.
-	(opexe_4): Likewise for OP_SAVE_FORCED.
-
-	gpgscm: Simplify get-output-string operation.
-	+ commit a80d4a9b50ad47eae1f8c740dd73804311e38783
-	* tests/gpgscm/scheme.c (opexe_4): Simplify 'get-output-string'.
-
-	gpgscm: Simplify substring operation.
-	+ commit d858096c99705ccf2e115475f81c4cf88edbeebf
-	* tests/gpgscm/scheme.c (opexe_2): Simplify 'substring'.
-
-2017-04-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Minor fix for get_client_pid.
-	+ commit 5744d2038bd17b8b1be4e73d0ad3bc41772efe96
-	* agent/command-ssh.c (get_client_pid): Use 0 to initialize.
-
-2017-04-03 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.20.
-	+ commit e7eb9b12deaf7ebe26967bfb56e980b7efeebdc3
-
-
-	dirmngr: New option --disable-ipv6.
-	+ commit 3533b854408fa93734742b2ee12b62aa0d55ff28
-	* dirmngr/dirmngr.h (struct opt): Add field 'disable_ipv6'.
-	* dirmngr/dirmngr.c (oDisableIPv6): New const.
-	(opts): New option --disable-ipv6.
-	(parse_rereadable_options): Set that option.
-	* dirmngr/dns-stuff.c (opt_disable_ipv6): New var.
-	(set_dns_disable_ipv6): New.
-	(resolve_name_standard): Make use of it.
-	* dirmngr/ks-engine-finger.c (ks_finger_fetch): Take care of
-	OPT.DISABLE_IPV6.
-	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
-	(send_request): Ditto.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-	* dirmngr/ocsp.c (do_ocsp_request): Ditto.
-
-	dirmngr,w32: Silence the 'certificate already cached' message.
-	+ commit fce36d7ec87be14b874813db277781c87a64ea87
-	* dirmngr/certcache.c (load_certs_from_w32_store): Silenece an info
-	message.
-
-	dirmngr: Handle EIO which is sometimes returned by cookie functions.
-	+ commit cc32ddbcba8c53d3e2cad952d72f62dc73911042
-	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Handle EIO.
-
-	dirmngr: Always print a warning for a missing /etc/hosts.
-	+ commit 35c843c815306f36d1efbc52f5e2f6bac3f67aec
-	* dirmngr/dns-stuff.c (libdns_init): No Windows specific handling of a
-	missing /etc/hosts.
-
-	dirmngr: Do not assume that /etc/hosts exists.
-	+ commit 5d873f288e86edfb684f4dd57ac36466b06494a4
-	* dirmngr/dns-stuff.c (libdns_init): Do not bail out.
-
-	po: Update the German translation.
-	+ commit c7be01dae914c183dd99bd531a388c794d858c61
-
-
-	gpgconf: Add --enable-extended-key-format for the agent.
-	+ commit d23052b04ebb0ac731aa351650c4084f080c640b
-	* tools/gpgconf-conf.c: Add option.
-	* agent/gpg-agent.c (main) <aGPGConfList>: Add option.
-
-2017-04-03 Justus Winter <justus@g10code.com>
-
-	gpgscm: Slightly improve the procedure dispatch.
-	+ commit 90932bdad607d06f4f040e3457caddba79ba8b7e
-	* tests/gpgscm/scheme.c (procnum): Procedures always have an integer
-	number, so we can safely use the cheaper 'ivalue_unchecked'.
-
-2017-04-03 Werner Koch <wk@gnupg.org>
-
-	gpg: Handle critical marked 'Reason for Revocation'.
-	+ commit 3f6d949011f485613bb4bd3e06a2643be79cce40
-	* g10/parse-packet.c (can_handle_critical): Add
-	SIGSUBPKT_REVOC_REASON.
-
-2017-04-02 Werner Koch <wk@gnupg.org>
-
-	agent: Use OCB for key protection with --enable-extended-key-format.
-	+ commit d24375271b97e45deaeb1ef0a8434c64066ba2e8
-	* agent/protect.c (PROT_DEFAULT_TO_OCB): Remove macro.
-	(agent_protect): Make the default protection mode depend on the extend
-	key format option.
-
-2017-04-01 Werner Koch <wk@gnupg.org>
-
-	kbx: Unify blob reading functions.
-	+ commit 0039d7107bcdfce6f3b02b46ff0495cfba07882a
-	* kbx/keybox-file.c (_keybox_read_blob): Remove.
-	(_keybox_read_blob2): Rename to ....
-	(_keybox_read_blob): this. Make arg options. Change all callers.
-	* kbx/keybox-search.c (keybox_search): Factor fopen call out to ...
-	(open_file): new.
-	(keybox_seek): Als use open_file.
-
-2017-03-31 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid multiple open calls to the keybox file.
-	+ commit 5556eca5acd46983bff0b38a1ffbc2f07fbaba9f
-	* g10/keydb.h (KEYDB_HANDLE): Move typedef to ...
-	* g10/gpg.h: here.
-	(struct server_control_s): Add field 'cached_getkey_kdb'.
-	* g10/gpg.c (gpg_deinit_default_ctrl): Release that keydb handle.
-	* g10/getkey.c (getkey_end): Cache keydb handle.
-	(get_pubkey): Use cached keydb handle.
-	* kbx/keybox-search.c (keybox_search_reset): Use lseek instead of
-	closing the file.
-
-	gpg: Pass CTRL also to getkey_end.
-	+ commit aca5f494a88776d4974bfa9b0b65cb60c1b42040
-	* g10/getkey.c (getkey_end): Add arg CTRL. Change all callers.
-
-	gpg: Print more stats for the keydb and the signature cache.
-	+ commit 3a10de3bfd785aefb0150e82b6dbbc7cb9f208c8
-	* g10/sig-check.c (sig_check_dump_stats): New.
-	(cache_stats): New struct.
-	(check_key_signature2): Update stats.
-	* g10/gpg.c (g10_exit): Call new function.
-	* g10/keydb.c (kid_not_found_cache_count): Replace by ...
-	(kid_not_found_stats): ... new struct. Change users.
-	(keydb_stats): New struct. Update the counters.
-	(keydb_dump_stats): Print all stats.
-
-	gpg: Assert that an opaque parameter is really what we expect.
-	+ commit 52ba5e67cad4311d0ddbc4f2979e20afd0161d1f
-	* g10/gpg.h (SERVER_CONTROL_MAGIC): New const.
-	(server_control_s): Add field 'magic'.
-	* g10/gpg.c (gpg_init_default_ctrl): Init MAGIC.
-	* g10/import.c (impex_filter_getval): Assert MAGIC.
-
-2017-03-30 Justus Winter <justus@g10code.com>
-
-	gpg: Consistent use of preprocessor conditionals.
-	+ commit 5e89144cbca36c1e7eb814b3aad4b7c46cd4efbf
-	* g10/parse-packet.c: Use '#if' instead of '#ifdef' when checking
-	DEBUG_PARSE_PACKET. This fixes the build with '#define
-	DEBUG_PARSE_PACKET 0'.
-
-	common: Avoid undefined behavior.
-	+ commit 214fa9012296d796b78f1a3106d656639cf50aef
-	* common/iobuf.c (iobuf_read_line): Do not consider 'length' if
-	'buffer' is NULL.
-
-2017-03-30 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove the use of the signature information from a KBX.
-	+ commit a6142dbdbc5783043deb847dc64998c421860941
-	* g10/keydb.c (keyblock_cache): Remove field SIGSTATUS.
-	(keyblock_cache_clear): Adjust for that removal.
-	(parse_keyblock_image): Remove arg SIGSTATUS. Remove the signature
-	cache setting; this is now done in the parser.
-	(keydb_get_keyblock): Do not set SIGSTATUS.
-	(build_keyblock_image): Remove arg SIGSTATUS and simplify. Change
-	caller.
-	* kbx/keybox-blob.c: Explain that the signature information is not
-	anymore used.
-	(_keybox_create_openpgp_blob): Remove arg SIGSTATUS and change
-	callers.
-	* kbx/keybox-search.c (keybox_get_keyblock): Remove arg R_SIGSTATUS
-	and change callers.
-	* kbx/keybox-update.c (keybox_insert_keyblock): Likewise.
-
-	gpg: Fix actual leak and possible leaks in the packet parser.
-	+ commit 7bf24e8146116a30c4c9d7b6dbf8bbb27fc35971
-	* g10/packet.h (struct parse_packet_ctx_s): Change LAST_PKT deom a
-	pointer to its struct.
-	(init_parse_packet): Adjust for LAST_PKT not being a pointer.
-	* g10/parse-packet.c (parse): Ditto. Free the last packet before
-	storing a new one in case of a deep link.
-	(parse_ring_trust): Adjust for LAST_PKT not being a pointer.
-	* g10/free-packet.c (free_packet): Ditto.
-	* g10/t-keydb-get-keyblock.c (do_test): Release keyblock.
-
-	gpg: Fix export porting of zero length user ID packets.
-	+ commit 64665404e43051fa50ee030766347e24b7d1e4d5
-	* g10/build-packet.c (do_user_id): Avoid indeterminate length header.
-
-	gpg: Revamp reading and writing of ring trust packets.
-	+ commit a8895c99a7d0750132477d80cd66caaf3a709113
-	* g10/parse-packet.c (parse_trust): Rename to ...
-	(parse_ring_trust): this. Change args and implement new ring trust
-	packet format.
-	(parse): Add special ring trust packet handling.
-	* g10/packet.h (PKT_user_id): New fields KEYUPDATE, UPDATEURL, and
-	KEYSRC.
-	(PKT_public_key): Ditto.
-	(RING_TRUST_SIG, RING_TRUST_KEY, RING_TRUST_UID): New consts.
-	(PKT_ring_trust): New.
-	(struct packet_struct): Remove member RING_TRUST.
-	(strcu parse_packet_ctx_s): Add field SKIP_META.
-	(init_parse_packet): Init SKIPT_META.
-	* g10/free-packet.c (release_public_key_parts): Free UDPATEURL.
-	(free_user_id): Ditto.
-	* g10/mainproc.c (list_node): Remove printing of non-documented "rtv"
-	lines.
-	* g10/build-packet.c (build_packet_and_meta): New.
-	(do_ring_trust): New.
-	* g10/export.c (write_keyblock_to_output): Use build_packet_and_meta
-	in backup mode.
-	(do_export_one_keyblock): Ditto.
-	* g10/import.c (read_block): Add arg WITH_META. Skip ring trust
-	packets if that ism not set.
-	(import): Call read_block WITH_META in restore mode.
-	* g10/keydb.h (KEYSRC_UNKNOWN, KEYSRC_FILE, KEYSRC_KS, KEYSRC_PREF_KS)
-	(KEYSRC_WKD, KEYSRC_WKD_SD, KEYSRC_DANE): New constants. They are not
-	yet used, though.
-	* g10/keydb.c (parse_keyblock_image): Allow ring trust packets.
-	(build_keyblock_image): Ditto. Use build_packet_and_meta.
-	* g10/keyring.c (keyring_get_keyblock): Remove specila treatment of
-	ring trust packets.
-	(write_keyblock): Use build_packet_and_meta. Remove special treatment
-	of ring trust packets and initialization of the signature caches.
-
-2017-03-29 Werner Koch <wk@gnupg.org>
-
-	gpg: Extend free_packet to handle a packet parser context.
-	+ commit afa86809087909a8ba2f9356588bf90cc923529c
-	* g10/packet.h (struct parse_packet_ctx_s): Add fields LAST_PKT and
-	FREE_LAST_PKT.
-	(init_parse_packet): Clear them.
-	(deinit_parse_packet): New macro. Change all users if
-	init_parse_packet to also call this macro.
-	* g10/free-packet.c (free_packet): Add arg PARSECTX and handle shallow
-	packet copies in the context. Change all callers.
-	* g10/parse-packet.c (parse): Store certain packets in the parse
-	context.
-
-	gpg: Change parse_packet to take a context.
-	+ commit 0526c99164d3531b5ec763ffc672407eb24b2296
-	* g10/packet.h (struct parse_packet_ctx_s): New.
-	(parse_packet_ctx_t): New type.
-	(init_parse_packet): New macro.
-	* g10/parse-packet.c (parse_packet, dbg_parse_packet): Change to take
-	a parse context. Change all callers to provide a context instead of
-	directly supplying the input stream.
-	(search_packet, dbg_search_packet): Ditto.
-	(copy_all_packets, dbg_copy_all_packets): Init an use a parse context.
-	(copy_some_packets, dbg_copy_some_packets): Ditto.
-	(skip_some_packets, dbg_skip_some_packets): Ditto.
-
-	gpg: Export ring trust packets in backup mode.
-	+ commit f5b565a5b8de3f2a3d98bc1a655e18333aee223b
-	* g10/export.c (write_keyblock_to_output): Export ring trust packets.
-
-2017-03-28 Justus Winter <justus@g10code.com>
-
-	tests,w32: Fix importing the extra key for GPGME's keylist test.
-	+ commit b20780658ebb1e1245db18c04db3e815399cf706
-	* tests/gpgme/wrap.scm: Qualify the tests name with the extension for
-	executables (if any).
-
-2017-03-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Prepare for listing last_update and key origin data.
-	+ commit 4af389c9721fa534ed06a64b80705b631575c775
-	* g10/keylist.c (list_keyblock_colon): Add empty fields 19 and 20.
-
-2017-03-28 Justus Winter <justus@g10code.com>
-
-	tests: Fix distcheck.
-	+ commit 5128cd74c029d57491a79ca9e918c81facdf1b76
-	* tests/openpgp/Makefile.am (sample_msgs): Add all missing sample
-	messages.
-
-	tests: Add test for '--decrypt --unwrap'.
-	+ commit 211d71f19c24da94f4c58014606125c1a29d86a2
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/decrypt-unwrap-verify.scm: New file.
-
-	g10: Fix memory leak.
-	+ commit 6d3edfd972c1114f43f6b35773dc25e0256f48f4
-	* g10/decrypt-data.c (decrypt_data): Free 'filename'.
-
-2017-03-27 Justus Winter <justus@g10code.com>
-
-	common: Fix connecting to the agent.
-	+ commit caf00915532e6e8e509738962964edcd14fb0654
-	* common/homedir.c (_gnupg_socketdir_internal): Fix error handling.
-
-2017-03-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Support specifying SERIALNO for --card-status.
-	+ commit c1e6302b347caf852a056b9c721469ccb51f44da
-	* g10/gpg.c (main): Allow an argument for --card-status.
-	* g10/card-util.c (current_card_status): Rename from card_status.
-	(card_status): New, which supports multiple cards.
-	(get_one_name): Use current_card_status.
-
-	scd: Change the order of applications when accessed.
-	+ commit d58275703f035e8cfd58cd1c2d0d5ac7dc59e110
-	* scd/app.c (select_application): Move the app to top.
-
-	scd: Fix timeout handling for key generation.
-	+ commit 0848cfcce738150b53bfb65b78efc1e6dc9f3d26
-	* scd/ccid-driver.c (CCID_CMD_TIMEOUT): Back to original value.
-	(CCID_CMD_TIMEOUT_LONGER): New.
-	(ccid_transceive): Add kludge for key generation.
-
-2017-03-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve check for already compressed packets.
-	+ commit 0b3770c421a35b64823a805fa8d49ddd5c653d50
-	* common/miscellaneous.c (is_openpgp_compressed_packet): New.
-	(is_file_compressed): Rerad 2 more bytes and call new function.
-
-	agent: New option --enable-extended-key-format.
-	+ commit 2c237c13628a88ba23742da34ea18d3e205d7c53
-	* agent/gpg-agent.c (oEnableExtendedKeyFormat): New const.
-	(opts): New option --enable-extended-key-format.
-	(parse_rereadable_options): Set option
-	* agent/findkey.c (write_extended_private_key): Add arg 'update'.
-	(agent_write_private_key): Implement new option.
-
-	agent: New option --stub-only for DELETE_KEY.
-	+ commit 6fab7bba879d7794e32112cf3eddd8d87130a5d7
-	* agent/findkey.c (agent_delete_key): Add arg 'only_stubs'.
-	* agent/command.c (cmd_delete_key): Add option --stub-only.
-
-2017-03-23 Werner Koch <wk@gnupg.org>
-
-	common: Implicitly do a gpgconf --create-socketdir.
-	+ commit 26086b362ff47d21b1abefaf674a6464bf0a8921
-	* common/homedir.c (_gnupg_socketdir_internal): Create the
-	sub-directory.
-
-	tests: Use gpgconf to stop the agent.
-	+ commit 2c9d9ac55ea455a5ec26428989dced0311ed46cc
-	* tests/openpgp/defs.scm (stop-agent): Swap order of actions. Kill
-	all daemons using gpgconf.
-	* tools/gpgconf.c (main) <aRemoveSocketDir>: Try to remove known
-	socketfails on rmdir failure. Do no fail for ENONET.
-
-2017-03-23 Justus Winter <justus@g10code.com>
-
-	gpgscm: Make test cleanup more robust.
-	+ commit 178b6314ab2d2268873067314744c8af74dc331e
-	* tests/gpgscm/tests.scm (mkdtemp-autoremove): New function that
-	cleans up at interpreter shutdown.
-	(run-tests-parallel): Use the new function.
-	(run-tests-sequential): Likewise.
-	(make-environment-cache): Execute setup with an temporary working
-	directory.
-
-2017-03-21 Justus Winter <justus@g10code.com>
-
-	tests: Test '--quick-set-primary-uid'.
-	+ commit fde885bbc47a4bf14a8570ac62e68adc8cf47a6e
-	* tests/openpgp/quick-key-manipulation.scm: Test
-	'--quick-set-primary-uid'.
-
-	tests,w32: Use GetTempPath to get the path for temporary files.
-	+ commit d17840c3f40111beaf97d96ad3ca52047976e221
-	* tests/gpgscm/ffi.c (do_get_temp_path): New function.
-	(ffi_init): Make function available.
-	* tests/gpgscm/tests.scm (mkdtemp): Use the new function.
-
-2017-03-21 Werner Koch <wk@gnupg.org>
-
-	gpg: New command --quick-set-primary-uid.
-	+ commit 74c1f30ad6616186f0ab9dbaf34db6c17b1e40c4
-	* g10/gpg.c (aQuickSetPrimaryUid): New const.
-	(opts): New command --quick-set-primary-uid.
-	(main): Implement it.
-	* g10/keyedit.c (keyedit_quick_adduid): Factor some code out to ...
-	(quick_find_keyblock): new func.
-	(keyedit_quick_revuid): Use quick_find_keyblock.
-	(keyedit_quick_set_primary): New.
-
-2017-03-21 Justus Winter <justus@g10code.com>
-
-	dirmngr: Fix error handling.
-	+ commit 483c1288a8f86dc6bf93d0d3f2865ecc246aecba
-	* dirmngr/dns-stuff.c (libdns_init): Convert error before printing it.
-
-	dirmngr: Load the hosts file into libdns.
-	+ commit 88f1505f0613894d5544290a170119eb538921e5
-	* dirmngr/dns-stuff.c (libdns_init): Actually load the hosts file into
-	libdns.
-
-	tests: Create temporary directories in '/tmp'.
-	+ commit 06f1f163e96f1039304fd3cf565cf9de1ca45849
-	* tests/gpgscm/tests.scm (mkdtemp): Create temporary directories in
-	'/tmp' on UNIX, or in '%Temp' on Windows.
-	* tests/migrations/common.scm (run-test): Turn error into a warning.
-	* tests/openpgp/defs.scm (start-agent): Likewise.
-
-2017-03-20 Justus Winter <justus@g10code.com>
-
-	tests: Remove debugging remnants.
-	+ commit ceb4b245752bb1fb43fde7e99f8d904ab8a9b5e2
-	* tests/gpgme/gpgme-defs.scm (run-python-tests?): Remove 'trace's.
-
-	tests: Fail if we cannot create the socket directory.
-	+ commit d75d20909d9f60d33ffd210def92278c0f383aad
-	* tests/migrations/common.scm (run-test): Turn warning into an error.
-	* tests/openpgp/defs.scm (start-agent): Likewise.
-
-2017-03-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Add new field no 18 to the colon listing.
-	+ commit fe0b37e123ded51cc5f4cb5e3547fdfbce37a43e
-	* g10/misc.c (gnupg_pk_is_compliant): New.
-	* g10/keylist.c (print_compliance_flags): New.
-	(list_keyblock_colon): Call it here.
-	* sm/keylist.c (print_compliance_flags): New.
-	(list_cert_colon): Call it here.
-
-	gpg: Remove unused stuff.
-	+ commit e2c63a13e2fa4ce39af8471a34c06d73ff3ee6f6
-	* g10/OPTIONS: Remove.
-	* g10/options.h (struct opt): Remove 'shm_coprocess'.
-
-2017-03-17 Neal H. Walfield <neal@g10code.com>
-
-	tests: Add test for issue 2959.
-	+ commit fb9d68d636490ca88925051f48b08963c324aed1
-	* tests/openpgp/tofu.scm: Add test for --tofu-default-policy=ask.
-
-	gpg: Make sure the conflict set includes the current key.
-	+ commit b1106b4d640325c60a7212a4a44e4f67c0e3312d
-	* g10/tofu.c (get_trust): Sanity check CONFLICT_SET after calling
-	get_policy. If POLICY is 'auto' and the default policy is 'ask', make
-	sure CONFLICT_SET includes the current key.
-
-2017-03-17 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Ignore warning alerts in the GNUTLS handshake.
-	+ commit 69c521df422a6c9a6b0a93e45c9373a8b6ceb28e
-	* dirmngr/http.c (send_request) GNUTLS: Don't bail out on warning
-	alerts.
-
-2017-03-17 Justus Winter <justus@g10code.com>
-
-	gpgscm: Simplify hash tables.
-	+ commit 6a3f857224eab108ae38e6259194b01b0ffdad8b
-	* tests/gpgscm/scheme.c (oblist_add_by_name): We now always get a
-	slot. Simplify accordingly.
-	(oblist_find_by_name): Always return the slot.
-	(vector_elem_slot): New function.
-	(new_slot_spec_in_env): We now always get a slot. Remove parameter
-	'env'. Simplify accordingly.
-	(find_slot_spec_in_env): Always return a slot.
-	(new_slot_in_env): Adapt callsite.
-	(opexe_0): Likewise.
-	(opexe_1): Likewise.
-	(scheme_define): Likewise.
-
-	gpgscm: Remove framework for immediate values.
-	+ commit 38c955599f7c6c20faeec57d8e1df7d2c0eeba18
-	* tests/gpgscm/scheme.c (IMMEDIATE_TAG): Remove macro.
-	(is_immediate): Likewise.
-	(set_immediate): Likewise.
-	(clr_immediate): Likewise.
-	(enum scheme_types): Set the LSB in every value.
-	(fill_vector): Adapt.
-	(vector_elem): Likewise.
-	(set_vector_elem): Likewise.
-	(mark): Likewise.
-	(gc): Test for the LSB to tell typeflags apart from pointers stored in
-	the same memory location.
-
-2017-03-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent,g10: Remove redundant SERIALNO request.
-	+ commit 8c8ce8711d9c938fcb982b0341e6b052742cb887
-	* agent/learncard.c (agent_handle_learn): Don't call
-	agent_card_serialno. Get the serialno in status response.
-	* g10/call-agent.c (agent_scd_learn): Don't request "SCD SERIALNO".
-	(agent_scd_serialno): New.
-	(card_cardlist_cb, agent_scd_cardlist): New.
-
-2017-03-15 Justus Winter <justus@g10code.com>
-
-	tests: Fix using tools from the build directory.
-	+ commit a98459d3f4ec3d196fb0adb0e90dadf40abc8c81
-	* tests/openpgp/defs.scm (gpg-conf'): Explicitly pass the build prefix
-	to gpgconf here...
-	(gpg-components): ... instead of only here.
-
-	tests: Dump the tools that the tests are going to use.
-	+ commit c7833eca38fdb8d9ba7b59438ea87d651b8bf7ba
-	* tests/openpgp/setup.scm: Dump the tools that the tests are going to
-	use. This will help us diagnose problems with the tests picking the
-	wrong paths in the future.
-
-	build: Remove '--disable-tools' configuration option.
-	+ commit 6993e42088c191f18468317ba2b5b8fbc8c3edff
-	* Makefile.am (SUBDIRS): Unconditionally include 'tools'.
-	* configure.ac: Remove '--disable-tools' configuration option.
-
-2017-03-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix check of serialno.
-	+ commit 61785b679c542bbd789395fa632eb8b5133b01ad
-	* g10/card-util.c (card_status): Fix.
-
-	g10: Remove unused function.
-	+ commit ed3248219e921ee24f6f1b2985abb7e0945d70e9
-	* g10/call-agent.c (select_openpgp): Remove.
-
-	tests: Fix running python condition.
-	+ commit a672ddec03f96475866d712b28be18b3fab43aef
-	* tests/gpgme/gpgme-defs.scm (run-python-tests?): We need Python.
-
-2017-03-14 Justus Winter <justus@g10code.com>
-
-	tests: Skip Python tests if the bindings are not built.
-	+ commit d82abbb1b6e80d5980e6259ddcfc770e65a6b1b3
-	* tests/gpgme/wrap.scm (python): Move variable...
-	* tests/gpgme/gpgme-defs.scm (python): ... here.
-	(run-python-tests?): New function.
-	* tests/gpgme/run-tests.scm: Only run Python tests if the bindings can
-	be located in GPGME's build directory.
-
-2017-03-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Flush stdout before printing stats with --check-sigs.
-	+ commit 9a77b3b6e41f97b1209ad61c04b3dd33242ecae8
-	* g10/keylist.c (print_signature_stats): Flush stdout.
-	(list_keyblock_colon): Use es_flush instead of fflush.
-
-2017-03-09 Justus Winter <justus@g10code.com>
-
-	tests: Run the tests for the Python bindings of GPGME.
-	+ commit 046a15a88c83b40a753b4ad7ecc1456efa5b527f
-	* tests/gpgme/gpgme-defs.scm (create-file): Write lines.
-	(create-gpgmehome): Extend function to create the right environment
-	for the Python tests.
-	* tests/gpgme/run-tests.scm: Make an environment cache for the Python
-	tests and enable them.
-	* tests/gpgme/wrap.scm: Do not hardcode the path of the Python
-	interpreter.
-
-	tests: Rework environment setup.
-	+ commit cca91a3f8f7e3e36b7149fc93f7b6df11d21eb1d
-	* tests/gpgscm/tests.scm (test::scm): Add a setup argument.
-	(test::binary): Likewise.
-	(run-tests-parallel): Remove setup parameter.
-	(run-tests-sequential): Likewise.
-	(make-environment-cache): New function that handles the cache
-	protocol.
-	* tests/gpgme/run-tests.scm: Adapt accordingly.
-	* tests/gpgsm/run-tests.scm: Likewise.
-	* tests/migrations/run-tests.scm: Likewise.
-	* tests/openpgp/run-tests.scm: Likewise.
-
-2017-03-08 Werner Koch <wk@gnupg.org>
-
-	wks: Put stdout into binary mode for Windows at another place.
-	+ commit ed5575ec550ff16b0b901a23c6aa3eb3d47b0575
-	* tools/wks-util.c (wks_send_mime): Set stdout to binary.
-
-	wks: Put stdout into binary mode for Windows.
-	+ commit 5c83759364272b19ceafbef46d057f0430a12698
-	* tools/send-mail.c (send_mail_to_file): Call es_set_binary.
-
-2017-03-08 Justus Winter <justus@g10code.com>
-
-	build: Use macOS' compatibility macros to enable all features.
-	+ commit dd60e868d2bf649a33dc96e207ffd3b8ae4d35af
-	* configure.ac: On macOS, use the compatibility macros to expose every
-	feature of the libc. This is the equivalent of _GNU_SOURCE on GNU
-	libc.
-
-	g10: Move more flags into the flag bitfield.
-	+ commit 2649fdfff5d9e227025956e015b67502fd4962c4
-	* g10/packet.h (PKT_user_id): Move 'is_primary', 'is_revoked', and
-	'is_expired' into the flags bitfield, and drop the prefix.
-	* g10/call-dirmngr.c: Adapt accordingly.
-	* g10/export.c: Likewise.
-	* g10/getkey.c: Likewise.
-	* g10/import.c: Likewise.
-	* g10/kbnode.c: Likewise.
-	* g10/keyedit.c: Likewise.
-	* g10/keylist.c: Likewise.
-	* g10/keyserver.c: Likewise.
-	* g10/mainproc.c: Likewise.
-	* g10/pkclist.c: Likewise.
-	* g10/pubkey-enc.c: Likewise.
-	* g10/tofu.c: Likewise.
-	* g10/trust.c: Likewise.
-	* g10/trustdb.c: Likewise.
-
-2017-03-08 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Do not put a keyserver into a new dirmngr.conf.
-	+ commit 8f028642239fa992c6c059e3c1b4421a1813c827
-	* g10/dirmngr-conf.skel: Do not define keyservers.
-
-	doc: Add a note to the trust model direct.
-	+ commit f0257b4a86b73f5b956028e68590b6d2a23ea4da
-	* doc/gpg.texi (GPG Configuration Options): Add note. Chnage Index
-	from trust-mode:foo to trust-model:foo.
-
-2017-03-07 Justus Winter <justus@g10code.com>
-
-	Revert "build: Improve CFLAGS handling."
-	+ commit b71384c8054ce2f245ccfae02b8ee81e1adfc512
-	This reverts commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4.
-
-	build: Improve CFLAGS handling.
-	+ commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4
-	* configure.ac: Strip any flags matching '-Werror' from CFLAGS before
-	running the tests, and add them back later on.
-
-2017-03-07 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-
-	gpgscm: Use system strlwr if available.
-	+ commit c22a2a89d3bd3d08b3abb8e4e33df32b480338ec
-	* tests/gpgscm/scheme.c: Define local strlwr only when HAVE_STRLWR is
-	not defined in config.h.
-	* tests/gpgscm/scheme-config.h: Remove hack.
-
-2017-03-07 Justus Winter <justus@g10code.com>
-
-	gpg: Do not allow the user to revoke the last valid UID.
-	+ commit 591b6a9d879cbcabb089d89a26d3c3e0306054e1
-	* g10/keyedit.c (keyedit_quick_revuid): Merge self signatures, then
-	make sure that we do not revoke the last valid UID.
-	(menu_revuid): Make sure that we do not revoke the last valid UID.
-	* tests/openpgp/quick-key-manipulation.scm: Demonstrate that
-	'--quick-revoke-uid' can not be used to revoke the last valid UID.
-
-2017-03-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	tools: Removal of -Icommon.
-	+ commit 80fb1a8a05b2194af16027555b09bbd5d48ec9ac
-	* tools/gpg-wks-server.c: Follow the change.
-
-	More change for common.
-	+ commit d6c7bf1f8ab8899faba2fb81a35b096921c38f3c
-	* g10, scd, test, tools: Follow the change of removal of -Icommon.
-
-	Remove -I option to common.
-	+ commit 70aca95d6816082b289fceca8eabfcf718a6b701
-	* dirmngr/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
-	* g10/Makefile.am (AM_CPPFLAGS): Ditto.
-	* g13/Makefile.am (AM_CPPFLAGS): Ditto.
-	* kbx/Makefile.am (AM_CPPFLAGS): Ditto.
-	* scd/Makefile.am (AM_CPPFLAGS): Ditto.
-	* sm/Makefile.am (AM_CPPFLAGS): Ditto.
-	* tools/Makefile.am (AM_CPPFLAGS): Ditto.
-	* Throughout: Follow the change.
-
-2017-03-07 Justus Winter <justus@g10code.com>
-
-	tests: Avoid overflowing signed 32 bit time_t.
-	+ commit de3838372ae3cdecbd83eea2c53c8e2656d93052
-	* tests/openpgp/quick-key-manipulation.scm: Use expiration times in
-	the year 2038 instead of 2105 to avoid overflowing 32 bit time_t.
-	time_t is used internally to parse the expiraton time from the iso
-	timestamp.
-
-2017-03-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Resolve conflict of util.h.
-	+ commit 176e07ce10d892fa7c7b96725b38b2fec9a1f916
-	* agent/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
-	* agent/call-pinentry.c, agent/call-scd.c: Follow the change.
-	* agent/command-ssh.c, agent/command.c, agent/cvt-openpgp.c: Ditto.
-	* agent/divert-scd.c, agent/findkey.c, agent/genkey.c: Ditto.
-	* agent/gpg-agent.c, agent/pksign.c, agent/preset-passphrase.c: Ditto.
-	* agent/protect-tool.c, agent/protect.c, agent/trustlist.c: Ditto.
-	* agent/w32main.c: Ditto.
-
-	agent: Add include files.
-	+ commit bf03925751abb739f2fd9d631694d3dd33decf92
-	* agent/command-ssh.c: Add sys/socket.h and sys/un.h.
-
-	agent: Fix get_client_pid for portability.
-	+ commit f7f806afa5083617f4aba02fc3b285b06a7d73d4
-	* configure.ac: Simply check getpeerucred and ucred.h, and structure
-	members.
-	* agent/command-ssh.c: Include ucred.h.
-	(get_client_pid) HAVE_STRUCT_SOCKPEERCRED_PID: Use sockpeercred
-	structure for OpenBSD.
-	LOCAL_PEERPID: Use LOCAL_PEERPID for macOS.
-	LOCAL_PEEREID: Use LOCAL_PEEREID for NetBSD.
-	HAVE_GETPEERUCRED: Use getpeerucred for OpenSolaris.
-
-	common: Fix warning for portability.
-	+ commit b9ab733fc0dd2ca2a7eaac0bde3a817c07af36c5
-	* common/localename.c (do_nl_locale_name): We don't use CATEGORY.
-
-	tools: More portable for openpty use.
-	+ commit ce37ada87139ef418401f9f35439007a8c04a856
-	* configure.ac (AC_CHECK_HEADERS): Add util.h libutil.h and termios.h.
-	* tools/symcryptrun.c: Include those headers.
-
-	scd: Close THE_EVENT handle.
-	+ commit cc933a96f8e83bc66fb69ed33d9593acdd60c929
-	* scd/scdaemon.c (handle_connections): Close the handle.
-
-2017-03-06 Justus Winter <justus@g10code.com>
-
-	tests: Harmonize temporary and socket directory handling.
-	+ commit 7e19786a5ddef637d1d9d21593fecf5a36b6f372
-	* tests/gpgscm/tests.scm (mkdtemp): Do not magically obey the
-	environment variable 'TMP', make sure to always return an absolute
-	path.
-	* tests/gpgme/Makefile.am (TMP): Drop variable.
-	(TESTS_ENVIRONMENT): Drop 'TMP'.
-	* tests/gpgme/gpgme-defs.scm (create-gpgmehome): Start the agent. Do
-	not create private key store, the agent does that for us.
-	* tests/gpgsm/Makefile.am (TMP): Drop variable.
-	(TESTS_ENVIRONMENT): Drop 'TMP'.
-	* tests/gpgme/gpgme-defs.scm (create-gpgsmhome): Start the agent. Do
-	not create private key store, the agent does that for us.
-	* tests/migrations/Makefile.am (TMP): Drop variable.
-	(TESTS_ENVIRONMENT): Drop 'TMP'.
-	* tests/migrations/common.scm (gpgconf): New variable.
-	(run-test): Create and remove socket directory.
-	* tests/migrations/extended-pkf.scm (src-tarball): Remove variable.
-	(setup): Remove function.
-	(trigger-migration): Likewise.
-	Use 'run-test' to execute the test.
-	* tests/migrations/from-classic.scm (src-tarball): Remove variable.
-	(setup): Remove function.
-	Use 'run-test' to execute the tests.
-	* tests/openpgp/Makefile.am (TMP): Drop variable.
-	(TESTS_ENVIRONMENT): Drop 'TMP'.
-	* tests/openpgp/README: Do not mention 'TMP'.
-	* tests/openpgp/defs.scm (with-home-directory): New macro.
-	(create-legacy-gpghome): Do not create private key store, the agent
-	does that for us.
-	(start-agent): Make sure to terminate the right agent with 'atexit'.
-
-	gpgscm: Fix creation of temporary directories.
-	+ commit 171e4314ebd3ff74af3dcdc8bd68e1100e8910ea
-	* tests/gpgscm/ffi.c (do_mkdtemp): Use a larger buffer for the
-	template.
-
-2017-03-06 Werner Koch <wk@gnupg.org>
-
-	wks: Set published keys world-readable.
-	+ commit e3589110e01dc6ad04463351ec2ce17201556d09
-	* tools/gpg-wks-server.c (check_and_publish): Set the permissions.
-
-	gpg: Fix attempt to double free an UID structure.
-	+ commit 4a130bbc2c2f4be6e8c6357512a943f435ade28f
-	* g10/getkey.c (get_best_pubkey_byname): Set released .UID to NULL.
-
-2017-03-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix compiler warnings for app-openpgp.c.
-	+ commit e6ca015ae182a6dbb0466441efc17c99683e9375
-	* scd/app-openpgp.c (retrieve_key_material): Remove touching I.
-	(do_change_pin): Make sure going to leave if PINVALUE == 0.
-	(rsa_writekey): Emit simpler log.
-
-	scd: More cleanup of old code.
-	+ commit 9bf39ed75ddbd35908bcd0996f55325ff801619a
-	* scd/app-dinsig.c (do_sign): Remove assignment to HASHALGO.
-	* scd/app-p15.c (parse_keyusage_flags): Remove assign to MASK.
-	(read_ef_aodf): Likewise.
-	(read_ef_cdf): Change the control to parse_error.
-	* scd/app-sc-hsm.c (parse_keyusage_flags): Remove assign to MASK.
-	(read_ef_prkd): Remove assign to S.
-	(read_ef_prkd): Check if PRKDF is not null.
-	(read_ef_cd): Likewise for CDF.
-
-	scd: Clean up old code.
-	+ commit cb6337329d3c858c695a7e56e2fc31d9d50ca3fe
-	* scd/apdu.c (CT_init, CT_data, CT_close): Remove.
-	(ct_error_string, ct_activate_card, close_ct_reader, reset_ct_reader)
-	(ct_get_status, ct_send_apdu, open_ct_reader): Remove.
-	(new_reader_slot) NEED_PCSC_WRAPPER: Remove fd and pid handling.
-	(writen, readn): Remove.
-	(pcsc_get_status, pcsc_send_apdu, control_pcsc, close_pcsc_reader)
-	(reset_pcsc_reader, open_pcsc_reader): Only DIRECT version.
-	(apdu_open_one_reader): Remove CT_api handling.
-	(apdu_get_status_internal, send_le): Fix to stop warnings.
-
-	scd: Fix API of select_file/_path.
-	+ commit 0703de01c8fbc417a99ecf8e950fc306b8c8ac9c
-	* scd/iso7816.c (iso7816_select_file, iso7816_select_path): Remove
-	unused arguments.
-	* scd/app-dinsig.c (do_readcert): Follow the change.
-	* scd/app-help.c (app_help_read_length_of_cert): Likewise.
-	* scd/app-nks.c (keygripstr_from_pk_file, do_readcert, do_readkey)
-	(switch_application): Likewise.
-	* scd/app-p15.c (select_and_read_binary, select_ef_by_path)
-	(micardo_mse, app_select_p15): Likewise.
-	* scd/app.c (app_new_register): Likewise.
-
-	agent: For SSH, robustly handling scdaemon's errors.
-	+ commit 4ce4f2f683a17be3ddb93729f3f25014a97934ad
-	* agent/command-ssh.c (card_key_list): Return 0 when
-	agent_card_serialno returns an error.
-	(ssh_handler_request_identities): Handle errors for card listing
-	and proceed to other cases.
-
-2017-03-03 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix commit de6d8313.
-	+ commit 67c203b6bf8d6dd489ceef3391f609986e7b7a49
-	* dirmngr/http-common.c (get_default_keyserver): Fix assert.
-
-2017-03-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix scd_kick_the_loop.
-	+ commit f9acc7d18bb90f47dafe7e32ae92f567756d6b12
-	* scd/scdaemon.c (notify_fd): Remove.
-	(the_event) W32: New.
-	(main_thread_pid) !W32: New.
-	(handle_signal): Handle SIGCONT.
-	(scd_kick_the_loop): Use signal on UNIX and event on Windows.
-	(handle_connections): Likewise.
-
-2017-03-03 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix possible segv when attribute packets are filtered.
-	+ commit 5f6f3f5cae8a95ed469129f9677782c17951dab3
-	* g10/import.c (impex_filter_getval): Handle PKT_ATTRIBUTE the same as
-	PKT_USER_ID
-	(apply_drop_sig_filter): Ditto.
-
-	gpg: Add new variables to the import and export filters.
-	+ commit 1813f3be23bdab5a42070424c47cb8daa9d9e6b7
-	* g10/import.c (impex_filter_getval): Add new variables "expired",
-	"revoked", and "disabled".
-
-2017-03-02 Werner Koch <wk@gnupg.org>
-
-	tools: Fix compile error with older gcc versions.
-	+ commit b1f48da02b474e985161aa2778d7b602a13c4292
-	* tools/mime-parser.h: Include rfc822parse.h.
-	(struct rfc822parse_context): Remove duplicate definition.
-
-	dirmngr: Rearrange files to fix de6d831.
-	+ commit 1890896fe698c55d15160a53aa6c5c22dc424031
-	* dirmngr/http-common.c: New.
-	* dirmngr/http-common.h: New.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add them.
-	(t_http_SOURCES): Add them.
-	(t_ldap_parse_uri_SOURCES): Add them.
-	* dirmngr/misc.c (get_default_keyserver): Move to ...
-	* dirmngr/http-common.c: here.
-	* dirmngr/http.c: Include http-common.h instead of misc.h.
-	* dirmngr/http-ntbtls.c: Ditto.
-
-	dirmngr: Let --gpgconf-list return the default keyserver.
-	+ commit de6d8313f6df32aaa151bee74e1db269ac1e0fed
-	* dirmngr/misc.c (get_default_keyserver): New.
-	* dirmngr/http.c: Include misc.h
-	(http_session_new): Use get_default_keyserver instead of hardwired
-	"hkps.pool.sks-keyservers.net".
-	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Ditto.
-	* dirmngr/dirmngr.c (main) <aGPGCongList>: Return default keyserver.
-
-2017-03-02 Justus Winter <justus@g10code.com>
-
-	gpg: Always initialize the trust db when generating keys.
-	+ commit 0c4d0620d327e8a2069532a5519afefe867a47d6
-	* g10/gpg.c (main): Always initialize the trust db when generating
-	keys.
-	* g10/keygen.c (do_generate_keypair): We can now assume that there is
-	a trust db.
-
-	gpg: Fix (quick) key generation with --always-trust.
-	+ commit 4735ab96aa5577d40ba7b3f72d863057198cc6a7
-	* g10/keygen.c (do_generate_keypair): Only update the ownertrust if we
-	do have a trust database.
-	* g10/trustdb.c (have_trustdb): New function.
-	* g10/trustdb.h (have_trustdb): New prototype.
-	* tests/openpgp/quick-key-manipulation.scm: Remove workaround.
-
-2017-03-02 Werner Koch <wk@gnupg.org>
-
-	agent: Improve error message for the KEYTOCARD command.
-	+ commit d6f0f368763006abf08818bfefcd32ecedb5c20a
-	* agent/command.c (cmd_keytocard): Always use leave_cmd. Simplify
-	timestamp checking and do an early test with an appropriate error
-	message.
-
-2017-03-02 Justus Winter <justus@g10code.com>
-
-	g10: Signal an error when trying to revoke non-existant UID.
-	+ commit 62d21a4ab4029b32ea129f1cf3a0e1f22e2fb7b0
-	* g10/keyedit.c (keyedit_quick_revuid): Signal an error when trying to
-	revoke non-existant UID.
-	* tests/openpgp/quick-key-manipulation.scm: Test that.
-
-	tests: Log information about ssh, add comments to test.
-	+ commit 74cb3b230c1f99afc5fd09bccc24186a63b154b0
-	* tests/openpgp/ssh-import.scm (ssh-version-string): New variable, and
-	log the binary and version used in the test.
-	(ssh-supports?): Document how we test what algorithms are supported by
-	ssh, and log ssh-keygen's replies.
-
-	common,tools: Always escape newlines when escaping data.
-	+ commit e064c75b08a523f738108428fe0c417a46e66238
-	* common/stringhelp.c (do_percent_escape): Always escape newlines.
-	* tools/gpgconf-comp.c (gc_percent_escape): Likewise.
-
-2017-03-01 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.19.
-	+ commit 4a28c212b35739ce951bd41cfc6ef1a215846b2e
-
-
-	build: Add kludge for "make distcheck" in a release build.
-	+ commit 246b27921b5dc34f367d879402725784aaee2494
-	* configure.ac: New option --enable-gnupg-builddir-envvar.
-	(ENABLE_GNUPG_BUILDDIR_ENVVAR): New ac_define.
-	* common/homedir.c (gnupg_set_builddir_from_env): Consider
-	ENABLE_GNUPG_BUILDDIR_ENVVAR.
-	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Rename to ...
-	(AM_DISTCHECK_CONFIGURE_FLAGS): this to be future proof. Add option
-	--enable-gnupg-builddir-envvar.
-
-2017-03-01 Yuri Chornoivan <yurchor@ukr.net>
-
-	po: Update Ukrainian translation.
-	+ commit c7f2a59833728e99e00449da2ddb10cf66693e7e
-
-
-2017-03-01 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit 280c724fe26bfd861ac74abc71e221795d8947f0
-
-
-2017-03-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Make --export-options work with --export-secret-keys.
-	+ commit 891ab23411b7f20ef37d8bde81d9857b083235df
-	* g10/export.c (export_seckeys): Add arg OPTIONS and pass it to
-	do_export.
-	(export_secsubkeys): Ditto.
-	* g10/gpg.c (main): Pass opt.export_options to export_seckeys and
-	export_secsubkeys
-
-	gpg: Allow creating keys using an existing ECC key.
-	+ commit 2bbdeb8ee87a6c7ec211be16391a11b7c6030bed
-	* common/sexputil.c (get_pk_algo_from_canon_sexp): Remove arg R_ALGO.
-	Change to return the algo id. Reimplement using get_pk_algo_from_key.
-	* g10/keygen.c (check_keygrip): Adjust for change.
-	* sm/certreqgen-ui.c (check_keygrip): Ditto.
-
-2017-02-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not require a trustdb for decryption.
-	+ commit e182542e90cbeff4f2ac6c8d71061356d7cdcdea
-	* g10/trustdb.c (init_trustdb): Add and implement arg NO_CREATE.
-	Change to return an error code. Change all callers to to pass False
-	for NO_CREATE.
-	(tdb_get_ownertrust): New arg NO_CREATE. Call init_trustdb to test
-	for a non-existing trustdb. Change all callers to to pass False for
-	NO_CREATE.
-	(tdb_get_min_ownertrust): Ditto.
-	* g10/trust.c (get_ownertrust_with_min): Add arg NO_CREATE. Call
-	init_trustdb for a quick check.
-	(get_ownertrust_info): Add arg NO_CREATE.
-	(get_ownertrust_string): Ditto.
-	* g10/gpgv.c (get_ownertrust_info): Adjust stub.
-	* g10/test-stubs.c (get_ownertrust_info): Ditto.
-	* g10/mainproc.c (list_node): Call get_ownertrust_info with NO_CREATE
-	set.
-	* g10/pubkey-enc.c (get_it): Ditto.
-
-2017-02-28 Justus Winter <justus@g10code.com>
-
-	gpgscm: Improve parsing.
-	+ commit e4583ae14e52482ab390c102d071755f91ab211d
-	* tests/gpgscm/scheme.c (port_increment_current_line): Avoid creating
-	the same integer if the delta is zero. This happens a lot during
-	parsing, and puts pressure on the memory allocator.
-
-	gpgscm: Fix calculating the line number.
-	+ commit 058c97f9fc485405246b1adfcc905c1891550652
-	* tests/gpgscm/scheme.c (opexe_5): Only increment the line number on
-	newlines.
-
-	gpg,tools: Make auto-key-retrieve configurable via gpgconf.
-	+ commit d379a0174cca595204b32da9a66c513a1304e6d0
-	* g10/gpg.c (gpgconf_list): Add 'auto-key-retrieve'.
-	* tools/gpgconf-comp.c (gc_options_gpg): Likewise.
-
-	tests: Improve support for gpgconf.
-	+ commit 41900175cf046dd9abe3d7a6805f6a403d68df15
-	* tests/openpgp/defs.scm: Improve high-level inteface to gpgconf.
-	* tests/openpgp/gpgconf.scm: Adapt.
-	* tests/openpgp/tofu.scm: Use it to select the trust model.
-
-	gpg,tools: Make trust-model configurable via gpgconf.
-	+ commit ebeccd73eb85f9027f0985d77dfe901266c6ddef
-	* g10/gpg.c (gpgconf_list): Add 'trust-model'.
-	* tools/gpgconf-comp.c (gc_options_gpg): Likewise.
-
-	gpgscm: Track source locations in every kind of ports.
-	+ commit 7cc57e2c63d0fa97569736419db5c76117e7685b
-	* tests/gpgscm/scheme-private.h (struct port): Move location
-	information out of the union.
-	* tests/gpgscm/scheme.c (mark): All ports need marking now.
-	(gc): Likewise all ports on the load stack.
-	(port_clear_location): Adapt accordingly. Also, add an empty function
-	for !SHOW_ERROR_LINE.
-	(port_increment_current_line): Likewise.
-	(port_reset_current_line): Drop function in favor of...
-	(port_init_location): ... this new function.
-	(file_push): Simplify.
-	(file_pop): Likewise.
-	(port_rep_from_filename): Likewise.
-	(port_rep_from_file): Likewise.
-	(port_rep_from_string): Also initialize the location.
-	(port_rep_from_scratch): Likewise.
-	(port_close): Simplify and generalize.
-	(skipspace): Likewise.
-	(token): Likewise.
-	(_Error_1): Generalize.
-	(opexe_5): Likewise.
-	(scheme_deinit): Simplify and generalize.
-	(scheme_load_named_file): Likewise.
-	(scheme_load_string): Also initialize the location.
-
-2017-02-28 Werner Koch <wk@gnupg.org>
-
-	gpgv,w32: Fix --status-fd.
-	+ commit 8a67dc4c4324b617b5a3fea51c59c674488544d6
-	* g10/gpgv.c (main): Use translate_sys2libc_fd_int for --status-fd.
-
-	w32: Make pipes really pollable.
-	+ commit 1192449207f41b26be8950b04df84a52c8a2a886
-	* common/exectool.c (gnupg_exec_tool_stream) W32: Use _get_osfhandle
-	to print the fd for the command line.
-	* common/exechelp-w32.c (create_pipe_and_estream): Use es_sysopen so
-	that the streams are actually pollable.
-
-2017-02-26 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	dirmngr: Avoid warnings during non-ntbtls build.
-	+ commit f5782e11a560fd590221042391254c810a42e45f
-	* dirmngr/t-http.c (my_http_tls_verify_cb): Avoid warnings when not
-	using ntbtls.
-
-	trustdb: Respect --quiet during --import-ownertrust.
-	+ commit ddf01a67d6388d988f1db50a06facb21c14d9426
-	* g10/tdbdump.c (import_ownertrust): If opt.quiet is set, do not send
-	log_info messages.
-
-2017-02-26 Manish Goregaokar <manish@mozilla.com>
-
-	g10: fix typo.
-	+ commit 64ec21bebd3f136722e608649906b59c6add6947
-	I already have copyright assignment with the FSF for GDB. I don't
-	think I'll need to do the DCO thing.
-
-2017-02-24 Werner Koch <wk@gnupg.org>
-
-	gpgv: New options --log-file and --debug.
-	+ commit 7af5d61c6e210210c777be9e6e87720dd4a055d9
-	* g10/gpgv.c (oLoggerFile, oDebug): New consts.
-	(opts): Add options --log-file and --debug.
-	(main): Implement options.
-
-2017-02-24 Andre Heinecke <aheinecke@intevation.de>
-
-	speedo,w32: Fix gpg-wks-client installation.
-	+ commit 49b4a676148523b51beca3ae929e9d78ed7ba110
-	* build-aux/speedo/w32/inst.nsi: gpg-wks-client is an exe.
-
-2017-02-23 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Add new debug flag "extprog"
-	+ commit 22b69b9edfdf6e6172239cbd1075ffe29077d339
-	* dirmngr/dirmngr.h (DBG_EXTPROG_VALUE, DBG_EXTPROG): New macros.
-	* dirmngr/dirmngr.c (debug_flags): Add flag "extprog".
-	(handle_connections): Use a macro instead of -1 for an invalid socket.
-	* dirmngr/loadswdb.c (verify_status_cb): Debug the gpgv call.
-
-	wks: Make sure that the draft 2 request is correctly detected.
-	+ commit d30e17ac62dea8913b7f353971d546b6b1a09bd5
-	* tools/gpg-wks.h (WKS_DRAFT_VERSION): New.
-	* tools/wks-receive.c (new_part): Move test wks draft version to ...
-	(t2body): new callback.
-	(wks_receive): Register this callback.
-	* tools/gpg-wks-server.c (send_confirmation_request): Emit draft
-	version header.
-	(send_congratulation_message): Ditto.
-	* tools/gpg-wks-client.c (decrypt_stream_parm_s): New.
-	(decrypt_stream_status_cb): Check DECRYTPION_KEY status.
-	(decrypt_stream): Get infor from new callback.
-	(process_confirmation_request): New arg 'mainfpr'. Check that it
-	matches the decryption key.
-	(read_confirmation_request): Check that the decryption key has been
-	generated by us.
-	(command_send): Use macro from draft version header.
-	(send_confirmation_response): Emit draft version header.
-
-	wks: New callback for the mime parser.
-	+ commit a2090250829fe8989be2afc8cf41ba2a022072fc
-	* tools/mime-parser.c (mime_parser_context_s): New field 't2body'.
-	(parse_message_cb): Call that callback.
-	(mime_parser_set_t2body): New.
-
-	gpg: Emit new status DECRYPTION_KEY.
-	+ commit effa80e0b5fd8cf9e31a984afe391c2406edee8b
-	* common/status.h (STATUS_DECRYPTION_KEY): New.
-	* g10/pubkey-enc.c (get_it): Emit that status.
-
-	dirmngr,w32: Make https with ntbtls work.
-	+ commit a42bf00b4edce789999aa3bdfce235cf726463ae
-	* dirmngr/http.c (simple_cookie_functions): New.
-	(send_request) HTTP_USE_NTBTLS, W32: Use es_fopencookie.
-	(cookie_read): Factor some code out to ...
-	(read_server): new.
-	(simple_cookie_read, simple_cookie_write) W32: New.
-
-2017-02-22 Werner Koch <wk@gnupg.org>
-
-	scd,agent: Improve the OpenPGP PIN prompt texts.
-	+ commit f98c8cb013033c08e98ebedcc0e084fbd2a85b0c
-	* scd/app-openpgp.c (get_prompt_info): Change texts.
-	* agent/call-pinentry.c (struct entry_features): New.
-	(getinfo_features_cb): New.
-	(start_pinentry): Set new fucntion as status callback.
-	(build_cmd_setdesc): New. Replace all snprintf for SETDESC by this
-	one.
-
-2017-02-22 Andre Heinecke <aheinecke@intevation.de>
-
-	scd: Nitpicks on the improved card prompts.
-	+ commit 143ca039e1e81140ae520cc1025f8e25c01acc80
-	* src/app-openpgp.c (get_prompt_info): Change wording and order
-	slightly.
-
-2017-02-22 Werner Koch <wk@gnupg.org>
-
-	scd: Improve the prompts for OpenPGP cards.
-	+ commit e3944f34e3220f96fb1be449eb6f3d7360bc2d0b
-	* scd/app-openpgp.c (get_disp_name): New.
-	(get_disp_serialno): New.
-	(get_prompt_info): New.
-	(build_enter_admin_pin_prompt): Rework the prompt texts. Factor some
-	code out to ...
-	(get_remaining_tries): New.
-	(verify_a_chv): Print a remaining counter also for the standard PIN.
-	Rework the prompt texts.
-
-	* agent/divert-scd.c (ask_for_card): Pretty format an OpenPGP serial
-	no.
-
-	agent: Prepend the description to a PIN prompt.
-	+ commit 6488ffb767733a2cf92ca5ba3e61fc0c53e0f673
-	* agent/divert-scd.c (has_percent0A_suffix): New.
-	(getpin_cb): Prepend DESC_TEXT to the prompt.
-	* agent/findkey.c (modify_description): Rename to ...
-	(agent_modify_description): this. MAke global. Add kludge to remove
-	empty parentheses from the end.
-	(agent_key_from_file, agent_delete_key): Adjust for above change.
-	* agent/pksign.c (agent_pksign_do): Modify DESC_TEXT also when
-	diverting to a card.
-
-	agent: Prepare to pass an additional parameter to the getpin callback.
-	+ commit 78d875a0f83bc046279b951aea76cd74f3c44fd8
-	* agent/call-scd.c (writekey_parm_s, inq_needpin_s): Merge into ...
-	(inq_needpin_parm_s): new struct. Add new field 'getpin_cb_desc'.
-	Change users to set all fields.
-	(inq_needpin): Pass GETPIN_CB_DESC to the GETPIN_CB.
-	(agent_card_pksign): Add arg 'desc_text' and change arg 'getpin_cb' to
-	take an additional arg 'desc_text'.
-	(agent_card_pkdecrypt): Ditto.
-	(agent_card_writekey): Change arg 'getpin_cb' to take an additional
-	arg 'desc_text'.
-	(agent_card_scd): Ditto.
-	* agent/divert-scd.c (getpin_cb): Add new arg 'desc_text'.
-	(divert_pksign): Add new arg 'desc_text' and pass is to
-	agent_card_pksign.
-	(divert_pkdecrypt): Add new arg 'desc_text' and pass is to
-	agent_card_pkdecrypt.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Pass DESC_TEXT to
-	divert_pkdecrypt.
-	* agent/pksign.c (agent_pksign_do): Pass DESC_TEXT to
-	divert_pksign.
-
-2017-02-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests: No spelling fix for test text.
-	+ commit ef424353f342f80ca6d18ede8b63c1b02215d105
-	* tests/openpgp/verify.scm (msg_ed25519_rshort): Revert the spelling
-	fix.
-
-2017-02-21 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Add special treatment for the standard hkps pool to ntbtls.
-	+ commit 831d014550863026dfefa774c961a21bd20c1e48
-	* dirmngr/validate.h (VALIDATE_FLAG_SYSTRUST): Remove
-	(VALIDATE_FLAG_EXTRATRUST): Remove
-	(VALIDATE_FLAG_TRUST_SYSTEM): New.
-	(VALIDATE_FLAG_TRUST_CONFIG): New.
-	(VALIDATE_FLAG_TRUST_HKP): New.
-	(VALIDATE_FLAG_TRUST_HKPSPOOL): New.
-	(VALIDATE_FLAG_MASK_TRUST): New.
-	* dirmngr/validate.c (check_header_constants): New.
-	(validate_cert_chain): Call new function. Simplify call to
-	is_trusted_cert.
-	* dirmngr/crlcache.c (crl_parse_insert): Pass
-	VALIDATE_FLAG_TRUST_CONFIG to validate_cert_chain
-	* dirmngr/server.c (cmd_validate): Use VALDIATE_FLAG_TRUST_SYSTEM and
-	VALIDATE_FLAG_TRUST_CONFIG.
-	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Check provided TLS
-	context. Set trustclass flags using the new VALIDATE_FLAG_TRUST
-	values.
-
-	* dirmngr/certcache.c (cert_cache_init): Load the standard pool
-	certificate prior to the --hkp-cacerts.
-
-	dirmngr: Load --hkp-cacert values into the certificate cache.
-	+ commit d1625a9a82b1e5d96bbbf2132c49c53108565ae1
-	* dirmngr/dirmngr.c (hkp_cacert_filenames): New var.
-	(parse_rereadable_options): Store filenames from --hkp-cacert in the
-	new var.
-	(main, dirmngr_sighup_action): Pass that var to cert_cache_init.
-	* dirmngr/certcache.c (cert_cache_init): Add arg 'hkp_cacert' and load
-	those certs.
-	(load_certs_from_file): Use autodetect so that PEM and DER encodings
-	are possible.
-
-	dirmngr: Load "sks-keyservers.netCA.pem" into the cache.
-	+ commit 9741aa24d9056b56cd5366ff5379bd8a3e6118df
-	* dirmngr/certcache.c (load_certs_from_file): Always build this
-	function. Add args 'trustclasses' and 'no_error'. Pass TRUSTCLASSES
-	to put_cert.
-	(load_certs_from_system): Pass CERTTRUST_CLASS_SYSTEM to
-	load_certs_from_file.
-	(cert_cache_init): Try to load "sks-keyservers.netCA.pem". Don't make
-	function fail in an out-of-core condition.
-
-	dirmngr: Implement trust classes for the cert cache.
-	+ commit 50b9828eacc39c1ca75cb8313db896e4bdc8b270
-	* dirmngr/certcache.h (CERTTRUST_CLASS_SYSTEM): New.
-	(CERTTRUST_CLASS_CONFIG): New.
-	(CERTTRUST_CLASS_HKP): New.
-	(CERTTRUST_CLASS_HKPSPOOL): New.
-	* dirmngr/certcache.c (MAX_EXTRA_CACHED_CERTS): Rename to ...
-	(MAX_NONPERM_CACHED_CERTS): this.
-	(total_extra_certificates): Rename to ...
-	(total_nonperm_certificates): this.
-	(total_config_certificates): Remove.
-	(total_trusted_certificates): Remove.
-	(total_system_trusted_certificates): Remove.
-	(cert_item_s): Remove field 'flags'. Add fields 'permanent' and
-	'trustclasses'.
-	(clean_cache_slot): Clear new fields.
-	(put_cert): Change for new cert_item_t structure.
-	(load_certs_from_dir): Rename arg 'are_trusted' to 'trustclass'
-	(load_certs_from_file): Use CERTTRUST_CLASS_ value for put_cert.
-	(load_certs_from_w32_store): Ditto.
-	(cert_cache_init): Ditto.
-	(cert_cache_print_stats): Rewrite.
-	(is_trusted_cert): Replace arg 'with_systrust' by 'trustclasses'.
-	Chnage the test.
-	* dirmngr/validate.c (allowed_ca): Pass CERTTRUST_CLASS_CONFIG to
-	is_trusted_cert.
-	(validate_cert_chain): Pass CERTTRUST_CLASS_ values to
-	is_trusted_cert.
-
-	dirmngr: New Assuan option "http-crl".
-	+ commit 493c142e582ff5ef1b5fdfcb9653715ef43e83e9
-	* dirmngr/dirmngr.h (server_control_s): New flag 'http_no_crl'.
-	* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Set this flag.
-	* dirmngr/server.c (option_handler): New option "http-crl"
-	* dirmngr/http.h (HTTP_FLAG_NO_CRL): New flag.
-	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Consult this flag.
-	* dirmngr/ks-engine-hkp.c (send_request): Set flag depending on CTRL.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-
-	* dirmngr/t-http.c (main): New option --no-crl.
-
-	dirmngr: Add a magic field to the http structs.
-	+ commit 39c745038181edd097e188434b3f9c971ed3987f
-	* dirmngr/http.c (HTTP_SESSION_MAGIC): New.
-	(http_session_s): New field 'magic'.
-	(HTTP_CONTEXT_MAGIC): New.
-	(http_context_s): New field 'magic'.
-	(my_ntbtls_verify_cb): Assert MAGIC.
-	(fp_onclose_notification): Ditto.
-	(session_unref): Ditto. Reset MAGIC.
-	(http_session_new): Set MAGIC.
-	(http_open): Ditto.
-	(http_raw_connect): Ditto.
-	(http_close): Assert MAGIC. Reset MAGIC.
-
-	* dirmngr/t-http.c (my_http_tls_verify_cb): MArk HTTP_FLAGS unused.
-
-2017-02-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Support primary key generation by keygrip.
-	+ commit 3fc69224b7b22ad1df1395ebcb21549384839cd1
-	* g10/keygen.c (para_name): Add pKEYGRIP.
-	(generate_keypair): Use pKEYGRIP for key generation.
-	(do_generate_keypair): Call do_create_from_keygrip with pKEYGRIP.
-
-2017-02-20 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Setup a log handler for ntbtls.
-	+ commit a022baa4a487eec769411255a64088450c4c8a49
-	* dirmngr/dirmngr.c (my_ntbtls_log_handler) HTTP_USE_NTBTLS: New.
-	(main) HTTP_USE_NTBTLS: Register log handler.
-
-	common: New function log_logv_with_prefix.
-	+ commit 3e9512e557d95c7dc36835365b127b25f6a5cdd9
-	* common/logging.c (do_logv): Add arg 'prefmt' and print it. Chnage
-	call callers to pass NULL.
-	(log_logv_with_prefix): New.
-
-	dirmngr.c: Make http.c build without any TLS support.
-	+ commit e174893262d8de0f52faa8abe4fc0402719a35d8
-	* dirmngr/http.c (http_session_new): Remove used of tls_prority.
-
-	 dirmngr: Make t-http.c work again with gnutls - second try.
-	+ commit 81ea24b8637ac08e44e9e44816689413c2ae7e08
-	* dirmngr/t-http.c: Always include ksba.h.
-
-	dirmngr: Make t-http.c work again with gnutls.
-	+ commit f923873863fd863d71349f20f5568f80aecc020b
-	* dirmngr/Makefile.am (t_http_CFLAGS, t_http_LDADD): Add KSBA flags
-	and libs.
-
-2017-02-19 Werner Koch <wk@gnupg.org>
-
-	dirmngr: First take on ntbtls cert verification.
-	+ commit 64fffd0ce2a4fd9cba152cf07497b585410cc652
-	* dirmngr/http-ntbtls.c: New.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add file.
-	* dirmngr/dirmngr.h (SERVER_CONTROL_MAGIC): New.
-	(server_conrol_s): Add field 'magic',
-	* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Set MAGIC.
-	(dirmngr_deinit_default_ctrl): Set MAGIC to deadbeef.
-	* dirmngr/http.c (my_ntbtls_verify_cb): New.
-	(http_session_new) HTTP_USE_NTBTLS: Remove all CA setting code.
-	(send_request) HTTP_USE_NTBTLS: Set the verify callback. Do not call
-	the verify callback after the handshake.
-	* dirmngr/ks-engine-hkp.c (send_request): Pass
-	gnupg_http_tls_verify_cb to http_session_new.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-
-	* dirmngr/t-http.c (my_http_tls_verify_cb): New.
-	(main): Rename option --gnutls-debug to --tls-debug.
-	(main) HTTP_USE_NTBTLS: Create a session.
-
-2017-02-18 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Add per-session verify callback to http.c.
-	+ commit a74902cccde539ee2bd216caec0da6eb54b67c1b
-	* dirmngr/http.h (http_verify_cb_t): New type.
-	* dirmngr/http.c (http_session_s): Add fields flags, verify_cb, and
-	verify_cb_value.
-	(http_session_new): Remove arg tls_priority. Add args verify_cb and
-	verify-cb_value. Store them in the session object.
-	(send_request): Use per-session verify callback.
-	(http_verify_server_credentials) HTTP_USE_NTBTLS: Return
-	GPG_ERR_NOT_IMPLEMENTED.
-	* dirmngr/ks-engine-hkp.c (send_request): Adjust for changed
-	http_session_new.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-	* dirmngr/t-http.c (main): Ditto.
-
-	* dirmngr/server.c (do_get_cert_local): Replace xmalloc by malloc.
-
-2017-02-17 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Strip the default https port from the Host: header.
-	+ commit cd32ebd152a522e362469ab969d91f8d49f28a60
-	* dirmngr/http.c (send_request): Strip the default https port.
-
-	dirmngr: Add option --no-crl to the VALIDATE cmd.
-	+ commit f07811ee2c0a8044551e2ec063eda61cff7f6e39
-	* dirmngr/validate.h: Remove enums VALIDATE_MODE_*.
-	(VALIDATE_FLAG_SYSTRUST, VALIDATE_FLAG_EXTRATRUST)
-	(VALIDATE_FLAG_CRL, VALIDATE_FLAG_RECURSIVE)
-	(VALIDATE_FLAG_OCSP, VALIDATE_FLAG_TLS)
-	(VALIDATE_FLAG_NOCRLCHECK): New constants.
-	* dirmngr/validate.c (validate_cert_chain): Change arg 'mode' to
-	'flags'. Change code accordingly. Remove NO-CRL in TLS mode kludge.
-	* dirmngr/crlcache.c (crl_parse_insert): Change to use flag values for
-	the validate_cert_chain call.
-	* dirmngr/server.c (cmd_validate): Ditto. Add new option --no-crl.
-
-	dirmngr: Add options --tls and --systrust to the VALIDATE cmd.
-	+ commit 070211eb990f5ea41271eba432b6a6b485cef7c7
-	* dirmngr/certcache.h (certlist_s, certlist_t): New.
-	* dirmngr/certcache.c (read_certlist_from_stream): New.
-	(release_certlist): New.
-	* dirmngr/server.c (MAX_CERTLIST_LENGTH): New.
-	(cmd_validate): Add options --tls and --systrust. Implement them
-	using a kludge for now.
-	* dirmngr/validate.c (validate_cert_chain): Support systrust
-	checking. Add kludge to disable the CRL checking for tls mode.
-
-	dirmngr: Remove use of hardcoded numbers in validate.
-	+ commit ed99af030d19305dd7cd41c41ac581306cb91fd5
-	* dirmngr/validate.c (enum cert_usage_modes): New.
-	(cert_usage_p): Change type of arg MODE. Use enums instead of
-	hardwired values. Use a switch instead of tricky bit tests.
-	(cert_use_cert_p, cert_use_ocsp_p, cert_use_crl_p): Adjust.
-
-	* dirmngr/validate.c (cert_usage_p): Rename to check_cert_usage.
-	(cert_use_cert_p): Rename to check_cert_use_cert.
-	(cert_use_ocsp_p): Rename to check_cert_use_ocsp.
-	(cert_use_crl_p): Rename to check_cert_use_crl.
-
-	* dirmngr/validate.h (VALIDATE_MODE_CERT_SYSTRUST): New.
-	(VALIDATE_MODE_TLS, VALIDATE_MODE_TLS_SYSTRUST): New.
-
-2017-02-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: No cards is not an error.
-	+ commit dea4b3c742acbd195d6ab12b279b4dda315f2582
-	* agent/command-ssh.c (card_key_list): Care the case of no cards.
-
-	agent: Send back all public keys for available cards.
-	+ commit 3f4f64b6ac0d7160fd9e1301f95820894b219c3f
-	* agent/call-scd.c (card_cardlist_cb, agent_card_cardlist): New.
-	* agent/command-ssh.c (card_key_list): New.
-	(ssh_handler_request_identities): Call card_key_list and loop for the
-	list to send public keys for all available cards.
-
-2017-02-17 Justus Winter <justus@g10code.com>
-
-	gpgscm: Guard use of tagged expressions.
-	+ commit aab6ba0bb60528b9e816e430be51170cf39611b0
-	* tests/gpgscm/init.scm (vm-history-print): Check that the tag added
-	to expressions when parsing source files matches the expected format.
-	* tests/gpgscm/lib.scm (assert): Likewise.
-
-2017-02-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix RESET command handling (more).
-	+ commit 99d4dfe83661d05ef3a20ed04e6cec5647536738
-	* scd/app-common.h (struct app_ctx_s): Add reset_requested.
-	* scd/app.c (app_reset): Locking APP, set reset_requested.
-	(deallocate_app): Release the lock.
-	(release_application): Add LOCKED_ALREADY argument.
-	(scd_update_reader_status_file): Hold the lock when accessing APP.
-	When reset_requested is set, close the reader and deallocate APP.
-	* scd/command.c (open_card_with_request, cmd_restart): Follow the
-	change of release_application.
-	(send_client_notifications): Here it calls release_application holding
-	the lock.
-
-2017-02-16 Werner Koch <wk@gnupg.org>
-
-	dirmngr,w32: Load all system provided certificates.
-	+ commit 7006352da773d82c47797bbf11e570ecafac6501
-	* dirmngr/certcache.c (CERTOPENSYSTEMSTORE) W32: New type.
-	(CERTENUMCERTIFICATESINSTORE) W32: New type.
-	(CERTCLOSESTORE) W32: New type.
-	(load_certs_from_file) W32: Do not build.
-	(load_certs_from_w32_store) W32: New.
-	(load_certs_from_system) W32: Call new function.
-
-	dirmngr: Load all system provided certificates.
-	+ commit 9a1a5ca0bc2cfb17ccf632de3e134b6d789c6855
-	* configure.ac: Add option --default-trust-store.
-	(DEFAULT_TRUST_STORE_FILE): New ac_define.
-	* dirmngr/certcache.c: Include ksba-io-support.h.
-	(total_trusted_certificates, total_system_trusted_certificates): New.
-	(put_cert): Manage the new counters.
-	(cert_cache_deinit): Reset them.
-	(cert_cache_print_stats): Print them.
-	(is_trusted_cert): Add arg WITH_SYSTRUST. Change all callers to pass
-	false.
-	(load_certs_from_file): New.
-	(load_certs_from_system): New.
-	(cert_cache_init): Load system certificates.
-
-	common: Rename remaining symbols in ksba-io-support.
-	+ commit e1dfd862367cf91b66abe86bd73664409354bb14
-	* common/ksba-io-support.c (gpgsm_reader_eof_seen): Rename to ...
-	(gnupg_ksba_reader_eof_seen): this. Change all callers.
-	(gpgsm_destroy_reader): Rename to ...
-	(gnupg_ksba_destroy_reader): this. Change all callers.
-	(gpgsm_finish_writer): Rename to ...
-	(gnupg_ksba_finish_writer): this. Change all callers.
-	(gpgsm_destroy_writer): Rename to ...
-	(gnupg_ksba_destroy_writer): this. Change all callers.
-	* common/ksba-io-support.c (struct base64_context_s): Rename to ...
-	(gnupg_ksba_io_s): this.
-	* common/ksba-io-support.h (base64_context_s): Ditto.
-	(Base64Context): Rename this typedef to ...
-	(gnupg_ksba_io_t): this. Change all users.
-
-	common: Remove gpgsm dependencies from ksba-io-support.
-	+ commit 28c31524be84f20b34573c78bd3a94a81e4b1d61
-	* common/ksba-io-support.c: Include ksba-io-support.h instead of
-	../sm/gpgsm.h. Include util.h.
-	(writer_cb_parm_s): Remove const from 'pem_name'.
-	(gpgsm_destroy_writer): Free 'pem_name'.
-	(gpgsm_create_reader): Rename to ...
-	(gnupg_ksba_create_reader): this. Replace args CTRL and
-	ALLOW_MULTI_PEM by a new arg FLAGS. Change the code to evaluate
-	FLAGS. Change all callers to pass the FLAGS.
-	(gpgsm_create_writer): Rename to ...
-	(gnupg_ksba_create_writer): this. Replace arg CTRL by new arg FLAGS.
-	Add arg PEM_NAME. Evaluate FLAGS. Store a copy of PEM_NAME. Change
-	all callers to pass the FLAGS and PEM_NAME.
-
-	common: Change license of ksba-io-support.c.
-	+ commit 919e76b407ac557b0f518ec03f3cc59e9e5740c9
-	* common/ksba-io-support.c: Change from GPLv3+ to LGPLv3+/GPLv2+.
-
-	sm,common: Move ksba reader and writer support to common/.
-	+ commit 04bfa6fe6597b8ffcec61cbcacdc7eb137444e80
-	* sm/base64.c: Rename to ...
-	* common/ksba-io-support.c: this.
-	* common/ksba-io-support.h: New.
-	* common/Makefile.am (common_sources): Add new files.
-	* sm/Makefile.am (gpgsm_SOURCES): Remove base64.c
-
-	dirmngr: Prepare certcache for forthcoming changes.
-	+ commit 5c4e67afd6385b48065de6a0f2dd0bfd936ab90b
-	* dirmngr/certcache.c (cert_item_s): Rename 'flags.loaded' to
-	'flags.config'. Add 'flags.systrust'.
-	(total_loaded_certificates): Rename to total_config_certificates.
-	(put_cert): Rename args for clarity. Set SYSTRUST flag.
-	(load_certs_from_dir): Make sure put_cert does not set the SYSTRUST
-	flag.
-
-	dirmngr: Replace stpcpy chains by strconcat.
-	+ commit aef60abe6a1772e18634984a94bd70f57d57ccdd
-	* dirmngr/certcache.c (find_cert_bysn): Use strconcat.
-	(find_cert_bysubject): Ditto.
-	* dirmngr/http.c (store_header): Ditto.
-	* dirmngr/ldap.c (make_url): Ditto.
-	* dirmngr/server.c (get_cert_local_ski): Ditto.
-	(do_get_cert_local): Use xstrconcat.
-
-2017-02-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Minor fixes to silence compiler warnings.
-	+ commit 7a666ccb44f43c4efbaa51c1ca16fc0b37c3399d
-	* scd/app.c (app_reset): Initialize ERR.
-	* scd/scdaemon.c (scd_kick_the_loop, handle_connections): Catch the
-	return value.
-
-2017-02-15 Werner Koch <wk@gnupg.org>
-
-	libdns: Workaround for bracketed numerical addresses.
-	+ commit a3509e12b6626a585ce7da6ceed8cfddcba2460f
-	* dirmngr/dns-stuff.c (resolve_name_libdns): Work around an
-	incompatibility between the glibc resolver and libdns.
-
-	dirmngr: Do PTR lookups only for 'keyserver --hosttable'.
-	+ commit a75325faf163275674a91971e75f1018035ca348
-	* dirmngr/ks-engine-hkp.c (hostinfo_s): Remove fields v4addr and
-	v5addr and add fields iporname and iporname_valid.
-	(create_new_hostinfo): Clear them.
-	(add_host): Remove the code to set the v4addr and v6addr fields.
-	(ks_hkp_print_hosttable): Remove printing of the fields. Compute the
-	iporname field and display it.
-	(ks_hkp_reload): Force re-computing of the iporname field in
-	ks_hkp_print_hosttable.
-
-	dirmngr: Avoid PTR lookup for hosts in a pool.
-	+ commit da2ba20868093e3054d18adc2b1bc56cb23e4ba7
-	* dirmngr/ks-engine-hkp.c (add_host): Don't to a PTR lookup for hosts
-	in a pool.
-
-2017-02-15 Justus Winter <justus@g10code.com>
-
-	tests,build: Fix distcheck.
-	+ commit 2f7b6cb279ea0ee27364fbb2b12df47e76166a39
-	* tests/gpgscm/Makefile.am (EXTRA_DIST): Add 'time.scm'.
-
-	tests: Test and document other ways to create keys.
-	+ commit 90d383f1eb07fc823518dea10eb15ca390f5cf8e
-	* doc/gpg.texi: Clarify usage and expiration arguments for key
-	generation.
-	* tests/openpgp/quick-key-manipulation.scm: Test all variants.
-
-	tests: Check expiration times of created keys.
-	+ commit 127e1e532da4083ccd3c307555b6177fab16f408
-	* tests/gpgscm/ffi.c (do_get_time): New function.
-	(ffi_init): Expose new function.
-	* tests/gpgscm/ffi.scm (get-time): Document new function.
-	* tests/gpgscm/time.scm: New file.
-	* tests/openpgp/quick-key-manipulation.scm: Use the new facilities to
-	check the expiration times of created keys.
-	* tests/openpgp/tofu.scm: Use the new module.
-
-2017-02-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix RESET command handling.
-	+ commit e2792813a55e091c51be7b1b089a71beb6466f1d
-	* scd/app.c (release_application_internal): Remove.
-	(release_application): Merge release_application_internal.
-	(app_reset): Kick the loop and let close the reader. Sleep is
-	required here to wait closing.
-	(scd_update_reader_status_file): When APP is no use, close it.
-
-2017-02-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Make --export-ssh-key work for the primary key.
-	+ commit b456e5be91dc064fc9509ea86edab113721ed299
-	* g10/export.c (export_ssh_key): Also check the primary key.
-
-2017-02-13 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Do a DNS lookup even if it is missing from nsswitch.conf.
-	+ commit dee026d761ae3d7594c3dbc5b3fa842df53cc189
-	* dirmngr/dns-stuff.c (libdns_init): Do not print error message for a
-	missing nsswitch.conf. Make sure that tehre is a DNS entry.
-
-	gpgconf: No ENOENT warning with --change-options et al.
-	+ commit 30dac0486b6357e84fbe79c612eea940b654e4d1
-	* tools/gpgconf-comp.c (retrieve_options_from_program): Check ERRNO
-	before printing a warning.
-
-	gpg: Print a warning if no command has been given.
-	+ commit 810adfd47801fc01e45fb71af9f05c91f7890cdb
-	* g10/gpg.c (main): Print in the default case.
-
-2017-02-13 Justus Winter <justus@g10code.com>
-
-	g13: Fix build on macOS.
-	+ commit f8ce31a7bf1ee85e5010b628a66e6f69486e5213
-	* g13/Makefile.am (t_common_ldadd): Add iconv.
-
-2017-02-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix use case of PC/SC.
-	+ commit da4c132cca2c6df81243c9660b7348268a848f88
-	* scd/apdu.c (apdu_open_reader): Add an argument APP_EMPTY.
-	When CCID driver fails to open, try PC/SC if APP is nothing.
-	* scd/app.c (select_application): Supply arg if APP is nothing.
-
-2017-02-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix memory leak in the error case of signature creation.
-	+ commit 5996c7bf99f3a681393fd9589276399ebc956cff
-	* g10/sign.c (write_signature_packets): Free SIG. Also replace
-	xcalloc by xtrycalloc.
-
-2017-02-08 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	common: Avoid warning about implicit declaration of gnupg_fd_valid.
-	+ commit 8810314e377a9cb6612150a57cf99260ed0bb9f6
-	* common/logging.c: Add #include "sysutils.h".
-
-2017-02-08 Justus Winter <justus@g10code.com>
-
-	gpg,common: Make sure that all fd given are valid.
-	+ commit 6823ed46584e753de3aba48a00ab738ab009a860
-	* common/sysutils.c (gnupg_fd_valid): New function.
-	* common/sysutils.h (gnupg_fd_valid): New declaration.
-	* common/logging.c (log_set_file): Use the new function.
-	* g10/cpr.c (set_status_fd): Likewise.
-	* g10/gpg.c (main): Likewise.
-	* g10/keylist.c (read_sessionkey_from_fd): Likewise.
-	* g10/passphrase.c (set_attrib_fd): Likewise.
-	* tests/openpgp/Makefile.am (XTESTS): Add the new test.
-	* tests/openpgp/issue2941.scm: New file.
-
-2017-02-07 Justus Winter <justus@g10code.com>
-
-	tests: Skip key types not supported by OpenSSH.
-	+ commit 56aa85f88f6b35fb03a2dc1a95882d49a74290e3
-	* tests/openpgp/ssh-import.scm (path): New variable.
-	(ssh,ssh-keygen,ssh-version,ssh-supports?): Likewise.
-
-2017-02-07 Werner Koch <wk@gnupg.org>
-
-	wks: Add WKS-Phase headers to the server messages.
-	+ commit b30ac663cec82c89ca9a3e87e65b36d2552f1533
-	* tools/gpg-wks-server.c (send_confirmation_request): Add custom
-	header.
-	(send_congratulation_message): Ditto.
-
-2017-02-05 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	po: Manual updates of nl translation.
-	+ commit aa3f08794bfc809821e2fc30a09a5ae23925c645
-	* po/nl.po: Apply several minor manual cleanups to nl.po that were
-	previously applied to all the other localizations.
-
-	po: Copied missing nl.po translation from the 2.0 branch.
-	+ commit 8a9d4b55b09d04482b46055f0a60f01b86738df3
-	* po/nl.po: Copy from 2.0 branch.
-
-	gpg: Fix aliases --list-key, --list-sig, and --check-sig.
-	+ commit f31120a5aa40b6e4e89d41d1d5d34e0f7da173b4
-	* g10/gpg.c (opts): Define commands with ARGPARSE_c
-	instead of ARGPARSE_s_n.
-
-2017-02-04 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc: Clarify abbreviation of --help.
-	+ commit f2b276dffbe2435b17abf2b3c51684d3636f3f11
-	* doc/gpg.texi: clarify abbreviation of --help.
-
-2017-02-03 Werner Koch <wk@gnupg.org>
-
-	agent: Tell pinentry the hostname the agent is running on.
-	+ commit 042fe711c76f6377cedb8f83a73ba386cee34bb7
-	* agent/call-pinentry.c !W32: Incluse utsname.h
-	(start_pinentry): Pass nodename to OPTION/owner.
-
-	agent: Tell the Pinentry the client's pid.
-	+ commit 309f464a5952c7d7504b875bf4853914b1242346
-	* configure.ac: Check for SO_PEERCRED et al.
-	* agent/agent.h (server_control_s): Add field 'client_pid'.
-	* agent/command.c (start_command_handler): Set CLIENT_PID.
-	* agent/command-ssh.c (get_client_pid): New.
-	(start_command_handler_ssh): Set CLIENT_PID.
-	* agent/call-pinentry.c (start_pinentry): Tell Pinentry the client-pid.
-
-	gpg: More diagnostics for a launched pinentry.
-	+ commit 7052a0d77cf8f3a445b252a809d29be445788625
-	* agent/call-pinentry.c (start_pinentry): Call getinfo/ttyinfo.
-	* g10/server.c (gpg_proxy_pinentry_notify): Simplify the output so
-	that we do not change the code when adding new fields to
-	PINENTRY_LAUNCHED.
-
-2017-02-02 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Don't assume that strtoul interprets "" as 0.
-	+ commit 407f5f9baea5591f148974240a87dfb43e5efef3
-	* g10/tofu.c (show_statistics): If there are not records, return 0
-	instead of NULL.
-
-	tests: Improve description of test.
-	+ commit 64be8e1e8607944687f3ae45ec64aa30bf4fdf6f
-	* tests/openpgp/issue2929.scm: Improve description of test.
-
-	Revert "Revert "tests: Add test demonstrating issue2929.""
-	+ commit e596b21f4b78dd27489e677699cc4ba648051b3f
-	This reverts commit 59048b0f1aa77313573a1004cd3a9f02692a7521.
-
-	gpg: Ensure TOFU bindings associated with UTKs are registered as usual.
-	+ commit 769272ba87f282a69e8d5f9bb27c86e6bec4496b
-	* g10/tofu.c (get_trust): Call get_policy before short-circuiting the
-	policy lookup for ultimately trusted keys to make sure the binding is
-	added to the bindings table, if necessary.
-
-	gpg: If there is a TOFU conflict, elide the too few message warning.
-	+ commit a08c781739e7561093f32b732c4991f2bd817ec2
-	* g10/tofu.c (tofu_get_validity): If there was a conflict, don't also
-	print out a warning about too few messages.
-
-	gpg: Only print out TOFU statistics for conflicts in interactive mode.
-	+ commit 027b81b35fe36692005b8dba22d9eb2db05e8c80
-	* g10/tofu.c (get_trust): Add arguments POLICYP and CONFLICT_SETP. If
-	they are not NULL, return the policy and conflict set (if there is
-	one), respectively. Update callers. If MAY_ASK is FALSE, don't print
-	out the statistics.
-	(tofu_register_encryption): If there is a conflict and we haven't yet
-	printed the statistics about the conflicting bindings, do so now.
-	(tofu_get_validity): Likewise.
-
-	gpg: Add newline to output.
-	+ commit 74268180e5a3acc827f3a369f1fe5971f3bbe285
-	* g10/tofu.c (ask_about_binding): Add newline to output.
-
-	gpg: Remove period at end of warning.
-	+ commit 6f9d8a956b2ca0f5a0eb7acc656fc17af2f2de47
-	* g10/tofu.c (tofu_register_encryption): Remove period at end of
-	warning.
-
-2017-02-01 Werner Koch <wk@gnupg.org>
-
-	dirmngr: New option --no-use-tor and internal changes.
-	+ commit 7440119e729d3fdedda8a9b44b70f8959beea8d7
-	* dirmngr/dns-stuff.c (disable_dns_tormode): New.
-	* dirmngr/dirmngr.c (oNoUseTor): New const.
-	(opts): New option --no-use-tor.
-	(tor_mode): New var.
-	(parse_rereadable_options): Change to use TOR_MODE.
-	(dirmngr_use_tor): New.
-	(set_tor_mode): Call disable_dns_tormode. Implement oNoUseTor.
-	* dirmngr/dirmngr.h (opt): Remove field 'use_tor'. Replace all
-	references by a call to dirmngr_use_tor().
-	* dirmngr/server.c (cmd_getinfo): Distinguish between default and
-	enforced TOR_MODE.
-
-2017-02-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix regression tracking the connection count.
-	+ commit 8ddc9268f6aedef0e178b174b89245c33d8189dd
-	* scd/scdaemon.c (get_active_connection_count): New.
-	(start_connection_thread): Bump ACTIVE_CONNECTIONS up and down.
-	* scd/command.c (cmd_getinfo): Add subcommand "connections".
-
-2017-01-31 Justus Winter <justus@g10code.com>
-
-	gpgscm: Tune the hash tables.
-	+ commit 2e78aa6ff770849415f8eb71ca70c8886e9564c8
-	* tests/gpgscm/scheme.c (oblist_initial_value): Increase the size of
-	the hash table based on the number of symbols used after initializing
-	the interpreter.
-	(new_frame_in_env): Increase the size of the hash table based on the
-	number of variables in the global environement.
-
-	gpgscm: Optimize environment lookups and insertions.
-	+ commit b85d509a8f5c2e6200b8051ca1593c019abce90b
-	* tests/gpgscm/scheme.c (pointercmp): New function.
-	(new_slot_spec_in_env): Add and use slot for insertions.
-	(find_slot_spec_in_env): New variant of 'find_slot_in_env' that
-	returns the slot on failures.
-	(find_slot_in_env): Express using the new function.
-	(new_slot_in_env): Update callsite.
-	(opexe_0): Optimize lookup-or-insert.
-	(opexe_1): Likewise.
-	(scheme_define): Likewise.
-
-	gpgscm: Fix build with list environments.
-	+ commit 874424ee3cc795eae9972b6259a2cc4dcdbb868e
-	* tests/gpgscm/scheme.c (new_slot_spec_in_env): Provide preallocation
-	inforomation if USE_ALIST_ENV.
-
-	gpgscm: Optimize symbol lookups and insertions.
-	+ commit cea6d114b60deaecfbc2eb1aedbdfb7e6700922f
-	* tests/gpgscm/scheme.c (oblist_find_by_name): Keep the list of
-	symbols sorted, return the slot where a new symbol must be inserted on
-	lookup failures.
-	(oblist_add_by_name): Add the new symbol at the given slot.
-	(mk_symbol): Adjust callsite.
-	(gensym): Likewise.
-	(assign_syntax): Likewise.
-
-	gpgscm: Fix build with object list.
-	+ commit 8f0ecb16cbb3798ad18be5f05b826db2aa1aaa00
-	* tests/gpgscm/scheme.c (oblist_add_by_name): Provide preallocation
-	information if USE_OBJECT_LIST.
-
-	gpgscm: Remove unused functions.
-	+ commit 2076cdaf6b93bc73223819895cc7a67323d8cee7
-	* tests/gpgscm/scheme.c (check_cell_alloced): Remove function.
-	(check_range_alloced): Likewise.
-
-2017-01-31 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Require --allow-version-check even if --use-tor is used.
-	+ commit b0e8376e19072ec3c590273c69ab3e8e5edfdaca
-	* dirmngr/dirmngr.c (housekeeping_thread): Load swdb only if the
-	option is set.
-
-2017-01-31 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Remove --debug-disable-ticker option.
-	+ commit e17fa5c75d76af4d4684ee810cb446ecd5110560
-	* scd/scdaemon.c (ticker_disabled): Remove.
-	(handle_tick, need_tick): Remove.
-	(handle_connections): Don't check ticker_disabled.
-
-	scd: Fix SERIALNO for multiple devices.
-	+ commit f08d37af049bf1718b301644020658dd2bb07638
-	* scd/app.c (select_application): Fix the logic if periodical check is
-	needed. If it is needed for newly found device(s), kick the loop.
-	(scd_update_reader_status_file): Return value if select(2) should be
-	called with timeout.
-	* scd/ccid-driver.c (ccid_require_get_status): Don't return 0 for
-	token with no interrupt transfer for now.
-	* scd/command.c (open_card_with_request): Fix scan by SERIALNO.
-	* scd/scdaemon.c (update_usb): Remove.
-	(handle_connections): Evaluate need_tick after handle_tick.
-
-2017-01-30 Justus Winter <justus@g10code.com>
-
-	gpgscm: Use a compact vector representation.
-	+ commit 49e2ae65e892f93be7f87cfaae3392b50a99e4b1
-	* tests/gpgscm/scheme-private.h (struct cell): Add a compact vector
-	representation.
-	* tests/gpgscm/scheme.c (vector_length): Use new representation.
-	(vector_size): New macro.
-	(get_vector_object): Use the new representation.
-	(fill_vector): Likewise.
-	(vector_elem): Likewise.
-	(set_vector_elem): Likewise.
-	(mark): Likewise.
-	(gc): Likewise. Be careful not to confuse immediate values for type
-	flags.
-	(finalize_cell): Vectors now require finalization.
-
-	gpgscm: Provide framework for immediate values.
-	+ commit e343984fc50e87830905614dc87f83f810551ad1
-	* tests/gpgscm/scheme.c (IMMEDIATE_TAG): New macro.
-	({is,set,clr}_immediate): Likewise.
-	(enum scheme_types): Make type tags disjoint from immediate values.
-	(TYPE_BITS): We need one more bit now.
-	(ADJ,T_MASKTYPE): Compute values.
-
-	gpgscm: Fix setting the line of the first gc reservation.
-	+ commit d27a4435bd8c0f0971d51ddf454422fc77d48271
-	* tests/gpgscm/scheme.c (_gc_disable): Negate guard.
-
-	gpgscm: Introduce macro for the vector length.
-	+ commit 489edf84c9a9c2122cef1b4e678154521525b54a
-	* tests/gpgscm/scheme.c (vector_length): New macro.
-	(get_vector_object): Use the new macro.
-	(oblist_add_by_name): Likewise.
-	(oblist_find_by_name): Likewise.
-	(oblist_all_symbols): Likewise.
-	(mk_vector): Likewise.
-	(mark): Likewise.
-	(new_slot_spec_in_env): Likewise.
-	(find_slot_spec_in_env): Likewise.
-	(opexe_2): Likewise.
-	(opexe_5): Likewise.
-
-	Revert "tests: Add test demonstrating issue2929."
-	+ commit 59048b0f1aa77313573a1004cd3a9f02692a7521
-	This reverts commit 5aafa56dffefe3fac55b9d0555c7c86e8a07f072.
-
-2017-01-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix GetSlotStatus.
-	+ commit 2a025039c1817c7f75c35a898884849a8e5dc926
-	* scd/apdu.c (get_status_reader): Add ON_WIRE arg, here.
-	(ct_get_status, pcsc_get_status_direct, pcsc_get_status_wrapped)
-	(pcsc_get_status, get_status_ccid, my_rapdu_get_status): Likewise.
-	(reset_pcsc_reader_wrapped, open_pcsc_reader_wrapped): Follow the
-	change.
-	(apdu_get_status_internal): It's lower-level driver which judge
-	it's not needed. Otherwise, it can't detect the removal.
-	* scd/ccid-driver.c (ccid_slot_status): After the POWERED_OFF check,
-	we can skip sending GetSlotStatus packet on wire, when no need.
-
-	scd: Don't send GET_STATUS packet if not needed.
-	+ commit 7c8eee4d396a751d41fd1ee1e1b87b851fca172a
-	* scd/apdu.c (apdu_get_status_internal): Add ON_WIRE arg.
-	(apdu_connect): Call apdu_get_status_internal with ON_WIRE enabled.
-	(apdu_get_status): For periodical check, call apdu_get_status_internal
-	with ON_WIRE disabled.
-
-	scd: Fix cancel INTERRUPT transfer.
-	+ commit 216afba0d99582d0fbae1d6e925f4ddb349d9de3
-	* scd/ccid-driver.c (do_close_reader): Don't lock events, but check the
-	return value of libusb_cancel_transfer.
-
-2017-01-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: More changes on watching removal of card/reader.
-	+ commit f3d9b2582bcaa1936b4fed5ec42a889b02df2f42
-	* scd/app-common.h (struct app_ctx_s): Rename field to
-	periodical_check_needed.
-	* scd/scdaemon.c (update_usb): Rename from update_fdset_for_usb.
-	Don't use libusb_get_pollfds any more.
-	(scd_kick_the_loop): New.
-	(need_tick): Follow the rename.
-	(handle_connections): No libusb event handling here.
-	* scd/app.c (app_new_register): Follow the change of rename.
-	(select_application, scd_update_reader_status_file): Likewise.
-	* scd/ccid-driver.c (ccid_usb_thread_is_alive): New.
-	(intr_cb): Call scd_kick_the_loop.
-	(ccid_usb_thread): New. Thread to invoke INTERRUPT callback.
-	(ccid_open_usb_reader): Add thread invocation.
-	(ccid_require_get_status): Remove
-	LIBUSB_WORKS_EXPECTED_FOR_INTERRUPT_ENDP.
-	(do_close_reader): Carefully handle handle->transfer.
-	(get_escaped_usb_string): Insert npth_unprotect/npth_protect.
-	(do_close_reader, bulk_out, bulk_in, abort_cmd, ccid_slot_status)
-	(ccid_transceive, ccid_transceive_secure): Likewise.
-
-	scd: Fix release of transfer object.
-	+ commit f92fe33f11c44f14fd31682259fcd231e8fa9e75
-	* scd/ccid-driver.c (intr_cb): Handle LIBUSB_TRANSFER_CANCELLED.
-	(do_close_reader): When callback is active, call
-	libusb_cancel_transfer and wait callback is fired off.
-
-	scd: Improve watching USB device removal.
-	+ commit 25cc8575da9a9b8bf60c64c8059cb5f73cc52e1d
-	* scd/apdu.c(struct reader_table_s): Add require_get_status.
-	(apdu_connect): Change return value meaning. Call apdu_reset here.
-	* scd/app.c (app_new_register): Add require_get_status.
-	(select_application): Use the return value of apdu_connect.
-	(scd_update_reader_status_file): Call update_fdset_for_usb with
-	checking all_have_intr_endp.
-	(app_list_start, app_list_finish): Remove.
-	* scd/ccid-driver.c (struct ccid_driver_s): Add transfer.
-	(intr_cb): Don't call libusb_transfer in this callback.
-	(ccid_require_get_status): New.
-	(do_close_reader): Call libusb_transfer here.
-	* scd/scdaemon.c (update_fdset_for_usb): Remove the first argument.
-
-	scd: Wake up the select when new USB scan.
-	+ commit 031e3fa7b9a6770a4de1a184555250feeba0d26f
-	* scd/scdaemon.c (update_fdset_for_usb): Wake up the select(2).
-	(handle_connections): Use a kind of "self-pipe" technique.
-
-2017-01-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Only submit apdu_get_status when needed.
-	+ commit 881dcdfd84ebad36bff20c895e629025bed9d94e
-	* scd/apdu.c (apdu_dev_list_finish): Return Boolean value if
-	all device support INTERRUPT transfer.
-	* scd/ccid-driver.c (ccid_dev_scan_finish): Likewise.
-	* scd/app.c (app_new_register): Fix initial value of card_status.
-	(select_application): Call update_fdset_for_usb.
-	(scd_update_reader_status_file): Ditto.
-	* scd/scdaemon.c (update_fdset_for_usb, need_tick): New.
-	(handle_connections): Call handle_tick when select returns.
-	Let select watch USB file descriptors, too.
-	Call libusb_handle_events_timeout_completed for INTERRUPT transfer.
-
-	scd: Fix APP reference counting.
-	+ commit 9b06633c811e8815c07d744f20b45405cb082367
-	* scd/app.c (scd_update_reader_status_file): Don't call another
-	release_application_internal.
-	* scd/command.c (open_card_with_request): Don't require APPTYPE !=
-	NULL.
-
-	scd: Add INTERRUPT endp support to CCID driver.
-	+ commit bb5ceb78c333129a44c0144f2cf49b17ede898f1
-	* scd/app.c (scd_update_reader_status_file): Fix releas of APP.
-	* scd/ccid-driver.c (struct ccid_driver_s): Add INTR_BUF.
-	(intr_cb, ccid_setup_intr): New.
-	(ccid_open_usb_reader): Call ccid_setup_intr.
-	(ccid_slot_status): Return CCID_DRIVER_ERR_NO_READER when removed.
-
-2017-01-25 Justus Winter <justus@g10code.com>
-
-	gpg: Fix searching for mail addresses in keyrings.
-	+ commit 3f4f20ee6eff052c88647b820d9ecfdbd8df0f40
-	* g10/keyring.c (compare_name): Fix KEYDB_SEARCH_MODE_MAIL* searches
-	in keyrings when the UID is a plain addr-spec.
-
-	tests,w32: Fix GPGME tests requiring a pinentry.
-	+ commit 02a39f0d1ed717f6fc33392e6ce4ab421c3bcbba
-	* tests/gpgme/gpgme-defs.scm: Use our fake pinentry, and configure it
-	to supply the correct passphrase.
-
-	tests,w32: Fix gpgsm signature verification test.
-	+ commit 7d5a0ed792133d875fcedb6e23a9a3682f1a23f9
-	* tests/gpgsm/verify.scm: Use 'call-with-binary-output-file' to avoid
-	automatic line-ending conversion.
-
-	agent: Fix double free.
-	+ commit e175152ef7515921635bf1e00383e812668d13fc
-	* agent/cache.c (agent_store_cache_hit): Make sure the update is
-	atomic.
-
-	tests: Skip GPGME tests that are not built.
-	+ commit 5f2da5d439debf44615a97de788d8f720b517972
-	* tests/gpgme/wrap.scm: Skip tests that are not built.
-
-	tests,w32: Fix locating GPGME's tests on Windows.
-	+ commit 6ecd8b3e71632bbcca524ad735c83bdc2a4c4a4a
-	* tests/gpgme/run-tests.scm: Qualify the test with the executable
-	extension.
-
-2017-01-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Print a warning on Tor problems.
-	+ commit 770b75a746836773909af25ccb9b480e61cea677
-	* dirmngr/ks-engine-hkp.c (tor_not_running_p): New.
-	(map_host): Call that to print a warning.
-	(handle_send_request_error): Ditto and avoid marking the host dead.
-	Also print a tor_config_problem warning. Add arg CTRL; adjust callers
-	to pass that new arg.
-	* g10/call-dirmngr.c (ks_status_cb): Detect and print the new
-	warnings.
-
-	dirmngr: Simplify error returning inside http.c.
-	+ commit 51e5a5e5a46279809848b4ab4419f35045336010
-	* dirmngr/http.c (connect_server): Change to return an gpg_error_t
-	and to store socket at the passed address.
-	(http_raw_connect, send_request): Adjust accordingly.
-
-	dirmngr: New option --disable-ipv4.
-	+ commit 72736af86a501592d974d46ff754a63959e183bd
-	* dirmngr/dirmngr.c (oDisableIPv4): New const.
-	(opts): New option --disable-ipv4.
-	(parse_rereadable_options): Set that option.
-	* dirmngr/dirmngr.h (opt): New field 'disable_ipv4'.
-	* dirmngr/dns-stuff.c (opt_disable_ipv4): bew var.
-	(set_dns_disable_ipv4): New.
-	(resolve_name_standard): Skip v4 addresses when OPT_DISABLE_IPV4 is
-	set.
-	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
-	(send_request): Pass HTTP_FLAG_IGNORE_IPv4 if opt.disable_v4 is set.
-	* dirmngr/crlfetch.c (crl_fetch): Ditto.
-	* dirmngr/ks-engine-finger.c (ks_finger_fetch): Ditto.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-	* dirmngr/ocsp.c (do_ocsp_request): Ditto.
-
-2017-01-24 Justus Winter <justus@g10code.com>
-
-	tools: Use platform abstraction for I/O.
-	+ commit 73d6572bd0f260c5aa1e191a1ba4859ec6fa262c
-	* tools/gpg-connect-agent.c (main): Use a gpgrt_stream_t for
-	'script_fp'. Adapt accordingly.
-
-	tools: Use platform abstraction for I/O.
-	+ commit 77b8aff4e1bb641f497e63230a5006ab70e6c3a8
-	* tools/gpgconf-comp.c (retrieve_options_from_file): Use a
-	gpgrt_stream_t for 'list_file'. Adapt accordingly.
-	(copy_file): Likewise for 'src' and 'dst'.
-	(change_options_file): Likewise for 'src_file' and 'dest_file'.
-	(change_options_program): Likewise for 'src_file' and 'dest_file'.
-	(gc_process_gpgconf_conf): Likewise for 'config'.
-
-	tools: Use platform abstraction for renaming files.
-	+ commit bfd75e9492fc4edd86f4049a62304943a7b2a29a
-	* tools/gpgconf-comp.c (gc_component_change_options): Use
-	'gnupg_rename_file'. Also, block signals across all renames in an
-	attempt to make the whole process atomic.
-
-	tools: Add comments explaining the functions parameters.
-	+ commit 82e309ad06884e54693f4856412984331febdda0
-	* tools/gpgconf-comp.c (change_options_file): Add comments explaining
-	the functions parameters.
-	(change_options_program): Likewise.
-
-	tools: Improve error handling.
-	+ commit b0348fdb26637b0bcbd68a96c1746a1613b309af
-	* tools/gpgconf-comp.c (gp_component_change_options): Improve error
-	handling when reading from stdin.
-
-	tools: Fix memory leak.
-	+ commit 5b28f025085b386e0ec49535d4cd3f875a414eb0
-	* tools/gpgconf-comp.c (change_options_file): Fix leak.
-
-	tests: Add test demonstrating issue2929.
-	+ commit 5aafa56dffefe3fac55b9d0555c7c86e8a07f072
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/issue2929.scm: New file.
-
-	tests: Enable gpgconf test.
-	+ commit 628ff843466b42309f850b8d65b13cf5f586b81f
-	* tests/openpgp/Makefile.am (XTESTS): Re-add gpgconf.scm.
-
-2017-01-23 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.18.
-	+ commit f8289b1d28f501d2f37bf9ccb5e42f7fb27b4688
-
-
-	build: Change make distcheck configure and temp. remove gpgconf.scm.
-	+ commit 25e029823813e190a18b601af60efcb1fb3b84af
-	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Also test gpgtar and
-	wks-tools. Disable ntbtls.
-	* tests/openpgp/Makefile.am (XTESTS): Temporary remove gpgconf.scm.
-
-	Fix format string errors and some missing error case initialization.
-	+ commit af5979a42b9468ffe0f3ac6de5a77d982c5cf8a0
-	* common/logging.c (do_logv): Remove extra parentheses in comparison.
-
-	* dirmngr/dns-stuff.c (resolve_addr_libdns): Init RES so that
-	dns_res_close is given a defined value in the error case.
-
-	* dirmngr/http.c (cookie_read, cookie_write) HTTP_USE_NTBTLS: Fix
-	format string char.
-
-	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Remove duplicate "const".
-	* dirmngr/ks-engine-http.c (ks_http_help): Ditto.
-	* dirmngr/ks-engine-kdns.c (ks_kdns_help): Ditto.
-	* dirmngr/ks-engine-ldap.c (ks_ldap_help): Ditto.
-
-	* scd/app-p15.c (send_keypairinfo, do_getattr): Fix format string
-	char.
-	* tools/gpgconf-comp.c (gpg_agent_runtime_change): Init PID for the
-	error case.
-	(scdaemon_runtime_change): Ditto.
-	(dirmngr_runtime_change): Ditto.
-
-	* tools/gpgconf.c (query_swdb): Init VALUE_SIZE_UL.
-
-	dirmngr: On SIGHUP mark all keyservers alive.
-	+ commit 3ca3da8fc4ef802b8cceec5fde398a07b4888848
-	* dirmngr/ks-engine-hkp.c (ks_hkp_reload): New.
-	* dirmngr/dirmngr.c (dirmngr_sighup_action): Call it.
-
-2017-01-23 Gaetan Bisson <bisson@archlinux.org>
-
-	libdns: Hack to skip negation term.
-	+ commit d4c0187dd93163f12e9f953366adef81ecf526a6
-	* dirmngr/dns.c (dns_nssconf_loadfile): Skip negation terms in
-	nsswitch.conf parser.
-
-2017-01-23 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Print debug message only with --debug.
-	+ commit 9ae0b81e4ff08712da642456d0164f81924a91e4
-	* dirmngr/dns-stuff.c (libdns_init): Call log_debug only if opt_debug
-	is set.
-
-2017-01-23 Phil Pennock <gnupg-devel@spodhuis.org>
-
-	dirmngr: Handle missing nsswitch.conf.
-	+ commit 88ade475c56ac3712d6bd6d41ae38e1421dcb320
-	* dirmngr/dns-stuff.c (libdns_init): Fallback to files,dns.
-
-2017-01-23 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	gpg: Fix misleading log message when checking regexp.
-	+ commit a85731ada2d361eacddc5ae92f80d34792dd4b5e
-	* src/trustdb.c (check_regexp): Correctly print whether the
-	regexp matched or not.
-
-2017-01-23 Werner Koch <wk@gnupg.org>
-
-	gpg: New export and import options "backup" and "restore".
-	+ commit 953d4ec6afd1b42feb7465ee57e48d72f033019a
-	* g10/export.c (parse_export_options): Add "backup" and its alias
-	"export-backup".
-	(do_export_one_keyblock): Export ring trust packets in backup mode.
-	* g10/import.c (parse_import_options): Add "restore" and its alias
-	"import-restore".
-	(read_block): Import ring trust packets.
-
-2017-01-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix INTERRUPT transfer.
-	+ commit 21c9ebb908c2ad2e322e7a13e59e5880494c4d67
-	* scd/ccid-driver.c (find_endpoint): Don't return Bulk endpoint as
-	Interrupt endpoint.
-	(ccid_poll): Call libusb_interrupt_transfer.
-
-2017-01-19 Werner Koch <wk@gnupg.org>
-
-	build: Print a commit id in the generated ChangeLog.
-	+ commit e926f30a1cda75f6334b79c303b5134f0441a3dc
-	* build-aux/gitlog-to-changelog: Print an extra line with the commit
-	id.
-
-	common: Fix buffer copy code again.
-	+ commit e031b3c16cfec583c4322c84d299b355f0849c77
-	* common/exectool.c (my_error_from_errno): Remove.
-	(copy_buffer_do_copy): Do without var RC.
-	(copy_buffer_flush): Ditto. Use ERRNO instead of es_write return
-	code.
-	(gnupg_exec_tool): Correctly return errors from es_read.
-
-2017-01-19 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	gpg: Allow to freeze faked system time.
-	+ commit 3daeef702b2e6a42f0f396b828f86ffc3f33fc88
-	* g10/gpg.c (main): If the parameter for --faked-system-time
-	ends with a '!', freeze time at the specified point.
-	* common/gettime.c (gnupg_set_time): Allow to freeze the time
-	at an arbitrary time instead of only the current time.
-	* doc/gpg.texi: Update documentation for --faked-system-time.
-
-2017-01-19 Werner Koch <wk@gnupg.org>
-
-	common: Clarify use of vars in buffer copy code.
-	+ commit 55c9212a2338bf0b07c8cf3a69bcedaa28d48d43
-	* common/exectool.c (my_error_from_errno): New.
-	(copy_buffer_do_copy): Use separate vars for errno values and
-	gpg-error values for clarity. s/assert/log_assert/.
-	(copy_buffer_flush): Ditto.
-	(gnupg_exec_tool_stream): Use gpg_err_code when testing.
-
-2017-01-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Add setup of CA for NTBTLS.
-	+ commit 367349b4dcc97718f8ae1163d1389d2a46fc3453
-	* dirmngr/http.c HTTP_USE_NTBTLS (http_session_new): Add CA by
-	ntbtls_set_ca_chain.
-
-2017-01-18 Justus Winter <justus@g10code.com>
-
-	common: Fix flushing copy buffers.
-	+ commit 34fa2d79a07a079be472c3ff486debfdac8c6070
-	* common/exectool.c (copy_buffer_flush): Write and flush the data, but
-	do not hide EAGAIN from the caller.
-	(gnupg_exec_tool_stream): Retry on EAGAIN.
-
-2017-01-18 Werner Koch <wk@gnupg.org>
-
-	agent: Reduce sleep time in the progress callback.
-	+ commit 3d356d165aed7d76a3ea811b1d24ed0a05ac90d4
-	* agent/gpg-agent.c (agent_libgcrypt_progress_cb): Reduce sleep time
-	from 100ms to 1ms or use gpgrt_yield when build against a recent
-	libgpg-error.
-
-	gpgconf: Allow "all" for --launch, --kill, and --reload.
-	+ commit 2312248b2e3adffa52d8a3ac4f24fe2c88f0f569
-	* tools/gpgconf-comp.c (gc_component_launch): Allow -1 for COMPONENT.
-	(gc_component_kill): Ditto.
-	(gc_component_reload): For robustness change the condition to < 0.
-	* tools/gpgconf.c (main) <aLaunch, aKill, aReload>: Support argument
-	"all".
-
-	gpg: Remove unused definitions.
-	+ commit 701f54eccf3da3319dd6d74f46b852c64d90bc52
-	* g10/keydb.h (rt_UNKNOWN, rt_RING): Remove constants.
-	(keyblock_pos_struct, KBPOS): Remove struct and type.
-
-2017-01-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Cleanup SERIALNO protocol.
-	+ commit 79cea89774e6327b6785e22b7057f9e3e188ac2b
-	* scd/app.c (app_get_serial_and_stamp): Remove.
-	(app_get_serialno): New.
-	(app_write_learn_status): Use send_status_direct.
-	(app_getattr): Use app_get_serialno for SERIALNO and
-	send with send_status_direct.
-	* scd/app-openpgp.c (do_getattr): Likewise.
-	* scd/command.c (cmd_serialno): Don't send TIMESTAMP of 0.
-	(cmd_learn): Likewise. Don't inquire with TIMESTAMP of 0.
-
-	scd: Add "card_list" sub command for GETINFO.
-	+ commit 8b1f24a29ebc7651437c01990215a55b1136dae0
-	* scd/app.c (app_send_card_list): New.
-	* scd/command.c (cmd_getinfo): Fix "status" sub command.
-	Add "card_list" sub command.
-
-2017-01-17 Werner Koch <wk@gnupg.org>
-
-	build: Handle packages with dashes in --find-version.
-	+ commit a09f258b1412209763222e2e81bab79663e4d685
-	* autogen.sh (--find-version): Improve version extraction.
-	* (--help): Extend.
-
-	gpg: Clean bogus subkey binding when cleaning a key.
-	+ commit 356323768a1a29138581d0aceed0336ab8be0d5c
-	* g10/trust.c (clean_key): Also clean bogus subkey bindings.
-
-	gpg: Sync print of additional sig data in --edit-key.
-	+ commit 766c25018b288a7185c6da6adac0dec01a64e94a
-	* g10/keylist.c (show_policy_url): Implement MODE -1.
-	(show_keyserver_url): Ditto.
-	(show_notation): Ditto.
-	* g10/keyedit.c (print_one_sig): Print policy URL, keyserver URL and
-	notation data to the tty.
-
-	common: Remove unused function tty_print_string.
-	+ commit bae42e543799a428e59bad870aed9719dd6e6e45
-	* common/ttyio.c (tty_print_string): Rename to ...
-	(do_print_string): this. Make local. Simplify FP case by using
-	print_utf8_buffer. Change caller.
-
-	gpg: Prepare some key cleaning function for use with secret key packets.
-	+ commit adbfbf608e75cdd72ae7b3a538b91bc0e236a18f
-	* g10/trust.c (mark_usable_uid_certs): Allow use of secret key packets.
-	(clean_sigs_from_uid): Ditto.
-	(clean_uid_from_key): Ditto.
-	(clean_one_uid): Ditto.
-	(clean_key): Ditto.
-
-2017-01-16 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Implement hkps lookups using literal addresses.
-	+ commit e6aebfe3d0f16c483296fd125b66a44017fe15f4
-	* dirmngr/ks-engine-hkp.c (map_host): For literal addresses do a
-	reverse lookup.
-
-	dirmngr: Allow reverse DNS lookups in Tor-mode.
-	+ commit 9850124c7bdf0a0e7c1866abc85f3437257d7095
-	* dirmngr/dns-stuff.c (resolve_dns_name): Move up in the file.
-	(resolve_addr_libdns): New.
-	(resolve_dns_addr): Divert to resolve_dns_addr.
-
-	dirmngr: Avoid network queries for literal IP addresses.
-	+ commit daae97bc14742c75408c4eb05808a2102cfe2bcf
-	* dirmngr/dns-stuff.c (resolve_name_libdns): USe flags AI_NUMERICHOST
-	for literal IP addresses.
-	(resolve_name_standard): Ditto.
-
-	dirmngr: Fix URL creation for literal IPv6 addresses in HKP.
-	+ commit 82646bbf1a5a7d745da81b239a12667a51703dc1
-	* dirmngr/dns-stuff.c (is_ip_address): Make the return value depend on
-	the address family.
-	* dirmngr/ks-engine-hkp.c (map_host): Rename arg R_POOLNAME to
-	R_HTTPHOST because that is its purpose. Note that the former
-	behaviour of storing a NULL to indicate that it is not a pool has not
-	been used.
-	(make_host_part): Ditto.
-	(make_host_part): Make sure that literal v6 addresses are correclty
-	marked in the constructed URL.
-
-2017-01-16 Justus Winter <justus@g10code.com>
-
-	tests: Improve GPGHOME handling.
-	+ commit 8b1611a9605b636db3e07a9d81016a11b318724c
-	* tests/openpgp/defs.scm (GPGHOME): New variable.
-	* tests/openpgp/ssh-import.scm: Remove redundant code, use 'path-join'.
-	* tests/openpgp/tofu.scm: Likewise.
-
-2017-01-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Ask specific SERIALNO for pksign/pkdecrypt.
-	+ commit 0801f49b0dc7102943f0e9fa51061f50f5708ca6
-	* agent/call-scd.c (agent_card_serialno): Add DEMAND argument.
-	* agent/command-ssh.c (card_key_available): Follow the change.
-	* agent/learncard.c (agent_handle_learn): Likewise.
-	* agent/divert-scd.c (ask_for_card): Use DEMAND argument.
-
-	scd: Add --demand option for SERIALNO.
-	+ commit 2e6f1c99d4f66a23a752092397e20a84964edf48
-	* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
-	arguments. Return matched APP with a serial number when specified.
-	* scd/command.c (open_card): Modify for the implicit open only.
-	(open_card_with_request): New for explicit open and support match with a
-	serial number.
-	(cmd_serialno): Support --demand option.
-	(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
-	(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
-	(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
-	the change of open_card.
-
-2017-01-12 Werner Koch <wk@gnupg.org>
-
-	build: Make autogen.sh more POSIX friendly (next try)
-	+ commit 3db76c9277d918dec9721a6439f4db3b3c06aba3
-	* autogen.sh: Fix dd count to 5.
-
-	gpg: Rename a var to avoid a shadowing warning.
-	+ commit c99a09f111c5980ae034faaea61a00d9ad60463c
-	* g10/keygen.c (keygen_set_std_prefs): Rename variable.
-
-	tests: Fix t-gettime for a time_t of 64 and a long of 32 bit.
-	+ commit 5c0777e1ca02ff1767755c417b64d6f78e02f475
-	* configure.ac (AC_CHECK_HEADERS): Add stdint.h.
-	* common/t-gettime.c: Include stdint.h.
-	(UINTMAX_C): Define replacement.
-	(test_isotime2epoch): Use UINTMAX_C for the >32 bit constants.
-
-	build: Make autogen.sh more POSIX friendly.
-	+ commit 3c00b52f7cb0fbd756c0bbe5134b8f2d69c60dd1
-	* autogen.sh: Replace non POSIX "cp -a" and "head -c".
-
-	libdns: Silence -Wstrict-prototypes on some function ptrs.
-	+ commit 97372b39cd9b4c84a083eadbf072fff77799617f
-	* dirmngr/dns.c (dns_rrtype): Ignore -Wstrict-prototypes warning.
-
-	libdns: Provide replacement for EPROTO.
-	+ commit 0fadff9cdde47e42f7e428bc903b3626c67ba9c0
-	* dirmngr/dns.c (EPROTO) !EPROTO: Define to EPROTONOSUPPORT.
-
-2017-01-11 Werner Koch <wk@gnupg.org>
-
-	dirmngr: After a connection failure log a hint if Tor is not running.
-	+ commit 20dfcfe08c618d23134d5d6efef7676b090f30d3
-	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Check whether
-	Tor is running.
-
-	dirmngr: Mark hosts dead on ENETDOWN.
-	+ commit 76fb2febde10da8237bbe7613830b51af2a45139
-	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Take care of
-	ENETDOWN.
-
-	dirmngr: Fix Tor access for v6 addresses.
-	+ commit 09aeac41c97bc8ecb44a09886c7fdbd9a6ec5c7f
-	* dirmngr/http.c (use_socks): New.
-	(my_sock_new_for_addr): New.
-	(connect_server): Replace assuan_sock_new by my_sock_new_for_addr.
-
-	dirmngr: Remove warnings about unused global variables.
-	+ commit 915864e7f0315b0c96315d0bcd48b1b93592353a
-	* dirmngr/crlcache.c (oidstr_issuingDistributionPoint): Comment.
-	* dirmngr/ocsp.c (oidstr_certHash): Comment.
-
-	dirmngr: Implement debug option "network" for http.
-	+ commit da894c48ec3393e7c815f575daa5a52ab37cc102
-	* dirmngr/dirmngr.c (parse_rereadable_options): Set http debugging.
-
-	dirmngr: Add debug code to http.c.
-	+ commit 02ab4b0085f8b4cdfe163d25ddd0fc80753d7f4a
-	* dirmngr/http.c (opt_verbose, opt_debug): New vars.
-	(http_set_verbose): New function.
-	(_my_socket_new): Add debug output.
-	(_my_socket_ref, _my_socket_unref, session_unref): Call log_debug if
-	OPT_DEBUG has ben set to 2 in a debugger.
-	(http_session_new, http_session_ref): Ditto.
-	(send_request, http_start_data): Print debug output for the request.
-	(parse_response): Change to use log_debug_string for the response.
-
-	common: New function log_debug_with_string.
-	+ commit 088d71d3671e74eb088386026f0e439a7e3b5543
-	* common/logging.c (do_logv): Factor some code out to ...
-	(print_prefix): new.
-	(log_logv): Add arg EXTRASTRING and print it. Change all callers to
-	pass NULL for it.
-	(log_debug_with_string): New. Uses EXTRASTRING.
-
-2017-01-11 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	common: Avoid unnecessary ambiguity in argparse.
-	+ commit 7249ab0f95d1f6cb8ee61eefedc79801bb56398f
-	* common/argparse.c (find_long_option): Avoid unnecessary ambiguity.
-
-2017-01-10 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	systemd-user: Enable "systemctl --user reload {dirmngr,gpg-agent}"
-	+ commit a20a450ac4ef10847fd59a5fd3acbbd2bfcaa6a2
-	* doc/examples/systemd-user/*.service: Add ExecReload directives to
-	 indicate the canonical way to reload the services.
-
-	GnuPG recommends reloading the agent and dirmngr with "gpgconf
-	--reload". if anyone is running them as systemd user services, they
-	might ask them to reload in the systemd way, so teach systemd the
-	right thing to do.
-
-2017-01-10 Justus Winter <justus@g10code.com>
-
-	tests: Improve gpgconf test.
-	+ commit 88e42ef08d65d4d1bc29c6cea48df19ca0d5e2bd
-	* tests/openpgp/defs.scm (valgrind): New variable.
-	(gpg-config): Fix clearing an option.
-	* tests/openpgp/gpgconf.scm: Also toggle 'quiet'.
-
-	tools: Fix memory leaks and improve error handling.
-	+ commit 1f5caf90bfaaaf7b9d8c06c12087aeeae3748032
-	* tools/gpgconf-comp.c (gc_option_free): New function.
-	(gc_components_free): Likewise.
-	(gc_components_init): Likewise.
-	(retrieve_options_from_program): Use 'xfree', fix memory leak.
-	(change_options_program): Improve error handling.
-	(gc_component_change_options): Fix memory leaks.
-	* tools/gpgconf.c (main): Initialize components.
-	* tools/gpgconf.h (gc_components_init): New prototype.
-
-	tests: Add test for gpgconf.
-	+ commit c8cfc62125aceee0ca48aab5c8a9fea1ec1ef652
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/defs.scm (percent-encode): New function.
-	(gpg-conf): Generalize so that we can feed stdin.
-	(gpg-config): New function.
-	* tests/openpgp/gpgconf.scm: New file.
-
-	common: Fix fallback code.
-	+ commit bfd6a490129ffc7c7ac8776bf5a5da3b1ddf6d42
-	* common/logging.c (_log_assert): Fix the variant for compilers that
-	do not support __FUNCTION__.
-	* common/logging.h (_log_assert): Likewise.
-
-2017-01-09 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Use "pgpkey-hkps" and "pgpkey-hkp" for SRV record lookups.
-	+ commit 0cc975d8a1cd54115938202432e43263b8893ea4
-	* dirmngr/ks-engine-hkp.c (map_host): Chnage arg NO_SRV to SRVTAG.
-	(make_host_part): Rewrite.
-
-	dirmngr: Do not use a SRV record for HKP if a port was specified.
-	+ commit c2cbe2f87c480c62239dc4c2cbb352acd98cd267
-	* dirmngr/http.h (parsed_uri_s): Add field EXPLICIT_PORT.
-	* dirmngr/http.c (do_parse_uri): That it.
-	* dirmngr/ks-engine-hkp.c (map_host): Add arg NO_SRV.
-	(make_host_part): Ditto.
-	(ks_hkp_resolve): Set NO_SRV from EXPLICIT_PORT.
-	(ks_hkp_search): Ditto.
-	(ks_hkp_get): Ditto.
-	(ks_hkp_put): Ditto.
-
-2017-01-08 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Implement experimental SRV record lookup for WKD.
-	+ commit 88dc3af3d4ae1afe1d5e136bc4c38bc4e7d4cd10
-	* dirmngr/server.c (cmd_wkd_get): Support SRV records.
-
-	dirmngr: Improve debug output for TLS.
-	+ commit 714faea4fa7f30d42e9986358214a99aa8fa57b3
-	* dirmngr/misc.c (dump_cert): Also print SubjectAltNames.
-
-	dirmngr: Change internal SRV lookup API.
-	+ commit 16078f3deea5b82ea26e2f01dbd3ef3a5ce25410
-	* dirmngr/dns-stuff.c (get_dns_srv): Add args SERVICE and PROTO.
-	* dirmngr/http.c (connect_server): Simplify SRV lookup.
-	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
-	* dirmngr/t-dns-stuff.c (main): Adjust for changed get_dns_srv.
-
-	dirmngr: Strip root zone suffix from libdns SRV results.
-	+ commit 9fa94aa10778bbd680315e93b23175423e338c40
-	* dirmngr/dns-stuff.c (getsrv_libdns): Strip trailing dot from the
-	target.
-
-2017-01-06 Werner Koch <wk@gnupg.org>
-
-	agent,w32: Fix annoying output to DebugView.
-	+ commit 8d774904c8066d8c0f19cfffe2d568979bb8c470
-	* agent/gpg-agent.c (startup_fd_list): Do not define for W32.
-	(main) W32: Do not call get_all_open_fds.
-
-2017-01-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for --disable-ccid for scdaemon.
-	+ commit 858e14cd794e2a6125d51e652a754bbe26def997
-	* scd/apdu.c (apdu_dev_list_finish): Don't call ccid_dev_scan_finish
-	with no table.
-	(apdu_open_reader): Only increment when it's zero.
-
-	scd: Fix for --disable-ccid-driver.
-	+ commit 62268a2732dddca7a05ca4cf45d0e4338c7dc3c4
-	* scd/apdu.c HAVE_LIBUSB (apdu_dev_list_start): Conditionalize.
-	HAVE_LIBUSB (apdu_dev_list_finish, apdu_open_reader): Likewise.
-
-	scd: Support multiple readers by CCID driver.
-	+ commit 8a41e73c31adb86d4a7dca4da695e5ad1347811f
-	* scd/apdu.c (new_reader_slot): Lock is now in apdu_dev_list_start.
-	(close_pcsc_reader_direct, close_ccid_reader): RDRNAME is handled...
-	(apdu_close_reader): ... by this function now.
-	(apdu_prepare_exit): Likewise.
-	(open_ccid_reader): Open with dev_list.
-	(apdu_dev_list_start, apdu_dev_list_finish): New.
-	(apdu_open_one_reader): New.
-	(apdu_open_reader): Support multiple readers.
-	* scd/app.c (select_application): With SCAN, opening all readers
-	available, and register as new APP.
-	(app_write_learn_status): app->ref_count == 0 is valid for APP which is
-	not yet used.
-	(app_list_start, app_list_finish): New.
-	* scd/ccid-driver.c (struct ccid_driver_s): Remove RID and BCD_DEVICE.
-	Add BAI.
-	(parse_ccid_descriptor): BCD_DEVICE is now on the arguments.
-	(ccid_dev_scan, ccid_dev_scan_finish): New.
-	(ccid_get_BAI, ccid_compare_BAI, ccid_open_usb_reader): New.
-	(ccid_open_reader): Support multiple readers.
-	(ccid_set_progress_cb, ccid_close_reader): No RID any more.
-
-2017-01-05 Werner Koch <wk@gnupg.org>
-
-	Silence two -Wlogical-op warnings.
-	+ commit 6170eb809033c9d144abf3b1f31f8b936878cdd4
-	* common/tlv.c (parse_ber_header): Avoid compiler warning about a
-	duplicate condition.
-	* tools/gpgtar-create.c (pattern_valid_p): Likewise.
-
-2017-01-05 Justus Winter <justus@g10code.com>
-
-	tests: New test for --{show,override}-session-key.
-	+ commit 168c8c9d79a817c1f08a9ef976dab377f8c4c69e
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/decrypt-session-key.scm: New file.
-
-	tests: Fix macro.
-	+ commit 4ded213698123a425393b89a800fda2a4ec5229d
-	* tests/openpgp/defs.scm (with-ephemeral-home-directory): Make
-	hygienic, use define-macro, do not change to the ephemeral home
-	directory.
-	* tests/gpgsm/setup.scm: Change to the ephemeral home directory.
-	* tests/openpgp/setup.scm: Likewise.
-
-2017-01-04 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	g10: avoid warning when --disable-tofu.
-	+ commit 38671cfe5a2a40bb991619f4cb992c42b5f1e8cd
-	If configured with --disable-tofu, we see compiler warnings about an
-	unused variable. This should remove those warnings.
-
-2017-01-04 Justus Winter <justus@g10code.com>
-
-	tests,w32: Fix locating the components.
-	+ commit 28e149609da44fab600f6a11b385d1c8ca8e7eb9
-	* tests/openpgp/defs.scm (percent-decode): New function.
-	(bin-prefix): New variable.
-	(installed?): Likewise.
-	(tool-hardcoded): Use the new variables.
-	(gpg-conf): Use the new function to decode the values.
-	(gpg-components): Do not use '--build-prefix' when 'installed?'.
-
-2017-01-03 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Make sure Tor mode is also set for DNS on SIGHUP.
-	+ commit 969512401603639e4467ede7d892f1b02582c2c9
-	* dirmngr/dns-stuff.c (enable_dns_tormode): Always succeed.
-	(reload_dns_stuff): Reset tor port.
-	* dirmngr/dirmngr.c (set_tor_mode): Also enable Tor mode for DNS.
-	(main): Remove warning that Tor mode may not fully work.
-	* dirmngr/server.c (cmd_dns_cert): Remove explicit Tor for DNS
-	initialization.
-	* dirmngr/t-dns-stuff.c (main): Remove option --new-circuit and error
-	checking for enable_dns_tormode.
-
-	dirmngr: New debug message on correctly initialized libdns.
-	+ commit 0004d52ba2f1245c84f95a151342ad99fd72ca3d
-	* dirmngr/dns-stuff.c (libdns_init): Add debug level diagnostic on
-	success.
-
-2017-01-02 Justus Winter <justus@g10code.com>
-
-	common: Turn assertions into expressions.
-	+ commit a1e0d4a1e75fc6e6c3392a4e1d1d27005b38d6cc
-	* common/logging.h (log_assert): Turn this into an expression so it
-	can be used in expressions.
-
-	tests: Fix faked time in the TOFU test.
-	+ commit 6d065198337b5242889723481bfa9ce81aa108bb
-	* tests/openpgp/tofu.scm (GPG): Fix time delta.
-
-2017-01-02 Werner Koch <wk@gnupg.org>
-
-	g13: Improve printing of debug infos.
-	+ commit 5b6ebfb9244602d9de31d61c7eceb0c45ac8aa49
-	* g13/g13tuple.c (all_printable): Make it work.
-
-	Replace use of variable-length-arrays.
-	+ commit 6b84ecbf312d98ac8cce9fe5facdc815bc742fa1
-	* common/t-iobuf.c (main): Replace variable-length-array.
-	* g10/gpgcompose.c (mksubpkt_callback): Ditto.
-	(encrypted): Ditto.
-	* g10/t-stutter.c (log_hexdump): Ditto.
-	(oracle_test): Ditto.
-	* g10/tofu.c (get_policy): Ditto. Use "%zu" for size_t.
-	* scd/app-openpgp.c (ecc_writekey): Replace variable-length-array.
-	Check for zero length OID_LEN.
-
-2017-01-02 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fail if too many arguments are given.
-	+ commit b0e14bd6ff8401b12b2b39f75aef94d3ad28017f
-	* tests/gpgscm/scheme.c (opexe_0): Enable check.
-	* tests/gpgscm/tests.scm (test::report): Remove superfluous argument.
-
-	gpgscm: Add 'finally', rework all macros.
-	+ commit b79274a3b7e58f88e9a8c1dc1fb24dd3e983543c
-	* tests/gpgscm/init.scm (finally): New macro.
-	* tests/gpgscm/tests.scm (letfd): Rewrite.
-	(with-working-directory): Likewise.
-	(with-temporary-working-directory): Likewise.
-	(lettmp): Likewise.
-
-	gpgscm: Use boxed values for source locations.
-	+ commit e8b843508dac96e9d0a3140954dd5a3618669cec
-	* tests/gpgscm/scheme-private.h (struct port): Use boxed values for
-	filename and current line. This allows us to use the same Scheme
-	object for labeling all expressions in a file.
-	* tests/gpgscm/scheme.c (file_push): Use boxed type for filename.
-	(mark): Mark location objects of port objects.
-	(gc): Mark location objects in the load stack.
-	(port_clear_location): New function.
-	(port_reset_current_line): Likewise.
-	(port_increment_current_line): Likewise.
-	(file_pop): Adapt accordingly.
-	(port_rep_from_filename): Likewise.
-	(port_rep_from_file): Likewise.
-	(port_close): Likewise.
-	(skipspace): Likewise.
-	(token): Likewise.
-	(_Error_1): Likewise.
-	(opexe_0): Likewise.
-	(opexe_5): Likewise.
-	(scheme_deinit): Likewise.
-	(scheme_load_file): Likewise.
-	(scheme_load_named_file): Likewise.
-
-2017-01-02 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Strip root zone suffix from libdns cname results.
-	+ commit b200e636ab20d2aa93d9f71f3789db5a04af0a56
-	* dirmngr/dns-stuff.c (resolve_name_libdns): Strip trailing dot.
-	(get_dns_cname_libdns): Ditto.
-
-2016-12-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix select_application.
-	+ commit 337690441fcb19343fe56b139f5649bed7d25c83
-	* scd/app.c (select_application): Fix the condition for open.
-
-	scd: Fix card removal monitor.
-	+ commit f300e12a793d59deb1a369713384eaabfa39b3e6
-	* scd/app.c (app_reset): Call send_client_notification with REMOVAL.
-	(scd_update_reader_status_file): Likewise.
-	* scd/command.c (send_client_notifications): Distinguish removal.
-
-2016-12-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Improve internal CCID driver.
-	+ commit cdc8d0bd933b958db878861587322bc541b580b3
-	* scd/ccid-driver.c (scan_or_find_usb_device): Don't scan for
-	configuration but use active configuration. Support alt_setting.
-	(scan_or_find_devices): Support alt_setting.
-	(ccid_open_reader): Support alt_setting.
-
-	scd: Fix a race condition for new_reader_slot.
-	+ commit c48cf7e32ffa02ebdf00265543344c611bef0431
-	* scd/apdu.c (reader_table_lock, apdu_init): New.
-	(new_reader_slot): Serialize by reader_table_lock.
-	* scd/app.c (lock_app, unlock_app, app_new_register): Fix error code
-	usage.
-	(initialize_module_command): Call apdu_init.
-	* scd/scdaemon.c (main): Handle error for initialize_module_command.
-
-2016-12-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: APP centric approach for device management.
-	+ commit 4cc9fc5eb9bd91d943c185d59da4a2b4cb885ee6
-	* scd/app.c (lock_app): Rename from lock_reader and use internal field
-	of APP.
-	(unlock_app): Likewise.
-	(app_dump_state): Use APP.
-	(application_notify_card_reset): Remove.
-	(check_conflict): Change API for APP, instead of SLOT.
-	(check_application_conflict): Likewise.
-	(release_application_internal): New.
-	(app_reset): New.
-	(app_new_register): New.
-	(select_application): Change API for APP, instead of SLOT.
-	(deallocate_app, release_application): Modify for manage link.
-	(report_change): New.
-	(scd_update_reader_status_file): Moved from command.c and
-	use APP list, instead of VREADER.
-	(initialize_module_command): Moved from command.c.
-
-	* scd/command.c (TEST_CARD_REMOVAL): Remove.
-	(IS_LOCKED): Simplify.
-	(vreader_table): Remove.
-	(vreader_slot, update_card_removed): Remove.
-	(do_reset): Call app_reset.
-	(get_current_reader): Remove.
-	(open_card): Add SCAN arg.
-	(cmd_serialno): No retry, since retry is done in lower layer in apdu.c.
-	No do_reset, since it is done in lower layer.
-	Add clearing card_removed flag.
-	(cmd_disconnect): Call apdu_disconnect.
-	(send_client_notifications): Modify for APP.
-	(update_reader_status_file): Remove.
-
-	scd: Simplify monitoring card removal.
-	+ commit f9882d8336feea96e3b5e250e9093f8cca01e08b
-	* scd/apdu.c (struct reader_table_s): Remove any_status, last_status,
-	status, and change_counter field.
-	(new_reader_slot, dump_reader_status, ct_activate_card, open_ct_reader)
-	(connect_pcsc_card, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
-	(open_ccid_reader, apdu_reset): Follow the change.
-	(ct_dump_reader_status): Remove.
-	(apdu_get_status_internal, apdu_get_status): Remove CHANGED arg.
-	(apdu_connect): Follow the change.
-	* scd/command.c (struct vreader_s): Remove reset_failed, any, and
-	changed field.
-	(cmd_getinfo, update_reader_status_file): Follow the change.
-
-2016-12-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Improve internal CCID driver.
-	+ commit c7ec9c42246033e14ebad679d11f3b1fbeed23b7
-	* scd/ccid-driver.c (scan_or_find_usb_device): Fix return value.
-	Support device with multiple CCID interfaces. Fix the case with
-	READERNO. Support partial string match of "reader-port" like PC/SC
-	driver.
-
-2016-12-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix for --disable-libdns usage.
-	+ commit d26c51825e2255fe58305cbc1cd74fa43f80d93e
-	* dirmngr/dns-stuff.c (enable_recursive_resolver, set_dns_nameserver)
-	(reload_dns_stuff): Conditionalize with USE_LIBDNS.
-	(get_h_errno_as_gpg_error): Map HOST_NOT_FOUND to GPG_ERR_NO_NAME.
-
-2016-12-22 Neal H. Walfield <neal@g10code.com>
-
-	tools: Show a clearer error message if a server doesn't support WKS.
-	+ commit 1909e994cb87d6c6866a465f0c20a456d4df46cc
-	* tools/gpg-wks-client.c (command_send): If we fail to lookup the
-	submission address, print a better error message. If it is because
-	the corresponding file doesn't exist, provide the hint that the server
-	probably doesn't support WKS.
-
-2016-12-22 Werner Koch <wk@gnupg.org>
-
-	wks: Let the client ignore missing policy flags.
-	+ commit e917dfcd973a3ebbf5eb584e819ffa89f932bfef
-	* tools/gpg-wks-client.c (command_send): Ignore missing policy flags.
-
-2016-12-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Clean up internal API for APP.
-	+ commit 8431f5a7e88e1f42d75c4a4b61f4aa9b35457204
-	* scd/app-common.h (app_readcert, app_readkey, app_setattr, app_sign,
-	app_auth, app_decipher, app_get_challenge, app_check_pin): Add CTRL as
-	the second argument.
-	* scd/app.c: Supply CTRL to lock_reader calls.
-	* scd/command.c (cmd_readcert, cmd_readkey, cmd_pksign, cmd_auth,
-	cmd_pkdecrypt, cmd_setattr, cmd_random, cmd_checkpin): Follow the
-	change.
-
-2016-12-21 Justus Winter <justus@g10code.com>
-
-	gpgscm: Guard use of union member.
-	+ commit 6e96cdd41a0e55b672309431062f37c4a4a9f485
-	* tests/gpgscm/scheme.c (opexe_5): Check that we have a file port
-	before accessing filename. Fixes a crash on 32-bit architectures.
-
-2016-12-20 Werner Koch <wk@gnupg.org>
-
-	tests: Avoid skipping exectool tests.
-	+ commit 6204f8104fea42d706a68e77e2dc0bca4704bddc
-	* common/t-exectool.c (test_executing_true): Try also /usr/bin/true.
-	(test_executing_false): Try also /usr/bin/false.
-
-2016-12-20 Justus Winter <justus@g10code.com>
-
-	tests: Add test suite for gpgsm.
-	+ commit 36c14139285982def6ad942d4b2d8bef7ed4ea76
-	* configure.ac (AC_CONFIG_FILES): Add new file.
-	* tests/Makefile.am (SUBDIRS): Add new directory.
-	* tests/gpgsm/32100C27173EF6E9C4E9A25D3D69F86D37A4F939: New file.
-	* tests/gpgsm/Makefile.am: Likewise.
-	* tests/gpgsm/cert_dfn_pca01.der: Likewise.
-	* tests/gpgsm/cert_dfn_pca15.der: Likewise.
-	* tests/gpgsm/cert_g10code_test1.der: Likewise.
-	* tests/gpgsm/decrypt.scm: Likewise.
-	* tests/gpgsm/encrypt.scm: Likewise.
-	* tests/gpgsm/export.scm: Likewise.
-	* tests/gpgsm/gpgsm-defs.scm: Likewise.
-	* tests/gpgsm/import.scm: Likewise.
-	* tests/gpgsm/plain-1.cms.asc: Likewise.
-	* tests/gpgsm/plain-2.cms.asc: Likewise.
-	* tests/gpgsm/plain-3.cms.asc: Likewise.
-	* tests/gpgsm/plain-large.cms.asc: Likewise.
-	* tests/gpgsm/run-tests.scm: Likewise.
-	* tests/gpgsm/setup.scm: Likewise.
-	* tests/gpgsm/shell.scm: Likewise.
-	* tests/gpgsm/sign.scm: Likewise.
-	* tests/gpgsm/verify.scm: Likewise.
-
-	tests: Add macro managing ephemeral home directories.
-	+ commit c067a012c764218b94ce8de2914615a895a75f3e
-	* tests/openpgp/defs.scm (with-ephemeral-home-directory): New macro.
-	* tests/openpgp/setup.scm: Use the new macro.
-
-	tests: Move argument parser.
-	+ commit a30c0a6972cabde3858108e9020e900696094843
-	* tests/gpgme/gpgme-defs.scm (flag): Move...
-	* tests/gpgscm/tests.scm: ... over here.
-
-	tests: Add missing encrypted sample, cleanup samples handling.
-	+ commit e2ed3c1597daf3188ddce049cc3c50113d56f1b9
-	* tests/openpgp/Makefile.am (TEST_FILES): Add new file.
-	* tests/openpgp/defs.scm (plain-files): Add 'plain-large'.
-	(all-files): New variable.
-	(create-sample-files): New function.
-	(create-legacy-gpghome): Use new function.
-	* tests/openpgp/plain-large.asc: New file.
-
-2016-12-20 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.17.
-	+ commit ade32464a25fdb35cc0f39e46d303ceba68ea8f6
-
-
-	sm: Remove wrong example from gpgsm --help.
-	+ commit 13465e708bb67e816e4fb3a37c117ad91dc6383f
-	* sm/gpgsm.c (opts): Remove group 303.
-
-	dirmngr: New option --resolver-timeout.
-	+ commit 81c012787fabf734d9c952c6f18ecac21929d4d8
-	* dirmngr/dns-stuff.c (DEFAULT_TIMEOUT): New.
-	(opt_timeout): New var.
-	(set_dns_timeout): New.
-	(libdns_res_open): Set the default timeout.
-	(libdns_res_wait): Use configurable timeout.
-	(resolve_name_libdns): Ditto.
-
-	* dirmngr/dirmngr.c (oResolverTimeout): New const.
-	(opts): New option --resolver-timeout.
-	(parse_rereadable_options): Set that option.
-	(main) <aGPGConfList>: Add --nameserver and --resolver-timeout.
-	* tools/gpgconf-comp.c (gc_options_dirmngr): Add --resolver-timeout
-	and --nameserver.
-
-	* dirmngr/http.c (connect_server): Fix yesterday introduced bug in
-	error diagnostic.
-
-2016-12-19 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix problems with the getsrv function.
-	+ commit af8b68fae39b1378c769e0de6ba6437ea1aac7e3
-	* dirmngr/dns-stuff.c (opt_debug, opt_verbose): New vars.
-	(set_dns_verbose): New func.
-	(libdns_switch_port_p): Add debug output.
-	(resolve_dns_name): Ditto.
-	(get_dns_cert): Ditto.
-	(get_dns_cname): Ditto.
-	(getsrv_libdns, getsrv_standard): Change SRVCOUNT to an unsigend int.
-	(getsrv): Rename to ...
-	((get_dns_srv): this. Add arg R_COUNT and return an error. Add debug
-	output.
-	* dirmngr/http.c: Adjust for chnaged getsrv().
-	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
-	* dirmngr/t-dns-stuff.c (main): Ditto. Call set_dns_verbose.
-	* dirmngr/dirmngr.c (parse_rereadable_options): Call set_dns_verbose.
-
-	build: Add target to sign the windows installer.
-	+ commit 284ec54495dddc9eb0232e959cf994234097578a
-	* build-aux/speedo.mk (w32-sign-installer): New.
-	(AUTHENTICODE_KEY): New.
-	(installer-from-source): Use cp instead of mv. Factor code out to ...
-	(MKSWDB_commands): new macro.
-	(sign-installer): New.
-
-2016-12-19 Justus Winter <justus@g10code.com>
-
-	tests: Use the common test framework for the migration tests.
-	+ commit 65a0d6a24e6299682793f213a9d2bae17c5b12d9
-	* tests/migrations/Makefile.am (reqired_pgms): Add 'gpgscm'.
-	(TESTS_ENVIRONMENT): Populate.
-	(TESTS): Rename to 'XTESTS'.
-	(xcheck): New target.
-	(EXTRA_DIST): Add new files.
-	(CLEANFILES): Remove log files.
-	* tests/migrations/common.scm: Honor 'verbose', fix paths.
-	* tests/migrations/run-tests.scm: New file.
-	* tests/migrations/setup.scm: Likewise.
-
-	tests: Use sequential test runner if only one test is given.
-	+ commit 0bf16d702665a269ce5ef724c927fbbd8f7f1ce9
-	* tests/openpgp/run-tests.scm: Use sequential test runner if only one
-	test is given.
-
-2016-12-19 Werner Koch <wk@gnupg.org>
-
-	dirmngr,w32: Hack around a select problem.
-	+ commit d51499fdc522a696f23c6776c3ab248742f4e06a
-	* dirmngr/dns.c (FD_SETSIZE): Bump up to 1024.
-	(dns_poll): Return an error instead of hitting an assertion failure.
-
-2016-12-19 Neal H. Walfield <neal@g10code.com>
-
-	test: Extend TOFU tests to also check the days with signatures.
-	+ commit aec89a7297bae30f79a63fdc830530e82bab6170
-	* tests/openpgp/tofu.scm (GPGTIME): Define the "standard" base time.
-	(faketime): New function.
-	(days->seconds): Likewise.
-	(GPG): Use faketime.
-	(check-counts): Also check the number of expected days with signatures
-	and encryptions. Update callers. Extend tests.
-
-2016-12-19 Justus Winter <justus@g10code.com>
-
-	tests: New test for --delete-secret-keys.
-	+ commit a1afc450e182af02ad5e6f6ba79e9dc4332ca2bc
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/defs.scm (keys): New variable.
-	(have-public-key?): New function.
-	(have-secret-key?): Likewise.
-	(have-secret-key-file?): Likewise.
-	* tests/openpgp/delete-keys.scm: New file.
-	* tests/openpgp/quick-key-manipulation.scm: Move the accessors to
-	'defs.scm'.
-
-	gpgscm: Change associativity of ::.
-	+ commit a45dc0849da0d944ec8c759bc8e3e733b1eb0079
-	* tests/gpgscm/scheme.c (mk_atom): Change associativity of the ::
-	infix-operator. This makes it possible to naturally express accessing
-	nested structures (e.g. a::b::c).
-
-	gpgscm: Display location when assertions fail.
-	+ commit 3949cbd1128585c9b810713aeffaa1455fb5aed9
-	* tests/gpgscm/lib.scm (assert): Use location information if
-	available.
-
-	gpgscm: Make exception handling more robust.
-	+ commit df00745d6eed7034b218a0c482a46d975425798a
-	* tests/gpgscm/init.scm (throw'): Check that args is a list.
-
-2016-12-19 Andre Heinecke <aheinecke@intevation.de>
-
-	speedo,w32: Use nsExec::ExecToLog to avoid popups.
-	+ commit 026bbf0d5ee4510967e5f1dd3db2dee4687b0612
-	* build-aux/speedo/w32/inst.nsi: Use ExecToLog instead of
-	ExecWait.
-
-2016-12-19 Werner Koch <wk@gnupg.org>
-
-	Remove unused debug flags and add "dns" and "network".
-	+ commit e384405b6e251629fb36bcbba4f5f9ac15a39d10
-	* g10/options.h (DBG_CARD_IO_VALUE, DBG_CARD_IO): Remove.
-	* g10/gpg.c (debug_flags): Remove "cardio".
-	* agent/agent.h (DBG_COMMAND_VALUE, DBG_COMMAND): Remove.
-	* agent/gpg-agent.c (debug_flags): Remove "command".
-	* scd/scdaemon.h (DBG_COMMAND_VALUE, DBG_COMMAND): Remove.
-	* scd/scdaemon.c (debug_flags): Remove "command".
-	* dirmngr/dirmngr.h (DBG_DNS_VALUE, DBG_DNS): New.
-	(DBG_NETWORK_VALUE, DNG_NETWORK): New.
-	* dirmngr/dirmngr.c (debug_flags): Add "dns" and "network".
-
-2016-12-17 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix setup of libdns for W32.
-	+ commit e77b924fec1082faae48cdd2ff8474874a22bdf7
-	* configure.ac (DNSLIB) {W32: Add -liphlpapi.
-	* dirmngr/dns-stuff.c W32: Include iphlpapi.h and define
-	WIN32_LEAN_AND_MEAN.
-	(libdns_init) W32: Use GetNetworkParams to get the nameserver.
-	* dirmngr/t-dns-stuff.c (init_sockets): New.
-	(main): Call it.
-
-2016-12-16 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Auto-switch from Tor port to Torbrowser port.
-	+ commit 024dbd7162fc1a7694176ebad3c21ee3ea67c024
-	* dirmngr/dns-stuff.c (libdns_tor_port): New var.
-	(set_dns_nameserver): Clear that var.
-	(libdns_init): Init var to the default port.
-	(libdns_switch_port_p): New func.
-	(resolve_dns_name): Use function to switch the port
-	(get_dns_cert): Ditto.
-	(getsrv): Ditto.
-	(get_dns_cname): Ditto.
-
-	dirmngr: Use one context for all libdns queries.
-	+ commit c4e8a3194d6b92f596a6483e486c645de7d2ddd1
-	* dirmngr/dns-stuff.c (libdns_reinit_pending): New var.
-	(enable_recursive_resolver): Set var.
-	(set_dns_nameserver): Ditto.
-	(libdns_init): Avoid double initialization.
-	(libdns_deinit): New.
-	(reload_dns_stuff): New.
-	(libdns_res_open): Act upon LIBDNS_REINIT_PENDING.
-	* dirmngr/t-dns-stuff.c (main): Call reload_dns_stuff to release
-	memory.
-	* dirmngr/dirmngr.c (cleanup): Ditto.
-	(dirmngr_sighup_action): Call reload_dns_stuff to set
-	LIBDNS_REINIT_PENDING.
-
-	dirmngr: Pass Tor credentials to libdns.
-	+ commit ddb48086833f8b86f0f0d69b21a23f245090ea7a
-	* dirmngr/dns-stuff.c (tor_credentials): Replace by ...
-	(tor_socks_user, tor_socks_password): new vars.
-	(enable_dns_tormode): Set these new vars.
-	(libdns_res_open): Tell libdns the socks credentials.
-
-	dirmngr: Factor common libdns code out.
-	+ commit 59d3c3e4baffff52548fb5d1766ebf02dd8e1bec
-	* dirmngr/dns-stuff.c (libdns_res_open): New. Replace all libdns_init
-	and dns-res_open by a call to this func.
-	(libdns_res_submit): New wrapper. Replace all dns_res_sumbit calls.
-	(libdns_res_wait): New function.
-	(resolve_name_libdns): Replace loop by libdns_res_wait.
-	(get_dns_cert_libdns): Ditto.
-	(getsrv_libdns): Ditto.
-
-	gpg,sm: A few more option for --gpgconf-list.
-	+ commit 48671f295ff233765689b6a73021f83ab845a28f
-	* g10/gpg.c (gpgconf_list): Add --compliance and
-	--default-new-key-algo.
-	(parse_compliance_option):
-	* sm/gpgsm.c (main) <gpgconf-list>: Add --enable-crl-checks.
-
-	gpgconf: New command --apply-profile.
-	+ commit 76cd64a5baf6057b199c01f7999b327f1f4a87bc
-	* tools/gpgconf.c (aApplyProfile): New.
-	(opts): New command --apply-profile.
-	(main): Implement that command.
-	* tools/gpgconf-comp.c (option_check_validity): Add arg VERBATIM.
-	(change_options_program): Ditto.
-	(change_one_value): Ditto.
-	(gc_component_change_options): Ditto.
-	(gc_apply_profile): New.
-
-	gpgconf: Fix --apply-defaults.
-	+ commit 6ca3c28da46873416822bf6ab7893db6c56a49d6
-	* tools/gpgconf-comp.c: Skip pinentry also in process_all mode.
-
-2016-12-16 Justus Winter <justus@g10code.com>
-
-	doc: Mention extra information in pinentry status lines.
-	+ commit 12a5265afa7f87ad92fb571e0882e57b07a3c267
-	* doc/DETAILS: Mention that 'PINENTRY_LAUNCHED may carry extra
-	information.
-
-	sm: Fix agent communication.
-	+ commit 3c7d6a1769ed6cc90d86247a814a0dce341512a3
-	* sm/call-agent.c (gpgsm_agent_pksign): Fix passing the control handle
-	to the callback.
-	(gpgsm_scd_pksign): Likewise.
-	(gpgsm_agent_reaedkey): Likewise.
-
-2016-12-16 Neal H. Walfield <neal@g10code.com>
-
-	doc: Fix manual.
-	+ commit a165fa09be4bfbeb97ebe25d551a9045255e5028
-	* doc/gpg.texi: Remove comment about options being parsed in-order.
-	They aren't.
-
-	g10: Use total days, not total messages to compute TOFU validity.
-	+ commit 4a2c210b75d4266e289712e73a42c286aabb07f0
-	* g10/tofu.c (write_stats_status): Use the number of days with
-	signatures / encryptions to compute the validity, not the total number
-	of signatures / encryptions.
-	(BASIC_TRUST_THRESHOLD): Adjust given the new semantics.
-	(FULL_TRUST_THRESHOLD): Likewise.
-
-	g10: Extend TOFU_STATS to emit <sign-days> and <encyrption-days>
-	+ commit 94f6b9010d2e80a75ccbb21426faf0b30195f1ab
-	* doc/DETAILS: Add SIGN-DAYS and ENCRYPT-DAYS to the TOFU_STATS status
-	line.
-	* g10/tofu.c (write_stats_status): Take additional parameters
-	signature_days and encryption_days. Update callers. Include them in
-	the tfs record and TOFU status lines.
-	(show_statistics): Compute the number of days on which we saw a
-	message signed by FINGERPRINT, and the number of days on which we
-	encrypted a message to it.
-
-2016-12-16 Justus Winter <justus@g10code.com>
-
-	doc: Improve section on unattended key generation.
-	+ commit ca02a8b78fca8815388a859962584d75169ae3ee
-	* doc/gpg.texi: Improve the subsection on unattended key generation by
-	suggesting the quick key manipulation interface as an alternative, and
-	by suggesting alternatives to '%pubring' and '%secring'. Simplify
-	examples accordingly.
-
-	doc: Add documentation for programmatic use of GnuPG.
-	+ commit 116a78eb869c4c589228bd0d6deff7c7a9f92dfb
-	* doc/gpg.texi: New subsections on programmatic use of GnuPG,
-	ephemeral home directories, and the quick key manipulation interface.
-
-2016-12-16 Neal H. Walfield <neal@g10code.com>
-
-	g10: On a TOFU conflict, write the conflicting keys to the status fd.
-	+ commit fea9da4a8afab6f3a49cdbbcc4a7a21f27a6d3e8
-	* g10/tofu.c (ask_about_binding): Emit all of the conflicting keys and
-	their statistics on the status fd.
-	(get_trust): Likewise, if we don't call ask_about_binding.
-	(show_statistics): Have the caller pass the policy as returned by
-	get_policy. Add argument only_status_fd and don't emit any output on
-	stdout if it is set. Update callers.
-
-	g10: Add missing space.
-	+ commit 6caa2d0ba2bfc0ae93878738b0169483f6b6b462
-	* g10/tofu.c (tofu_register_encryption): Add missing space.
-
-2016-12-15 Justus Winter <justus@g10code.com>
-
-	g10: Avoid translating simple error messages.
-	+ commit 6b16b02109f4bb5b934e456667ff4c0ba7bc85fd
-	* g10/gpg.c (main): Avoid translating arguments to 'wrong_args'.
-
-	g10: Rework the --quick-* interface.
-	+ commit 41ad04d403de05abe54280d2a84aa51a603194e4
-	* g10/gpg.c (opts): Rename options.
-	(main): Update errors.
-	* doc/gpg.texi: Update accordingly.
-
-	g10: Rename 'card-edit' to 'edit-card'.
-	+ commit 6e4396723e9e5865015ebf7033628fa3919cf7d1
-	* g10/gpg.c (opts): Rename option.
-	* g10/call-agent.c (agent_scd_learn): Update comment.
-	* doc/gpg.texi: Update accordingly.
-
-	g10: Spell out --desig-revoke.
-	+ commit 3c691097ca144e9a1d4c9185636c59a848bec85c
-	* g10/gpg.c (opts): Rename option.
-	* doc/gpg.texi: Update accordingly.
-
-	g10: Shorten unreasonably long option.
-	+ commit c252627c6fd93bc305c5a5a2f013c3de2d45c6b0
-	* g10/gpg.c (opts): Rename 'generate-revocation-certificate' to
-	'generate-revocation'.
-	* doc/gpg.texi: Update accordingly.
-	* po: Update translations.
-
-	doc: Add aliases of all changed options.
-	+ commit bc6b76ef26f31c54ae1c29c761b8ecc437fcf565
-	* doc/gpg.texi: Add the old version of every option that was updated
-	with the last change set.
-	* doc/gpgsm.texi: Likewise.
-
-2016-12-15 Werner Koch <wk@gnupg.org>
-
-	dirmngr: First patch to re-enable Tor support.
-	+ commit 2d1760ffe2ff46b77bd0f38db8b781d9564ae999
-	* dirmngr/dns-stuff.c (SOCKS_PORT, TOR_PORT, TOR_PORT2): New
-	constants.
-	(libdns_init): Start adding tor support.
-	(resolve_name_libdns): Pass socks hosts to dns_res_open.
-	(get_dns_cert_libdns): Ditto.
-	(getsrv_libdns): Ditto.
-	(get_dns_cname_libdns): Ditto.
-
-2016-12-15 Justus Winter <justus@g10code.com>
-
-	build: Fix distcheck.
-	+ commit 0e2055c7d30d987a7a74923a7080b80cce470601
-	* tests/gpgme/Makefile.am (CLEANFILES): New variable, clean test logs.
-
-2016-12-14 Justus Winter <justus@g10code.com>
-
-	tests: Reuse GPGME's tests.
-	+ commit 948cca9c99e701a1668bb5fd6e25f07e35381b4d
-	* configure.ac (AC_CONFIG_FILES): Add new Makefile.
-	* tests/Makefile.am (SUBDIRS): Add new directory.
-	* tests/gpgme/Makefile.am: New file.
-	* tests/gpgme/gpgme-defs.scm: Likewise.
-	* tests/gpgme/run-tests.scm: Likewise.
-	* tests/gpgme/setup.scm: Likewise.
-	* tests/gpgme/wrap.scm: Likewise.
-
-	common: Support locating components in the build tree.
-	+ commit ca1e9749bfb069d90aa44efbf6f3d611b6104c1b
-	* common/homedir.c (gnupg_build_directory): New variable.
-	(gnupg_module_name_called): Likewise.
-	(gnupg_set_builddir): New function.
-	(gnupg_set_builddir_from_env): Likewise.
-	(gnupg_module_name): Support locating components in the build tree.
-	* common/util.h (gnupg_set_builddir): New prototype.
-	* tests/openpgp/defs.scm (tools): Drop 'gpg and 'gpg-agent.
-	(tool): Rename to 'tool-hardcoded.
-	(gpg-conf): New function, with accessors for the results.
-	(gpg-components): New variable.
-	(tool): New function.
-	* tools/gpgconf.c (enum cmd_and_opt_values): New key.
-	(opts): New option '--build-prefix'.
-	(main): Handle new option.
-
-	tests: Rework check for trust models.
-	+ commit 55dc81125abc43cd3cc8db951fc3b8a81767942d
-	* tests/openpgp/defs.scm (gpg-has-option?): New function.
-	(have-opt-always-trust): Use a simpler test for that option. This way
-	that is less distracting when we run the tests with verbose=3.
-
-2016-12-14 Werner Koch <wk@gnupg.org>
-
-	dirmngr: New configure option --disable-libdns.
-	+ commit d34a2bb410c7c770d26430d69ff77bd83fc407f1
-	* configure.ac: Add option --disable-libdns
-	(USE_LIBDNS): New ac_subst and am_conditional.
-	(USE_C99_CFLAGS): Set only if libdns is used.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Move dns.c and dns.h to ...
-	(dirmngr_SOURCES) USE_LIBDNS0: here.
-	(t_common_src): Ditto.
-	* dirmngr/dirmngr.c (oRecursiveResolver): New constant.
-	(opts): New option "--recursive-resolver".
-	(parse_rereadable_options): Set option.
-	* dirmngr/t-dns-stuff.c (main): Add option --recursive-resolver.
-	* dirmngr/server.c (cmd_getinfo): Depend output of "dnsinfo" on the
-	new variables.
-	* dirmngr/dns-stuff.c: Include dns.h only if USE_DNSLIB is defined.
-	Also build and call dnslib functions only if USE_DNSLIB is defined.
-	(recursive_resolver): New var.
-	(enable_recursive_resolver): New func.
-	(recursive_resolver_p): New func.
-
-	dirmngr: Implement CERT record lookup via libdns.
-	+ commit 3c2a7918eac024b5e1258ea9b272b4e8a1f1af43
-	* dirmngr/dns-stuff.c (get_dns_cert_libdns): New.
-	(get_dns_cert_standard): Fix URL malloc checking.
-
-	dirmngr: Implement CNAME and SRV record lookup via libdns.
-	+ commit 4c13e4e3debe0e55e86ae29c095f2d86eb0a6f11
-	* dirmngr/dns-stuff.c (dns_free): New macro.
-	(libdns): Move var to the top.
-	(libdns_error_to_gpg_error): Map error codes to the new gpg-error
-	codes.
-	(resolve_name_libdns): Restructure code.
-	(getsrv_libdns): New.
-	(get_dns_cname_libdns): New.
-
-	dirmngr: Fix bugs in the standard resolver code.
-	+ commit 4a030f682ef48542ed324b28207f2c2b4847dbef
-	* dirmngr/dns-stuff.c: Include dirmngr-err.h to set the correct error
-	source.
-	(get_h_errno_as_gpg_error): New.
-	(get_dns_cert_libdns): Fix error code.
-	(getsrv_libdns): Add arg R_COUNT and return an error code.
-	(getsrv_standard): Ditto. Fix handling of res_query errors and
-	provide the correct size for the return buffer.
-	(getsrv): Adjust for changed worker functions.
-	(get_dns_cname_standard): Fix handling of res_query errors and provide
-	the correct size for the return buffer.
-
-	dirmngr: Require a c99 compiler.
-	+ commit 392966aed9b2a5e1456c671e5d13b561a27e4bb2
-	* configure.ac (USE_C99_CFLAGS): New ac_subst. Set to -std=gnu99 for
-	gcc.
-	* dirmngr/Makefile.am (AM_CFLAGS): Add USE_C99_CFLAGS.
-	(t_http_CFLAGS): Ditto.
-	(t_ldap_parse_uri_CFLAGS): Ditto.
-	(t_dns_stuff_CFLAGS): Ditto.
-
-	doc: Add license notes for libdns.
-	+ commit d84f5a88233c073a82fd47728574b001343784ee
-	* COPYING.other: New.
-	* Makefile.am (EXTRA_DIST): Add it.
-	* AUTHORS: Add info on libdns.
-	* build-aux/speedo/w32/pkg-copyright.txt: Add license terms.
-
-	common: Add replacements for error codes from gpg-error 1.26.
-	+ commit aae68a3ccd3d9870162b3ffd49eae08d5bf1b1e1
-
-
-2016-12-14 Justus Winter <justus@g10code.com>
-
-	dirmngr: New libdns snapshot.
-	+ commit f8ab2c4c70ad15c4b2e45492606fb94ddaccdac7
-
-
-	dirmngr: Add basic libdns support.
-	+ commit f6acd0426453d3a18536ca69d63baa0d971082ef
-	* dirmngr/dns.c: New file.
-	* dirmngr/dns.h: New file.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add new files.
-	* dirmngr/dns-stuff.c: Include dns.h.xxx use libdns
-	(libdns): New global var for the libdns state.
-	(libdns_error_to_gpg_error): New.
-	(libdns_init): New.
-	(resolve_name_libdns): New.
-	(get_dns_cert_libdns): New stub.
-	(getsrv_libdns): New stub.
-	(get_dns_cname_libdns): New stub.
-
-	dirmngr,build: Remove support for ADNS.
-	+ commit 2e734a3ce159de8fb60df2bd5d454f98ca710717
-	* autogen.rc: Remove '--with-adns' argument.
-	* configure.ac: Remove check for ADNS.
-	* dirmngr/dns-stuff.c: Remove all code that uses ADNS.
-	* dirmngr/server.c (cmd_getinfo): Update status line.
-	* doc/dirmngr.texi: Do not mention ADNS.
-
-2016-12-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Improve ntbtls support.
-	+ commit 57aa42ce9b28bc17ac24491d595766fbf80762af
-	* dirmngr/http.c HTTP_USE_NTBTLS (close_tls_session): Release.
-	(send_request): Call ntbtls_set_transport.
-	(cookie_read, cookie_write): Implement.
-	(cookie_close): Add initial implementation for ntbtls.
-
-2016-12-13 Justus Winter <justus@g10code.com>
-
-	g10,sm: Spell out --passwd.
-	+ commit c1c35fb887061de05661f3411eda97546e1a52d7
-	* g10/gpg.c (opts): Spell out option.
-	* sm/gpgsm.c (opts): Likewise.
-	* doc/gpg.texi: Update accordingly.
-	* doc/gpgsm.texi: Likewise.
-
-	g10: Spell out --gen-revoke.
-	+ commit ec1bd3ae685e95563e38077ab3c1655fd55dea07
-	* g10/gpg.c (opts): Spell out option.
-	* doc/gpg.texi: Update accordingly.
-	* po: Update translations.
-
-	g10: Spell out --full-gen-key.
-	+ commit 09163a6390bd9713f3a7946de739765b30ef6f64
-	* g10/gpg.c (opts): Spell out option.
-	(main): Likewise.
-	* g10/keygen.c (generate_keypair): Likewise.
-	* doc/gpg.texi: Update accordingly.
-
-	g10,sm: Spell out --gen-key.
-	+ commit 892c827e72b1396e3b58e2f8869cc48328a2b59c
-	* g10/gpg.c (opts): Spell out option.
-	* sm/gpgsm.c (opts): Likewise.
-	* doc/gpg.texi: Update accordingly.
-
-	g10,sm: Spell out --check-sigs.
-	+ commit 9147737f1c6894f38b855f3cf38cd33122a1ae2a
-	* g10/gpg.c (opts): Spell out option.
-	* sm/gpgsm.c (opts): Likewise.
-	* doc/gpg.texi: Update accordingly.
-
-	g10,sm: Spell out --list-sigs.
-	+ commit a6d6e4afe488bc05ee730e85da6a9505c6cd245a
-	* g10/gpg.c (opts): Spell out option.
-	* sm/gpgsm.c (opts): Likewise.
-	* doc/gpg.texi: Update accordingly.
-
-	g10: Hyphenate --clearsign.
-	+ commit 04754ce3a704b1e6d38cb9a28dacf2821dc3f15f
-	* g10/gpg.c (opts): Hyphenate option.
-	* doc/gpg.texi: Update accordingly.
-	* po: Update translations.
-	* tests/openpgp: Update tests.
-
-	g10: Spell out --recv-keys.
-	+ commit ca598152345b40f3a236227dfc63ae04ddf777d7
-	* g10/gpg.c (opts): Spell out option.
-	* doc/gpg.texi: Update accordingly.
-
-	g10: Create expiring keys in quick key generation mode.
-	+ commit dd3dde07a9a46130ac01d849f8edf0566e44f11f
-	* doc/gpg.texi: Document that fact.
-	* g10/keygen.c (quick_generate_keypair): Use a default value.
-	* tests/openpgp/quick-key-manipulation.scm: Test that fact.
-
-	gpgscm: Print failed and skipped tests.
-	+ commit 429891a704057437517cb0b45d11392b40fa1ee8
-	* tests/gpgscm/tests.scm (test-pool::report): Print failed and skipped
-	tests at the end.
-
-	gpgscm: Generalize the test runner.
-	+ commit d43dabf4607d3bcfc217eb9aea34d093f5aa698f
-	* tests/gpgscm/tests.scm (test::scm) Add explicit name argument.
-	(test::binary): Likewise. Also, add missing unquote.
-	* tests/openpgp/run-tests.scm: Adapt accordingly.
-
-	gpgscm: Move the test runner to the Scheme library.
-	+ commit 1a176b92a8aad42056ed2c4e1f49a5feb40770cf
-	* tests/openpgp/run-tests.scm: Move most of the code...
-	* tests/gpgscm/tests.scm: ... here.
-
-	tests: Refactor test runner.
-	+ commit fe36e63763c9c595bb057ac50160d2aff7c7a63f
-	* tests/openpgp/run-tests.scm (locate-test): New function.
-	(test): Factor-out the code starting the child process.
-	(test::binary): New function.
-
-	gpgscm: Improve library functions.
-	+ commit e3876f16eb237bdeb9f79aca2e7db5e9e2d86686
-	* tests/gpgscm/tests.scm (absolute-path?): New function.
-	(canonical-path): Use the new function.
-	* tests/gpgscm/lib.scm (string-split-pln): New function.
-	(string-indexp, string-splitp): Likewise.
-	(string-splitn): Express using the above function.
-	(string-ltrim, string-rtrim): Fix corner case.
-	(list->string-reversed): New function.
-	(read-line): Fix performance.
-
-2016-12-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix memory leak in ecc key generation.
-	+ commit 98433c70431dfbde99b0e89416856d1eef9ebc88
-	* g10/keygen.c (ecckey_from_sexp): Release curve.
-
-	gpg: Do not use a fixed string for --gpgconf-list:default_pubkey_algo.
-	+ commit f1304ee9b21e6ceac6c13d04ceddd23fadb5c7f1
-	* g10/keygen.c (get_default_pubkey_algo): New.
-	(parse_key_parameter_string): Use it.
-	* g10/gpg.c (gpgconf_list): Take value from new function.
-
-	gpg: Fix algo string parsing of --quick-addkey.
-	+ commit 522e6f798db9f3f3a9e0123fdc389a86ac69dedf
-	* g10/keygen.c (parse_key_parameter_string): Fix handling of PART==1.
-	(parse_key_parameter_part): Use default key size if only "rsa", "dsa",
-	or "elg" is given.
-
-2016-12-09 Justus Winter <justus@g10code.com>
-
-	g10: Create keys that expire in simple key generation mode.
-	+ commit d568a1561642ed9b7b7b6282b86c56786d10a956
-	* g10/keygen.c (default_expiration_interval): New variable.
-	(generate_keypair): Use the new default.
-
-	tests: Add a test for '--quick-addkey'.
-	+ commit b778d8deedf344c8116362633925b8153c7f1bf1
-	* tests/openpgp/quick-key-manipulation.scm: Test '--quick-addkey'.
-
-	tests: New test using all available compression algorithms.
-	+ commit 59f1562c25119a4fe27411e6350f2149d6147148
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/compression.scm: New file.
-	* tests/openpgp/defs.scm (all-compression-algos): New variable.
-
-	g10: List compression algorithms using human-readable names.
-	+ commit c8100fc0faadf8ba35e4df32b4760cc975e3a83d
-	* g10/gpg.c (list_config): List all enabled compression algorithms
-	under the key 'compressname'.
-
-	g10: Fix memory leak.
-	+ commit 3de9bad359e28ced4a2539e411d222ffd82a4a62
-	* g10/sign.c (do_sign): Release old signature data.
-
-2016-12-08 Werner Koch <wk@gnupg.org>
-
-	common: Skip the Byte Order Mark in conf files.
-	+ commit 5c7d58222834793629a30248e72b6ea96e832dc4
-	* common/argparse.c (optfile_parse): Detect and skip the UTF-8 BOM.
-
-	Fix 2 compiler warnings.
-	+ commit cb4c7abb774e2d95806d8b0ec6ea5cd130c1b5b8
-	* dirmngr/loadswdb.c: Set ERR on malloc failure.
-	* g10/passphrase.c (passphrase_to_dek): Initialize all fields of
-	HELP_S2K.
-
-	wks: New option --status-fd for gpg-wks-client.
-	+ commit 4a04277ad112e0966296133795f93cf6a3daa48e
-	* tools/wks-util.c: Include status.h.
-	(statusfp): New global var.
-	(wks_set_status_fd): New func.
-	(wks_write_status): New func.
-	* tools/gpg-wks-client.c: Include status.h.
-	(oStatusFD): New constant.
-	(opts): New option --status-fd.
-	(parse_arguments): Handle that option.
-	(main): Return STATUS_SUCCESS or STATUS_FAILURE.
-
-2016-12-08 Justus Winter <justus@g10code.com>
-
-	gpgscm: Better error reporting.
-	+ commit e7429b1ced0c69fa7901f888f8dc25f00fc346a4
-	* tests/gpgscm/ffi.scm: Move the customized exception handling and
-	atexit logic...
-	* tests/gpgscm/init.scm: ... here.
-	(throw): Record the current history.
-	(throw'): New function that is history-aware.
-	(rethrow): New function.
-	(*error-hook*): Use the new throw'.
-	* tests/gpgscm/main.c (load): Fix error handling.
-	(main): Save and use the 'sc->retcode' as exit code.
-	* tests/gpgscm/repl.scm (repl): Print call history.
-	* tests/gpgscm/scheme.c (_Error_1): Make a snapshot of the history,
-	use it to provide a accurate location of the expression causing the
-	error at runtime, and hand the history trace to the '*error-hook*'.
-	(opexe_5): Tag all lists at parse time with the current location.
-	* tests/gpgscm/tests.scm: Update calls to 'throw', use 'rethrow'.
-
-	gpgscm: Keep a history of calls for error messages.
-	+ commit 404e8a4136bbbab39df7dd5119841e131998cc15
-	* tests/gpgscm/init.scm (vm-history-print): New function.
-	* tests/gpgscm/opdefines.h: New opcodes 'CALLSTACK_POP', 'APPLY_CODE',
-	and 'VM_HISTORY'.
-	* tests/gpgscm/scheme-private.h (struct history): New definition.
-	(struct scheme): New field 'history'.
-	* tests/gpgscm/scheme.c (gc): Mark objects in the history.
-	(history_free): New function.
-	(history_init): Likewise.
-	(history_mark): Likewise.
-	(add_mod): New macro.
-	(sub_mod): Likewise.
-	(tailstack_clear): New function.
-	(callstack_pop): Likewise.
-	(callstack_push): Likewise.
-	(tailstack_push): Likewise.
-	(tailstack_flatten): Likewise.
-	(callstack_flatten): Likewise.
-	(history_flatten): Likewise.
-	(opexe_0): New variable 'callsite', keep track of the expression if it
-	is a call, implement the new opcodes, record function applications in
-	the history.
-	(opexe_6): Implement new opcode.
-	(scheme_init_custom_alloc): Initialize history.
-	(scheme_deinit): Free history.
-	* tests/gpgscm/scheme.h (USE_HISTORY): New macro.
-
-	gpgscm: Add flag TAIL_CONTEXT.
-	+ commit 01256694f006405c54bc2adef63ef0c8f07da9ee
-	* tests/gpgscm/scheme.c (S_FLAG_TAIL_CONTEXT): New macro. This flag
-	indicates that the interpreter is evaluating an expression in a tail
-	context (see R5RS, section 3.5).
-	(opexe_0): Clear and set the flag according to the rules layed out in
-	R5RS, section 3.5.
-	(opexe_1): Likewise.
-
-	gpgscm: Add flags to the interpreter.
-	+ commit a4a69163d9d7e4d9f3339eb5cda0afb947180b26
-	* tests/gpgscm/scheme-private.h (struct scheme): Add field 'flags'.
-	* tests/gpgscm/scheme.c (S_OP_MASK): New macro.
-	(S_FLAG_MASK, s_set_flag, s_clear_flag, s_get_flag): Likewise.
-	(_s_return): Unpack the encoded opcode and flags.
-	(s_save): Encode the flags along with the opcode. Use normal
-	integers to encode the result.
-	(scheme_init_custom_alloc): Initialize 'op' and 'flags'.
-
-	gpgscm: Implement tags.
-	+ commit fcf5aea44627def43425d03881e20902e7c0331e
-	* tests/gpgscm/opdefines.h: Add opcodes to create and retrieve tags.
-	* tests/gpgscm/scheme.c (T_TAGGED): New macro.
-	(mk_tagged_value): New function.
-	(has_tag): Likewise.
-	(get_tag): Likewise.
-	(mark): Mark tag.
-	(opexe_4): Implement new opcodes.
-	* tests/gpgscm/scheme.h (USE_TAGS): New macro.
-
-2016-12-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix the fix out-of-bounds access.
-	+ commit a75790b74095828f967c012eff7033f570d93077
-	* g10/tofu.c (build_conflict_set): Revert to int* and fix calloc.
-
-	wks: New option --check for gpg-wks-client.
-	+ commit d8c5e8ccfdb53cc327f7520fc7badc31d0c9c666
-	* tools/call-dirmngr.c (wkd_get_key): New.
-	* tools/gpg-wks-client.c (aCheck): New constant.
-	(opts): New option "--check".
-	(main): Call command_check.
-	(command_check): New.
-
-	tools: Move a function from gpg-wks-server to wks-util.c.
-	+ commit c3138decd77d788906885b638b344d0d1faf32c0
-	* tools/gpg-wks-server.c (list_key_status_cb): Remove.
-	(list_key): Move to ...
-	* tools/wks-util.c (wks_list_key): here and rename. Add new args
-	R_FPR and R_MBOXES and remove the CTX.
-	(list_key_status_cb): New.
-	* tools/wks-util.c: Include ccparray.h, exectool.h, and mbox-util.h.
-	* tools/gpg-wks-server.c (process_new_key): Replace list_key by
-	wks_list_key.
-	(check_and_publish): Ditto.
-
-2016-12-08 Justus Winter <justus@g10code.com>
-
-	gpgscm: Generalize 'for-each-p'.
-	+ commit a2bedc8ac6fcdcd1de0a9fa3d540006481387dff
-	* tests/gpgscm/tests.scm (for-each-p): Generalize to N lists like
-	for-each.
-	(for-each-p'): Likewise.
-
-	g10: Fix out-of-bounds access.
-	+ commit 3b5b94ceab7c0ed9501c5cf54b4efa17fcd7300a
-	* g10/tofu.c (build_conflict_set): Use 'char'.
-
-2016-12-08 Werner Koch <wk@gnupg.org>
-
-	tools: Fix use of uninitialized var in mime-maker.
-	+ commit dd03667ab1062bba3b9413c3f8007d63302d1b31
-	* tools/mime-maker.c (ensure_part): Make sure to set R_PARENT on
-	error.
-	(add_missing_headers): Ensure that ERR is set on success.
-
-	* tools/wks-util.c (wks_parse_policy): Fix indentation.
-
-	tools: Fix memleak in gpgconf.
-	+ commit b265969154741bf9f93167699fe7ddda1d485265
-	* tools/gpgconf.c (main): Free SOCKETDIR.
-
-	gpg: Fix portability problem.
-	+ commit c3008bffac68b6f31e9ae9bad837cdce5de7c0db
-	* g10/tofu.c (build_conflict_set): Replace variable dynamic array.
-
-2016-12-07 Justus Winter <justus@g10code.com>
-
-	tests: Add test for '--quick-set-expire'.
-	+ commit dec2ae31a46a0f41886c7ad228865cc573f2dea9
-	* tests/openpgp/quick-key-manipulation.scm: Test '--quick-set-expire'.
-
-	tests: Improve quick key manipulation test.
-	+ commit 92df40a3a2ae471fbba00d6d7040230404931fd4
-	* tests/openpgp/quick-key-manipulation.scm: Do not update the trust
-	database, rather be more specific when filtering the user ids.
-
-2016-12-06 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: Respect --enable-large-secmem.
-	+ commit 8636ad5023a1bdc527add40a5508f8c5b7c35221
-	* agent/gpg-agent.c (main): Initialize secmem to the configured buffer
-	size.
-
-2016-12-06 Justus Winter <justus@g10code.com>
-
-	tests: Add test importing a revocation certificate.
-	+ commit e352ead43fbb0180e1f1c71bf1a000d1954eb777
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/import-revocation-certificate.scm: New file.
-	* tests/openpgp/samplemsgs/revoke-2D727CC768697734.asc: Likewise.
-
-	tests: Rename 'error' to 'fail'.
-	+ commit 5b5d881f47c82f320abf440c20b7a1bac078a987
-	* tests/gpgscm/tests.scm (error): Rename to 'fail'. 'error' is a
-	primitive function (an opcode) of the TinySCHEME vm, and 'error' is
-	also defined by R6RS. Better avoid redefining that. Fix all call
-	sites.
-	* tests/openpgp/4gb-packet.scm: Adapt.
-	* tests/openpgp/decrypt-multifile.scm: Likewise.
-	* tests/openpgp/ecc.scm: Likewise.
-	* tests/openpgp/export.scm: Likewise.
-	* tests/openpgp/gpgtar.scm: Likewise.
-	* tests/openpgp/gpgv-forged-keyring.scm: Likewise.
-	* tests/openpgp/import.scm: Likewise.
-	* tests/openpgp/issue2015.scm: Likewise.
-	* tests/openpgp/issue2346.scm: Likewise.
-	* tests/openpgp/issue2419.scm: Likewise.
-	* tests/openpgp/key-selection.scm: Likewise.
-	* tests/openpgp/mds.scm: Likewise.
-	* tests/openpgp/multisig.scm: Likewise.
-	* tests/openpgp/setup.scm: Likewise.
-	* tests/openpgp/signencrypt.scm: Likewise.
-	* tests/openpgp/ssh-import.scm: Likewise.
-	* tests/openpgp/tofu.scm: Likewise.
-	* tests/openpgp/verify.scm: Likewise.
-
-	tests: Remove debugging display.
-	+ commit 89ac071eb4c7539e98c7dc17e11f57c620b54e90
-	* tests/openpgp/tofu.scm: Remove debugging display.
-
-2016-12-06 Neal H. Walfield <neal@g10code.com>
-
-	tests: Update distributed files.
-	+ commit 87972fdef2cd853fb97624d0765686674a19e3c4
-	* tests/openpgp/Makefile.am (TEST_FILES): Remove tofu-keys.asc,
-	tofu-keys-secret.asc, tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and
-	tofu-EE37CF96-1.txt. Add tofu/conflicting/1C005AF3.gpg,
-	tofu/conflicting/1C005AF3-secret.gpg, tofu/conflicting/1C005AF3-1.txt,
-	tofu/conflicting/1C005AF3-2.txt, tofu/conflicting/1C005AF3-3.txt,
-	tofu/conflicting/1C005AF3-4.txt, tofu/conflicting/1C005AF3-5.txt,
-	tofu/conflicting/B662E42F.gpg, tofu/conflicting/B662E42F-secret.gpg,
-	tofu/conflicting/B662E42F-1.txt, tofu/conflicting/B662E42F-2.txt,
-	tofu/conflicting/B662E42F-3.txt, tofu/conflicting/B662E42F-4.txt,
-	tofu/conflicting/B662E42F-5.txt, tofu/conflicting/BE04EB2B.gpg,
-	tofu/conflicting/BE04EB2B-secret.gpg, tofu/conflicting/BE04EB2B-1.txt,
-	tofu/conflicting/BE04EB2B-2.txt, tofu/conflicting/BE04EB2B-3.txt,
-	tofu/conflicting/BE04EB2B-4.txt, tofu/conflicting/BE04EB2B-5.txt and
-	tofu/conflicting/README.
-
-	doc: Improve the text in the gpg manual.
-	+ commit 7572d270fcda1614648c6f08d711d5096ffebbe6
-	* doc/gpg.texi: Improve the text.
-
-	g10: Avoid a memory leak.
-	+ commit 6102099985c1b82b6c0bba0464c1f913cc673e96
-	* g10/gpg.c (main): Free KB when we're done with it.
-
-	tests: Change (interactive-shell) to start an interactive shell.
-	+ commit db6d8cfdc118131f497596ef1ffc121949377754
-	* tests/gpgscm/tests.scm (interactive-shell): Start an interactive
-	shell.
-
-	tests: Check the signature count in the TOFU TFS record.
-	+ commit 17c717d7c92d9a52101fea7e396fc133322a8786
-	* tests/openpgp/tofu.scm: Check the signature count in the TOFU TFS
-	record.
-
-	tests: Replace data used by the TOFU conflict test.
-	+ commit d5b18d6c55d65e8df2dd112651e3b9b3d9e6e27a
-	* tests/openpgp/tofu-2183839A-1.txt: Remove file.
-	* tests/openpgp/tofu-BC15C85A-1.txt: Remove file.
-	* tests/openpgp/tofu-EE37CF96-1.txt: Remove file.
-	* tests/openpgp/tofu-keys-secret.asc: Remove file.
-	* tests/openpgp/tofu-keys.asc: Remove file.
-	* tests/openpgp/tofu/conflicting/1C005AF3.gpg: New file.
-	* tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg: New file.
-	* tests/openpgp/tofu/conflicting/1C005AF3-1.txt: New file.
-	* tests/openpgp/tofu/conflicting/1C005AF3-2.txt: New file.
-	* tests/openpgp/tofu/conflicting/1C005AF3-3.txt: New file.
-	* tests/openpgp/tofu/conflicting/1C005AF3-4.txt: New file.
-	* tests/openpgp/tofu/conflicting/1C005AF3-5.txt: New file.
-	* tests/openpgp/tofu/conflicting/B662E42F.gpg: New file.
-	* tests/openpgp/tofu/conflicting/B662E42F-secret.gpg: New file.
-	* tests/openpgp/tofu/conflicting/B662E42F-1.txt: New file.
-	* tests/openpgp/tofu/conflicting/B662E42F-2.txt: New file.
-	* tests/openpgp/tofu/conflicting/B662E42F-3.txt: New file.
-	* tests/openpgp/tofu/conflicting/B662E42F-4.txt: New file.
-	* tests/openpgp/tofu/conflicting/B662E42F-5.txt: New file.
-	* tests/openpgp/tofu/conflicting/BE04EB2B.gpg: New file.
-	* tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg: New file.
-	* tests/openpgp/tofu/conflicting/BE04EB2B-1.txt: New file.
-	* tests/openpgp/tofu/conflicting/BE04EB2B-2.txt: New file.
-	* tests/openpgp/tofu/conflicting/BE04EB2B-3.txt: New file.
-	* tests/openpgp/tofu/conflicting/BE04EB2B-4.txt: New file.
-	* tests/openpgp/tofu/conflicting/BE04EB2B-5.txt: New file.
-	* tests/openpgp/tofu/conflicting/README: New file.
-	* tests/openpgp/tofu.scm: Update accordingly.
-
-	g10: Remove dead code.
-	+ commit bd9ebe1404c1395edd0e029023a9e780c90f6d73
-	* g10/tofu.c (tofu_set_policy_by_keyid): Remove function.
-
-2016-12-05 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --quick-set-expire.
-	+ commit 41b3d0975de65d1654f5e37c626d7c9b7c9a7a4d
-	* g10/gpg.c (aQuickSetExpire): New.
-	(opts): New option --quick-set-expire.
-	(main): Implement option.
-	* g10/keyedit.c (menu_expire): Add args FORCE_MAINKEY and
-	NEWEXPIRATION. Change semantics of the return value. Change caller.
-	(keyedit_quick_set_expire): New.
-
-2016-12-05 Justus Winter <justus@g10code.com>
-
-	tests: New test for '--enarmor' and '--dearmor'.
-	+ commit fae4d06b0ccaa9803e0c0da56c327b0bcfffcac5
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/enarmor.scm: New file.
-
-2016-12-03 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix error code arg in ERRSIG status line.
-	+ commit ef10c348bffc7dad19e1832bebc453755d209420
-	* g10/mainproc.c (check_sig_and_print): Use gpg_err_code to return an
-	error code in ERRSIG.
-
-2016-12-02 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --default-new-key-algo.
-	+ commit ce29272e24e7b718b8fca9b84bc728e65f3dea24
-	* common/openpgp-oid.c (openpgp_is_curve_supported): Add optional arg
-	R_ALGO and change all callers.
-	* common/util.h (GPG_ERR_UNKNOWN_FLAG): New error code.
-	* g10/options.h (struct opt): Add field DEF_NEW_KEY_ALGO.
-	* g10/gpg.c (oDefaultNewKeyAlgo): New enum.
-	(opts): New option "--default-new-key-algo".
-	(main): Set the option.
-	* g10/keygen.c: Remove DEFAULT_STD_ FUTURE_STD_ constants and replace
-	them by ...
-	(DEFAULT_STD_KEY_PARAM, FUTURE_STD_KEY_PARAM): new string constants.
-	(get_keysize_range): Remove arg R_DEF and return that value instead.
-	Change all callers.
-	(gen_rsa): Use get_keysize_range instead of the removed
-	DEFAULT_STD_KEYSIZE.
-	(parse_key_parameter_part): New function.
-	(parse_key_parameter_string): New function.
-	(quick_generate_keypair): Refactor using parse_key_parameter_string.
-	(generate_keypair): Ditto.
-	(parse_algo_usage_expire): Ditto.
-
-2016-12-02 Neal H. Walfield <neal@g10code.com>
-
-	g10: Improve debugging output.
-	+ commit cd532bb7b866e104304e2443cc942799c385daa5
-	* g10/tofu.c (string_to_long): Improve debugging output.
-	(string_to_ulong): Likewise.
-
-2016-12-01 Neal H. Walfield <neal@g10code.com>
-
-	g10: In the TOFU module, make strings easier to translate.
-	+ commit bd1a1d8582abcfd7f29812942fa70f88d0aec7cf
-	* g10/tofu.c: Remove dead code.
-	(time_ago_str): Simplify implementation since we only want the most
-	significant unit.
-	(format_conflict_msg_part1): Use ngettext.
-	(ask_about_binding): Likewise and only emit full sentences.
-	(show_statistics): Likewise.
-
-2016-12-01 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Add option --standard-resolver.
-	+ commit 304566d3327ef0a85188cce3109d46d5ff47177a
-	* dirmngr/dirmngr.c (oStandardResolver): New constant.
-	(opts): New option --standard-resolver.
-	(parse_rereadable_options): Set option.
-	* dirmngr/dns-stuff.c: Refactor all code to support the new option.
-	(standard_resolver): New var.
-	(enable_standard_resolver, standard_resolver_p): New func.
-	* dirmngr/http.c (connect_server): Remove USE_DNS_SRV build
-	conditional.
-	* dirmngr/ks-engine-hkp.c (map_host): Ditto.
-	* dirmngr/server.c (cmd_getinfo) <dnsinfo>: Take care of new option
-	* configure.ac (HAVE_ADNS_IF_TORMODE): Remove var ADNSLIB. ac_define
-	USE_ADNS in the adns checking code. Remove options --disable-dns-srv
-	and --disable-dns-cert. Always look for the system resolver. Print
-	warning if no system resolver was found.
-	(USE_DNS_CERT, USE_DNS_SRV): Remove ac_defines.
-	(HAVE_SYSTEM_RESOLVER): New ac_define.
-	(USE_DNS_SRV): Remove am_conditional; not used anyway.
-
-	gpg: Let only Dirmngr decide whether CERT is supported.
-	+ commit 86efc3ee53abaf1e22b53c1b360c51829e476115
-	* g10/getkey.c (parse_auto_key_locate): Do not build parts depending
-	on USE_DNS_CERT.
-
-2016-12-01 Justus Winter <justus@g10code.com>
-
-	tests,build: Fix distcheck.
-	+ commit fbdfe6a514a95fb46f2b811a13709024e2baf252
-	* tests/openpgp/Makefile.am (sample_msgs): Add messages required for
-	the new test 'verify-multifile.scm'.
-
-	tests: Add test for '--verify --multifile'.
-	+ commit 12af8e84a32df728462da09a00a8bec24a487720
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/verify-multifile.scm: New file.
-
-2016-11-30 Justus Winter <justus@g10code.com>
-
-	tests: Add test for '--encrypt --multifile'.
-	+ commit 3c0569e99498c7470ebdb639b4c5ae829af92761
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/encrypt-multifile.scm: New file.
-
-2016-11-29 Werner Koch <wk@gnupg.org>
-
-	agent,dirmngr: Tiny restructuring.
-	+ commit aa6ab9e0bc67fe9ce5601047e84ea4a875e8eb64
-	* agent/gpg-agent.c (handle_connections): Add a comment.
-	* dirmngr/dirmngr.c (main): Move assuan_sock_close of the listening
-	socket to ...
-	(handle_connections): here. Add a comment why we keep the
-	listening socket open during a shutdown.
-
-	agent,dirmngr: Handle corner case in shutdown mode.
-	+ commit 854adc8ae19749e44cb79dfa0c5401f48012b13a
-	* agent/gpg-agent.c (handle_connections): Keep on selecting on the
-	inotify fd even when a shutdown is pending.
-	* dirmngr/dirmngr.c (handle_connections): Ditto. Also simplifyy the
-	use of the HAVE_INOTIFY_INIT cpp conditional.
-
-	gpgsm: Allow decryption with a card returning a PKCS#1 stripped key.
-	+ commit 8489b12211098ad58c008cfb74b5cb91849cf68d
-	* sm/decrypt.c (prepare_decryption): Handle a 16 byte session key.
-
-	agent,w32: Initialize nPth in server mode.
-	+ commit 81d6e98cdf4caa3aa92398fc3b8bed397b40f58d
-	* agent/gpg-agent.c (main) W32: Call initialize_modules in server
-	mode.
-
-	gpg: Make --decrypt with output '-&nnnn' work.
-	+ commit a5910e00ace882b8a17169faf4607163ab454af9
-	* g10/plaintext.c (get_output_file): Check and open special filename
-	before falling back to stdout.
-
-	gpg,sm: Merge the two versions of check_special_filename.
-	+ commit 60b4982836a00ef6b2a97d16f735b3f6b74dce62
-	* sm/gpgsm.c (check_special_filename): Move to ..
-	* common/sysutils.c (check_special_filename): here. Add arg
-	NOTRANSLATE.
-	(allow_special_filenames): New local var.
-	(enable_special_filenames): New public functions.
-	* sm/gpgsm.c (allow_special_filenames): Remove var.
-	(main): Call enable_special_filenames instead of setting the var.
-	(open_read, open_es_fread, open_es_fwrite): Call
-	check_special_filename with 0 for NOTRANSLATE.
-	* common/iobuf.c (special_names_enabled): Remove var.
-	(iobuf_enable_special_filenames): Remove func.
-	(check_special_filename): Remove func.
-	(iobuf_is_pipe_filename): Call new version of the function with
-	NOTRANSLATE set.
-	(do_open): Ditto.
-	* g10/gpg.c (main): Call enable_special_filenames instead of
-	iobuf_enable_special_filenames.
-	* g10/gpgv.c (main): Ditto.
-
-2016-11-29 Justus Winter <justus@g10code.com>
-
-	g10: Fix memory leak.
-	+ commit 52385a2ba1bf7e53f500ffde5fd34f28e69cf76b
-	* g10/decrypt.c (decrypt_messages): Properly decrease the reference
-	count of the armor filters after pushing them.
-
-	tools,build: Build WKS tools against libintl.
-	+ commit 9fb5e9c14557f7567cbc7c50b9881b7d7bfa2f12
-	* tools/Makefile.am (gpg_wks_server_LDADD): Link against libintl.
-	(gpg_wks_client_LDADD): Likewise.
-
-2016-11-29 Neal H. Walfield <neal@g10code.com>
-
-	Improve some comments.
-	+ commit 522f74f7e377135cf098b6b0b9b35284c1dfc963
-
-
-	g10: Extend TOFU_STATS to always show the validity.
-	+ commit 2f27cb12e30c9f6e780354eecc3ff0039ed52c63
-	* doc/DETAILS (TOFU_STATS): Rename the VALIDITY field to SUMMARY. Add
-	a new field called VALIDITY.
-	* g10/tofu.c (write_stats_status): Update output accordingly.
-
-2016-11-29 Justus Winter <justus@g10code.com>
-
-	tests: Add test for '--decrypt --multifile'.
-	+ commit bde4fddadc75ad6071e3fc6c0980905de14c03cb
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/decrypt-multifile.scm: New file.
-
-	gpgscm: Avoid truncating pointers.
-	+ commit e062bc4da8062b822ee85096d9adfcbca8dcb56a
-	* tests/gpgscm/scheme.c (_alloc_cellseg): Avoid truncating pointers on
-	systems where sizeof(unsigned long) < sizeof(void *).
-
-2016-11-29 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	dirmngr: Lazily launch ldap reaper thread.
-	+ commit f6728d13e8e544dbd4b9351ed981613e5504293f
-	* dirmngr/dirmngr.c (main): Avoid calling ldap_wrapper_launch_thread()
-	Before we need it.
-	* dirmngr/ldap-wrapper.c (ldap_wrapper): Call
-	ldap_wrapper_launch_thread() just in time (before any attempt to use
-	an ldap subprocess).
-
-2016-11-29 Werner Koch <wk@gnupg.org>
-
-	build: Remove more keywords from the generated ChangeLog.
-	+ commit ecc126a7cef371e3b88e65715ba37fb77e92ea0f
-	* build-aux/gitlog-to-changelog (parse_amend_file): Generalize keyword
-	removal.
-
-2016-11-28 Justus Winter <justus@g10code.com>
-
-	tests: Add test for the ssh key export.
-	+ commit 47b8b9e2ce5af7fba117ae0b00e10bec414dcfb0
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	(sample_keys): Add new files.
-	* tests/openpgp/samplekeys/authenticate-only.pub.asc: New file.
-	* tests/openpgp/samplekeys/authenticate-only.sec.asc: Likewise.
-	* tests/openpgp/ssh-export.scm: Likewise.
-
-	g10: Fix iteration over getkey results.
-	+ commit 4db9a425644dccaf81b51ebc97b32a9cc21941a4
-	* g10/getkey.c (getkey_next): Only ask 'lookup' for the exact match if
-	our caller requested the key. Fixes a crash in 'lookup'.
-
-	tests: Rename ssh test.
-	+ commit cc1d21342659a7def5d662d0547579f9e0d3b109
-	* tests/openpgp/ssh.scm: Rename to 'ssh-import.scm'.
-	* tests/openpgp/Makefile (XTESTS): Likewise.
-
-2016-11-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support OpenPGP card V3 for RSA.
-	+ commit b89e63e5c326af71470124b410e6429cbd2b5c43
-	* scd/app-openpgp.c (struct app_local_s): Remove max_cmd_data and
-	max_rsp_data fields as Extended Capabilities bits are different.
-	(get_cached_data) Use extcap.max_certlen_3.
-	(get_one_do): Don't use exmode=1.
-	(determine_rsa_response): New.
-	(get_public_key, do_genkey): Call determine_rsa_response.
-	(do_sign): Use keyattr0.rsa.n_bits / 8, instead of max_rsp_data.
-	(do_auth): Use keyattr2.rsa.n_bits / 8, instead of max_rsp_data.
-	(do_decipher): Likewise with Use keyattr1.rsa.n_bits / 8.
-	(show_caps): Remove max_cmd_data and max_rsp_data.
-	(app_select_openpgp): Likewise.
-
-2016-11-23 Justus Winter <justus@g10code.com>
-
-	gpgscm: Make 'reverse' compatible with 'reverse_in_place'.
-	+ commit 005d326d19ba28005182205f25edc4f7499ec0b5
-	* tests/gpgscm/scheme.c (reverse): Update prototype, add terminator
-	argument.
-	(opexe_4): Update callsite.
-
-	gpgscm: Clean sweeped cells.
-	+ commit 3fb9954c43425775a517060959dad01fa00238f7
-	* tests/gpgscm/scheme.c (gc): Zero typeflag and car of free cells.
-
-	gpgscm: Fix initialization of 'sink'.
-	+ commit 7856e3efaad7614979bc0b91379a0a4dcbc739d5
-	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Also initialize
-	cdr.
-
-2016-11-23 Neal H. Walfield <neal@g10code.com>
-
-	g10: Avoid gratuitously loading a keyblock when it is already available.
-	+ commit 03a65a53231cc3132a50a1871e81a512c44da169
-	* g10/trust.c (get_validity): Add new, optional parameter KB. Only
-	load the keyblock if KB is NULL. Update callers.
-	(get_validity): Likewise.
-	* g10/trustdb.c (tdb_get_validity_core): Likewise.
-
-2016-11-22 Neal H. Walfield <neal@g10code.com>
-
-	g10: Use es_fopen instead of open.
-	+ commit bfeafe2d3f9bbaa7f11f3ad870a446141c038b0d
-	* g10/tofu.c: Don't include <utime.h>, <fcntl.h> or <unistd.h>.
-	(busy_handler): Replace use of open with es_fopen.
-
-	g10: If the set of UTKs changes, invalidate any changed policies.
-	+ commit 44c17bcb003a3330f595a6ab144e8439b7b630cb
-	* g10/trustdb.c (tdb_utks): New function.
-	* g10/tofu.c (check_utks): New function.
-	(initdb): Call it.
-	* tests/openpgp/tofu.scm: Modify test to check the effective policy of
-	keys whose effective policy changes when we change the set of UTKs.
-
-2016-11-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix receive buffer size.
-	+ commit 5c2db9dedfe9dbb14ffec24751ca23a69cead94e
-	* scd/apdu.c (send_le): Fix the size, adding two for status
-	bytes to Le.
-
-2016-11-22 Justus Winter <justus@g10code.com>
-
-	gpgscm: Refactor.
-	+ commit a3b258d1d15953816e0567511ecc527a4ccdd626
-	* tests/gpgscm/scheme.c (opexe_0): Reduce code duplication.
-
-	gpgscm: Fix property lists.
-	+ commit d8df80427238cdbb9ae0f6dae8bc7e9c24f6e265
-	* tests/gpgscm/opdefines.h (put, get): Check arguments. Also rename
-	to 'set-symbol-property' and 'symbol-property', the names used by
-	Guile, because put and get are too unspecific.
-	* tests/gpgscm/scheme.c (hasprop): Only symbols have property lists.
-	(get_property): New function.
-	(set_property): Likewise.
-	(opexe_4): Use the new functions.
-
-	gpgscm: Fix installation of error handler.
-	+ commit 7b4e2ea274ace22245264f1759279390d0300a62
-	* tests/gpgscm/ffi.scm: Set '*error-hook*' again so that the
-	interpreter will use our function.
-
-	gpgscm: Use a static pool of cells for small integers.
-	+ commit 66834eb838a8892d088f6b7332084a64d9f15008
-	* tests/gpgscm/scheme-private.h (struct scheme): New fields for the
-	static integer cells.
-	* tests/gpgscm/scheme.c (_alloc_cellseg): New function.
-	(alloc_cellseg): Use the new function.
-	(MAX_SMALL_INTEGER): New macro.
-	(initialize_small_integers): New function.
-	(mk_small_integer): Likewise.
-	(mk_integer): Return a small integer if possible.
-	(_s_return): Do not free 'op' if it is a small integer.
-	(s_save): Use a small integer to box the opcode.
-	(scheme_init_custom_alloc): Initialize small integers.
-	(scheme_deinit): Free chunk of small integers.
-	* tests/gpgscm/scheme.h (USE_SMALL_INTEGERS): New macro.
-
-	tests: Delay querying the avaliable algorithms.
-	+ commit 893a3f7fb46021961914a8acdf1292a80e3eba93
-	* tests/openpgp/defs.scm: Set verbosity earlier, turn 'all-*-algos'
-	into promises.
-	* tests/openpgp/conventional-mdc.scm: Force the promises.
-	* tests/openpgp/conventional.scm: Likewise.
-	* tests/openpgp/encrypt-dsa.scm: Likewise.
-	* tests/openpgp/encrypt.scm: Likewise.
-	* tests/openpgp/gpgtar.scm: Likewise.
-	* tests/openpgp/sigs.scm: Likewise.
-
-	g10: Fix memory leak.
-	+ commit 6ce14a805f1da687dfb8535db57730d5c7403db7
-	* g10/tofu.c (tofu_notice_key_changed): Remove spurious duplicate call
-	to 'hexfingerprint'.
-
-2016-11-21 Neal H. Walfield <neal@g10code.com>
-
-	g10: Cache the effective policy. Recompute it when required.
-	+ commit 037f9de09298a31026ea2ab5fbd4a599b11cc34f
-	* g10/tofu.c (initdb): Add column effective_policy to the bindings
-	table.
-	(record_binding): New parameters effective_policy and set_conflict.
-	Save the effective policy. If SET_CONFLICT is set, then set conflict
-	according to CONFLICT. Otherwise, preserve the current value of
-	conflict. Update callers.
-	(get_trust): Don't compute the effective policy here...
-	(get_policy): ... do it here, if it was not cached. Take new
-	parameters, PK, the public key, and NOW, the time that the operation
-	started. Update callers.
-	(show_statistics): New parameter PK. Pass it to get_policy. Update
-	callers.
-	(tofu_notice_key_changed): New function.
-	* g10/gpgv.c (tofu_notice_key_changed): New stub.
-	* g10/import.c (import_revoke_cert): Take additional argument CTRL.
-	Pass it to keydb_update_keyblock.
-	* g10/keydb.c (keydb_update_keyblock): Take additional argument CTRL.
-	Update callers.
-	USE_TOFU: Call tofu_notice_key_changed.
-	* g10/test-stubs.c (tofu_notice_key_changed): New stub.
-	* tests/openpgp/tofu.scm: Assume that manually setting a binding's
-	policy to auto does not cause the tofu engine to forget about any
-	conflict.
-
-	g10: Correctly parameterize ngettext.
-	+ commit 182efc5b5d20ac0d43501a22f349a23dc06a27a4
-	* g10/tofu.c (ask_about_binding): Correctly parameterize ngettext.
-
-	g10: Don't use the same variable for multiple SQL compiled statements.
-	+ commit 7142b293c870d73ce0146bfb90e6a556e0079650
-	* g10/tofu.c (struct tofu_dbs_s): Remove unused field
-	record_binding_update2. Replace register_insert with
-	register_signature and register_encryption.
-	(tofu_register_signature): Don't use dbs->s.register_insert, but
-	dbs->s.register_signature.
-	(tofu_register_encryption): Don't use dbs->s.register_insert, but
-	dbs->s.register_encryption.
-
-	g10: Add a convenience function for checking if a key is a primary key.
-	+ commit 91a0483c5db8ee4510981448a705981ee1cce199
-	* g10/keydb.h (pk_is_primary): New function.
-	* g10/tofu.c (get_trust): Use it.
-	(tofu_register_signature): Likewise.
-	(tofu_register_encryption): Likewise.
-	(tofu_set_policy): Likewise.
-	(tofu_get_policy): Likewise.
-
-2016-11-21 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc: Ship example gpg-agent-browser.socket in examples/systemd-user/.
-	+ commit 0540cfbee455b197edd89b602a4b47ebf0be8588
-	* doc/Makefile.am: Ship gpg-agent-browser.socket alongside the other
-	systemd user service example files.
-
-2016-11-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix npth + daemon mode problem.
-	+ commit 9a707a223a3d45ccf245dee7989ca144e4e6bb49
-	* agent/gpg-agent.c (main): Remove duplicated initialization in daemon
-	mode.
-
-2016-11-18 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.16.
-	+ commit 0a641ad25d8c3b91dc32bb9f3f1ae49ae539a4f7
-
-
-2016-11-18 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit 11aaa9c6d4ed3e47de45b4aee925ab1065120988
-
-
-2016-11-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix flags to open for lock of ToFU.
-	+ commit 1c0b140cccfb884c6d07785c3284b9df06dccd3c
-	* g10/tofu.c (busy_handler): Fix the flags and utime is not needed.
-
-2016-11-18 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Use a longer timer tick interval.
-	+ commit 833eef974ad4721b9b3e247bae9c890476a936ce
-	* dirmngr/dirmngr.c (TIMERTICK_INTERVAL): Always use 60 seconds like
-	we did for WindowsCE.
-
-2016-11-18 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	dirmngr: More w32 system daemon cleanup.
-	+ commit b3a917201207898059c048dd101344765201b03c
-	* dirmngr/dirmngr.c (handle_tick): Remove w32 tests for
-	shutdown_pending; no longer needed.
-
-2016-11-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix creating a lock for ToFU.
-	+ commit b2e1b17efa952afcf7aeec8b15e9d0088dba587a
-	* g10/tofu.c (busy_handler): Add third argument which is mandatory for
-	O_CREATE flag.
-
-	scd: Don't limit to ST-2xxx for PC/SC.
-	+ commit b6066ab18a67195817babaf9eccf896c2b3c7b0e
-	* scd/apdu.c (pcsc_vendor_specific_init): Only check vender ID.
-
-2016-11-17 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	dirmngr: Use a default keyserver if none is explicitly set.
-	+ commit 8fb482252436b3b4b0b33663d95d1d17188ad1d9
-	* configure.ac: Define DIRMNGR_DEFAULT_KEYSERVER.
-	* dirmngr/server.c (ensure_keyserver): Use it if no keyservers are set.
-	* doc/dirmngr.texi: Document this behavior.
-
-	dirmngr: Add system CAs if no hkp-cacert is given.
-	+ commit 7c1613d41566f7d8db116790087de323621205fe
-	* dirmngr/dirmngr.c (http_session_new): If the user isn't talking to
-	the HKPS pool, and they have not specified any hkp-cacert, then we
-	should default to the system CAs, rather than nothing.
-	* doc/dirmngr.texi: Document choice of CAs.
-
-	dirmngr: Register hkp-cacert even if the file doesn't exist yet.
-	+ commit c4e02a3b7ad6ee1da6bfc439921378bdbd5c029c
-	* dirmngr/dirmngr.c (parse_readable_options): If we're unable to turn
-	an argument for hkp-cacert into an absolute filename, terminate
-	completely.
-	* dirmngr/http.c (http_register_tls_ca): Show a warning if file is not
-	immediately accessible, but register it anyway.
-
-2016-11-17 Justus Winter <justus@g10code.com>
-
-	gpgscm: Re-enable the garbage collector in case of errors.
-	+ commit 4f189325a409bb08f7a8eabfac3f4579288cf5c5
-	* tests/gpgscm/scheme.c (opexe_0): Enable gc before calling 'Error_1'.
-
-	gpgscm: Fix string.
-	+ commit fc53a4d06eaf891143ab4efec9caffe31ebc2bc0
-	* tests/gpgscm/scheme.c (type_to_string): Fix string.
-
-2016-11-17 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Auto-sownload the swdb.lst.
-	+ commit bd91f92ace09263e3a91177f2a1644379baeb08a
-	* dirmngr/dirmngr.h (struct opt): Add field allow_version_check.
-	* dirmngr/dirmngr.c (oAllowVersionCheck): New.
-	(opts): Add --allow-version-check.
-	(network_activity_seen): New variable.
-	(parse_rereadable_options): Set opt.allow_version_check.
-	(main) <aGPGConfList>: Do not anymore set the no change flag for
-	Windows. Add allow-version-check.
-	(netactivity_action): Set network_activity_seen.
-	(housekeeping_thread): Call dirmngr_load_swdb.
-	* tools/gpgconf-comp.c (gc_options_dirmngr): Add allow-version-check.
-	Make "use-tor" available at Basic level.
-
-	dirmngr: Improve downloading of swdb.lst.
-	+ commit c45ca316a54665915ae08399484db271566db7c0
-	* dirmngr/loadswdb.c (time_of_saved_swdb): Aslo return the "verified"
-	timestamp.
-	(dirmngr_load_swdb): Avoid unnecessary disk or network access witout
-	FORCE. Do not update swdb.lst if it did not change.
-
-	gpgconf: Change the displayed names of the components.
-	+ commit d8da5bc50b856db3445435780311c9f8e52a5144
-
-
-2016-11-16 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Add command to only load the swdb.
-	+ commit 52c10a280af6ce06eb1732ff35b095f2b8d24b9f
-	* dirmngr/loadswdb.c: New.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add that file.
-	* dirmngr/server.c: Remove includes cpparray.h and exectool.h.
-	(cmd_loadswdb): New.
-	(parse_version_number,parse_version_string): Remove.
-	(my_mktmpdir, cmp_version): Remove.
-	(fetch_into_tmpdir): Remove.
-	(struct verify_swdb_parm_s): Remove.
-	(verify_swdb_status_cb): Remove.
-	(cmd_versioncheck): Remove.
-	(register_commands): Register LOADSWDB. Remove VERSIONCHECK.
-
-	scd,dirmngr: Keep the standard fds when daemonizing.
-	+ commit 4839e6d002a8ad1f7d3260792c3c9641e258f342
-	* dirmngr/dirmngr.c (main): Before calling setsid do not close the
-	standard fds but connect them to /dev/null.
-	* scd/scdaemon.c (main): Ditto. Noet that the old test for a log
-	stream was even reverted.
-
-	common: Rename keybox_file_rename to gnupg_rename_file.
-	+ commit c4506a3f15bba5d257cb4c6738800c5e00ecc9a2
-	* kbx/keybox-util.c (keybox_file_rename): Rename to ...
-	* common/sysutils.c (gnupg_rename_file): this. Change all callers.
-
-	wks: Always build gpg-wks-client.
-	+ commit c564790df723beef031d83802bd7830737bd330a
-	* tools/Makefile.am (gpg_wks_client): Remove macro.
-	(libexec_PROGRAMS): Add gpg-wks-client.
-
-	gpg: New option --override-session-key-fd.
-	+ commit 43bfaf2c5417ede621c0a07721952ea549a7a139
-	* g10/gpg.c (oOverrideSessionKeyFD): New.
-	(opts): Add option --override-session-key-fd.
-	(main): Handle that option.
-	(read_sessionkey_from_fd): New.
-
-2016-11-15 Werner Koch <wk@gnupg.org>
-
-	gpgv: New option --enable-special-filenames.
-	+ commit 500e594c2da530e69a63fc1a40d173458682fa0e
-	* g10/gpgv.c (oEnableSpecialFilenames): New.
-	(opts): Add option --enable-special-filenames.
-	(main): Implement that option.
-
-	gpg: Add new compliance mode "de-vs".
-	+ commit b47603a0ac24902c5bb000f8ef27cfb99aceeb81
-	* g10/options.h (CO_DE_VS): New.
-	(GNUPG): Also allow CO_DE_VS.
-	* g10/gpg.c (oDE_VS): New.
-	(parse_compliance_option): Add "de-vs".
-	(set_compliance_option): Set "de-vs".
-	* g10/misc.c (compliance_option_string): Return a description string.
-	(compliance_failure): Ditto.
-	* g10/keygen.c (ask_algo): Take care of CO_DE_VS.
-	(get_keysize_range): Ditto.
-	(ask_curve): Add new field to CURVES and trun flags into bit flags.
-	Allow only Brainpool curves in CO_DE_VS mode.
-
-	gpg: Use usual free semantics for packet structure free functions.
-	+ commit 8ea3b4c4102dc67ed83d4419b7171e422fc01047
-	* g10/free-packet.c (free_attributes): Turn function into a nop for a
-	NULL arg.
-	(free_user_id): Ditto.
-	(free_compressed): Ditto.
-	(free_encrypted): Ditto.
-	(free_plaintext): Ditto.
-	(release_public_key_parts): Avoid extra check for NULL.
-	* g10/getkey.c (get_best_pubkey_byname): Ditto.
-
-2016-11-15 Justus Winter <justus@g10code.com>
-
-	g10: Optimize key iteration.
-	+ commit 12834e84aca9d74800245f0f2f2e6b5123e76173
-	* g10/getkey.c (get_best_pubkey_byname): Use the node returned by
-	'getkey_next' instead of doing another lookup.
-
-	g10: Fix memory leak.
-	+ commit d20107f6da094edd782947abb357abae5129a12c
-	* g10/getkey.c (finish_lookup): Clarify that we do not return a
-	reference.
-	(lookup): Clarify the relation between RET_KEYBLOCK and RET_FOUND_KEY.
-	Check arguments. Actually release the node if it is not returned.
-
-	g10: Fix iteration over getkey results.
-	+ commit 1d03cc77e1706f7da653153ad4b58c61e4fd2573
-	* g10/getkey.c (getkey_next): Fix invocation of 'lookup'. If we want
-	to use RET_FOUND_KEY, RET_KEYBLOCK must be valid.
-
-	g10: Fix use-after-free.
-	+ commit bd60742925414e0ef2a497df827c1913ea211a44
-	* g10/getkey.c (pubkey_cmp): Make a copy of the user id.
-	(get_best_pubkey_byname): Free the user ids.
-
-2016-11-15 Werner Koch <wk@gnupg.org>
-
-	sm: New stub option --compliance.
-	+ commit 26c7c1d72c5f2acb3edb58d610c09a635c87bdbf
-	* sm/gpgsm.c (oCompliance): New.
-	(opts): Add "--compliance".
-	(main): Implement as stub.
-
-2016-11-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix memory leak.
-	+ commit 1f7639ebbe58af1b581b0be7809da9ee55482992
-	* g10/keyedit.c (menu_adduid): Don't copy 'sig'.
-
-2016-11-15 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --compliance.
-	+ commit f86b1a15ad4bb7bcc1e9f7d209aabcb23641f7df
-	* g10/gpg.c (oCompliance): New.
-	(opts): Add "--compliance".
-	(parse_tofu_policy): Use a generic description string for "help".
-	(parse_compliance_option): New.
-	(main): Add option oCompliance. Factor out code for compliance
-	setting to ...
-	(set_compliance_option): new.
-
-2016-11-15 Justus Winter <justus@g10code.com>
-
-	g10: Fix memory leak.
-	+ commit 809d67e74014cb563efd965744fd11f87bbae743
-	* g10/keyedit.c (menu_adduid): Deallocate 'sig'.
-
-	gpgscm: Mark cells requiring finalization.
-	+ commit 64a58e23c38db8658423bbe26fcd650330e24a88
-	* tests/gpgscm/scheme.c (T_FINALIZE): New macro.
-	(mk_port): Use the new macro.
-	(mk_foreign_object): Likewise.
-	(mk_counted_string): Likewise.
-	(mk_empty_string): Likewise.
-	(gc): Only call 'finalize_cell' for cells with the new flag.
-
-	gpgscm: Recover more cells.
-	+ commit 93cc322ac06d3045a24aece90091f7f80f3dacb8
-	* tests/gpgscm/scheme.c (_s_return): Recover the cell holding the
-	opcode.
-
-2016-11-14 Justus Winter <justus@g10code.com>
-
-	g10: Fix memory leak.
-	+ commit 2cd281c4def1ea881b92b9aba18c1892f89c1870
-	* g10/mainproc.c (check_sig_and_print): Free 'pk'.
-
-	gpgscm: Avoid cell allocation overhead.
-	+ commit 83c184a66b73f312425b01008f0495610e5329a4
-	* tests/gpgscm/scheme-private.h (struct scheme): New fields
-	'inhibit_gc', 'reserved_cells', and 'reserved_lineno'.
-	* tests/gpgscm/scheme.c (GC_ENABLED): New macro.
-	(USE_GC_LOCKING): Likewise.
-	(gc_reservations): Likewise.
-	(gc_reservation_failure): New function.
-	(_gc_disable): Likewise.
-	(gc_disable): New macro.
-	(gc_enable): Likewise.
-	(gc_enabled): Likewise.
-	(gc_consume): Likewise.
-	(get_cell_x): Consume reserved cell if garbage collection is disabled.
-	(_get_cell): Assert that gc is enabled.
-	(get_cell): Only record cell in the list of recently allocated cells
-	if gc is enabled.
-	(get_vector_object): Likewise.
-	(gc): Assert that gc is enabled.
-	(s_return): Add comment, adjust call to '_s_return'.
-	(s_return_enable_gc): New macro.
-	(_s_return): Add flag 'enable_gc' and re-enable gc if set.
-	(oblist_add_by_name): Use the new facilities to protect the
-	allocations.
-	(new_frame_in_env): Likewise.
-	(new_slot_spec_in_env): Likewise.
-	(s_save): Likewise.
-	(opexe_0): Likewise.
-	(opexe_1): Likewise.
-	(opexe_2): Likewise.
-	(opexe_5): Likewise.
-	(opexe_6): Likewise.
-	(scheme_init_custom_alloc): Initialize the new fields.
-
-2016-11-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix status info encoding.
-	+ commit 4ee4d0b02172cf56d9582bb99e32a65c75315b25
-	* scd/command.c (send_status_info): Do percent plus encoding correctly.
-
-2016-11-12 Werner Koch <wk@gnupg.org>
-
-	agent: Improve concurrency when Libgcrypt 1.8 is used.
-	+ commit 6bf698197222bf6081c249c815aebb075e8ec820
-	* agent/gpg-agent.c (thread_init_once): Tell Libgcrypt to reinit the
-	system call clamp.
-	(agent_libgcrypt_progress_cb): Do not sleep if Libgcrypt is recent
-	enough.
-
-2016-11-11 Werner Koch <wk@gnupg.org>
-
-	agent: Kludge to mitigate blocking calls in Libgcrypt.
-	+ commit 4473db1ef24031ff4e26c9a9de95dbe898ed2b97
-	* agent/gpg-agent.c (agent_libgcrypt_progress_cb): Sleep for 100ms on
-	"need_entropy".
-
-	dirmngr: Prepare to trigger jobs by network activity.
-	+ commit 7b04a43c05834b937b32a596f1941e9728add5fa
-	* dirmngr/http.c (netactivity_cb): New.
-	(http_register_netactivity_cb): New.
-	(notify_netactivity): New.
-	(connect_server): Call that function.
-	* dirmngr/dirmngr.c (main): Call http_register_netactivity_cb.
-	(netactivity_action): New stub handler.
-
-2016-11-11 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: Clean up comments.
-	+ commit e51912f467fda963c7abcfcd4082d6eb084ba5be
-	* agent/agent.h: Clean up comments.
-
-2016-11-10 Werner Koch <wk@gnupg.org>
-
-	gpg,sm: Add STATUS_ERROR keydb_search and keydb_add-resource.
-	+ commit 5d13581f4737c18430f6572dd4ef486d1ad80dd1
-	* g10/keydb.c (keydb_add_resource): Make ANY_REGISTERED
-	file-global. Write a STATUS_ERROR.
-	(maybe_create_keyring_or_box): Check for non-accessible but existant
-	file.
-	(keydb_search): Write a STATUS_ERROR if no keyring has been registered
-	but continue to return NOT_FOUND.
-	* sm/keydb.c (keydb_add_resource): Rename ANY_PUBLIC to ANY_REGISTERED
-	and make file-global. Write a STATUS_ERROR.
-	(keydb_search): Write a STATUS_ERROR if no keyring has been registered
-	but continue to return NOT_FOUND. Also add new arg CTRL and change
-	all callers to pass it down.
-
-	sm: Remove unused arg SECRET from keydb functions.
-	+ commit c8044c6e335f044d7386b9e8869bc4a0d3adff70
-	* sm/keydb.c (struct resource_item): Remove field 'secret'.
-	(keydb_add_resource): Remove arg 'secret' and change all callers.
-	(keydb_new): Ditto.
-
-2016-11-10 Justus Winter <justus@g10code.com>
-
-	gpgscm: Recover cells from the list of recently allocated cells.
-	+ commit ee08677d63a900cea85228024861a4f5c5a87c69
-	* tests/gpgscm/scheme.c (ok_to_freely_gc): Recover cells.
-
-	gpgscm: Recover cells used to maintain interpreter state.
-	+ commit e0cbd3389e2dd6ec19ee3a4c7bad81fa0f1907f5
-	* tests/gpgscm/scheme.c (free_cell): New function.
-	(free_cons): Likewise.
-	(_s_return): Use the new function to recover cells used to save the
-	state of the interpreter in 's_save'. This reduces the need to do a
-	garbage collection considerably.
-
-	gpgscm: Reduce opcode dispatch overhead.
-	+ commit d3a98ff5bc972a4c9b01b9e5338a4a59b5b4ac48
-	* tests/gpgscm/scheme.c (s_thread_to): New macro.
-	(CASE): Likewise.
-	(opexe_0-6): Use 'CASE' instead of 'case' statements, replace
-	's_goto' with 's_thread_to' where applicable.
-
-	gpgscm: Make the compile-hook configurable.
-	+ commit 568cfcde45a0d6c456d8f8be1ea0e408416badad
-	* tests/gpgscm/scheme-private.h (struct scheme): Make field
-	'COMPILE_HOOK' optional.
-	* tests/gpgscm/scheme.c (opexe_0): Fix guard.
-	(scheme_init_custom_alloc): Conditionally initialize 'COMPILE_HOOK'.
-	* tests/gpgscm/scheme.h (USE_COMPILE_HOOK): Define to 1 by default.
-
-	gpgscm: Drop obsolete commented-out code.
-	+ commit 9ee184bc0afaea06785d836ed175b851b9ae532f
-	* tests/gpgscm/scheme.c (opexe_5): Drop obsolete code.
-
-	gpgscm: Remove dubious stack implementation.
-	+ commit d7c5799c282a03dcce0e3d327075233353cb76cc
-	* tests/gpgscm/scheme-private.h (struct scheme): Remove related fields.
-	* tests/gpgscm/scheme.c: Drop all !USE_SCHEME_STACK code.
-	* tests/gpgscm/scheme.h (USE_SCHEME_STACK): Remove macro.
-
-2016-11-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve error message for --quick-gen-key.
-	+ commit 088d955bd8a6ec8bbf76c8a4c01eb08499d1d9fa
-	* g10/keygen.c (parse_algo_usage_expire): Use a different error
-	message for an unknown algorithm name.
-
-	dirmngr: Improve concurrency in the non-adns case.
-	+ commit c7ea98cd3d44abf00e32c081e5049ad1d0b1f12c
-	* dirmngr/dns-stuff.c (map_adns_status_to_gpg_error): New.
-	(resolve_name_adns, get_dns_cert, get_dns_cname): Use that function.
-	(getsrv) !USE_ADNS: Call res_query outside of nPth.
-
-2016-11-08 Justus Winter <justus@g10code.com>
-
-	tests: Fix environment setup.
-	+ commit 1062953d5132af674aacfc6372e3e9f066c5d145
-	* tests/openpgp/defs.scm (setup-legacy-environment): Do not call
-	'setup-environment' because that will start the agent, and hence
-	register the atexit function twice.
-
-	Fixes: a55393cb5f4b331cb3a715c7d9a8b91f7606f337
-
-	tests: Log and display output from tests when run in parallel.
-	+ commit 2a7615c48ed79e6b28710cc293ce30c812b2e5b0
-	* tests/openpgp/run-tests.scm (test): Add field 'logfd'.
-	(test::new, test::set-*): Adapt accordingly.
-	(test::set-logfd): New function.
-	(test::open-log-file): Likewise.
-	(test::run-sync): Use the new function.
-	(test::run-async): Likewise.
-	(test::report): Replay the log.
-	(run-tests-parallel): Reverse the results to restore the original
-	order.
-
-	tests: Simplify test.
-	+ commit 4dd4801bfa4c3f7ba279b3d171a8ed299dbffaaa
-	* tests/openpgp/issue2417.scm: Simplify.
-
-	gpgscm: Expose seek and associated constants.
-	+ commit 591d61d80f4f81176f7e236df794922df9e001a1
-	* tests/gpgscm/ffi.c (do_seek): New function.
-	(ffi_init): Expose 'seek' and 'SEEK_{SET,CUR,END}'.
-	* tests/gpgscm/lib.scm: Document the new function.
-
-	gpgscm: Fix error message.
-	+ commit d4454837cd60981c2863955b11c9e1cc8f9e3833
-	* tests/gpgscm/ffi.c (do_wait_processes): Fix and improve error
-	messages.
-
-	tests,w32: Make cleanup more robust.
-	+ commit dd13b2a561e31045fd3d3576bab99543cd4eb6cc
-	* tests/openpgp/run-tests.scm (run-tests-parallel): Catch errors when
-	removing the working directory. On Windows this can fail if there is
-	still a process using one of the files there.
-	(run-tests-sequential): Likewise.
-
-	common,w32: Simplify locking.
-	+ commit 7cbb0803847b8db618d39ff50ae6015e409ab1ae
-	* common/asshelp.c (lock_spawning): Use the same code on Windows that
-	we use on all other platforms.
-	(unlock_spawning): Likewise.
-
-2016-11-07 Justus Winter <justus@g10code.com>
-
-	tests: Write a log file for each test.
-	+ commit 26df829fa22f027ca4a5eaf155cdaa2123afbdd5
-	* tests/openpgp/Makefile.am (CLEANFILES): Delete logs.
-	* tests/openpgp/run-tests.scm (test::run-sync): Write logs.
-
-	gpgscm: Generalize splice to write to multiple sinks.
-	+ commit abe0cc7a21d2b0b5c77cc525b999d1ede2d29185
-	* tests/gpgscm/ffi.c (ordinal_suffix): New function.
-	(do_splice): Generalize splice to write to multiple sinks.
-	* tests/gpgscm/lib.scm (splice): Document this fact.
-
-	gpgscm: Drop 'len' argument from splice.
-	+ commit 4d98a72b88cf167295e1ecd6125b9c7a11b6239f
-	* tests/gpgscm/ffi.c (do_splice): Drop 'len' argument, no-one uses it.
-	* tests/gpgscm/lib.scm (splice): Document foreign function.
-
-	tests: Move environment creation and teardown into each test.
-	+ commit a55393cb5f4b331cb3a715c7d9a8b91f7606f337
-	* tests/gpgscm/tests.scm (log): New function.
-	* tests/openpgp/run-tests.scm (run-tests-parallel): Do not run the
-	startup and teardown scripts.
-	(run-tests-sequential): Likewise.
-	* tests/openpgp/setup.scm: Move all functions...
-	* tests/openpgp/defs.scm: ... here and make them less verbose.
-	(setup-environment): New function.
-	(setup-legacy-environment): Likewise.
-	(start-agent): Make less verbose, run 'stop-agent' at interpreter
-	exit.
-	(stop-agent): Make less verbose.
-	* tests/openpgp/finish.scm: Drop file.
-	* tests/openpgp/Makefile.am (EXTRA_DIST): Drop removed file.
-	* tests/openpgp/4gb-packet.scm: Use 'setup-environment' or
-	'setup-legacy-environment' as appropriate.
-	* tests/openpgp/armdetach.scm: Likewise.
-	* tests/openpgp/armdetachm.scm: Likewise.
-	* tests/openpgp/armencrypt.scm: Likewise.
-	* tests/openpgp/armencryptp.scm: Likewise.
-	* tests/openpgp/armor.scm: Likewise.
-	* tests/openpgp/armsignencrypt.scm: Likewise.
-	* tests/openpgp/armsigs.scm: Likewise.
-	* tests/openpgp/clearsig.scm: Likewise.
-	* tests/openpgp/conventional-mdc.scm: Likewise.
-	* tests/openpgp/conventional.scm: Likewise.
-	* tests/openpgp/decrypt-dsa.scm: Likewise.
-	* tests/openpgp/decrypt.scm: Likewise.
-	* tests/openpgp/default-key.scm: Likewise.
-	* tests/openpgp/detach.scm: Likewise.
-	* tests/openpgp/detachm.scm: Likewise.
-	* tests/openpgp/ecc.scm: Likewise.
-	* tests/openpgp/encrypt-dsa.scm: Likewise.
-	* tests/openpgp/encrypt.scm: Likewise.
-	* tests/openpgp/encryptp.scm: Likewise.
-	* tests/openpgp/export.scm: Likewise.
-	* tests/openpgp/finish.scm: Likewise.
-	* tests/openpgp/genkey1024.scm: Likewise.
-	* tests/openpgp/gpgtar.scm: Likewise.
-	* tests/openpgp/gpgv-forged-keyring.scm: Likewise.
-	* tests/openpgp/import.scm: Likewise.
-	* tests/openpgp/issue2015.scm: Likewise.
-	* tests/openpgp/issue2417.scm: Likewise.
-	* tests/openpgp/issue2419.scm: Likewise.
-	* tests/openpgp/key-selection.scm: Likewise.
-	* tests/openpgp/mds.scm: Likewise.
-	* tests/openpgp/multisig.scm: Likewise.
-	* tests/openpgp/quick-key-manipulation.scm: Likewise.
-	* tests/openpgp/seat.scm: Likewise.
-	* tests/openpgp/shell.scm: Likewise.
-	* tests/openpgp/signencrypt-dsa.scm: Likewise.
-	* tests/openpgp/signencrypt.scm: Likewise.
-	* tests/openpgp/sigs-dsa.scm: Likewise.
-	* tests/openpgp/sigs.scm: Likewise.
-	* tests/openpgp/ssh.scm: Likewise.
-	* tests/openpgp/tofu.scm: Likewise.
-	* tests/openpgp/use-exact-key.scm: Likewise.
-	* tests/openpgp/verify.scm: Likewise.
-	* tests/openpgp/version.scm: Likewise.
-	* tests/openpgp/issue2346.scm: Likewise and simplify.
-
-	tests: Do not allow tests to be run in a shared environment.
-	+ commit ac078469cbafe85cf771fca84f376740850d10b0
-	* tests/openpgp/README: Update.
-	* tests/openpgp/run-tests.scm (run-tests-parallel-shared): Drop
-	function.
-	(run-tests-parallel-isolated): Rename to 'run-tests-parallel'.
-	(run-tests-sequential-shared): Drop function.
-	(run-tests-sequential-isolated): Rename to 'run-tests-sequential'.
-
-	tests: Fix build.
-	+ commit 37751d2b194bc33539f5b9ea0e02e9f209d2bcf6
-	* tests/openpgp/Makefile.am: Drop dependency on 'mk-tdata'.
-
-	Fixes: 70215ff470c82d144e872057dfa5a478cc9195f2
-
-2016-11-07 Werner Koch <wk@gnupg.org>
-
-	wks: Encrypt all client mails also the target key,
-	+ commit 56e1864aa337f36317534db521fd4434d70e0784
-	* tools/gpg-wks-client.c (encrypt_response): Add arg FINGERPRINT.
-	(send_confirmation_response): Ditto.
-	(process_confirmation_request): Parse out fingerprint and pass
-	send_confirmation_response.
-
-2016-11-07 Justus Winter <justus@g10code.com>
-
-	tests,tools: Reimplement 'mk-tdata' in Scheme.
-	+ commit 70215ff470c82d144e872057dfa5a478cc9195f2
-	* tests/openpgp/defs.scm (tools): Drop 'mk-tdata'.
-	* tests/openpgp/setup.scm (make-test-data): New function.
-	* tests/openpgp/verify.scm: Avoid 'mk-tdata'.
-	* tools/Makefile.am (noinst_PROGRAMS): Drop 'mk-tdata'.
-	* tools/mk-tdata.c: Drop file.
-
-	gpgscm,w32: Provide schemish file handling for binary files.
-	+ commit 413cc50345557e0a516f33b98e8aab19bbc8b4fe
-	* tests/gpgscm/lib.scm (call-with-binary-input-file): New function.
-	(call-with-binary-output-file): Likewise.
-
-	gpgscm: Add support for pseudo-random numbers.
-	+ commit 6e677f9b55fdb610e93134042ee41ee5c641cbdf
-	* tests/gpgscm/ffi.c (do_getpid): New function.
-	(do_srandom): Likewise.
-	(random_scaled): Likewise.
-	(do_random): Likewise.
-	(do_make_random_string): Likewise.
-	(ffi_init): Expose the new functions.
-	* tests/gpgscm/lib.scm: Document the new functions.
-
-	g10: Fix crash.
-	+ commit 5840353d8bbcd9e75374f3bdb2547ffa7bbea897
-	* g10/getkey.c (get_best_pubkey_byname): If 'get_pubkey_byname' does
-	not return a getkey context, then it can return at most one key,
-	therefore there is nothing to rank. Also, always initialize '*retctx'
-	to be on the safe side.
-
-	Fixes: ab89164be02012f1bf159c971853b8610e966301
-
-2016-11-04 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fix printing strings containing zero bytes.
-	+ commit 1f45878a72f23d4bae08d73b614096b485f35274
-	* tests/gpgscm/scheme.c (atom2str): Fix computing the length of Scheme
-	strings. Scheme strings can contain zero bytes.
-
-	gpgscm: Implement 'atexit'.
-	+ commit 43f8006f5c75e3d15fe200e2fa41587a73bfb07b
-	* tests/gpgscm/ffi.scm (throw): Run *run-atexit-handlers* when
-	terminating the interpreter.
-	(*atexit-handlers*): New variable.
-	(*run-atexit-handlers*): New function.
-	(atexit): Likewise.
-	* tests/gpgscm/main.c (main): Run *run-atexit-handlers* at normal
-	interpreter shutdown.
-
-2016-11-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix length error for READKEY.
-	+ commit cd00b07ec26c3408e6aee66957b08c6fd319b700
-	* scd/app-openpgp.c (do_readkey): Decrement the length.
-
-	scd: Add --advanced option for READKEY.
-	+ commit f9da935c3eb302e75a80def51128fb6f669661d7
-	* scd/command.c (cmd_readkey) : Support ADVANCED arg.
-	* scd/app.c (app_readcert): Add ADVANCED arg.
-	* scd/app-openpgp.c (do_readkey): Implement ADVANCED arg.
-	* scd/app-nks.c (do_readkey): Error return with GPG_ERR_NOT_SUPPORTED.
-
-2016-11-03 Werner Koch <wk@gnupg.org>
-
-	agent: Extend the PINENTRY_LAUNCHED inquiry and status.
-	+ commit c1ea0b577a468030d2b006317ba27fc1746c4b14
-	* agent/call-pinentry.c (start_pinentry): Get flavor and version and
-	pass it to agent_inq_pinentry_launched.
-	* agent/command.c (agent_inq_pinentry_launched): Add arg EXTRA.
-	* g10/server.c (gpg_proxy_pinentry_notify): Print a new diagnostic.
-
-2016-11-03 Justus Winter <justus@g10code.com>
-
-	g10: Improve and unify key selection for -r and --locate-keys.
-	+ commit ab89164be02012f1bf159c971853b8610e966301
-	* g10/getkey.c (struct pubkey_cmp_cookie): New type.
-	(key_is_ok, uid_is_ok, subkey_is_ok): New functions.
-	(pubkey_cmp): Likewise.
-	(get_best_pubkey_byname): Likewise.
-	* g10/keydb.h (get_best_pubkey_byname): New prototype.
-	* g10/keylist.c (locate_one): Use the new function.
-	* g10/pkclist.c (find_and_check_key): Likewise.
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	(TEST_FILES): Add new files.
-	* tests/openpgp/key-selection.scm: New file.
-	* tests/openpgp/key-selection/0.asc: Likewise.
-	* tests/openpgp/key-selection/1.asc: Likewise.
-	* tests/openpgp/key-selection/2.asc: Likewise.
-	* tests/openpgp/key-selection/3.asc: Likewise.
-	* tests/openpgp/key-selection/4.asc: Likewise.
-
-	gpgscm,tests: Add new functions to the test environment.
-	+ commit 1ec07cbc209f247fd85704f5701564e31aa56d0b
-	* tests/gpgscm/lib.scm (first, last, powerset): New functions.
-	* tests/gpgscm/tests.scm (interactive-shell): New function.
-	* tests/openpgp/Makefile.am (EXTRA_DIST): Add new file.
-	* tests/openpgp/README: Document 'interactive-shell'.
-	* tests/openpgp/shell.scm: New file.
-
-2016-11-03 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Add a new field to the --query-swdb output.
-	+ commit d10b67b9bc32e8feff1be86e6646fc23e58fe45d
-	* tools/gpgconf.c (query_swdb): Insert new field with the installed
-	version. Check that the supplied version does not contain a colon.
-
-2016-11-02 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Add command --query-swdb.
-	+ commit 0ed6a6df5aa421a9c5cdb1e63867f0deee79af9e
-	* tools/gpgconf.c (aQuerySWDB): New.
-	(opts): Add --query-swdb.
-	(valid_swdb_name_p): New.
-	(query_swdb): New.
-	(main): Implement command --query-swdb.
-
-	common: Improve compare_string_versions.
-	+ commit 488b183811fc25c1ae49b4730491accf1adf518e
-	* common/stringhelp.c: Include limits.h.
-	(compare_version_strings): Change semantics to behave like strcmp.
-	Include the patch lebel in the comparison. Allow checking a single
-	version string.
-	* common/t-stringhelp.c (test_compare_version_strings): Adjust test
-	vectors and a few new vectors.
-	* g10/call-agent.c (warn_version_mismatch): Adjust to new sematics.
-	* g10/call-dirmngr.c (warn_version_mismatch): Ditto.
-	* sm/call-agent.c (warn_version_mismatch): Ditto.
-	* sm/call-dirmngr.c (warn_version_mismatch): Ditto.
-
-2016-11-02 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fix inclusion of readline header.
-	+ commit 60ad1a7f37ffc10e601e69a3e2d2bb14af510257
-	* tests/gpgscm/ffi.c: Define magic macro to prevent the completion
-	function from redefined.
-
-2016-11-02 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	build: Fix misspelled dirmngr.
-	+ commit 5e693ddfbe44d149ce0d9393d699c613ad5ea706
-
-
-	Spelling: correct spelling of "passphrase".
-	+ commit 68b59bbc42ba9ec69496758743924d54a95742f0
-	There were several different variant spellings of "passphrase". This
-	should fix them all for all English text.
-
-	I did notice that po/it.po contains multiple instances of
-	"passhprase", which also looks suspect to me, but i do not know
-	Italian, so i did not try to correct it.
-
-2016-11-02 Justus Winter <justus@g10code.com>
-
-	g10,w32: Fix build on Windows.
-	+ commit 5d4f1408d0dd055d412ae44bb4a0f28f74617f05
-	* g10/tofu.c (begin_transaction): Use the new 'gnupg_usleep'.
-
-2016-10-31 Werner Koch <wk@gnupg.org>
-
-	common: New function gnupg_usleep.
-	+ commit ad491ceec6145b3781a05dc7b4a36052abeeb4b4
-	* configure.ac (HAVE_NANOSLEEP): Test for nanosleep.
-	* common/sysutils.c: Always include time.h.
-	(gnupg_usleep): New.
-
-2016-10-31 Andre Heinecke <aheinecke@intevation.de>
-
-	w32: Fix PKG_CONFIG_LIBDIR in --build-w32.
-	+ commit 3b6b8fe32af7568ff51066d4c2e3679df6dea86f
-	* autogen.sh: Point pkg-config to the right location.
-
-2016-10-31 Neal H. Walfield <neal@g10code.com>
-
-	g10: Avoid gratuitious SQLite aborts and starving writers.
-	+ commit 7a634e48b13c5d5d295b8fed9b429e1b2109a333
-	* g10/tofu.c: Include <time.h>, <utime.h>, <fcntl.h> and <unistd.h>.
-	(tofu_dbs_s): Add fields want_lock_file and want_lock_file_ctime.
-	(begin_transaction): Only yield if DBS->WANT_LOCK_FILE_CTIME has
-	changed since we took the lock. Don't use gpgrt_yield to yield, but
-	sleep for 100ms. After taking the batch lock, update
-	DBS->WANT_LOCK_FILE_CTIME. Also take the batch lock the first time we
-	take the real lock. When taking the real lock, use immediate not
-	deferred mode to avoid gratuitious aborts.
-	(end_transaction): When dropping the outermost real lock, drop the
-	batch lock.
-	(busy_handler): New function.
-	(opendbs): Set the busy handler to it when opening the DB. Initialize
-	CTRL->TOFU.DBS->WANT_LOCK_FILE.
-	(tofu_closedbs): Free DBS->WANT_LOCK_FILE.
-
-2016-10-30 Neal H. Walfield <neal@g10code.com>
-
-	g10: Avoid reading in keys when possible.
-	+ commit eec365a02bd35d2d5c9e4d2c8d18bcd9180cf859
-	* g10/tofu.c (build_conflict_set): If CONFLICT_SET contains a single
-	element, don't bother to check for cross sigs. Add parameter PK.
-	Update callers.
-
-	g10: Fix bit setting.
-	+ commit 614ca00676bb8ca12b5107fec0e4ef8818445254
-	* g10/tofu.c (build_conflict_set): Fix bit setting.
-
-2016-10-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Enable the Issuer Fingerprint from rfc4880bis.
-	+ commit b6f08dbb0b45059cdbbb5d9be9725e437f42a8cc
-	* g10/build-packet.c (build_sig_subpkt_from_sig): Always write the new
-	Issuer Fingerprint sub-packet.
-	* g10/mainproc.c (check_sig_and_print): Always consider that
-	sub-packet.
-
-2016-10-27 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix signature checking.
-	+ commit 5a1f6a0062488aaf345b1c73ba98a540e673d619
-	* dirmngr/server.c: Include cpparray.h.
-	(verify_swdb_parm_s): New.
-	(verify_swdb_status_cb): New.
-	(cmd_versioncheck): Use gpgv to correclty verify the signature.
-	Rename some variable to comply with GNU standards.
-
-	gpg: Verify multiple detached signatures with different hash algos.
-	+ commit 8fced66be35db5ac2a6bfdb9bccb2c0e582d8256
-	* g10/mainproc.c (proc_tree): Loose check. Enable all algos.
-
-	common: Add GNUPG_MODULE_NAME_GPGV.
-	+ commit ece9ade4b44fb3d5d120cfd32b23632e5efd2134
-	* common/util.h (GNUPG_MODULE_NAME_GPGV): New.
-	* common/homedir.c (gnupg_module_name): Implement.
-
-2016-10-27 Justus Winter <justus@g10code.com>
-
-	g10: Fix iteration over getkey results.
-	+ commit 8ea72a776a88f3c851e812d258355be80caa1bc1
-	* g10/getkey.c (getkey_next): Return the public key in PK even if
-	RET_KEYBLOCK is NULL.
-
-	g10: Assert preconditions.
-	+ commit 66a0091d74768ab3a4a5342d3645e1834c59045a
-	* g10/getkey.c (get_pubkey_byname): Assert preconditions.
-
-2016-10-27 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Do not implement --supervised in Windows.
-	+ commit cf20b23c146c9e499263654644035796475de097
-	* dirmngr/dirmngr.c (opts) W32: Remove --supervised.
-	(main) W32: Ditto.
-
-	common: Remove debug output from gnupg_get_socket_name.
-	+ commit a9c8b5fbe7ae241bf45bdee15884abc7891aedf9
-	* common/sysutils.c (gnupg_get_socket_name): Remove debug message and
-	use my_error_from_syserror.
-
-2016-10-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: ADNS error handling fix.
-	+ commit 45dfc02b47f798f5a3b9973ca6a9f5a907d7e665
-	* dirmngr/dns-stuff.c (resolve_name_adns, get_dns_cert, get_dns_cname):
-	Use gpg_error and gpg_err_code_from_errno to compose the error value.
-
-2016-10-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Convey --quick option to dirmngr for --auto-key-retrieve.
-	+ commit a15ed5a1fd5307b3ec1822daf3b138b187db0b5e
-	* g10/call-dirmngr.c (gpg_dirmngr_ks_get): Add arg 'quick'.
-	(gpg_dirmngr_wkd_get): Ditto.
-	* g10/keyserver.c (keyserver_get): Add arg 'quick'.
-	(keyserver_get_chunk): Add arg 'quick'.
-	(keyserver_import_fprint): Ditto. Change callers to pass 0 for it.
-	(keyserver_import_keyid): Ditto.
-	(keyserver_import_wkd): Ditto.
-	* g10/mainproc.c (check_sig_and_print): Call the 3 fucntions with
-	QUICK set.
-
-2016-10-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix gnupg_inotify_has_name, differently.
-	+ commit 8b3d0d1a36cab83dafb98ccb7895144edb95e298
-	* common/sysutils.c (gnupg_inotify_has_name): Use void * to stop the
-	warning.
-
-	dirmngr: More ADNS error fix.
-	+ commit 6f1d8123d61b3efac94b4c61ee75bd947790ba42
-	* dirmngr/dns-stuff.c (get_dns_cert, getsrv, get_dns_cname): Fix return
-	value.
-
-	dirmngr: Fix error return for ADNS.
-	+ commit 8a9341b42cd1891090d45cc068bff84b2b3edb50
-	* dirmngr/dns-stuff.c (resolve_name_adns): Use RET for return value.
-
-	g10: Fix ECDH, clarifying the format.
-	+ commit ca0ee4e381d0b6a57e4ddc8f4bb2390eb97a2540
-	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Returns error when
-	it's short. Clarify the format. Handle other prefixes correctly.
-
-	scd: Add 0x41 prefix for x-coordinate only result.
-	+ commit 6bbd97d6c771b2e2c7cfcff6d5a823f0fb44d443
-	* scd/app-openpgp.c (do_decipher): When it's x-coordinate only, add the
-	prefix 0x41.
-
-2016-10-27 Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
-
-	g10: ECDH shared point format.
-	+ commit b648f28f9f8b889f1217a649ded1d45f261bb2bf
-	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Improve handling of
-	ECDH shared point format.
-
-2016-10-27 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	dirmngr: Implement --supervised command (for systemd, etc).
-	+ commit 75f8aaf5bc2dc7fcffe2987a572d489155c91eb9
-	* dirmngr/dirmngr.c (main): Add new --supervised command, which is a
-	mode designed for running under a process supervision system like
-	systemd or runit.
-	* doc/dirmngr.texi: document --supervised option.
-
-	agent,common: move get_socket_name() into common.
-	+ commit 6316b28e896957adb76a61a41d2e1c2a08d9f716
-	* agent/gpg-agent.c (get_socket_name): move to ...
-	* common/sysutils.c (gnupg_get_socket_name): ... here.
-
-	dirmngr: report actual socket name.
-	+ commit 6bb6ac56cca8135666387a0b9d88dd6b50311418
-	* dirmngr/dirmngr.ch (dirmngr_get_current_socket_name): new function
-	to report known socket name.
-	* dirmngr/server.c (cmd_getinfo): use dirmngr_get_current_socket_name
-	to report correct socket name.
-
-2016-10-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix gnupg_inotify_has_name.
-	+ commit bc28f320fa6f5b9fcdb73dba5e6c582daf7992c5
-	* common/sysutils.c (gnupg_inotify_has_name): Take care of the
-	alignment.
-
-	dirmngr: Fix help string and argument.
-	+ commit 96414baf36b8e6385b71847c789d489ebe176a93
-	* dirmngr/server.c (hlp_versioncheck): Add a newline.
-	(cmd_versioncheck): Fix argument.
-
-2016-10-26 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix hang due to deferred thread initialization.
-	+ commit d1ccab5176d7719328b287544b54b85e0277b146
-	* dirmngr/dirmngr.c (main): Call ldap_wrapper_launch_thread after
-	thread_init.
-
-	agent: Avoid double error message.
-	+ commit b77f95a4a675fd20f6eeb611f4e7b519eceb4ad3
-	* agent/gpg-agent.c (map_supervised_sockets): Shorten error message.
-	Remove unneeded diagnostic.
-
-	common: Use GPG_ERR_INV_VALUE instead of GPG_ERR_EINVAL.
-	+ commit ece13f177d948013b6f3df926406c0cd947abc25
-	* common/sysutils.c (gnupg_inotify_watch_socket): Return
-	GPG_ERR_INV_VALUE for a missing socket name and set proper error
-	source.
-
-	tests: Improve portability of fake-pinentry.
-	+ commit 21b318452abbfe21c45c2a67dae0e3a81cff1090
-	* tests/openpgp/fake-pinentry.c: Make all functions static.
-	(get_passphrase): s/unlink/remove/ because that is standard C.
-	(spacep): Rename to whitespace and change all callers.
-	(main): Move macro out of if-then chain.
-
-2016-10-26 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: --supervised mode improvements.
-	+ commit 27f6d5b9f4b6057ddeb9ace87a1e7e61ebac63e6
-	* agent/gpg-agent.c (map_supervised_socket): if the agent is running
-	 in --supervised mode and is not actually given LISTEN_FDNAMES
-	 directives, require at least fd 3 to be open for listening.
-
-	common: avoid segfault.
-	+ commit 3b5f5e0eb02ecbdcf59722755f22a9d2f88de6e6
-	* common/sysutils.c (gnupg_inotify_watch_socket): return EINVAL if
-	 socket_name is NULL, rather than segfaulting
-
-2016-10-25 Justus Winter <justus@g10code.com>
-
-	agent,tests,w32: Fix relaying pinentry user data, fix fake-pinentry.
-	+ commit 852b8f0b89d447536dfdf6cd4ea91615c75491ce
-	* agent/call-pinentry.c (start_pinentry): Also send the user data
-	using an Assuan 'OPTION' command.
-	* tests/openpgp/fake-pinentry.c (get_passphrase): Fix updating
-	passphrase file.
-	(spacep): Include newline characters.
-	(rstrip): New function.
-	(main): Handle Windows line endings. Handle the userdata option, and
-	restart with the new options.
-
-	tests: Do not autostart gpg-agents on teardown.
-	+ commit f88f11a25665dca7490a09088aa24edf396e4c40
-	* tests/openpgp/defs.c (stop-agent): Use '--no-autostart' when calling
-	gpg-connect-agent.
-
-2016-10-25 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Allow command VERSIONCHECK to handle 3 part version numbers.
-	+ commit b120f358c25cc846ca9d841d47e71ca1a7fe02e4
-	* dirmngr/server.c (parse_version_string): Add arg MICRO and set it.
-	(cmp_version): Extend to handle the MICRO part.
-	(confucius_mktmpdir): Rename to my_mktmpdir.
-	(my_mktmpdir): xstrconcat does not fail; use strconcat.
-	(fetch_into_tmpdir): Improve error checking.
-
-	common: Use strconcat in gnupg_setenv.
-	+ commit 7983f8758703071710c11bf2a255efcd71836b65
-	* common/sysutils.c (gnupg_setenv): Replace malloc+stpcpy by
-	strconcat. Indent cpp conditionals.
-	(gnupg_unsetenv): Indent cpp conditionals.
-
-2016-10-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Replace two sprintf calls.
-	+ commit 9d6146d6f9870fbfcec15cdc4becaf094d5a90e0
-	* g10/keygen.c (print_status_key_created): Use snprintf for now.
-	(ask_expire_interval): Replace xmalloc and sprintf by xasprintf.
-
-	agent: Minor cleanup for recent change in findkey.c.
-	+ commit 8c40b3b98d3ddeda79fde981e6539c5b3b09d9a2
-	* agent/findkey.c (agent_write_private_key): Avoid label name error.
-
-	agent: Slightly change structure of cmd_readkey.
-	+ commit fdb653a33ea1a24d1159880624dbbcc0867865b5
-	* agent/command.c (cmd_readkey): Avoid a leave label in the middle of
-	the code. Remove the special return.
-
-2016-10-24 Kai Michaelis <kai@gnupg.org>
-
-	dirmngr: Fix segfault in VERSIONCHECK.
-	+ commit 5e7dfd979d2d91800d90c3ce9a66755df3217682
-	* dirmngr/server.c (cmd_versioncheck): The VERSIONCHECK command crashes
-	when called without program version.
-
-2016-10-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Use canonical curve name of libgcrypt.
-	+ commit b1828c17fc475def1ee9e06f083f513f568c241b
-	* scd/app-openpgp.c (send_key_attr): Use curve instead of OID.
-	(ecdh_params): New.
-	(ecc_read_pubkey): Use ecdh_params. Use curve name.
-	(ecc_writekey): Likewise.
-	(ecc_curve): Rename from ecc_oid.
-	(parse_algorithm_attribute): Use ecc_curve.
-	* g10/call-agent.c (learn_status_cb): Use openpgp_is_curve_supported to
-	intern the curve name string.
-	* g10/card-util.c (card_status): Conver curve name to alias for print.
-
-	common: Fix openpgp_is_curve_supported.
-	+ commit 945e7ab0ddedf5f58afd97d81e101939de5b5d89
-	* common/openpgp-oid.c (openpgp_is_curve_supported): Support both of
-	canonical name of the curve and alias.
-
-	g10: Fix card keygen for decryption.
-	+ commit acef0951646b47c87ccc1c616f0105a068e7ed86
-	* g10/keygen.c (do_generate_keypair): Fix arguments.
-
-2016-10-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: More card key generation change.
-	+ commit 987bbb2276aeb6bee2793e8406e223717b605009
-	* g10/keygen.c (gen_card_key): Add back ALGO as the second argument.
-	Don't get ALGO by KEY-ATTR by this function. It's caller to provide
-	ALGO. Don't do that by both of caller and callee.
-	(generate_keypair): Only put paramerters needed. Use parameters
-	for ALGO to call gen_card_key.
-	(generate_card_subkeypair): Get ALGO and call gen_card_key with it.
-
-2016-10-21 Andre Heinecke <aheinecke@intevation.de>
-
-	g10: Write first keybox record in binary mode.
-	+ commit f7e50634be71ce3028726f23edf14454109a04a8
-	* g10/keydb.c (maybe_create_keyring_or_box): Open in binary mode.
-
-2016-10-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10,scd: Fix ECC keygen.
-	+ commit d2653b1a6db90aed073194a51fd61023d69773ec
-	* g10/keygen.c (generate_keypair): For card key generation, fill
-	parameters by KEY-ATTR.
-
-	* scd/app-openpgp.c (ecc_read_pubkey): OID should be freed at last,
-	after its reference by OIDBUF is finished.
-	(ecc_writekey): Likewise.
-
-	scd: Fix segfault changing key attr.
-	+ commit 693e657ff04756737dce025203c0deba480ea8de
-	* asc/app-openpgp.c (change_keyattr_from_string): Release after
-	allocated.
-
-2016-10-21 NIIBE Yutaka <gniibe@fsij.org>
-	 Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
-
-	g10: Don't ask keysize for for non-RSA card.
-	+ commit dafce6f698bec6e9d4c0125b90754d0687294e86
-	* g10/card-util.c (card_status): Bug fix for keyno.
-	(ask_card_rsa_keysize, do_change_rsa_keysize): Rename.
-	(generate_card_keys): Only ask keysize when RSA.
-	(card_generate_subkey): Likewise.
-
-	g10: Support ECC for gen_card_key.
-	+ commit 161cb22f13bcd8cbdb08558d9926b2168a8297ac
-	* g10/keygen.c (gen_card_key): Remove the first argument of ALGO.
-	(do_generate_keypair, generate_card_subkeypair): Follow the change.
-
-2016-10-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	Fix use cases of snprintf.
-	+ commit 6e85ac77af594035137950d801d8a1bacce548a3
-	* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
-	build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
-	dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
-	g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
-	sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
-
-	agent: Fix saving with FORCE=1.
-	+ commit 1ffd475f99eaff4e40950eda88702f8db9288eb5
-	* agent/findkey.c (agent_write_private_key): Recover from an error of
-	GPG_ERR_ENOENT when FORCE=1 and it is opened with "rb+".
-
-2016-10-20 Justus Winter <justus@g10code.com>
-
-	tests: Simplify test.
-	+ commit 71158d8d5f823888abc8588caa6497860ce59c06
-	* tests/openpgp/quick-key-manipulation.scm: Avoid creating a temporary
-	home directory, just make the uids unique.
-
-	tests: Flush stdout in the fake pinentry.
-	+ commit ca9597f080f70a8435daaeb5449bef0462a1402a
-	* tests/openpgp/fake-pinentry.c (reply): Flush stdout.
-
-	common,w32: Fix setting environment variables on Windows.
-	+ commit 8c7c4faf3de28ca70a60e6b15f51c1b206e0ddd9
-	* common/sysutils.c (gnupg_setenv): Also update the environment block
-	maintained by the C runtime.
-	(gnupg_unsetenv): Likewise.
-	* tests/gpgscm/ffi.c (do_setenv): Fix error handling.
-
-	tests,w32: Cope with Windows line endings.
-	+ commit bf37916a23bd0929fc4a5f28c9a41f43c5a473f6
-	* tests/openpgp/issue2015.scm: Rstrip line before comparison.
-
-	tests: Create and remove socket directories.
-	+ commit 2d794779e0fd9d9a1efc98e7bd77a296a25f4293
-	* tests/openpgp/defs.scm (start-agent): Move function here and create
-	the socket directory prior to starting the agent.
-	(stop-agent): Move function here and remove the socket directory.
-	* tests/openpgp/finish.scm: Adapt.
-	* tests/openpgp/setup.scm: Likewise.
-
-2016-10-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent, g10: Fix keygen.
-	+ commit 9a34e2142b426b98c73fd888102ea1596bbce62a
-	* agent/command.c (cmd_readkey): Get length after card_readkey.
-	* g10/keygen.c (gen_card_key): Fix off-by-one error.
-
-	scd: GENKEY updates the public key in APP.
-	+ commit b680f79cc112c4831293e259d7db2921bcd783a4
-	* scd/app-openpgp.c (rsa_read_pubkey, ecc_read_pubkey): New.
-	(read_public_key): New.
-	(get_public_key, do_genkey): Use read_public_key.
-
-	g10: smartcard keygen change.
-	+ commit 980c037bedb968ddf155dd334c0a70b918a17759
-	* g10/call-agent.c (scd_genkey_cb_append_savedbytes): Remove.
-	(scd_genkey_cb): Only handle KEY-CREATED-AT and PROGRESS.
-	(agent_scd_genkey): Remove INFO argument. CREATETIME is now in/out
-	argument.
-	(agent_readkey): Use READKEY --card instead of SCD READKEY.
-	* g10/keygen.c (gen_card_key): Use READKEY --card command of the agent
-	to retrieve public key information from card and let the agent make
-	a file for private key with shadow info.
-
-	agent: Add --card option for READKEY.
-	+ commit 82cbab906a3e72a98fdc16096f2f0451465969a2
-	* agent/findkey.c (agent_write_shadow_key): New.
-	* agent/command-ssh.c (card_key_available): Use agent_write_shadow_key.
-	* agent/learncard.c (agent_handle_learn): Likewise.
-	* agent/command.c (cmd_readkey): Add --card option.
-
-2016-10-19 Kai Michaelis <kai@gnupg.org>
-
-	dirmngr: improve VERSIONCHECK.
-	+ commit 72a99f582dad4cb4c3b05b97c7ebb8d537f10b79
-	Replace strtok_r() and code formatting. Use code from libgpg-error for
-	version comparison.
-
-2016-10-18 Justus Winter <justus@g10code.com>
-
-	common: Fix copying data to estreams.
-	+ commit 8dce5ee55a0268d196023224dcf3020306922490
-	* common/exectool.c (copy_buffer_do_copy): Correctly account for
-	partially written data in the event of errors.
-
-	common,w32: Communicate with child in non-blocking mode.
-	+ commit 05a1e412332dd980353a4e3e59bc75ba40bae7fc
-	* common/exechelp-w32.c (gnupg_spawn_process): Open streams in
-	non-blocking mode if requested.
-
-	common,w32: Extend gnupg_create_inbound_pipe et al.
-	+ commit f2d39a6d051413289c717b9cd2dc387a270b8e7c
-	* common/exechelp-w32.c (do_create_pipe): Rename, add arguments, and
-	create a stream if reqested.
-	(gnupg_create_inbound_pipe): Use the extended function to open the
-	stream if requested.
-	(gnupg_create_outbound_pipe): Likewise.
-	(gnupg_create_pipe): Update call site.
-
-	common,w32: Make use of default_errsource in exechelp.
-	+ commit 727ca74bb942464217e678012cccbfc347ae08a5
-	* common/exechelp-posix.c (my_error_from_syserror, my_error): New.
-	Use them instead of gpg_error and gpg_error_from_syserror.
-
-2016-10-18 NIIBE Yutaka <gniibe@fsij.org>
-	 Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
-
-	scd: Support ECC key generation.
-	+ commit 34439da2d62b964a914ace66bae7e38f619582a4
-	* scd/app-openpgp.c (get_public_key): Fix a message.
-	(change_keyattr_from_string, ecc_writekey): Call mpi_release sooner.
-	(do_genkey): Add ECC support.
-
-2016-10-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: minor cleanup to merge other works.
-	+ commit f1845f25dbea79c191427710fa56ed01e63a045b
-	* scd/iso7816.c (do_generate_keypair): Use const char * for DATA.
-	(iso7816_generate_keypair, iso7816_read_public_key): Likewise.
-	* scd/app-openpgp.c (get_public_key): Follow the change.
-	(do_genkey): Ditto. Use ERR instead of RC. Use u32 for CREATED_AT.
-
-2016-10-17 Justus Winter <justus@g10code.com>
-
-	gpgscm: Initialize nesting stack.
-	+ commit c2e713d9e25ef8b61e8eeb3c01ee1e31cb70b794
-	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize nesting
-	stack.
-
-2016-10-17 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc: Document how to manually shut down gpg-agent.
-	+ commit 869c06efa791bbc8330becdb3f13f7cf9506257e
-	* doc/gpg-agent.texi: document "gpgconf --kill gpg-agent" for manual
-	 agent termination.
-
-	This was requested in a side-comment in https://bugs.debian.org/840669
-
-	doc: Point gpg-agent(1) at the right gpg manpage in SEE ALSO.
-	+ commit c53ce53ab1fa6a328c368f2a15e3ccd803f03ee2
-	* doc/gpg-agent.texi (SEE ALSO): refer to @gpgname, instead of
-	 hard-coding "gpg2".
-
-2016-10-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix keytocard for ECC.
-	+ commit 25428be52168fa9c581b7f11c95a5c63b25343b7
-	* scd/app-openpgp.c (build_ecc_privkey_template): Size can be greater
-	than 128 when it comes with public key for curve of larger field.
-
-	gpgconf: Fix for --homedir.
-	+ commit 70a8584ec4389209762eb65bb77f20f7881577be
-	* tools/gpgconf-comp.c (gpg_agent_runtime_change,
-	scdaemon_runtime_change, dirmngr_runtime_change): Provide the homedir
-	arguments by --homedir when it's not default.
-
-2016-10-16 Werner Koch <wk@gnupg.org>
-
-	agent: Use straightforward names for the default socket names.
-	+ commit 0b0f9a3788cb5d3c26cec16cd24acc973069d280
-	* configure.ac (GPG_AGENT_SOCK_NAME): Change name to *.extra.
-	(GPG_AGENT_EXTRA_SOCK_NAME): Change name to *browser.
-
-2016-10-15 Werner Koch <wk@gnupg.org>
-
-	agent: Move inotify code to common and improve it.
-	+ commit 2f7d4c38c9e7bcc14e6e0bf219d688c40a4afecb
-	* common/sysutils.c: Include sys/inotify.h.
-	(my_error_from_syserror, my_error): New.
-	(gnupg_inotify_watch_socket): New.
-	(gnupg_inotify_has_name): New.
-	* agent/gpg-agent.c: Do not include sys/inotify.h.
-	(my_inotify_is_name): Remove.
-	(handle_connections): Remove HAVE_INOTIFY_INIT protected code and use
-	the new functions.
-
-2016-10-14 Kai Michaelis <kai@gnupg.org>
-
-	dirmngr: use gnupg_mkdtemp instead of mkstemp.
-	+ commit c318561ef4c97f0c2767aef377531d58174060a1
-	MinGW on debian does not support mkstemp.
-
-	dirmngr: add VERSIONCHECK command.
-	+ commit f99c5fa1c970dc1122ac62371eb8d758f380ed57
-	Given an application name and version VERSIONCHECK fetches the software
-	version list from version.gnupg.org, verifies the signature and returns
-	whenever the given version is older (UPDATE), current (CURRENT) or newer
-	(ROLLBACK).
-
-2016-10-13 Neal H. Walfield <neal@g10code.com>
-
-	tests: Use shorter filenames.
-	+ commit 0c56ad5a8d89d69a9ed00571720b3b105f955214
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/EC38277E-1.txt: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/EC38277E-2.txt: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/EC38277E-3.txt: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: Rename from
-	 this...
-	* tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/871C2247-1.gpg: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/871C2247-1.txt: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/871C2247-2.gpg: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/871C2247-2.txt: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/871C2247-3.gpg: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/871C2247-3.txt: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: Rename from this...
-	* tests/openpgp/tofu/cross-sigs/871C2247-4.gpg: .. to this.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: Rename from
-	 this...
-	* tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg: .. to this.
-	* tests/openpgp/Makefile.am (TEST_FILES): Update accordingly.
-
-	g10: Be more careful when checking if a binding is signed by a UTK.
-	+ commit 95d0f3e5eebd85dcf226dca14891a1215bfe93ae
-	* g10/tofu.c (signed_by_utk): When checking if a key is signed by an
-	ultimately trusted key, only consider the signatures on the specified
-	user id.
-	* tests/openpgp/tofu.scm: Add test for the above.
-
-	tests: Add test data to TEST_FILES.
-	+ commit d2d936fbe86d61b89cead95df633b2b575690e05
-	* tests/openpgp/Makefile.am (TEST_FILES): Add new test data.
-
-	g10: Be more careful when checking cross signatures.
-	+ commit 4c0389f8eb19ae7dfd9c5d784a629b386d93cc5c
-	* g10/tofu.c (cross_sigs): When checking cross signatures, only
-	consider the signatures on the specified user id.
-	* tests/openpgp/tofu.scm: Add test for the above.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg:
-	 New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: New file.
-	* tests/openpgp/tofu/cross-sigs/
-	 DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: New file.
-	* tests/openpgp/tofu/cross-sigs/README: New file.
-
-	g10: Still check if the key is an UTK or cross signed in batch mode.
-	+ commit e09166c77273f459c8f87cab9224f85808af2cba
-	* g10/tofu.c (get_trust): If POLICY is ask, but we can't ask, don't
-	bail immediately. Instead, check if the key in question is an
-	ultimately trusted key or cross signed.
-
-	g10: If an sqlite operation fails, map the error code to GPG_ERR_GENERAL
-	+ commit 5bf92e51dfdfb4f4746ecd817d8d2240ed27ea74
-	* g10/tofu.c (get_policy): If an sqlite operation fails, map the error
-	 code to GPG_ERR_GENERAL.
-	(ask_about_binding): Likewise.
-	(build_conflict_set): Likewise.
-	(get_trust): Likewise.
-	(show_statistics): Likewise.
-	(tofu_register_signature): Likewise.
-	(tofu_register_encryption): Likewise.
-
-	tests: Remove support for deprecated functionality.
-	+ commit 2282c3b761413dfa894300e70084bbd58908c0b1
-	* tests/openpgp/tofu.scm: Don't remove tofu.d. It's deprecated.
-
-2016-10-12 Neal H. Walfield <neal@g10code.com>
-
-	g10: When changing a TOFU binding's policy, update the conflict info.
-	+ commit 3ad17e72fa81d18c95732ddcd4def244f52bb5b1
-	* g10/tofu.c (record_binding): Take an additional argument, CONFLICT.
-	Set the binding's conflict accordingly. Update callers.
-
-	g10: Make a singular string singular.
-	+ commit ca84f65c7cf2c6a08a01018519965a82e6c52cac
-	* g10/tofu.c (ask_about_binding): Make the singular string singular.
-
-	g10: Correctly determine whether a binding has a conflict.
-	+ commit 6fdf37f0831949cb279de6dc6b247ab2ed53fe5a
-	* g10/tofu.c (build_conflict_set): A binding has a conflict is
-	conflict is *not* NULL, not if it is NULL.
-
-	g10: Fix a column's type in TOFU DB.
-	+ commit 78eda335fd1c29038b74b9cc912b6a4515fccd9f
-	* g10/tofu.c (initdb): Change policy from a boolean to an integer.
-
-2016-10-07 Justus Winter <justus@g10code.com>
-
-	tests: Rework test environment setup.
-	+ commit cbbf0a7a8da1757fea29cff0daaa42a6bbb95b26
-	* tests/openpgp/setup.scm: Import one keyring at a time. This works
-	around a yet to be investigated hang on Windows. It is also much
-	prettier.
-
-	tests: Improve handling of Windows newlines.
-	+ commit 1f76f8d8bc65fad98927c977baf4d5e36dafe52b
-	* tests/gpgscm/lib.scm (string-split-newlines): New function.
-	* tests/openpgp/default-key.scm: Use new function.
-	* tests/openpgp/defs.scm: Likewise.
-	* tests/openpgp/export.scm: Likewise.
-	* tests/openpgp/import.scm: Likewise.
-
-	gpgscm: Improve test of low-level functions.
-	+ commit 11eac7eb2fa3392a9aa052f8f5bb9875129ab84b
-	* tests/gpgscm/t-child.c: Print large amounts of data.
-	* tests/gpgscm/t-child.scm: Test that this works.
-
-	gpgscm: Improve path handling.
-	+ commit dff266059813d22d1e2ba7e77279999cd41ceb75
-	* tests/gpgscm/ffi.c (ffi_init): New Scheme variable '*win32*'.
-	* tests/gpgscm/tests.scm (canonical-path): Correctly handle paths with
-	drive letter on Windows. Use 'path-join'.
-	(path-expand): Use 'path-join'.
-
-	tools: Fix error handling.
-	+ commit 5afbfdfd59540cb882d891ff1f4afa73fe48f99a
-	* tools/gpgtar-create.c (gpgtar_create): Do not crash if opening the
-	tarball failed.
-
-2016-10-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix get_socket_name.
-	+ commit fb3b3e1e7a4219f61a834fd07809898918611c2f
-	* agent/gpg-agent.c (get_socket_name): Fix the size of copying.
-
-2016-10-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Put extra parens around bit tests.
-	+ commit 5d43d28aa3c44c3a27fde823f467b0c4be1a58c2
-	* g10/options.h (DBG_MPI): New.
-	* g10/gpg.c (set_debug): Use macro or extra parens for binary operator.
-	* g10/parse-packet.c (set_packet_list_mode): Use dbg macro.
-
-2016-10-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent, dirmngr, scd: Fix init_common_subsystems.
-	+ commit fc0b392e766af8127094e8b529d25abb84ad1d65
-	* common/init.c (_init_common_subsystems): Don't call
-	gpgrt_set_syscall_clamp in this function.
-	* agent/gpg-agent.c, dirmngr/dirmngr.c, scd/scdaemon.c: Call
-	gpgrt_set_syscall_clamp after npth_init.
-
-2016-10-06 Justus Winter <justus@g10code.com>
-
-	common: Avoid pointer arithmetic on string literals.
-	+ commit 4aadc751f201f8f97c9c1f454e3a29803cce3edb
-	* common/gettime.c (rfctimestamp): Use indexing instead.
-	* common/signal.c (got_fatal_signal): Likewise.
-
-	g10: Fix singular term.
-	+ commit b0d2526bc4e5c663eeffe04500420c70cee98712
-	* g10/tofu.c (ask_about_binding): Fix singular message.
-
-	g10: Use appropriate variant of 'abs'.
-	+ commit 73000d1ce0317210f5a9e5262404cc90258041ff
-	* g10/tofu.c (ask_about_binding): Use 'labs' instead of 'abs'.
-
-	sm: Remove statement without effect.
-	+ commit 2d446759bd43ae38fbce9a18c955285ca535bc08
-	* sm/call-dirmngr.c (gpgsm_dirmngr_isvalid): Remove statement without
-	effect.
-
-	g10: Fix testing for debug flag.
-	+ commit 6b626824c8e30b41c47724b5ccbf761937499512
-	* g10/parse-packet.c (set_packet_list_mode): Fix testing for debug
-	flag.
-
-	tools: Improve error handling.
-	+ commit 32f81f56a8be6d13dea0a64d24f52343c7e72c84
-	* tools/gpg-wks-server.c (copy_key_as_binary): Initialize 'argv'.
-
-	gpgscm: Update callsite of 'gnupg_spawn_process'.
-	+ commit 07cfb3b27a77491eae818d57f6eb660e75fa013f
-	* tests/gpgscm/ffi.c (do_spawn_process): Adapt to the changes to
-	'gnupg_spawn_process'.
-
-2016-10-05 Werner Koch <wk@gnupg.org>
-
-	wks: Send key encrypted as required by draft -02.
-	+ commit 8ce800d21919eaaba7ed4f04f712292be310fd66
-	* tools/gpg-wks-client.c (get_key): Encrypt.
-	(encrypt_response): Take care of --fake-submission-addr.
-
-	wks: Add option --fake-submission-addr to gpg-wks-client.
-	+ commit e514a5b725f0c997cef4362808b2778a3faa9cf8
-	* tools/gpg-wks-client.c (oFakeSubmissionAddr): New.
-	(opts): Add option --fake-submission-addr.
-	(fake_submission_addr): New variable.
-	(parse_arguments): Set it.
-	(command_send): Use --fake-submission-addr.
-
-	agent: Another minor fix to map_supervised_sockets.
-	+ commit 1cedc32c95c2e3c3ab98af23ddc2845d51e596c1
-	* agent/gpg-agent.c (map_supervised_sockets): Remove debug message.
-	Provide correct fd in the second error case.
-
-	agent: Fix npth + supervised mode problem.
-	+ commit f57dc2b1e6f28d164f882373535dbcb0d632ca17
-	* agent/gpg-agent.c (main): Initialize modules in supervised mode.
-
-2016-10-05 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: Fix error handling in map_supervised_sockets.
-	+ commit a2127c71dbf87c1710b43d91a733dd4c9b2953bc
-	* agent/gpg-agent.c (map_supervised_sockets): the file descriptor to
-	 close on error is fd, not i.
-
-2016-10-04 Werner Koch <wk@gnupg.org>
-
-	agent: Streamline the supervised mode code.
-	+ commit 1a9c8d78ece2f31fdb1a8e2be049aa71053061fa
-	* agent/gpg-agent.c (get_socket_path): Rename to ...
-	(get_socket_name): this. This is to comply with the GNU coding guide.
-	Use xtrymalloc instead of malloc. Do not build for W32.
-	(map_supervised_sockets): Use strtokenize and set the the socket names
-	here.
-	(main): Adjust for above change. Do not close the socket.
-
-	agent: Adjust cleanup for supervised mode. Fix for W32.
-	+ commit afcfae7959f39e7d85309b9496e1f1cf9acd5cc2
-	* agent/gpg-agent.c (opts) W32: Remove option --supervised.
-	(is_supervised): Move from main() to global.
-	(inhibit_socket_removal): New.
-	(cleanup): Take care of supervise mode and INHIBIT_SOCKET_REMOVAL.
-	(check_own_socket_thread): Set INHIBIT_SOCKET_REMOVAL instead of
-	seting the socket names to empty.
-
-	agent: Adjust supervised mode for the new default socket names.
-	+ commit dc059af1ff007842e2633e686c87d05daf1d45e3
-	* agent/gpg-agent.c (main): In supervised mode do not provide default
-	socket names. Unset DISPLAY and INSIDE_EMACS. Use log_error and
-	agent_exit.
-
-2016-10-04 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	agent: Implement --supervised command (for systemd, etc).
-	+ commit 9f92b62a51d2d60f038fdbe01602865c5933fa95
-	* agent/gpg-agent.c (get_socket_path): New function for POSIX systems
-	to return the path for a provided unix-domain socket.
-	(map_supervised_sockets): New function to inspect $LISTEN_FDS and
-	$LISTEN_FDNAMES and map them to the specific functionality offered by
-	the agent.
-	(main): Add --supervised command. When used, listen on already-open
-	file descriptors instead of opening our own.
-	* doc/gpg-agent.texi: Document --supervised option.
-
-2016-10-04 Justus Winter <justus@g10code.com>
-
-	build,w32: Unconditionally build tests.
-	+ commit 4a232d23a8f51bebf9ee382e480248b4bde30f28
-	* configure.ac (run_tests, RUN_TESTS, RUN_GPG_TESTS): Remove
-	variables. They are misleadingly named, as they inhibit building the
-	tests. There is no reason not to build the tests even when
-	cross-compiling, as they are only run if one does 'make check'.
-	* Makefile: Adapt accordingly.
-	* tests/Makefile.am: Adapt accordingly. Avoid building 'asschk' on
-	Windows as it uses non-portable functions.
-
-	tests,w32: Do not expose 'glob' to gpgscm.
-	+ commit 41b510f9c510f8fd1b59eb0c5dd2e2b2deaf0a1b
-	* tests/gpgscm/ffi.c (do_glob): Remove function.
-	(ffi_init): Likewise.
-
-	tests,w32: Avoid using 'glob'.
-	+ commit 949e70115eb2c04bd09da6477f6c433e6fd9a366
-	* tests/openpgp/setup.scm: Avoid 'glob' which is not available on
-	mingw.
-
-	tools: Ignore existing directories in gpgtar.
-	+ commit fbc83c0cdd390473c044953fb774571ffc636c6d
-	* tools/gpgtar-extract.c (extract_directory): Ignore existing
-	directories now that we have '--directory'.
-
-2016-10-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent, dirmngr, scd: npth_init must be after fork.
-	+ commit eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d
-	* agent/gpg-agent.c (thread_init_once, initialize_modules): New.
-	(main): Make sure no daemonizing-fork call after npth_init, and no npth
-	calls before npth_init, with care of npth calls by assuan hooks.
-	* dirmngr/dirmngr.c (thread_init): New.
-	(main): Make sure npth_init must not be called before daemonizing fork.
-	* scd/scdaemon.c (main): Likewise.
-
-2016-09-30 Werner Koch <wk@gnupg.org>
-
-	agent: Remove the warning for the GKR hijacking.
-	+ commit a43739a2456a38c01704d8a52dca441055e29bc6
-	* g10/call-agent.c (check_hijacking): Remove.
-	(start_agent): Remove call.
-
-	agent: Create the extra sockets in the standard socket dir.
-	+ commit 80cc16e0728256f6b07a12980e1f3512cf2324fa
-	* agent/gpg-agent.c (main): Take the socketdir in account for the
-	default sockets.
-	* tools/gpgconf.c (list_dirs): Add "agent-extra-socket" and
-	"agent-browser-socket".
-
-	agent: Kludge to allow disabling of the extra sockets.
-	+ commit 95cf7afff074613825f4442fa131145a2c0d3cf7
-	* agent/gpg-agent.c (main): Check for special socket names.
-
-	wks: Avoid long trustdb checks.
-	+ commit de67055aff916455cec89fab1d95177d3b383008
-	* tools/wks-receive.c (verify_signature): Use --always-trust.
-
-2016-09-30 Justus Winter <justus@g10code.com>
-
-	build: Fix build against libiconv.
-	+ commit 6054e8aaecbd355bb7559697eecaadf2225189b8
-	* agent/Makefile.am: Add INCICONV and LIBICONV.
-	* common/Makefile.am: Likewise.
-	* tools/Makefile.am: Likewise.
-
-	agent: Enable restricted, browser, and ssh socket by default.
-	+ commit e11686f973b35869d7b299ce4726003ac22e2e3a
-	* agent/gpg-agent.c (main): Provide defaults for 'extra-socket' and
-	'browser-socket', enable ssh socket by default, but do not emit the
-	'SSH_AUTH_SOCK' variable unless it has been explicitly requested.
-	* configure.ac (GPG_AGENT_{EXTRA,BROWSER}_SOCK_NAME): New definitions.
-	* doc/gpg-agent.texi: Update documentation.
-
-	w32: Fix STARTTLS on LDAP connections.
-	+ commit 8d37018050373a47566bf8ea0d894da20ed292c7
-	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Fix build against
-	<winldap.h>.
-
-2016-09-29 Werner Koch <wk@gnupg.org>
-
-	wks: Partly implement draft-koch-openpgp-webkey-service-02.
-	+ commit 33800280da55a859e08dfa57f29144c89dd1bead
-	* tools/gpg-wks.h (WKS_RECEIVE_DRAFT2): New.
-	* tools/wks-receive.c: Include rfc822parse.h.
-	(struct receive_ctx_s): Add fields PARSER, DRAFT_VERSION_2, and
-	MULTIPART_MIXED_SEEN.
-	(decrypt_data): Add --no-options.
-	(verify_signature): Ditto.
-	(new_part): Check for Wks-Draft-Version header. Take care of text
-	parts.
-	(wks_receive): Set Parser and pass a flag value to RESULT_CB.
-	* tools/gpg-wks-client.c (read_confirmation_request): New.
-	(main) <aRead>: Call read_confirmation_request instead of
-	process_confirmation_request.
-	(command_receive_cb): Ditto. Add arg FLAGS..
-	(decrypt_stream_status_cb, decrypt_stream): New.
-	(command_send): Set header Wks-Draft-Version.
-	* tools/gpg-wks-server.c (struct server_ctx_s): Add field
-	DRAFT_VERSION_2.
-	(sign_stream_status_cb, sign_stream): New.
-	(command_receive_cb): Set draft flag.
-	(send_confirmation_request): Rework to implement protocol draft
-	version 2.
-
-	* tools/gpg-wks.h (DBG_MIME_VALUE, DBG_PARSER_VALUE): New.
-	(DBG_MIME, DBG_PARSER, DBG_CRYPTO): New. Use instead of a plain
-	opt.debug where useful.
-	* tools/gpg-wks-client.c (debug_flags): Add "mime" and "parser".
-	* tools/gpg-wks-server.c (debug_flags): Ditto.
-
-	tools: Convey signeddata also to the part_data callback in mime-parser.
-	+ commit c738f92c195d91662ddc7848cc3c92c7f091f1f8
-	* tools/mime-parser.c (mime_parser_parse): Factor some code out to ...
-	(process_part_data): new.
-	((mime_parser_parse): Also call process_part_data for signed data.
-
-	tools: Allow retrieval of signed data from mime-maker.
-	+ commit f776757ea94542e2f425840dddaf3e65b0ff7757
-	* tools/mime-maker.c (find_part): New.
-	(mime_maker_get_part): New.
-
-	tools: Change mime-maker to write out CR,LF.
-	+ commit 29db3be6e8dbc9b4dd52cd1781106fa9fa3954a5
-	* tools/mime-maker.c (struct part_s): Add field PARTID.
-	(struct mime_maker_context_s): Add field PARTID_COUNTER.
-	(dump_parts): Print part ids.
-	(mime_maker_add_header): Assign PARTID.
-	(mime_maker_add_container): Ditto.
-	(mime_maker_get_partid): New.
-	(write_ct_with_boundary): Remove.
-	(add_header): Strip trailing white spaces.
-	(write_header): Remove trailing spaces trimming. Add arg BOUNDARY.
-	Handle emdedded LFs.
-	(write_gap, write_boundary, write_body): New.
-	(write_tree): Use new functions.
-
-	tools: Simplify the mime-maker container creation.
-	+ commit 95d60c6ce9e8a7a7741553af957978c1f91547c5
-	* tools/mime-maker.c (struct part_s): Remove field MEDIATYPE.
-	(release_parts): Ditto.
-	(dump_parts): Print a body line only if tehre is a body.
-	(mime_maker_add_header): Check for body or container.
-	(mime_maker_add_container): Remove arg MEDIATYPE. Change all callers.
-	(mime_maker_end_container): New.
-
-	tools: Give mime parser callbacks access to the rfc822 parser.
-	+ commit 4ac138c84d0f344ca9442f90c96f0e1f76062a4a
-	* tools/mime-parser.c (mime_parser_context_s): Add field MSG.
-	(parse_message_cb): Set it.
-	(mime_parser_rfc822parser): New.
-	* tools/mime-parser.h: Declare rfc822parse_t for the new prototype.
-
-2016-09-29 Justus Winter <justus@g10code.com>
-
-	dirmngr: Fix STARTTLS on LDAP connections.
-	+ commit 9e6f8a55ed04f876635792125858ee76a948802a
-	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Fix unfortunate typo.
-
-2016-09-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve WKD by importing only the requested UID.
-	+ commit cbf2ac66692daa7a324108724698d60d6c7e473f
-	* g10/keyserver.c: Include mbox-util.h.
-	(keyserver_import_wkd): Do not use the global import options but
-	employ an import filter.
-
-	gpg: Reject import if an import filter removed all user ids.
-	+ commit 80393661bdfa7ae0288644513575e8a5d708b084
-	* g10/import.c (any_uid_left): New.
-	(import_one): Check that a UID is left.
-
-	gpg: Make import filter data object more flexible.
-	+ commit c9237bf2ba2c49588576dcece756ebf5fe89aada
-	* g10/main.h (import_filter_t): New.
-	* g10/import.c (struct import_filter_s): Declare struct.
-	(import_keep_uid, import_drop_sig): Replace by ...
-	(import_filter): new. Adjust all users.
-	(cleanup_import_globals): Move code to ...
-	(release_import_filter): new.
-	(save_and_clear_import_filter): New.
-	(restore_import_filter): New.
-
-	gpg: Make sure that internal key import is done with a binary stream.
-	+ commit 829949f3823c2306022928ce782f9c9d9c5f1cc8
-	* g10/import.c (import_keys_internal): Open stream in binary mode.
-
-2016-09-27 Justus Winter <justus@g10code.com>
-
-	build: Do not link gpg-connect-agent against npth.
-	+ commit 20a16833ee2bb05f735377f705899302bcf2b4d3
-	* tools/Makefile.am: Do not link gpg-connect-agent against npth.
-
-	build: Fix check for resolver library on macOS.
-	+ commit 2e64ccb0f96d615b1eb87e37f230a5d761aa9c36
-	* configure.ac: Check for the mangled name of 'dn_skipname' first.
-
-	common: Correctly handle modules relying on npth.
-	+ commit 2b23a321ac0b07beeac1dfa8d71f223e66c49b71
-	* common/Makefile.am (common_sources): Drop 'call-gpg.{c,h}'.
-	(with_npth_sources): New variable.
-	(libcommonpth_a_SOURCES): Use the new variable.
-
-2016-09-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent, sm: Set CTX after start_agent.
-	+ commit 4e4843e735f32b5e79a51d8062da55bfaab6ad77
-	* g10/call-agent.c (agent_keytocard): Assign parm.ctx after start_agent.
-	* sm/call-agent.c (gpgsm_agent_pksign, gpgsm_scd_pksign)
-	(gpgsm_agent_readkey, gpgsm_agent_scd_serialno)
-	(gpgsm_agent_scd_keypairinfo, gpgsm_agent_marktrusted)
-	(gpgsm_agent_passwd, gpgsm_agent_get_confirmation)
-	(gpgsm_agent_ask_passphrase, gpgsm_agent_keywrap_key)
-	(gpgsm_agent_export_key): Likewise.
-
-	dirmngr: Removal of no-libgcrypt.o.
-	+ commit 836b72363168cbb0051fc2356f61788468db211c
-	* dirmngr/Makefile.am (dirmngr_ldap_LDADD): Remove no-libgcrypt.o.
-
-	agent: Allow only specific digest size for ECDSA.
-	+ commit 98bc6f480ac973dccce90378dc021a2e24e58704
-	* agent/pksign.c (do_encode_dsa): Fix validation of digest size.
-
-2016-09-22 Neal H. Walfield <neal@g10code.com>
-
-	g10: When adding a user id, make sure the keyblock has been prepared.
-	+ commit df5353b95eefc13135e7df50a7c197f270d6080d
-	* g10/keyedit.c (keyedit_quick_adduid): Call merge_keys_and_selfsig on
-	KEYBLOCK before adding the user id.
-	* tests/openpgp/quick-key-manipulation.scm: Make sure that the key
-	capabilities don't change when adding a user id.
-	(key-data): New function.
-
-2016-09-20 Justus Winter <justus@g10code.com>
-
-	tests: Add documentation, make interactive debugging possible.
-	+ commit 7e0379a75475abfd15e0623913795779ff0f40d7
-	* tests/openpgp/README: Add documentation about debugging and
-	interfacing with GnuPG.
-	* tests/openpgp/run-tests.scm (test::run-sync): Hand stdin to the
-	child so that we can use a repl in the tests.
-
-	tests: Port the quick key manipulation test to Scheme.
-	+ commit 6c4c0e3ac2aeafba7a2b7c2dd92a18be8aec92b1
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/quick-key-manipulation.scm: New file.
-
-	tests: Remove list of tests from the test runner.
-	+ commit 49fae88fd170f2bdc12a1794a2637260e3c73a73
-	* tests/openpgp/run-tests.scm: Drop hardcoded list.
-
-	tests: Reduce runtime of excessive test.
-	+ commit 988a04b98d42ff9cc9e62007ebcc0e4c03f4047d
-	* tests/openpgp/conventional-mdc.scm: Use only two plaintexts when
-	iterating over all cipher algorithms.
-
-	dirmngr: Fix type.
-	+ commit 285d193f1e1464495bce57bd0f323468515b4513
-	* dirmngr/dns-stuff.c (get_dns_cert): Fix type in fallback code.
-
-2016-09-20 Andre Heinecke <aheinecke@intevation.de>
-
-	dirmngr: Open file CRL's in binary mode.
-	+ commit 4644c27514f34f5efc555d43672a25088a611a72
-	* dirmngr/crlcache.c (crl_cache_load): Open file in binary mode.
-
-2016-09-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	doc: Fix a xref usage.
-	+ commit b9b4ff857034df51e055ceddce567ca97e94e075
-
-
-2016-09-20 Ineiev <ineiev@gnu.org>
-
-	doc: Do not end section names with "."
-	+ commit 8078d8246fa38c3e478fc9a542117468780ace00
-
-
-2016-09-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	doc: minor fix for @xref.
-	+ commit 9c1b3bc25a1b38c4eda31bf12ccc10d94bb05212
-	* doc/yat2m.c (proc_texi_cmd): Captalize "see" for xref.
-
-2016-09-20 Justus Winter <justus@g10code.com>
-
-	doc: Implement simple '@ref'erences.
-	+ commit 91d5e6f805aaf24a3f1f03a95998f757dce04cb2
-	* doc/yat2m.c (proc_texi_cmd): Handle '@ref'.
-
-2016-09-20 Ineiev <ineiev@gnu.org>
-
-	doc: Fix full stops.
-	+ commit 0eaab1af48f600b636183321e4a4e9c6bc361610
-	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
-	doc/instguide.texi, doc/scdaemon.texi, doc/specify-user-id.texi,
-	doc/tools.texi: Fix.
-
-	doc: Fix spacings.
-	+ commit 32bcf8b73ede9c8f1469821a54dedc6be75241d2
-	* doc/debugging.texi, doc/dirmngr.texi, doc/gpg-agent.texi,
-	doc/gpg.texi, doc/tools.texi: Fix.
-
-	doc: Improve markup.
-	+ commit 377624207e9b2895ce00dfc4d1163d72f349841f
-	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
-	doc/howto-create-a-server-cert.texi, doc/scdaemon.texi,
-	doc/specify-user-id.texi, doc/tools.texi: Fix.
-
-	doc: Replace rfc0123 with RFC-0123.
-	+ commit 9d2b7bff12b268638465da222ca7cc9042bba072
-	* doc/gpg.texi, doc/gpgsm.texi, doc/specify-user-id.texi: Fix.
-
-	doc: Add missing description of datafile.
-	+ commit 789916281c25e737d8fb44add5ca61f8fd25de2f
-	* doc/gpg.texi: Fix.
-
-	doc: Replace UTF8 with UTF-8.
-	+ commit 00d6d8bc8772e48b6f200d359e11eb93ab65f51f
-	* doc/gpg.texi: Fix.
-
-	doc: Fix mistakes.
-	+ commit f25e04005af5831053ba194a09e3afa48d1e162b
-	* doc/dirmngr.texi, doc/gpg.texi, doc/gpgsm.texi,
-	doc/howto-create-a-server-cert.texi,
-	doc/scdaemon.texi, doc/tools.texi: Fix.
-
-	doc: Eliminate inconsistent UK English.
-	+ commit 825c1dfb3ee4c1704f42eaf064161b9731c20134
-	* doc/dirmngr.texi, doc/gpg-agent.texi, doc/scdaemon.texi,
-	doc/tools.texi: Fix.
-
-	doc: Use the right reference commands.
-	+ commit f32689f833838a742243e94c900e98f5b59a5811
-	* doc/debugging.texi, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
-	doc/tools.texi: Fix.
-
-	doc: Fix "Not(e) that you can(not) abbreviate".
-	+ commit 20a27d8a57c4c990fcada4278a1ce2e6fc9043e9
-	* doc/dirmngr.texi, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
-	doc/scdaemon.texi, doc/tools.texi: Fix.
-
-	doc: Fix typos.
-	+ commit fa346508fe323e61cf157ee30c13301e1d2117c0
-	* doc/debugging.texi, doc/dirmngr.texi, doc/glossary.texi
-	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi
-	* doc/instguide.texi, doc/opt-homedir.texi, doc/scdaemon.texi
-	* doc/specify-user-id.texi, doc/tools.texi: Fix.
-
-	doc: Fix Martin Hellman's name.
-	+ commit 858af2b3473e436af53470d53cdac334edce9f09
-	* doc/contrib.texi: Fix.
-
-2016-09-19 Justus Winter <justus@g10code.com>
-
-	tests: Refine the repl function.
-	+ commit 884e78efe1f3ba50513bf81c8b4804d22b25eac4
-	* tests/gpgscm/repl.scm (repl): Add an argument 'environment'.
-	(interactive-repl): Add an optional argument 'environment'.
-
-	tests: Implement interpreter shutdown using exceptions.
-	+ commit 9a0659a65c52378de1c4736a0eddf8518eb20948
-	* tests/gpgscm/ffi.c (ffi_init): Rename 'exit' to '_exit'.
-	* tests/gpgscm/ffi.scm (*interpreter-exit*): New variable.
-	(throw): New function.
-	(exit): New function.
-
-	tests: Correctly handle exceptions in resource handling macros.
-	+ commit 58007e52593e6b0f838de2e464ceeacf22757018
-	* tests/gpgscm/tests.scm (letfd): Correctly release resources when an
-	exception is thrown.
-	(with-working-directory): Likewise.
-	(with-temporary-working-directory): Likewise.
-	(lettmp): Likewise.
-
-	tests: Refine exception handling.
-	+ commit ab483eff9a8254adf127cdee178e14ba74f0a2b3
-	* tests/gpgscm/init.scm (catch): Bind all arguments to '*error*' in
-	the error handler, update and fix comment.
-	(*error-hook*): Revert to original definition.
-	* tests/gpgscm/tests.scm (tr:do): Adapt accordingly.
-	* tests/openpgp/issue2419.scm: Likewise.
-
-	tests: Use descriptive temporary file names.
-	+ commit 83a406b38a21d0eeb4963db824a27783c212d2fb
-	* tests/gpgscm/ffi.c (do_get_isotime): New function.
-	(ffi_init): Add parameter 'scriptname', bind new function and
-	scriptname.
-	* tests/gpgscm/ffi.h (ffi_init): Update prototype.
-	* tests/gpgscm/main.c (main): Hand in the script name.
-	* tests/gpgscm/tests.scm (mkdtemp): Use current time and script name
-	for the names of temporary directories.
-
-2016-09-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix regression in fingerprint printing.
-	+ commit 998643666c016dbacf10f813c22efc97deadec65
-	* g10/keylist.c (list_keyblock_print): Do not depend calling
-	print_fingerprint on opt.keyid_format.
-
-	dirmngr: Silence diagnostics about starting housekeeping.
-	+ commit 5bf1facc973eb6e0bfab0f8f17129534dec56e04
-	* dirmngr/dirmngr.c (housekeeping_thread): Print info only in very
-	verbose mode.
-
-2016-09-19 Justus Winter <justus@g10code.com>
-
-	g10: Fix memory leak.
-	+ commit 086d219d96caa3501048aff82a282481e07c195b
-	* g10/tofu.c (build_conflict_set): Free 'kb_all'.
-
-2016-09-19 Werner Koch <wk@gnupg.org>
-
-	doc: Update license information.
-	+ commit 3899041cd2877ce9584c7bd149f232f35a07c399
-	* tests/fake-pinentries/COPYING: Rename to ...
-	* COPYING.CC0: this. Add a note on the scope of this license.
-	* COPYING.LIB: Add a note on the scope of this license.
-	* AUTHORS (License): Mention CC) license.
-
-	gpgscm: Fix gcrypt version check.
-	+ commit 47baeac50ccaaf06dc8b0cebece50f47754de6ca
-	* tests/gpgscm/main.c (main): Check against required and not installed
-	version.
-
-	gpg: Avoid malloc failure due to no key signatures.
-	+ commit 18bbefa27f9e47e1062ee4d7af09487632795ba7
-	* g10/keyedit.c (check_all_keysigs): Check early for no key
-	signatures. Use xtrycalloc.
-
-2016-09-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	Fix comment and format.
-	+ commit 7305d27f36148a7fb8c2f4ef5b94774cbd21b18e
-	* agent/protect-tool.c (main): Fix comment.
-	* doc/DETAILS (colon listings): Fix list.
-	* tests/openpgp/multisig.test: Fix comment.
-
-2016-09-17 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	Fix more spelling.
-	+ commit 0d67241e317b172a258a910c02d90639e2b08fce
-	* NEWS, acinclude.m4, agent/command-ssh.c, agent/command.c,
-	 agent/gpg-agent.c, agent/keyformat.txt, agent/protect-tool.c,
-	 common/asshelp.c, common/b64enc.c, common/recsel.c, doc/DETAILS,
-	 doc/HACKING, doc/Notes, doc/TRANSLATE, doc/dirmngr.texi,
-	 doc/faq.org, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
-	 doc/instguide.texi, g10/armor.c, g10/gpg.c, g10/keyedit.c,
-	 g10/mainproc.c, g10/pkclist.c, g10/tofu.c, g13/sh-cmd.c,
-	 g13/sh-dmcrypt.c, kbx/keybox-init.c, m4/pkg.m4, sm/call-dirmngr.c,
-	 sm/gpgsm.c, tests/Makefile.am, tests/gpgscm/Manual.txt,
-	 tests/gpgscm/scheme.c, tests/openpgp/gpgv-forged-keyring.scm,
-	 tests/openpgp/multisig.test, tests/openpgp/verify.scm,
-	 tests/pkits/README, tools/applygnupgdefaults,
-	 tools/gpg-connect-agent.c, tools/mime-maker.c, tools/mime-parser.c:
-	 minor spelling cleanup.
-
-	move some file encodings to UTF-8.
-	+ commit 215180d1ce6c93e2b4969d746c83ac4c055d25ef
-	* dirmgnr/cdblib.c: comment used unnecesary hyphenation
-	* dirmngr/crlcache.h: comment was iso-8859-1
-	* doc/contrib.text: list contributors using UTF-8 (now we can
-	 acknowledge many more people using their preferred orthography)
-
-	At least one other files remains in a non-UTF-8 encoding, which i'm
-	not sure what to do with:
-
-	 - build-aux/speedo/w32/inst.nsi is ISO-8859-1, but maybe Windows needs
-	 it that way?
-
-2016-09-16 Neal H. Walfield <neal@g10code.com>
-
-	g10: On failure, propagate the return code.
-	+ commit 6e930f0e4077bc7aa3d28b1ba649a82d62427d87
-	* g10/tofu.c (tofu_register_encryption): If get_trust fails, set RC.
-
-	g10: Don't ignore failure. On failure, rollback.
-	+ commit 221b0bd0e5946edaea7135bc3b6f3c5c0fc6dbca
-	* g10/tofu.c (tofu_set_policy): If record_binding fails, fail. If the
-	function fails, rollback the transaction.
-
-	g10: Load the key block if the supplied user id list is NULL.
-	+ commit c2e563421e4fd4f0910642aa7b171bcf0b374b01
-	* g10/tofu.c (tofu_register_encryption): Load the key block if
-	USER_ID_LIST is NULL.
-
-	g10: Use the accessor functions for accessing and comparing key ids.
-	+ commit af196342bf44ce6dc42111d37539dec7ee3b3d82
-	* g10/tofu.c (get_trust): Use the pk_main_keyid accessor function.
-	(tofu_register_signature): Likewise.
-	(tofu_register_encryption): Likewise.
-	(tofu_set_policy): Likewise and also use pk_keyid and keyid_cmp.
-
-2016-09-16 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	po: convert localizations to UTF-8.
-	+ commit 4ab8107063b641ed74fc4c9bf98304bcea573178
-	* po/{it,et,pl,ro,gl,es,el,sk,pt,eo,hu}.po: convert to UTF-8
-
-	This was an automated conversion process, using:
-
-	 for x in po/{it,et,pl,ro,gl,es,el,sk,pt,eo,hu}.po; do
-	 cs=$(grep charset= $x | cut -f2 -d= | cut -f1 -d\\)
-	 iconv -f $cs -t UTF-8 < $x >$x.tmp
-	 sed "s/$cs/UTF-8/" < $x.tmp > $x
-	 rm -f $x.tmp
-	 done
-
-2016-09-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Add support of ECC pubkey attribute.
-	+ commit dd06d33655bc872a6310edac8e448419479d3312
-	* scd/app-openpgp.c (ECC_FLAG_PUBKEY): New.
-	(send_key_attr, get_public_key, ecc_writekey, do_auth, do_decipher)
-	(parse_algorithm_attribute): Check ECC_FLAG_DJB_TWEAK.
-	(build_ecc_privkey_template): Add ECC_Q and ECC_Q_LEN.
-	Support offering public key when ECC_FLAG_PUBKEY sets.
-	(ecc_writekey): Supply ECC_Q and ECC_Q_LEN.
-	(parse_algorithm_attribute): Parse pubkey-required byte.
-
-2016-09-15 Justus Winter <justus@g10code.com>
-
-	g10: Add missing header.
-	+ commit c0e620cee86b5dacc941964bd187bba0dfa90eea
-	* g10/trustdb.c: Include 'mbox-util.h'.
-
-2016-09-15 Neal H. Walfield <neal@g10code.com>
-
-	g10: Only consider bindings matching the signer's user id.
-	+ commit 3f7f7447316f57d002d683af4ad30ac5730b9ebe
-	* g10/trustdb.c (tdb_get_validity_core): If the signer's user id
-	subpacket is present, only consider matching user ids.
-
-	g10: Don't include the signature when printing a binding's validity.
-	+ commit dcc64663051f8af82abc11e2699649c3b35936db
-	* g10/mainproc.c (check_sig_and_print): When printing information
-	about a binding don't include the current signature.
-
-2016-09-15 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	tests/fake-pinentries: fake pinentries for downstream developers.
-	+ commit 3248182d1b5a03098ee797c980fa0f0ec06e716f
-	* tests/fake-pinentries/README.txt and
-	 tests/fake-pinentries/fake-pinentry.{sh,py,pl,php}}: New public
-	 domain (CC0) files to encourage better test suite practices from
-	 downstream developers.
-	* tests/fake-pinentries/COPYING (new): a copy of
-	 https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt
-
-	spelling: conenction should be connection.
-	+ commit 167273ee9d3c04f29835aa2d12fde52eebf61efb
-	* dirmngr/server.c, sm/server.c: s/conenction/connection/
-
-	spelling: correct achived to achieved.
-	+ commit 7fafc3c49901c118b47d4d13a41fb3575c1f9e4b
-
-
-2016-09-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	tests/gpgscm: Fix use of pointer.
-	+ commit 68eb5fbd37c31ed7c0c916656131eea7bb58d13d
-	* tests/gpgscm/scheme-private.h (struct scheme): Use (void *) for
-	alloc_seg.
-	* tests/gpgscm/scheme.c (alloc_cellseg): Use (void *) for cp. Use
-	(void *) for coercion of address calculation.
-
-2016-09-14 Neal H. Walfield <neal@g10code.com>
-
-	g10: Fix whitespace.
-	+ commit 9799b5d18f8fd29872b75c4d70d370af2b4e9a89
-	* g10/tofu.c (show_statistics): Fix whitespace.
-
-	g10: Correctly compute the euclidean distance.
-	+ commit 05b2b13efd8ecea86d31af863cbf82c8b38dc94f
-	* g10/tofu.c (write_stats_status): Correctly compute the euclidean
-	distance.
-	(show_statistics): Likewise.
-
-	g10: Change the default TOFU policy for UTKs to good.
-	+ commit ca91caabb5798f67c69ee96657c7cb402e7db0df
-	* g10/tofu.c (get_trust): Change the default TOFU policy for UTKs to
-	good.
-
-	g10: Add missing static qualifier.
-	+ commit 9d62b79e62ef2690e6522fe1621140fbfc10695c
-	* g10/tofu.c (cross_sigs): Add missing static qualifier.
-
-	g10: Default to the "good" TOFU policy for keys signed by a UTK.
-	+ commit 8df8aa13c795e400324a782fbaea578c8f2a1398
-	* g10/tofu.c (signed_by_utk): New function.
-	(get_trust): If a key is signed by an ultimately trusted key, then
-	set any bindings to good.
-
-2016-09-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Emit a new error status line in --quick-adduid.
-	+ commit f4e11f2e9e8f58fd5f0df3148e6d7ccef0f84232
-	* g10/keyedit.c (menu_adduid): Emit an ERROR status for an existsing
-	user id.
-
-	gpg: Allow use of "default" algo for--quick-addkey.
-	+ commit 0fd332bc1f6f1f10c96da0cc91203925d3ac81eb
-	* g10/keygen.c (quick_generate_keypair): Write a status error.
-	(parse_algo_usage_expire): Set a default curve.
-
-2016-09-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve usability of --quick-gen-key.
-	+ commit 30a011cfd6ec172cc460e59f0904a26fe2d68632
-	* g10/keygen.c (FUTURE_STD_): New constants.
-	(parse_expire_string): Handle special keywords.
-	(parse_algo_usage_expire): Allow "future-default". Simplify call to
-	parse_expire_string.
-	(quick_generate_keypair): Always allow an expiration date. Replace
-	former "test-default" by "future-default".
-
-2016-09-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid mixing up status and colon line output.
-	+ commit 31fc420727f45dd081f8ad5d056da6675dad29f2
-	* g10/keylist.c (list_keyblock_colon): Avoid calling functions which
-	trigger a status line output before having printed a LF.
-
-2016-09-12 Justus Winter <justus@g10code.com>
-
-	tests: Simplify tofu test.
-	+ commit aa81e32df7189c3eb44d4c602fd63f5b3f6a9e49
-	* tests/openpgp/tofu.scm: Simplify now that we only have one db
-	format.
-
-2016-09-10 Ben Kibbey <bjk@luxsci.net>
-
-	Portability build fix.
-	+ commit eddcba038025cdbd58aaf67cafd6d83f0ea042d5
-	* kbx/Makefile.am: Add NETLIBS.
-	* dirmngr/Makefile.am: Ditto for dirmngr_ldap.
-
-	Fix symbol conflict.
-	+ commit 937ec53eff290c3d916faebc23218c9272671c02
-	* g10/gpgcompose.c: Rename struct siginfo to signinfo.
-
-2016-09-09 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: print fingerprint regardless of keyid-format.
-	+ commit d757009a24eb856770fc3a3729e2f21f54d2a618
-	* g10/keylist.c (print_fingerprint): use compact format independent of
-	 keyid-format; (print_key_line): always print the fingerprint
-
-2016-09-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove option --yes from gpgv.
-	+ commit 30a9f53a0f2af6b98c26b8ddc0b4b87c38416f2a
-	* g10/gpgv.c (opts): Remove --yes.
-	(main): Always set opt.ANSWER_YES.
-
-	gpg: Add options --output and --yes to gpgv.
-	+ commit a8363b7d0bcc77b55226d5fe8f972214c968ddc3
-	* g10/gpgv.c (oOutput, oAnswerYes): New.
-	(opts): Add --output and --yes.
-	(main): Implement options.
-
-	gpg: Make --output work with --verify.
-	+ commit bbe940c095f2bca7a1ca5f8e68ca1af98350a885
-	* g10/mainproc.c (proc_plaintext): Handle opt.output.
-
-2016-09-07 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Terminate on deletion of the socket file (Linux only).
-	+ commit 6308c300196ae85fd82ed383217219e0206640a4
-	* dirmngr/dirmngr.c HAVE_INOTIFY_INIT: Include sys/inotify.h.
-	(oDisableCheckOwnSocket): New.
-	(opts): Add --disable-check-own-socket.
-	(disable_check_own_socket): New var.
-	(parse_rereadable_options): Set that var.
-	(my_inotify_is_name) HAVE_INOTIFY_INIT: New.
-	(handle_connections) HAVE_INOTIFY_INIT: New.
-
-2016-09-07 Neal H. Walfield <neal@g10code.com>
-
-	g10: Use the time a signature was seen, not the embedded time, for stats
-	+ commit bde29a46cedbbd2a5dfe7c91a6277c0a4ff50825
-	* g10/tofu.c (ask_about_binding): Use the time that a signature was
-	seen, not allegedly generated, when generating statistics.
-
-	tests: Don't use --tofu-db-format.
-	+ commit a937eef2d4e80cd43095802176d3db5e7fd94008
-	* tests/openpgp/tofu.scm: Remove use of --tofu-db-format, which is
-	deprecated.
-
-	g10: Check for a new binding a bit later.
-	+ commit ee06b3f7889bd99c28ac68f4781bda77d67eed00
-	* g10/tofu.c (build_conflict_set): Check for the current key after
-	looking for conflicts and removing any '!'.
-
-	g10: Change TOFU code to respect --faked-system-time.
-	+ commit 7b3e8572e3bb8a65d20577a48009251fdc7b1910
-	* g10/tofu.c (record_binding): New parameter now. Update callers.
-	Don't use SQLite's strftime('%s','now') to get the current time, use
-	NOW.
-	(ask_about_binding): Likewise.
-	(get_trust): New parameter now. Update callers.
-	(show_statistics): Likewise.
-	(tofu_register_signature): Don't use SQLite's strftime('%s','now') to
-	get the current time, use gnupg_get_time().
-	(tofu_register_encryption): Likewise.
-
-	g10: Use the correct conversion function.
-	+ commit 56c18408d4955713d9c4e634367c7912d6564651
-	* g10/tofu.c (show_statistics): Use string_to_ulong, not
-	string_to_long.
-
-2016-09-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix format string issues in tofu.
-	+ commit 97a67d42dc946b2d6ed81723d86e37002b5931b3
-	* g10/tofu.c (write_stats_status): Use ulong for MESSSAGES. Fix
-	format strings. Simplify by using the new write_status_printf.
-
-2016-09-06 Neal H. Walfield <neal@g10code.com>
-
-	g10: Make sure some functions are passed a primary key.
-	+ commit 13ddc17ddb266d74033d5739fec932034fa85c72
-	* g10/tofu.c (get_trust): Make sure the caller provides a primary key.
-	(tofu_register_signature): Likewise.
-
-	g10: Tweak TOFU's verbosity.
-	+ commit ee19eacd1d688d3a98cd66e5ef2f42079eb829f1
-	* g10/tofu.c (time_ago_str): Only show the most significant unit.
-	* g10/tofu.c (show_statistics): Tweak the output.
-
-	g10: Only show the TOFU warning once per key.
-	+ commit 67cef405cbfad2e53fc388dd6591ee4f7cb0d973
-	* g10/tofu.c (show_statistics): Return whether to call show_warning.
-	Move the warning from here...
-	(show_warning): ... to this new function.
-	(tofu_get_validity): If show_statistics returns a non-zero value, call
-	show_warning.
-
-	g10: Record and show statistics for encrypted messages when using TOFU.
-	+ commit 875ac9216f1383851a82bd240cadb17c7112f6a8
-	* g10/tofu.c: Include "sqrtu32.h".
-	(struct tofu_dbs_s.s): Rename get_trust_gather_other_keys to
-	get_trust_gather_signature_stats. Add new field
-	get_trust_gather_encryption_stats.
-	(initdb): Create the encryptions table.
-	(ask_about_binding): Show the encryption statistics too.
-	(tofu_register): Rename from this...
-	(tofu_register_signature): ... to this and update callers.
-	(tofu_register_encryption): New function.
-	(write_stats_status): Add parameters encryption_count,
-	encryption_first_done and encryption_most_recent. Update callers.
-	Compute the trust using the euclidean distance of the signature and
-	signature count. Compare with twice the threshold. Include
-	encryption count information in the TFS and TOFU_STATS lines.
-	(show_statistics): Also get information about the encrypted messages.
-	* g10/trustdb.c (tdb_get_validity_core): Use it.
-
-	g10: Simplify the binding statistics shown for a TOFU conflict.
-	+ commit a9e6db6c7e23d9f4b8de59f5cabbf9eb6a59e626
-	* g10/tofu.c (ask_about_binding): Simplify binding statistics.
-
-2016-09-06 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fix detection of unbalanced parenthesis.
-	+ commit f2249b737055f84842778285bbeff5e61fa55225
-	* tests/gpgscm/main.c (load): Print error message.
-	* tests/gpgscm/scheme.c (opexe_0): Correctly report nesting level when
-	loading files.
-
-	tests: Fix test.
-	+ commit 213b3cf465fb091dc0a205d1a08b88b950ffb85f
-	* tests/openpgp/multisig.scm: Add missing parenthesis.
-
-2016-09-06 Werner Koch <wk@gnupg.org>
-
-	agent: Terminate on deletion of the socket file (Linux only).
-	+ commit 650356148af43ea619bec12e599a4981b147d5f8
-	* configure.ac (AC_CHECK_FUNCS): Chec for inotify_init.
-	* agent/gpg-agent.c HAVE_INOTIFY_INIT: Include sys/inotify.h.
-	(my_inotify_is_name) HAVE_INOTIFY_INIT: New.
-	(handle_connections) HAVE_INOTIFY_INIT: New.
-
-2016-09-05 Justus Winter <justus@g10code.com>
-
-	tests: Speed up the test suite.
-	+ commit 46c4333c372f0e1ad2aadc411490c2a330b4c5a6
-	* tests/openpgp/run-tests.scm (test::run-sync): Pass additional
-	arguments to the test.
-	(test::run-sync-quiet): Likewise.
-	(test::run-async): Likewise.
-	(run-tests-{parallel,sequential}-isolated): Create a tarball of the
-	gnupghome, then extract it for each test.
-	* tests/openpgp/setup.scm: Refactor into functions, add an interface
-	to tar-up the created environment, and untar it multiple times.
-
-	common: Restore a simpler variant of 'gnupg_wait_process'.
-	+ commit c97bde2dfeab23a84b4788d998934ac49ff5b797
-	* common/exechelp-posix.c (gnupg_wait_process): Use the code prior to
-	5ba4f604.
-
-	common: Fix error handling.
-	+ commit 845e2cc201d6a2cdb151e39e29516d26cb49311c
-	* common/exechelp-posix.c (store_result): Use xtrymalloc.
-	(gnupg_wait_processes): Likewise, and check result.
-
-2016-09-05 Neal H. Walfield <neal@g10code.com>
-
-	g10: Don't add user attributes to the TOFU DB.
-	+ commit 9082bde01cc18e32504ce39d55ea6dd3c05dddec
-	* g10/trustdb.c (tdb_get_validity_core): Skip user attributes.
-
-2016-09-05 Werner Koch <wk@gnupg.org>
-
-	agent: Silence --debug IPC output for connections from self.
-	+ commit 0b99d1fd2a80b8efaacc731027d2b2ecd9eca699
-	* agent/command.c (server_local_s): Add fields 'greeting_seen' and
-	'connect_from_self'.
-	(io_monitor): Do not log connections from self.
-	(start_command_handler): Set flag 'connect_from_self'.
-	* agent/gpg-agent.c (check_own_socket_thread): Disable logging.
-	(do_start_connection_thread): Do not log conection start and
-	termination if IPC debugging is enabled.
-
-	agent: Small improvement of the server's local state.
-	+ commit 2eeb5551c37659fdd59e8537fc77a9e7fb6a9204
-	* agent/command.c (sserver_local_s): Change flags to use only one bit.
-	(option_handler): Make an atoi return 1 or 0.
-
-2016-09-05 Neal H. Walfield <neal@g10code.com>
-
-	g10: Refactor cross sig check code.
-	+ commit 1f1f56e606c1cb28eec68c60bd8bcb7ab30805de
-	* g10/tofu.c (BINDING_NEW): New enum value.
-	(BINDING_CONFLICT): Likewise.
-	(BINDING_EXPIRED): Likewise.
-	(BINDING_REVOKED): Likewise.
-	(ask_about_binding): Move cross sig check from here...
-	(get_trust): ... and the conflict set building from here...
-	(build_conflict_set): ... to this new function.
-	(format_conflict_msg_part1): Replace parameter conflict with
-	conflict_set. Drop parameter fingerprint. Update callers.
-	(ask_about_binding): Drop unused parameter conflict and redundant
-	parameter bindings_with_this_email_count. Rename parameter
-	bindings_with_this_email to conflict_set. Update callers.
-
-2016-09-05 Justus Winter <justus@g10code.com>
-
-	tests: Update README.
-	+ commit 65a7563edbbab8f93fe901f932065687508788de
-	* tests/openpgp/README: Update.
-
-	tests: Pass flags to test driver.
-	+ commit 059c79d8b447a3baa9ad0b4d3367bdb64dd2ef3b
-	* tests/openpgp/Makefile.am (xcheck): Pass flags to 'run-tests.scm'.
-
-	common: Improve waiting for processes on POSIX.
-	+ commit e33111fcdac08ed2ddfbdf59b1f790569b42f695
-	* common/exechelp-posix.c (struct terminated_child): New definition.
-	(terminated_children): New variable.
-	(store_result): New function.
-	(get_result): Likewise.
-	(gnupg_wait_process): Store results that were not requested and
-	consider previously stored results.
-
-	waitpid(2) may return information about terminated children that we
-	did not yet request, and there is no portable way to wait for a
-	specific set of children. As a workaround, we store the results of
-	children for later use.
-
-2016-09-05 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Exclude D lines from the IPC debug output.
-	+ commit de623474db3ba402c9bbd872ab6f932f46cbdde9
-	* dirmngr/dirmngr.h: Include asshelp.h.
-	* dirmngr/server.c (server_local_s): Add inhibit_dara_logging fields.
-	(data_line_write): Implement logging inhibit.
-	(data_line_cookie_close): Print non-logged D lines.
-	(cmd_wkd_get, cmd_ks_get, cmd_ks_fetch): Do not log D lines.
-	(dirmngr_assuan_log_monitor): New.
-	* dirmngr/dirmngr.c (main): Register monitor function.
-
-	common: Add an assuan logging monitor.
-	+ commit 0ac671f8a2b65a4b339f615c6420287a549779fa
-	* common/asshelp.c (my_log_monitor): New var.
-	(my_libassuan_log_handler): Run that monitor.
-	(setup_libassuan_logging): Add arg to set a log monitor and change all
-	callers.
-
-	gpg: New export filter drop-subkey.
-	+ commit 0a4a03e5310946b0866a0f6a34031eda7a240162
-	* g10/import.c (impex_filter_getval): Add properties for key packets.
-	* g10/export.c (export_drop_subkey): New var.
-	(cleanup_export_globals): Release that var.
-	(parse_and_set_export_filter): Add filter "drop-subkey".
-	(apply_drop_subkey_filter): New.
-	(do_export_stream): Run that filter.
-
-	common: Add string operator gt,ge,le,lt to recsel.
-	+ commit 959cd8903fd012e63dbb156db56708dd3934b5df
-	* common/recsel.c (recsel_parse_expr): Add them.
-	(recsel_dump): Print them.
-	(recsel_select): Evaluate them.
-
-	gpg: Use a common filter_getval for import and export.
-	+ commit c8e0d37f4152d1341ef562a190fce93a0386a759
-	* g10/import.c (filter_getval): Rename to ...
-	(impex_filter_getval): this. Make global.
-	(apply_keep_uid_filter, apply_drop_sig_filter): Adjust.
-	* g10/export.c (filter_getval): Remove.
-	(apply_drop_sig_filter): Use impex_filter_getval.
-
-2016-09-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix an action after card removal.
-	+ commit f9e49c80e706a27d5e30d4b3237ff26367a67130
-	* scd/command.c (update_card_removed): Call apdu_close_reader here.
-
-2016-09-02 Werner Koch <wk@gnupg.org>
-
-	wks: Add framework for policy flags.
-	+ commit 46362cbc0e2260e989820795a6e4245c72335172
-	* tools/call-dirmngr.c (wkd_get_policy_flags): New.
-	* tools/gpg-wks.h (struct policy_flags_s, policy_flags_t): New.
-	* tools/wks-util.c (wks_parse_policy): New.
-	* tools/gpg-wks-client.c (command_send): Get the policy flags to show
-	a new info line.
-	* tools/gpg-wks-server.c (get_policy_flags): New.
-	(process_new_key): get policy flag and add a stub for "auth-submit".
-	(command_list_domains): Check policy flags.
-
-	dirmngr: Add --policy-flags option to WKD_GET.
-	+ commit 505ee45106d6aa2902bbdd6326f8eb7527c273c4
-	* dirmngr/server.c (cmd_wkd_get): Add new option.
-
-	common: Check read errors in name-value.c.
-	+ commit fc445b36fafc8a4cc3ce5a675ac42df7a9d9a02a
-	* common/name-value.c: Check for read errors.
-
-2016-09-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Release the card reader after card removal.
-	+ commit 8fe81055762d9c9e6f03fb7853a985c94ef73ac3
-	* scd/command.c (update_reader_status_file): Call apdu_close_reader.
-
-	scd: Clean up unused shutdown method.
-	+ commit d1ae7103352fbda2a05f098379cd3043a0ab5566
-	* scd/apdu.c (shutdown_ccid_reader, apdu_shutdown_reader): Remove.
-	(reset_ccid_reader): Don't set shutdown_reader.
-	* scd/ccid-driver.c (ccid_shutdown_reader): Remove.
-
-	agent: invoke scdaemon with --homedir.
-	+ commit 8b6c0bae33bdc36892f4595806665ce61f77dfd2
-	* agent/call-scd.c (start_scd): Supply --homedir option when it's not
-	default homedir.
-
-	po: Update Japanese translation.
-	+ commit afdfc954b35370fbf03aaf8dc0e496410923aa4e
-
-
-2016-09-01 Neal H. Walfield <neal@g10code.com>
-
-	g10: End transaction earlier.
-	+ commit 85fad6c34c08b2850580e0644faba62d3a501b84
-	* g10/tofu.c (ask_about_binding): End the transaction earlier.
-
-	g10: Don't consider cross-signed keys to be in conflict.
-	+ commit b410a3cb7683fc7c2a253e23130c44df42a6203c
-	* g10/tofu.c (cross_sigs): New function.
-	(ask_about_binding): If apparently conflicting keys are cross signed,
-	then don't mark them as conflicting.
-
-2016-09-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid homedir creation by --list-config.
-	+ commit 38d369de13acb95208a0ed8d1cf82ac19173688f
-	* g10/gpg.c (main): Do not register a key for the list config
-	commands.
-
-	gpg: Simplify code to print VALIDSIG.
-	+ commit fde9fa81d3d3b25a929b532cc1960d9d9f454a0c
-	* g10/mainproc.c (check_sig_and_print): Use hexfingerprint and
-	write_status_printf.
-
-	gpg: Add new function write_status_printf.
-	+ commit 6bdadae00512b4907826f6754cdb220d06e1ac6d
-	* g10/cpr.c (write_status_printf): New.
-
-	gpg: Fix printing of pubkey algo in --verbose signature verify.
-	+ commit 37e3c897252babc203447be9d2f286a4507875ad
-	* g10/sig-check.c (check_signature2): Replace arg PK by R_PK and
-	change the semantics. Also clear the other R_ args on function entry,
-	use gpg_error() and change retturn type to gpg_error_t.
-	* g10/mainproc.c (do_check_sig): Add arg R_PK.
-	(list_node): Pass NULL for new arg.
-	(check_sig_and_print): Rework to make use of the returned PK.
-
-2016-09-01 Neal H. Walfield <neal@g10code.com>
-
-	g10: When asking about a TOFU binding conflict, default to unknown.
-	+ commit 3d44e5e8a8d1d8bf6cf5d387f50d75f84d804412
-	* g10/tofu.c (ask_about_binding): Default to unknown.
-
-	g10: Add support for TRUST_NEVER.
-	+ commit f2e5cb6ffb55e49a05d452cd85e45f6f67c20abb
-	* g10/pkclist.c (do_we_trust): Handle TRUST_NEVER, which can be
-	returned by the TOFU trust model.
-	(do_we_trust_pre): Print a different message if TRUSTLEVEL is
-	TRUST_NEVER.
-	(check_signatures_trust): Improve comment.
-
-	g10: Improve text.
-	+ commit 0cb0ea1633955fb7acd33fe993a4ae4e96e83ae3
-	* g10/tofu.c (show_statistics): Improve the text (key and user id, not
-	just key).
-
-	g10: Remove unused parameter.
-	+ commit 00c2850393ecc320f591f511c3534286964780c2
-	* g10/tofu.c (show_statistics): Remove unused parameter sig_exclude.
-	Update callers.
-
-2016-09-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Copy the correct digest for use by TOFU.
-	+ commit 3e67b50490aef087b5769bb35145d23f6657780f
-	* g10/mainproc.c (do_check_sig): Use the current digest algo.
-
-2016-09-01 Neal H. Walfield <neal@g10code.com>
-
-	g10: Be careful to not be in a transaction during long operations.
-	+ commit 4cbd2a690c5e5ed2dff49c1f4fc867b31fca689a
-	* g10/tofu.c (begin_transaction): New parameter only_batch. If set,
-	only start a batch transaction if there is none and one has been
-	requested. Update callers.
-	(tofu_suspend_batch_transaction): New function.
-	(tofu_resume_batch_transaction): Likewise.
-	(ask_about_binding): Take a ctrl_t, not a tofu_dbs_t. Update
-	callers. Gather statistics within a transaction. Suspend any batch
-	transaction when getting user input.
-	(get_trust): Take a ctrl_t, not a tofu_dbs_t. Update callers.
-	Enclose in a transaction.
-	(tofu_get_validity): Use a batch transaction, not a normal
-	transaction.
-
-2016-09-01 Werner Koch <wk@gnupg.org>
-
-	tests: Run test requiring the network only in maintainer-mode.
-	+ commit babeb6f8a9b1f8341652145bad58be6cd49e0712
-	* dirmngr/Makefile.am (noinst_PROGRAMS, TESTS): Add module_net_tests.
-	(module_tests): Move t-dns-test to ...
-	(module_net_tests): here.
-
-2016-08-31 Werner Koch <wk@gnupg.org>
-
-	wks: Send a final message to the user.
-	+ commit 04c042f3f2a631bc6e772c33f8da5e7aa7b1902a
-	* tools/gpg-wks-server.c (send_congratulation_message): New.
-	(check_and_publish): Call it.
-
-	wks: Relax permission check for the top directory.
-	+ commit e4eac16330449f3893c11820c15e07d58fb807ff
-	* tools/gpg-wks-server.c: Allow S_IXOTH for the top directory.
-
-2016-08-31 Neal H. Walfield <neal@g10code.com>
-
-	g10: On a TOFU conflict, show whether the uids are expired or revoked.
-	+ commit edfb6934caf16c6afcfd82d684d8ae9c79674d10
-	* g10/tofu.c (struct signature_stats): Add fields is_expired and
-	is_revoked.
-	(signature_stats_prepend): Clear *stats when allocating it.
-	(ask_about_binding): Also show whether the user ids are expired or
-	revoked.
-
-	doc: Add a help text for tofu.conflict.
-	+ commit b69b2cb082e39a7eb56082fa80219f6f14fbd2b4
-	* doc/help.txt (.gpg.tofu.conflict): New help text.
-
-	g10: Always trust ultimately trusted keys.
-	+ commit 28c235ae757e9036b0b96efc28931fa5cc74f7ee
-	* g10/tofu.c (get_trust): Always return TRUST_ULTIMATE for ultimately
-	trusted keys.
-
-	g10: Fix error detection.
-	+ commit 5b48960a8a2555db7bf992261de9e922838c9913
-	* g10/tofu.c: first_seen == 0 is not an error.
-
-	g10: Update a key's TOFU policy in a transaction.
-	+ commit e4d5e3cb0d10e8f77c7100d42cfdb32051de1c18
-	* g10/tofu.c (tofu_set_policy): Do the update in a transaction.
-	* g10/gpg.c (main): Do a TOFU policy update in a batch transaction.
-
-	g10: Fix the show old policy functionality when changing a TOFU policy.
-	+ commit 247eef005cf4c34e9a82227e4ab7823e04911be4
-	* g10/tofu.c (record_binding): Fix the show old policy functionality.
-
-	g10: Drop unused argument.
-	+ commit 70df5a8fd781d8774d835384ca28c4d8518bb9d0
-	* g10/tofu.c (begin_transaction): Remove unused option only_batch.
-
-	gpg: Move state local to tofu.c to a private structure.
-	+ commit 268f6b7a3403d036882b4af384ba7ab2f8c8355f
-	* g10/gpg.h (struct server_control_s.tofu): Move fields in_transaction
-	and batch_update_started from here...
-	* g10/tofu.c (struct tofu_dbs_s): ... to here.
-
-	gpg: Avoid name spaces clash with future sqlite versions (2).
-	+ commit b8184d2d74e5ddd5eb68836b53fe5568110e14dd
-	* g10/gpgsql.h (gpgsql_arg_type): Rename SQLITE_ARG_END to
-	GPGSQL_ARG_END, SQLITE_ARG_INT to GPGSQL_ARG_INT, SQLITE_ARG_LONG_LONG
-	to GPGSQL_ARG_LONG_LONG, SQLITE_ARG_STRING to GPGSQL_ARG_STRING, and
-	SQLITE_ARG_BLOB to GPGSQL_ARG_BLOB.
-
-2016-08-31 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix regression in gpgv's printing of the keyid.
-	+ commit 76304a971fe507ea659b952932ea899463ab7166
-	* g10/keyid.c (keystr): Take care of KF_NONE != KF_DEFAULT.
-
-2016-08-30 Neal H. Walfield <neal@g10code.com>
-
-	g10: Improve TOFU batch update code.
-	+ commit 371ae66e9d5c7524431773c4a479fcae1ea3b652
-	* g10/gpg.h (tofu): Rename field batch_update_ref to
-	batch_updated_wanted.
-	* g10/tofu.c (struct tofu_dbs_s): Rename field batch_update to
-	in_batch_transaction.
-	(begin_transaction): Only end an extant batch transaction if we are
-	not in a normal transaction. When ending a batch transaction, really
-	end it. Update ctrl->tofu.batch_update_started when starting a batch
-	transaction.
-	(end_transaction): Only release a batch transaction if ONLY_BATCH is
-	true. When releasing a batch transaction, assert that there is no
-	open normal transaction. Only allow DBS to be NULL if ONLY_BATCH is
-	true.
-	(tofu_begin_batch_update): Don't update
-	ctrl->tofu.batch_update_started.
-	(opendbs): Call end_transaction unconditionally.
-
-	g10: If a key has no valid user ids, change TOFU to return TRUST_NEVER.
-	+ commit d0451440c036106895a291f9ca1c53c2d5159f8f
-	* g10/tofu.c (tofu_get_validity): If a key has no valid (non-expired)
-	user ids, change TOFU to return TRUST_NEVER.
-
-	g10: Change tofu_register & tofu_get_validity to process multiple uids.
-	+ commit 6052c147091935fc0321ba24f4a44146df70ef01
-	* g10/tofu.c (tofu_register): Take a list of user ids, not a single
-	user id. Only register the bindings, don't compute the trust. Thus,
-	change return type to an int and remove the may_ask parameter. Update
-	callers.
-	(tofu_get_validity): Take a list of user ids, not a single user id.
-	Update callers. Observe signatures made by expired user ids, but
-	don't include them in the trust calculation.
-
-	g10: Support nested transactions on the TOFU DB.
-	+ commit 33e97813d72996d22a295773c64261f5588ce9dd
-	* g10/gpg.h (struct server_control_s): New field in_transaction.
-	* g10/tofu.c (struct tofu_dbs_s): Remove fields savepoint_inner and
-	savepoint_inner_commit.
-	(begin_transaction): Increment CTRL->TOFU.IN_TRANSACTION. Name the
-	savepoint according to the nesting level.
-	(end_transaction): Name the savepoint according to the nesting level.
-	Decrement CTRL->TOFU.IN_TRANSACTION.
-	(rollback_transaction): Likewise. Only ever rollback a non-batch
-	transaction.
-	(opendbs): Assert that there are no outstanding transactions.
-
-	g10: Print the info text in more situations.
-	+ commit 4c2abb221b29c9e8e0876fe986472b562ee1c99f
-	* g10/tofu.c (ask_about_binding): Print the info text when the policy
-	is ask and there are multiple bindings with the email address.
-
-	g10: Print the formatted text.
-	+ commit 0858f141a8b8d0c098a0c6097176b7225c4a9db8
-	* g10/tofu.c (ask_about_binding): Print the formatted text, not the
-	unformatted text.
-
-	g10: When showing a user id's trust, pass the current signature.
-	+ commit 8dda861ad80228da76cd5c97467008c87b8b6eee
-	* g10/mainproc.c (check_sig_and_print): Consistently pass SIG to
-	get_validity.
-
-2016-08-29 Werner Koch <wk@gnupg.org>
-
-	w32: Fix build regression due to 2aa0701.
-	+ commit 8b3e691ffbaaa218d309d5aaf8f37532308558ff
-	* common/logging.c (fun_writer): Always declare 'name_for_err'.
-
-	gpgconf: Print the plain socket directory with --list-dirs.
-	+ commit 8e3fa5a4b205c534de2142e5d071712f957cf06a
-	* tools/gpgconf.c (list_dirs): Add plain socketdir out.
-
-	common: Add a default socket name feature.
-	+ commit 2aa0701013f703ad93e17da3345c493c08aa04ee
-	* common/logging.c (log_set_socket_dir_cb): New.
-	(socket_dir_cb): New.
-	(set_file_fd): Allow "socket://".
-	(fun_writer): Implement default socket name.
-	* common/init.c (_init_common_subsystems): Register default socket.
-
-	gpg: Make decryption of -R work w/o --try-secret-key or --default-key.
-	+ commit bdbd03608b6f508ac4732f9986a046de8a85a311
-	* g10/getkey.c (enum_secret_keys): At state 3 enumerate the keys in all
-	cases not just when --try-all-secrets is used.
-
-2016-08-25 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix false negatives in Ed25519 signature verification.
-	+ commit 0a5a854510fda6e6990938a3fca424df868fe676
-	* g10/pkglue.c (pk_verify): Fix Ed25519 signatrue values.
-	* tests/openpgp/verify.scm (msg_ed25519_rshort): New
-	(msg_ed25519_sshort): New.
-	("Checking that a valid Ed25519 signature is verified as such"): New.
-
-	common: Rename an odd named function.
-	+ commit 74a082bc10960b2d65d4d1e31152f988a40a2225
-	* common/openpgp-oid.c (oid_crv25519): Rename to oid_cv25519.
-	(openpgp_oid_is_crv25519): Rename to openpgp_oid_is_cv25519. Change
-	callers.
-
-	gpg: New option --with-tofu-info.
-	+ commit 19d12be3cea5b4ee8153287a2f2442913a5e07a1
-	* g10/gpg.c (oWithTofuInfo): New.
-	(opts): Add --with-tofu-info.
-	(main): Set opt.with_tofu_info.
-	* g10/options.h (struct opt): Add field WITH_TOFU_INFO.
-	* g10/tofu.c (show_statistics): Add optional arg OUTFP and enter
-	special mode if not NULL. Change all callers.
-	(tofu_write_tfs_record): New.
-	* g10/keylist.c (list_keyblock_colon): Do not print the tofu policy as
-	part of the "uid" record. Print a new "tfs" record if the new option
-	is set.
-	* tests/openpgp/tofu.scm (getpolicy): Change from UID to TFS record.
-
-2016-08-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Change TOFU_STATS to return timestamps.
-	+ commit 0f1f02acc1cdcc2cf74a97b05507bb1f062f8af2
-	* g10/tofu.c (write_stats_status): Add arg FP to print a colon
-	formated line. Adjust for changed TOFU_STATS interface.
-	(show_statistics): Let the query return timestamps and use
-	gnupg_get-time to compute the "time ago" values.
-
-	common: Guarantee that gnupg_get_time does not return an error.
-	+ commit 5eb2682686b32bd82096924eeabd0c5bd347adfd
-	* common/gettime.c (gnupg_get_time): Abor if time() failed.
-	(gnupg_get_isotime): Remove now useless check.
-	(make_timestamp): Remove check becuase we already checked this modulo
-	the faked time thing.
-
-	wks: Add command --supported to gpg-wks-client.
-	+ commit 460568d341851ac79dd100e00e4eafcac1318148
-	* tools/gpg-wks-client.c (aSupported): New.
-	(opts): Add --supported.
-	(parse_arguments): Ditto.
-	(main): Call command_supported.
-	(command_supported): New.
-
-2016-08-22 Werner Koch <wk@gnupg.org>
-
-	wks: Install gpg-wks-client under libexec.
-	+ commit c47386a11a32c5ed3b5a31fad5c3e9a9a020ca7b
-	* tools/Makefile.am (bin_PROGRAMS): Move gpg-wks-client to ...
-	(libexec_PROGRAMS): ...here.
-
-	common: Remove unused vars in simple-pwquery.
-	+ commit 62f3e0027724b23c0de5be6d1e66cfdeef7e7bc9
-	* common/simple-pwquery.c (agent_send_option): Remove unused vars.
-	(simple_query): Ditto.
-	(agent_open): Ditto. Return RC on error.
-	(simple_pwquery): Remove unused vars. Remove shadowing of 'p'.
-
-2016-08-18 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.15.
-	+ commit 6bee88dd067e03e7767ceacf6a849d9ba38cc11d
-
-
-	po: Update German translation.
-	+ commit 0a32153316855224acda268edb60b80d4e64b12f
-
-
-2016-08-18 Åka Sikrom <a4@hush.com>
-
-	po: Update Norwegian translation.
-	+ commit ec88d7c8a9af864fad8ab5e0b9c4eb90ddcdd630
-
-
-2016-08-18 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit 6f6bfbf175653faa5cf560a7174e81a599247e80
-
-
-2016-08-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Add import filter "drop-sig".
-	+ commit 1b55e864421f88b8c8088639682767076abbeab0
-	* g10/import.c (import_drop_sig): New variable.
-	(cleanup_import_globals): Release that.
-	(parse_and_set_import_filter): Add filter "drop-sig".
-	(filter_getval): Implement properties for drop-sig.
-	(apply_drop_sig_filter): New.
-	(import_one): Apply that filter.
-
-	dirmngr: Remove all system daemon features.
-	+ commit d83ba4897bf217d1045c58d1b99e52bd31c58812
-	* dirmngr/dirmngr.h (opts): Remove fields 'system_service' and
-	'system_daemon'.
-	* common/homedir.c (dirmngr_sys_socket_name): Remove.
-	(dirmngr_user_socket_name): Rename to ...
-	(dirmngr_socket_name): this. Change call callers.
-	* common/asshelp.c (start_new_dirmngr): Remove the system socket
-	feature.
-	* tools/gpgconf.c (list_dirs): Do not print "dirmngr-sys-socket".
-	* sm/server.c (gpgsm_server): Adjust for removed system socket feature.
-	* dirmngr/server.c (cmd_getinfo): Ditto.
-	(cmd_killdirmngr): Remove check for system daemon.
-	(cmd_reloaddirmngr): Ditto.
-	* dirmngr/dirmngr.c (USE_W32_SERVICE): Remove macro.
-	(aService): Remove.
-	(opts): Remove --service.
-	(w32_service_control): Remove.
-	(real_main, call_real_main) W32: Remove wrapper.
-	(main): Remove Windows system service feature. Remove system dameon
-	feature. Use only the "~/.gnupg/dirmngr_ldapservers.conf" file.
-	* dirmngr/certcache.c (load_certs_from_dir): Remove warning in the
-	system dameon case.
-	* dirmngr/crlcache.c (DBDIR_D): Always use "~/.gnupg/crls.d".
-	* dirmngr/ocsp.c (validate_responder_cert): Do not call
-	validate_cert_chain which was used only in system daemon mode.
-	* dirmngr/validate.c (validate_cert_chain): Always use the code.
-
-	gpg: New option --sender.
-	+ commit de6e3217cde81df370926571e0fd65e468619803
-	* g10/options.h (struct opt): Add field 'sender_list'.
-	* g10/gpg.c: Include mbox-util.h.
-	(oSender): New.
-	(opts): Add option "--sender".
-	(main): Parse option.
-
-2016-08-16 Werner Koch <wk@gnupg.org>
-
-	agent: Allow import of overly large keys.
-	+ commit b5d63e81d5c472647decc7687cef91fee0378eb8
-	* agent/command.c (MAXLEN_KEYDATA): Double the size.
-
-2016-08-14 Werner Koch <wk@gnupg.org>
-
-	g13: Allow the use of a g13tab label for --mount.
-	+ commit f02ceb6c6e94c6fbfaeeafe728397be38107de4d
-	* g13/mount.c (g13_mount_container): Do not run the first access check
-	if syshelp is required.
-
-	g13: Implement --umount for dm-crypt.
-	+ commit b781113cf1391926dedf8dc943624d3bb9726318
-	* g13/g13.c (main): Implement command --umount.
-	* g13/mount.c (g13_umount_container): use the syshelper if needed.
-	* g13/backend.c (be_umount_container): New.
-	* g13/be-dmcrypt.c (be_dmcrypt_umount_container): New.
-	* g13/call-syshelp.c (call_syshelp_run_umount): New.
-	* g13/sh-cmd.c (cmd_umount): New.
-	(register_commands): Register UMOUNT.
-	* g13/sh-dmcrypt.c (sh_dmcrypt_umount_container): New.
-
-2016-08-13 Werner Koch <wk@gnupg.org>
-
-	g13: Fix double free bug.
-	+ commit c9a0bccc77c93c08d6980a1718dfaf238a559eb9
-	* g13/sh-cmd.c (cmd_mount, cmd_resume): Do not xfree TIUPLES.
-
-	g13: Consider g13tab for a mount command.
-	+ commit 700920640211168ae1c97d0adef74ba8615d90bb
-	* g13/sh-cmd.c (cmd_getkeyblob): New.
-	(register_commands): Register it.
-	* g13/call-syshelp.c (getkeyblob_data_cb): New.
-	(call_syshelp_get_keyblob): New.
-	* g13/mount.c: Include callsyshelp.h.
-	(g13_mount_container): Ask syshelp whether the filename is managed by
-	g13tab. Call syshelp to get the encrypted keyblob in this case.
-
-	g13: Move some function around.
-	+ commit 37e932658cbd873ac96ff7e2067a97dffc2e0507
-	* g13/keyblob.c (g13_keyblob_decrypt): Move to ...
-	* g13/server.c: to here.
-	* g13/suspend.c, g13/mount.c: Include server.h.
-	* g13/Makefile.am (g13_syshelp_SOURCES): Add keyblob.c
-
-	g13: New command --find-device.
-	+ commit b57f55321295846d47144bd6b39fbbcac0127421
-	* common/status.h (STATUS_BLOCKDEV: New.
-	* g13/call-syshelp.c: Include "call-syshelp.h".
-	(finddevice_status_cb, call_syshelp_find_device): New.
-	* g13/g13.c (aFindDevice): New.
-	(opts): Add "--find-device".
-	(main): Implement --find-device.
-	* g13/sh-cmd.c (cmd_finddevice): New.
-	(register_commands): Register new command.
-
-2016-08-12 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	Avoid leading ": " in the log output when there are no prefixes.
-	+ commit 3a75ff65fba24ea2d024bd8fef633ab7d8f7d520
-	* common/logging.c (do_logv): When no prefixes have been requested,
-	omit the ": " separator, since there is nothing on the left-hand
-	side of it.
-
-	Call log_set_prefix() with human-readable labels.
-	+ commit 61c2a1fa6d6cb345f9d81f4bdd3f8f8ddac1ea3e
-	* agent/preset-passphrase.c, agent/protect-tool.c, dirmngr/dirmngr.c
-	* dirmngr/t-http.c, g10/gpg.c, g10/gpgv.c, g13/g13-syshelp.c
-	* g13/g13.c, kbx/kbxutil.c, scd/scdaemon.c, sm/gpgsm.c
-	* tests/gpgscm/main.c, tools/gpg-check-pattern.c
-	* tools/gpg-connect-agent.c, tools/gpgconf.c, tools/gpgtar.c
-	* tools/symcryptrun.c: Invoke log_set_prefix() with
-	human-readable labels.
-
-2016-08-11 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --input-size-hint.
-	+ commit 70b5d7c43a57a44dad60c2c700a263610748d8f4
-	* g10/options.h: Include stdint.h.
-	(struct opt): Add field 'input_size_hint'.
-	* g10/gpg.c (oInputSizeHint): New.
-	(opts): Add --input-size-hint.
-	(main): Set opt.input_size_hint.
-	* g10/progress.c (write_status_progress): Use the hint.
-
-	common: New function string_to_u64.
-	+ commit 0698324cde3e0cef7eeb6cfd1640c5eefdf13698
-	* common/stringhelp.c (string_to_u64): New.
-	* dirmngr/http.c (longcounter_t): Remove.
-	(struct cookie_s): Change content_length to uint64_t.
-	(parse_response): Use string_to_u64.
-
-2016-08-11 Justus Winter <justus@g10code.com>
-
-	common: Remove compatibility code.
-	+ commit 72fa314b71e4ce8780f59b16d32cabf5d4bd5451
-	* common/Makefile.am: Drop deleted files.
-	* common/w32-afunix.c: Delete file.
-	* common/w32-afunix.h: Likewise.
-
-	common: Rework the simple password query module.
-	+ commit 14479e2515439c73e385f37e8c2b3fc517b038b9
-	* common/simple-pwquery.c (writen, readline): Drop.
-	(agent_send_option, agent_send_all_options, agent_open): Just use
-	libassuan.
-	(simple_pw_set_socket): Simplify.
-	(default_inq_cb): New function.
-	(simple_pwquery, simple_query): Just use libassuan.
-	* agent/Makefile.am (gpg_preset_passphrase_LDADD): Add libassuan.
-	* tools/Makefile.am (symcryptrun_LDADD): Likewise.
-
-	common: Remove simple password query error codes.
-	+ commit 9e6503b7ce019aa417099ded1dda87b68c33f912
-	* common/simple-pwquery.h: Remove mapping function. Move all
-	definitions of status codes...
-	* common/simple-pwquery.c: ... here, and define them to meaningful gpg
-	error values.
-	* agent/preset-passphrase.c (preset_passphrase): Use error code as-is.
-	(forget_passphrase): Likewise.
-	* tools/symcryptrun.c (confucius_get_pass): Likewise.
-
-2016-08-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Print the signer's UID during verification.
-	+ commit ed5c1b0b8a4790c4fb36a3129387f7c2ef5db302
-	* g10/parse-packet.c (parse_signature): Sanitize the value stored in
-	SIGNERS_UID.
-	* g10/mainproc.c (issuer_fpr_string): New.
-	(check_sig_and_print): Print the signers' UID. Print the issuer
-	fingerprint in --rfc4880bis mode.
-
-	common: New function try_make_printable_string.
-	+ commit f2ea7e539c9a22081e3159dcbca84f57f30724ca
-	* common/stringhelp.c (sanitize_buffer): Remove. Move code to ...
-	* common/miscellaneous.c (try_make_printable_string): new.
-	(make_printable_string): Call try_make_printable_string.
-
-2016-08-10 Justus Winter <justus@g10code.com>
-
-	tests: Fix distcheck.
-	+ commit a6acf1f6b39c5a607f61f643a5d21309ba58685d
-	* tests/openpgp/issue2417.scm: Copy configuration.
-
-2016-08-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove tofu database format "split".
-	+ commit 5b59999ce0dd1650ebe47a74a30ded6af00eeed3
-	* g10/options.h (struct opt): Remove field tofu_db_format.
-	* g10/gpg.h (server_control_s): Add fields tofu.batch_update_ref and
-	tofu.batch_update_started.
-	* g10/gpg.c (parse_tofu_db_format): Remove.
-	(main): Make option --tofu-db-format obsolete.
-	* g10/tofu.c: Major rework. Remove the pretty complicated and slower
-	split format and with that all the caching. Use the dbs struct
-	directly. Move global vars for batch update into CTRL. Change
-	calling conventions of some function to take CTRL or DBS pointers
-	instead of the former low-level database pointer.
-
-2016-08-10 Justus Winter <justus@g10code.com>
-
-	g10: Fix opening of trust database.
-	+ commit a27410a251cd25ca96cd6743969c4db0a0fd553f
-	* g10/tdbio.c (tdbio_set_dbname): This function explicitly checks for
-	the file size, but handled the case of a zero-sized file incorrectly
-	by returning success. Fix this by initializing the database in that
-	case.
-	* tests/openpgp/Makefile.am (XTESTS): Add new test.
-	* tests/openpgp/issue2417.scm: New file.
-
-	tests: Fix distcheck.
-	+ commit 194b1e979c7c547afd0dfea5b2496bdfa34b20f1
-	* tests/openpgp/Makefile.am (EXTRA_DIST): Explicitly add setup and
-	teardown scripts now that they no longer are included in the list of
-	tests.
-
-	tests: Improve temporary directory handling.
-	+ commit d9240a3a4688c263632b4168ae2e04363bc91a3a
-	* tests/gpgscm/ffi.c (ffi_init): Rename 'mkdtemp'.
-	* tests/gpgscm/tests.scm (mkdtemp): New function that uses a sensible
-	location and template if no arguments are given.
-	(with-temporary-working-directory): Simplify accordingly.
-	(make-temporary-file): Likewise.
-	* tests/openpgp/run-tests.scm (run-tests-parallel-isolated): Likewise.
-	(run-tests-sequential-isolated): Likewise.
-
-	gpgscm: Make the name of foreign functions more unique.
-	+ commit efe973dab7f69e2b1309446b2fbcd47ce0305399
-	* tests/gpgscm/ffi-private.h (ffi_define_function_name): Add another
-	underscore.
-
-	tests: Run each test in a clean environment.
-	+ commit e13f1ea8fff3964dc3008432f5c0f26aaa2eaa35
-	* tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Drop obsolete
-	variables, add 'srcdir', use absolute paths.
-	(TESTS): Rename to 'XTESTS' to avoid emitting the automake test
-	runner. Drop 'setup.scm' and 'finish.scm'.
-	(xcheck): New target that runs 'run-tests.scm', our Scheme test suite
-	runner. It will run each test in a clean environment, isolated from
-	the other tests.
-	(EXTRA_DIST): Adapt accordingly.
-	* tests/openpgp/README: Likewise.
-
-	tests: Make ssh test more robust.
-	+ commit b2b21580b68f3a9069562f99675b389a0d044713
-	* tests/openpgp/ssh.scm: Drop the 'MD5:' which was not printed by
-	previous ssh versions.
-
-2016-08-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: SSH support fix.
-	+ commit f14795d57f6c81709e9225dd3c5dfd3495cf1b2b
-	* agent/command-ssh.c (ssh_handler_request_identities): Keep error
-	message same.
-
-2016-08-09 Werner Koch <wk@gnupg.org>
-
-	agent: Fix regression in recent ssh changes.
-	+ commit e630f904993725c54ec63be00369589b7b7234d2
-	* agent/command-ssh.c (sexp_key_construct): Lowercase the algo name.
-
-	gpg: Extend the PROGRESS line to give the used unit.
-	+ commit 16feb1e0ea9b5d3966f22f4ae047335b9d1b60e1
-	* g10/progress.c (write_status_progress): Print the units parameter.
-
-2016-08-09 Ben Kibbey <bjk@luxsci.net>
-
-	Cleanup initialization of libgcrypt.
-	+ commit 49829c29e541546084950b8a153067db371d101a
-	* common/init.c (init_common_subsystems): Initialize libgcrypt.
-	* dirmngr/Makefile.am (dirmngr_ldap): Link with libgcrypt.
-
-2016-08-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: SSH support improvement.
-	+ commit ebf24e3b29766595204355d82f435a3e675bfbbc
-	* agent/command-ssh.c (ssh_handler_request_identities): Skip a key with
-	error, not giving up to handle the request itself.
-	* agent/cvt-openpgp.c (extract_private_key): Support "ecdsa" key.
-
-2016-08-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Cleanup of dek_to_passphrase function (part 2).
-	+ commit 491d6fdabb3d95905cd96d905e1f965ce8ff07e1
-	* g10/passphrase.c (passphrase_get): Remove arg KEYID. Change arg
-	MODE to NOCACHE.
-	(passphrase_to_dek): Remove args KEYID and PUBKEY_ALGO. Split arg
-	MODE into CREATE and NOCACHE. Change all callers and adjust stubs.
-	(passphrase_clear_cache): Remove args KEYID and ALGO. They are not
-	used. Change caller.
-
-	gpg: Cleanup of dek_to_passphrase function (part 1).
-	+ commit 5b614973fe2d4b5ef402a3057c31c3ef3042a483
-	* g10/passphrase.c (passphrase_to_dek_ext): Remove args CUSTDESC and
-	CUSTPROMPT. Merge into the passphrase_to_dek wrapper.
-	(passphrase_get): Remove args CUSTOM_DESCRIPTION and CUSTOM_PROMPT.
-
-2016-08-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: More clean up of SSH support.
-	+ commit 591a8373a5d9567db9b1a1a48205e8a206c7b669
-	* common/util.h (get_pk_algo_from_key): New.
-	* common/sexputil.c (get_pk_algo_from_key): The implementation.
-	* agent/gpg-agent.c: Remove include of openpgpdefs.h.
-	* agent/command-ssh.c (struct ssh_key_type_spec): Use integer ALGO.
-	(ssh_key_types): Update with GCRY_PK_*.
-	(make_cstring, sexp_extract_identifier): Remove.
-	(sexp_key_construct): Use gcry_pk_algo_name to get ALGO string.
-	(ssh_key_to_blob): Use cadr to get value list.
-	(ssh_key_type_lookup): Lookup with integer ALGO.
-	(ssh_receive_key): Follow the change of ssh_key_type_lookup.
-	(ssh_send_key_public): Likewise. Use get_pk_algo_from_key to get ALGO.
-
-	tests: Add openpgp/gpgv-forged-keyring.scm.
-	+ commit 7dcad0d3503ac0d75e09efb16246dd78518986fc
-	* tests/openpgp/gpgv-forged-keyring.scm: New.
-	* tests/openpgp/forged-keyring.gpg: New.
-	* tests/openpgp/Makefile.am (TESTS): Add gpgv-forged-keyring.scm.
-	* tests/openpgp/defs.scm (tools): Add GPGV.
-	(GPGV): New.
-
-2016-08-06 Werner Koch <wk@gnupg.org>
-
-	agent: Fix long standing regression tracking the connection count.
-	+ commit 40d16029ed8b334c371fa7f24ac762d47302826e
-	* agent/gpg-agent.c (get_agent_active_connection_count): New.
-	(do_start_connection_thread, start_connection_thread_ssh): Bump
-	ACTIVE_CONNECTIONS up and down.
-	* agent/command.c (cmd_getinfo): Add subcommand "connections".
-
-2016-08-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Clean up SSH support.
-	+ commit 894789c3299dc47a8c1ccaaa7070382f0fae0262
-	* agent/command-ssh.c (file_to_buffer): Remove.
-	(ssh_handler_request_identities): Use agent_public_key_from_file.
-
-2016-08-05 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: Avoid publishing the GnuPG version by default.
-	+ commit c9387e41db7520d176edd3d6613b85875bdeb32c
-	* g10/gpg.c (main): initialize opt.emit_version to 0
-	* doc/gpg.texi: document different default for --emit-version
-
-2016-08-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Make sure that keygrips are printed for each subkey.
-	+ commit c8cc804f56bfefba46641f2c7078fcd67b494bae
-	* g10/keylist.c (list_keyblock_colon): Print an emprty grip in case of
-	an error.
-
-	gpg: Always print the fingerprint in colons mode.
-	+ commit 54a1ed20e203dcafeacbe21eb147efa08255dbf5
-	* g10/keylist.c (list_keyblock_colon): Remove arg FPR. Always print
-	fingerprint records. For secret keys always print keygrip records.
-
-	tests: Use gpgconf to set the ssh socket envvar.
-	+ commit 0c2a745a2bc21e8f439930f7c0e5d1521c2fd44c
-	* tests/openpgp/ssh.scm ("SSH_AUTH_SOCK"): Use gpgconf.
-
-	gpgconf: Add limited support for -0.
-	+ commit db6f3eb926619dfe6ed2a9be197c51f9a1b6198c
-	* tools/gpgconf.h (opt): Add field 'null'.
-	* tools/gpgconf.c: Add option --null/-0.
-	(list_dirs): Use it here.
-
-2016-08-04 Justus Winter <justus@g10code.com>
-
-	tests: Update list of tests in Scheme test runner.
-	+ commit 05cb30052cdf1d308ff7da901cfa5a809cd49479
-	* tests/openpgp/run-tests.scm: Add missing tests.
-
-	tests: Fix path to fake-pinentry.
-	+ commit 3566544d04a4b81e5dd8a2883304673b2cc2f108
-	* tests/openpgp/defs.scm: Correctly compute the path to fake-pinentry.
-
-2016-08-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit 89234f7f3643bad2daddc94569f1d651ec5c835e
-
-
-	po: update Japanese translation.
-	+ commit 573e0f36190346e0263bea3ae12a389f4f598d55
-
-
-	g10: Fix checking key for signature validation.
-	+ commit 6f284e6ed63f514b15fe610f490ffcefc87a2164
-	* g10/sig-check.c (check_signature2): Not only subkey, but also primary
-	key should have flags.valid=1.
-
-2016-08-03 Justus Winter <justus@g10code.com>
-
-	kbx: Add missing header file.
-	+ commit e3358b246d9380008a4ba7c8f2fe03659901adaf
-	* kbx/keybox-update.c: Add missing header file.
-
-2016-08-03 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	More cleanup of "allow to".
-	+ commit dc107b78509807db375d3a382eb3376cd2183357
-	* README, agent/command.c, agent/keyformat.txt, common/i18n.c,
-	 common/iobuf.c, common/keyserver.h, dirmngr/cdblib.c,
-	 dirmngr/ldap-wrapper.c, doc/DETAILS, doc/TRANSLATE,
-	 doc/announce-2.1.txt, doc/gpg.texi, doc/gpgsm.texi,
-	 doc/scdaemon.texi, doc/tools.texi, doc/whats-new-in-2.1.txt,
-	 g10/export.c, g10/getkey.c, g10/import.c, g10/keyedit.c, m4/ksba.m4,
-	 m4/libgcrypt.m4, m4/ntbtls.m4, po/ca.po, po/cs.po, po/da.po,
-	 po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fi.po,
-	 po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po,
-	 po/nb.po, po/pl.po, po/pt.po, po/ro.po, po/ru.po, po/sk.po,
-	 po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po,
-	 scd/app-p15.c, scd/ccid-driver.c, scd/command.c, sm/gpgsm.c,
-	 sm/sign.c, tools/gpgconf-comp.c, tools/gpgtar.h: replace "Allow to"
-	 with clearer text.
-
-	In standard English, the normal construction is "${XXX} allows ${YYY}
-	to" -- that is, the subject (${XXX}) of the sentence is allowing the
-	object (${YYY}) to do something. When the object is missing, the
-	phrasing sounds awkward, even if the object is implied by context.
-	There's almost always a better construction that isn't as awkward.
-
-	These changes should make the language a bit clearer.
-
-	dirmngr: Emit correct spelling of "superseded".
-	+ commit 436b28c23194fa77919967338d5a61a82d242153
-	* dirmngr/crlcache.c (list_one_crl_entry): Spell superseded correctly.
-	* dirmngr/ocsp.c (ocsp_invalid): Likewise.
-
-	This might break some tools which parse the existing output and expect
-	misspellings, but i'm not sure there are many such tools, and we
-	should use standardized orthography going forward.
-
-	Fix spelling and grammar.
-	+ commit cd45cf782b91ff0f6b023913963e5258ffcbf464
-	* agent/learncard.c: s/coccured/occurred/
-	* doc/dirmngr.texi: s/ommitted/omitted/, s/orginally/originally/,
-	 s/reponses/responses/i
-	* doc/gpg-agent.texi, doc/dirmngr.texi, doc/gpg.texi: Fix "allows
-	 to" to more conventional english usage.
-	* doc/tools.texi, g10/gpgcommpose.c, tests/openpgp/armor.scm,
-	 tests/openpgp/armor.test: s/occured/occurred/
-	* tools/gpgsplit.c: s/calcualting/calculating/
-	* sm/server.c: s/formated/formatted/
-
-2016-08-03 Werner Koch <wk@gnupg.org>
-
-	gpg,gpgsm: Block signals during keyring/keybox update.
-	+ commit 48a2c93a1886589d1a0e2a4a2173e0e81311200b
-	* kbx/keybox-util.c (keybox_file_rename): Add arg BLOCK_SIGNALS.
-	* kbx/keybox-update.c (rename_tmp_file): Block all signals when doing
-	a double rename.
-	* g10/keyring.c (rename_tmp_file): Block all signals during the double
-	rename.
-
-	common: New file utilproto.c.
-	+ commit 3a2421c94015432caa49e166bc5bf5c4f80ab7c7
-	* common/util.h: Factor prototypes from signal.c out to ...
-	* common/utilproto.h: new.
-	* common/Makefile.am (common_sources): Add new file.
-
-2016-08-01 Justus Winter <justus@g10code.com>
-
-	gpgsm: Fix machine-readable key listing.
-	+ commit 40365b28c3fdf087fd58401f5a6f42f9d7d29d20
-	* sm/keylist.c (list_cert_colon): Drop superfluous colon.
-
-	tests: Distribute standalone test runner.
-	+ commit c971ff0823d9a649b32fd9f169a12abc3095246e
-	* tests/openpgp/Makefile.am (EXTRA_DIST): Add missing file
-	'run-tests.scm'.
-
-2016-07-28 Justus Winter <justus@g10code.com>
-
-	tests: Fix distcheck.
-	+ commit 9e799b0e4f131126b80a5d3272c36d52b8ba1720
-	* tests/openpgp/Makefile.am (sample_msgs): New variable.
-	(EXTRA_DIST): Also ship the sample msgs.
-
-2016-07-27 Fredrik Fornwall <fredrik@fornwall.net>
-
-	build: Fix check for Android.
-	+ commit 583a464c62ce8f7d70f5fdab2c7ea73ec3348d69
-	* configure.ac: Match other Android targets as well.
-
-2016-07-26 Justus Winter <justus@g10code.com>
-
-	common: Fix iobuf_peek corner case.
-	+ commit b2572b0c386fd12ac6581fcce72f8d48cbfd27c7
-	Previously, iobuf_peek on a file smaller than 'buflen' would hang.
-
-	* common/iobuf.c (underflow): Generalize by adding a target parameter.
-	(iobuf_peek): Use this to prevent looping here.
-	* tests/openpgp/Makefile.am (TESTS): Add new test.
-	* tests/openpgp/setup.scm (dearmor): Move function...
-	* tests/openpgp/defs.scm (dearmor): ... here.
-	* tests/openpgp/issue2419.scm: New file.
-	* tests/openpgp/samplemsgs/issue2419.asc: Likewise.
-
-	gpgscm: Do not shadow common function name in catch macro.
-	+ commit 046338b8494c036a5e717130d3eadce0291126fc
-	* tests/gpgscm/init.scm (catch): Do not shadow 'exit'.
-
-	tests: Fix distcheck.
-	+ commit 66c0dab3c722c2766828515120775b106286334e
-	* tests/openpgp/Makefile.am (samplekeys): Add missing key.
-
-	gpgscm: Make the verbose setting more useful.
-	+ commit f17aecbcd98103fcd2ece537be96930f354de656
-	* tests/gpgscm/ffi.c (do_get_verbose): New function.
-	(do_set_verbose): Likewise.
-	(ffi_init): Turn *verbose* into a function, add *set-verbose!*.
-	* tests/gpgscm/tests.scm (call): Adapt accordingly.
-	(call-with-io): Dump output if *verbose* is high.
-	(pipe-do): Adapt accordingly.
-	* tests/openpgp/defs.scm: Set verbosity according to environment.
-	* tests/openpgp/run-tests.scm (test): Adapt accordingly.
-
-	common: Avoid excessive stack use.
-	+ commit b3610badf691178bbbf0831af9aa6b6658c1948a
-	* common/exectool.c (copy_buffer_shred): Make passing NULL a nop.
-	(gnupg_exec_tool_stream): Allocate copy buffers from the heap.
-
-	common: Rework resource cleanup when handling errors.
-	+ commit 35132a8b119dbc3393ceb0d0874917905d1a6354
-	* common/exectool.c (gnupg_exec_tool_stream): Rework error handling.
-
-	common: Add unit test for exectool.
-	+ commit fe40e9c53dc0710ff73e72d05ba8040874465b55
-	* common/Makefile.am: Build new test.
-	* common/t-exectool.c: New file.
-
-2016-07-25 Justus Winter <justus@g10code.com>
-
-	g10: Fix key import statistics.
-	+ commit 4ba11251aff578394000bf480f47160f0879c763
-	'transfer_secret_keys' collects statistics on a subkey-basis, while
-	the other code does not. This leads to inflated numbers when
-	importing secret keys. E.g. 'count' is incremented by the main
-	parsing loop in 'import', and again in 'transfer_secret_keys', leading
-	to a total of 3 if one key with two secret subkeys is imported.
-
-	* g10/import.c (import_secret_one): Adjust to the fact that
-	'transfer_secret_keys' collects subkey statistics.
-	* tests/openpgp/Makefile.am (TESTS): Add new test.
-	* tests/openpgp/issue2346.scm: New file.
-	* tests/openpgp/samplekeys/issue2346.gpg: Likewise.
-
-2016-07-22 Justus Winter <justus@g10code.com>
-
-	gpgscm: Make function more general.
-	+ commit 9ee23a715d5dad6bf568a2deb1c55bf15601cf51
-	* tests/gpgscm/tests.scm (in-srcdir): Accept more path fragments.
-
-	g10: Properly ignore legacy keys in the keyring cache.
-	+ commit d9839c9d303a01dc1032a6de311e034fe14e81da
-	* g10/keyring.c (keyring_rebuild_cache): Properly ignore legacy keys
-	in the keyring cache.
-	* tests/migrations/Makefile.am (TESTS): Add new test.
-	* tests/migrations/common.scm (GPG-no-batch): New variable.
-	(run-test): New function.
-	* tests/migrations/issue2276.scm: New file.
-	* tests/migrations/issue2276.tar.asc: Likewise.
-
-2016-07-21 Justus Winter <justus@g10code.com>
-
-	g10: Fix error handling.
-	+ commit 45bb9a2a46e11bc13c6b39e7b4748b7de199018e
-	* g10/tofu.c (show_statistics): Fix error handling, 0 is a valid
-	duration.
-
-	g10: Drop superfluous begin transaction.
-	+ commit 8a6f8e1e397a2d676b211f2dbc6df4a80b67442d
-	* g10/tofu.c (record_binding): We only need a transaction for the
-	split format.
-
-	gpgscm: Make assert macro more accurate.
-	+ commit 699c6c9f4b44441ab3db7f942df5b81f4cd88b06
-	* tests/gpgscm/lib.scm (assert): Print the representation of the
-	failed expression.
-
-	gpgscm: Make error message more useful.
-	+ commit 7207b2fe45bcf884e029366a2677a570234bed2e
-	* tests/gpgscm/scheme.c (opexe_0): Include names of missing function
-	parameters in the error message.
-
-	g10: Fix crash.
-	+ commit 1af2fd44f0a66fd0d94c224319db0b128d42a288
-	* g10/tofu.c (tofu_closedbs): Fix freeing database handles up to the
-	cache limit. Previously, this would crash if db_cache_count == count.
-
-2016-07-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix card removal/reset on multiple contexts.
-	+ commit 1598a4476466822e7e9c757ac471089d3db4b545
-	* scd/app.c (application_notify_card_reset): Add message for debug.
-	*scd/command.c (update_card_removed): Call release_application and set
-	SLOT -1 here.
-	(struct server_local_s): Remove app_ctx_marked_for_release.
-	(do_reset): Don't mark release but call release_application here.
-	(open_card): Remove app_ctx_marked_for_release handling.
-	(update_reader_status_file): Don't set SLOT here, so that it can be
-	released the APP by application_notify_card_reset in
-	update_card_removed.
-
-2016-07-19 Justus Winter <justus@g10code.com>
-
-	agent: Add known keys to sshcontrol.
-	+ commit 270f7f7b8b235cc93516566702e2a1d256605cca
-	* agent/command-ssh.c (ssh_identity_register): Add a key to sshcontrol
-	even if it is already in the private key store.
-	* tests/openpgp/ssh.scm: Test this.
-
-	tests: Add test for ssh support.
-	+ commit d7a405de8325aa945ab791dcd3bc48272af33b86
-	* tests/gpgscm/tests.scm (path-expand): New function.
-	* tests/openpgp/Makefile.am (TESTS): Add new test.
-	(sample_keys): Add new keys.
-	(CLEANFILES): Clean ssh socket and control file.
-	* tests/openpgp/fake-pinentry.c (main): Add a default passphrase.
-	* tests/openpgp/gpg-agent.conf.tmpl: Enable ssh support.
-	* tests/openpgp/samplekeys/ssh-dsa.key: New file.
-	* tests/openpgp/samplekeys/ssh-ecdsa.key: Likewise.
-	* tests/openpgp/samplekeys/ssh-ed25519.key: Likewise.
-	* tests/openpgp/samplekeys/ssh-rsa.key: Likewise.
-	* tests/openpgp/ssh.scm: Likewise.
-
-2016-07-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix race conditions for release_application.
-	+ commit 0c1fd4e9884ed7c1edd1819762b9e8a77f606ed3
-	* scd/command.c (do_reset, cmd_restart): Reset app_ctx before calling
-	release_application.
-
-2016-07-18 Justus Winter <justus@g10code.com>
-
-	agent: Fix passphrase cache lookups.
-	+ commit f474249366e8e143c8e6eb7f7b1a74056e46fa1f
-	CACHE_MODE_ANY is supposed to match any cache mode except
-	CACHE_MODE_IGNORE, but the code used '==' to compare cache modes.
-
-	* agent/cache.c (cache_mode_equal): New function.
-	(agent_set_cache): Use the new function to compare cache modes.
-	(agent_get_cache): Likewise.
-	* tests/openpgp/Makefile.am (TESTS): Add new test.
-	* tests/openpgp/issue2015.scm: New file.
-
-2016-07-15 Justus Winter <justus@g10code.com>
-
-	build: Always build gpgtar.
-	+ commit 7f4dd24b880323a5b772719dafae829c288303a8
-	We use gpgtar to unpack test data, hence we always build it. If the
-	user opts out, we simply don't install it.
-
-	* configure.ac: Add comment.
-	* tests/migrations/Makefile.am (required_pgms): Make sure gpgtar is
-	built.
-	* tools/Makefile.am: Always build gpgtar, but do not install it if the
-	user used '--disable-gpgtar'.
-
-2016-07-15 Werner Koch <wk@gnupg.org>
-
-	wks: Publish as binary file.
-	+ commit b7b37716b9d2cd1b71b5f7f0e4fb2c1a43eee90a
-	* tools/gpg-wks-server.c (copy_key_as_binary): New.
-	(check_and_publish): Use new function instead of rename.
-
-2016-07-15 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fix linking.
-	+ commit c49c43d7e4229fd9f1bc55e17fa32fdc334dbef6
-	* tests/gpgscm/Makefile.am: Add -lintl.
-
-	g10: Fix building without trust models.
-	+ commit d21efa398874be4a15e8283c5fc382fb90f562fd
-	* g10/pkclist.c (write_trust_status): Fall back to the previous
-	behavior.
-
-	tests: Check for gpgtar.
-	+ commit 12a887050a560c4cacaf95e4cdb0cc42d8b87aa1
-	* tests/migrations/extended-pkf.scm: Skip test if gpgtar is not built.
-	* tests/migrations/from-classic.scm: Likewise.
-	* tests/openpgp/gpgtar.scm: Fix check for gpgtar.
-
-2016-07-14 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.14.
-	+ commit 09c448202ffb4c26d7ec2028351a78e2d3680396
-
-
-	po: Update the German translation.
-	+ commit 23c2491f94b94fa231bde8187eb958432555eff1
-
-
-2016-07-14 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	dirmngr: fix handling of HTTP redirections.
-	+ commit 60428c24fb29cb633c9392abb777bc4da88dbfba
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Reinitialize HTTP session
-	when following a HTTP redirection.
-
-2016-07-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove options --print-dane-records and --print-pka-records.
-	+ commit 1e9bc66a9a60de668890452d504eea3c3c614f7e
-	* g10/gpg.c (main): Remove options but print a dedicated warning.
-	* g10/options.h (struct opt): Remove fields 'print_dane_records' and
-	'print_pka_records'.
-	* g10/keylist.c (list_keyblock): Do not call list_keyblock_pka.
-	(list_keyblock_pka): Remove.
-
-2016-07-14 Åka Sikrom <a4@hush.com>
-
-	po: Complete update of the Norwegian translation.
-	+ commit d6d7e4d218a1e2e2a88bc893b00967b032d194f8
-
-
-2016-07-14 Yuri Chornoivan <yurchor@ukr.net>
-
-	Update Ukrainian translation.
-	+ commit 9427288ebb32141c196996315f93535fd7744901
-
-
-2016-07-14 Ineiev <ineiev@gnu.org>
-
-	Update Russian translation.
-	+ commit 39c88870359bc75e9f72e08a7466fcff01bdc655
-
-
-2016-07-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix regression since 2.1 in --search-key with a fingerprint.
-	+ commit 0342369ce001b9dba04dc79e7a4eb66fbda278e7
-	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Prefix fingerprint with 0x.
-
-	gpgscm: Use kludge to avoid improper use of ffi_schemify_name.
-	+ commit fb14bf0a95e361b0991067e3aea2902d54be811d
-	* tests/gpgscm/ffi.c (ffi_schemify_name): Use xstrdup instead of
-	strdup for now.
-
-	build: Require latest released libraries.
-	+ commit c98995efefbdebea8f53d54ba2df4217dfd31ad4
-	* agent/protect.c (OCB_MODE_SUPPORTED): Remove macro.
-	(do_encryption): Always support OCB.
-	(do_decryption): Ditto.
-	(agent_unprotect): Ditto.
-	* dirmngr/server.c (is_tor_running): Unconditionally build this.
-
-2016-07-13 Werner Koch <wk@gnupg.org>
-
-	build: Update config.{guess,sub} to {2016-05-15,2016-06-20}.
-	+ commit 66b634f27f10e4c0cb21c3f201998497d0bb24ca
-	* build-aux/config.guess: Update.
-	* build-aux/config.sub: Update.
-
-	gpg: Fix regression due to the new --mimemode options.
-	+ commit 3b8ed7650d2d63b01ec80ecf9e493b80e3ac7ef8
-	* g10/gpg.c (opts): Re-add oTextmodeShort.
-
-2016-07-13 Daiki Ueno <ueno@gnu.org>
-
-	gpg: Make --try-all-secrets work for hidden recipients.
-	+ commit 82b90eee100cf1c9680517059b2d35e295dd992a
-	* g10/getkey.c (enum_secret_keys): Really enumerate all secret
-	keys if --try-all-secrets is specified.
-
-2016-07-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not print a the short keyid if the high word is zero.
-	+ commit 7b96a8d736934e65bb2adbc17059f84dfeaf95fb
-	* g10/keyid.c (format_keyid): Always returh long keyid ifor KF_LONG.
-
-	gpg: New option --mimemode.
-	+ commit e148c3caa90fbadba32bdbfea9513392e3aea598
-	* g10/gpg.c (oMimemode): New.
-	(opts): Add --mimemode.
-	(main): Use --mimemode only in rfc4880bis compliance mode.
-	* g10/options.h (struct opt): Add field "mimemode".
-	* g10/build-packet.c (do_plaintext): Allow for mode 'm'.
-	* g10/encrypt.c (encrypt_simple, encrypt_crypt): Use 'm' if requested.
-	* g10/plaintext.c (handle_plaintext): Handle 'm' mode.
-	* g10/sign.c (write_plaintext_packet): Handle 'm' mode.
-	(sign_file, sign_symencrypt_file): Use 'm' if requested.
-
-	wks: Use correct key for the confirmation.
-	+ commit 95810929f75bd718dbdf2cd1c0181137a45e2456
-	* tools/gpg-wks-client.c (send_confirmation_response): Actually
-	encrypt to the recipient.
-
-	wks: New server command --list-domains.
-	+ commit 44ecc33b4a7147d9c112a72f55a42b65cef4fe67
-	* tools/gpg-wks-server.c (aListDomains): New.
-	(opts): Add --list-domains.
-	(parse_arguments): Implement.
-	(main): Ditto. Use only one final diagnostic message.
-	(command_list_domains): New.
-	(check_and_publish): Remove directory creation.
-	(get_domain_list): New.
-	(expire_pending_confirmations): Rewrite using a list of directories.
-	(command_cron): Get domain list and pass to
-	expire_pending_confirmations.
-
-2016-07-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix envvars for UPDATESTARTUPTTY.
-	+ commit 7be218177701af316db75057c99ca674d53cf585
-	agent/command.c (cmd_updatestartuptty): Use session_env_list_stdenvnames
-	to get the list.
-
-2016-07-12 Werner Koch <wk@gnupg.org>
-
-	g13: Fix memleak.
-	+ commit acb27915f8646a875b6bb507ff46cd1bc330c02b
-	* g13/g13tuple.c (create_tupledesc): Init refcount to 1.
-
-	wks: Add --cron command to gpg-wks-server.
-	+ commit 38eb5f81d223616e3ee34bdfb41c387ce4e7df22
-	* tools/gpg-wks-server.c (PENDING_TTL): New.
-	(expire_one_domain, expire_pending_confirmations): New.
-	(command_cron): New.
-	(main): Implement --cron.
-
-	wks: Try to send an encrypted confirmation back.
-	+ commit 5de41c4ecef32add89044b8a550a47cce8c6d61e
-	* tools/gpg-wks-client.c (encrypt_response_status_cb): New.
-	(encrypt_response): New.
-	(send_confirmation_response): Encrypt the response.
-
-	* tools/gpg-wks-server.c (send_confirmation_request): Use freeing of
-	BODY and BODYENC.
-
-	wks: Also create DANE record.
-	+ commit d3837e0435921bfa5587a50738f5924a5fdf976a
-	* tools/gpg-wks-server.c (copy_key_as_dane): New.
-	(check_and_publish): Also publish as DANE record.
-
-	gpg: Extend import-option import-export to print PKA or DANE.
-	+ commit 9b075575cdc5851b019aed5ca5d5e18416beec8e
-	* g10/export.c (do_export_stream): Move PKA and DANE printing helper
-	code to ...
-	(print_pka_or_dane_records): this fucntion.
-	(write_keyblock_to_output): Add arg OPTIOSN and call
-	print_pka_or_dane_records if requested.
-
-	gpg: Move a function from import.c to export.c.
-	+ commit 0f5b105d96780a29cc58893285e6c38482e0cc2d
-	* g10/import.c (write_keyblock_to_output): Move to ...
-	* g10/export.c (write_keyblock_to_output): here. Add arg WITH_ARMOR.
-	Also make sure never to export ring trust packets.
-
-2016-07-11 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Enhance --list-dirs.
-	+ commit 7732b332886792b2bbf47ecf7430e953f1c55a2c
-	* tools/gpgconf.c (main) <aListDir>: Factor code out to ...
-	(list_dirs): new. Rewrite to use a table. Allow selection of a
-	items. Add "agent-ssh-socket".
-
-2016-07-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpgv: Tweak default options for extra security.
-	+ commit e32c575e0f3704e7563048eea6d26844bdfc494b
-	* g10/gpgv.c (main): Set opt.no_sig _cache, so that it doesn't depend on
-	cached status. Similarly, set opt.flags.require_cross_cert for backsig
-	validation for subkey signature.
-
-2016-07-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Add export options "export-pka" and "export-dane".
-	+ commit cbe467e794f3be81b8da2bcb1732b5514b13b71d
-	* g10/options.h (EXPORT_PKA_FORMAT): New.
-	* g10/keylist.c (list_keyblock_pka): Do not use DANE flag.
-	* g10/export.c: Include zb32.h.
-	(parse_export_options): Add options "export-pka" and "export-dane".
-	(do_export): Do not armor if either of these option is set.
-	(print_pka_or_dane_records): New.
-	(do_export_stream): Implement new options.
-
-	gpg: Split a too large export function.
-	+ commit b05878f32aa507aa9087d7c992b630840b5ad71c
-	* g10/export.c (do_export_stream): Factor some code out to ...
-	(do_export_one_keyblock): new.
-
-2016-07-07 Justus Winter <justus@g10code.com>
-
-	gpgscm: Capture output of spawned processes.
-	+ commit 2f61aa0ff11b194d20307751ab686c87cd47dd56
-	* tests/gpgscm/tests.scm (call-check): Capture stdout and stderr, and
-	return stdout if the child exited successfully, or include stderr in
-	the error.
-	* tests/openpgp/version.scm: Demonstrate this by checking the stdout.
-
-2016-07-06 Werner Koch <wk@gnupg.org>
-
-	doc: Escape file names in generated macros.
-	+ commit 511c2522b95333226a5e45e538fed29dd44c9be3
-	* doc/mkdefsinc.c (print_filename): New.
-	(main): Use it here.
-
-	wks: Let the server take the encrytion key from the file.
-	+ commit e5896da666551da5322b2ae5458d429b9e60241e
-	* tools/gpg-wks-server.c (encrypt_stream): Change arg 'fingerprint' to
-	'keyfile'.
-	(store_key_as_pending): Add arg 'r_fname' to make of the keyfile.
-	(send_confirmation_request): Add arg 'keyfile'.
-	(process_new_key): Pass on the name of the keyfile.
-
-	gpg: New options --recipient-file and --hidden-recipient-file.
-	+ commit a479804c86bc24bfab101f39464db3ecfbaedf6d
-	* g10/gpg.c (oRecipientFile, oHiddenRecipientFile): New.
-	(opts): Add options --recipient-file and --hidden-recipient-file.
-	(main): Implement them. Also remove duplicate code from similar
-	options.
-	* g10/keydb.h (PK_LIST_FROM_FILE): New.
-	(PK_LIST_SHIFT): Bump up.
-	* g10/pkclist.c (expand_group): Take care of PK_LIST_FROM_FILE.
-	(find_and_check_key): Add and implement arg FROM_FILE.
-	(build_pk_list): Pass new value for new arg.
-	* g10/getkey.c (get_pubkey_fromfile): New.
-	* g10/gpgv.c (read_key_from_file): New stub.
-	* g10/test-stubs.c (read_key_from_file): New stub.
-	* g10/server.c (cmd_recipient): Add flag --file.
-	* g10/import.c (read_key_from_file): New.
-
-	* tests/openpgp/defs.scm (key-file1): New.
-	(key-file2): New.
-	* tests/openpgp/setup.scm: Add their private keys and import the
-	key-file1.
-	* tests/openpgp/encrypt.scm: Add new test.
-
-	gpg: New option --no-keyring.
-	+ commit 073be51a866cb5600479c504a44ae5ac94a449a2
-	* g10/gpg.c (oNoKeyring): New.
-	(opts): Add "--no-keyring".
-	(main): Do not register any keyring if the option is used.
-
-	gpg: Document use of node flags in import.c and remove unused args.
-	+ commit fdfde91595109e51a5b8fafd292244ad41dfb83d
-	* g10/import.c (NODE_GOOD_SELFSIG): New. Use instead of 1.
-	(NODE_BAD_SELFSIG): New. Use instead of 2.
-	(NODE_DELETION_MARK): New. Use instead of 4.
-	(NODE_FLAG_A): New. Use to mark new nodes in merge_blocks.
-	(chk_self_sigs): Remove unused args FNAME and PK.
-	(import_one): Adjust call. Simplify error return because
-	chk_self_sigs does not return an error code.
-	(append_uid, append_key, merge_sigs, merge_keysigs): Remove unsued
-	args FNAME and KEYID.
-	(merge_blocks, import_one, import_secret_one)
-	(import_revoke_cert): Remove unused arg FNAME.
-
-	gpg: Get rid of an unused arg in a function in getkey.c.
-	+ commit 7e0c48eb6f18a80142ca2a0f76fe8d270a4e5b33
-	* g10/getkey.c (pk_from_block): Remove unused arg CTX. Change all
-	callers.
-
-	gpg: Change calling convention for a function in getkey.c.
-	+ commit 9385dfeb9dd6d83608a10c7896c341f585a25a2b
-	* g10/getkey.c (merge_selfsigs): Remove arg CTX. Add args REQ_USAGE
-	and WANT_EXACT.
-	(finish_lookup): Adjust caller. Set LOOKUP_NOT_SELECTED here...
-	(lookup): and not here.
-
-2016-07-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix possible out-of-bounds read in is_armored.
-	+ commit 5d1a9c4dc823b418db6c4686da55ee3abdf023b0
-	* g10/armor.c (check_input): Call is_armored only if LEN >= 2.
-	(unarmor_pump): Use a 2 byte buffer for is_armored.
-
-2016-07-05 Justus Winter <justus@g10code.com>
-
-	tests: Honor environment variable 'TMP'.
-	+ commit 8270580a5a70874beeffcdd16221937db4bcdc93
-	This fixes problems with long socket names, e.g. when doing distcheck.
-
-	* tests/gpgscm/tests.scm (path-join): New function.
-	(with-temporary-working-directory): Honor 'TMP'.
-	(make-temporary-file): Likewise.
-	* tests/migrations/Makefile.am (TMP): Default to '/tmp'.
-	(TESTS_ENVIRONMENT): Set 'TMP'.
-	* tests/openpgp/Makefile.am (TMP): Default to '/tmp'.
-	(TESTS_ENVIRONMENT): Set 'TMP'.
-
-	gpgscm: Improve robustness and compatibility.
-	+ commit f26fe4f73e8430d93c03d95a8a24fdabd078bb20
-	* tests/gpgscm/ffi.c (do_getenv): Avoid gccism.
-	(do_mkdtemp): Handle errors.
-
-	tests/migrations: Fix distcheck.
-	+ commit b70d08827ddb56423ad610b4ebaaaf9cc763512f
-	* tests/migrations/Makefile.am (TESTS): Rename test.
-	(TEST_FILES): Update list.
-	(EXTRA_DIST): Add common.scm.
-	* tests/migrations/common.scm (GPGTAR): New variable.
-	(dearmor): Rename and untar archive.
-	* tests/migrations/extended-private-key-format.scm: Rename.
-	(setup): Update.
-	* tests/migrations/extended-pkf.tar.asc: New file.
-	* tests/migrations/extended-private-key-format.gpghome: Delete.
-	* tests/migrations/from-classic.gpghome: Likewise.
-	* tests/migrations/from-classic.scm (setup): Update.
-	* tests/migrations/from-classic.tar.asc: New file.
-
-	tools/gpgtar: Provide --create and --extract.
-	+ commit 0b8a3358798b7028be872a923da2e275da67d592
-	* tools/gpgtar.c (cmd_and_opt_values): New values.
-	(opts): New actions.
-	(parse_arguments): Handle new actions.
-	* tests/openpgp/gpgtar.scm: Test new interface.
-
-	g10: Fix out-of-bounds read.
-	+ commit a6b87981f7ddef42b25703723162c647e312b125
-	* g10/armor.c (use_armor_filter): We need two bytes for 'is_armored'.
-
-2016-07-04 Werner Koch <wk@gnupg.org>
-
-	wks: Add command --read to gpg-wks-client.
-	+ commit 8c8ae043b8d65cb79e0e99c5bdbdcbf34714bd0c
-	* tools/gpg-wks-client.c (aRead): New.
-	(opts): Add command "--read".
-	(main): Implement that.
-
-	tests: Add a gettime test for sizeof (time_t) > 4.
-	+ commit 27d158ead4a2b9c52269ef28d050a49c786c7d13
-	* common/t-gettime.c (test_isotime2epoch): Add 4 more tests.
-
-2016-07-03 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid spurious failures on keyblocks with no or only deleted nodes.
-	+ commit 9177a897732b3cebf3f15c97c1f613f71b6318fe
-	* g10/import.c (write_keyblock_to_output): Clear ERR on success.
-
-	wks: Let the client only export the requested UID.
-	+ commit 1bfed0bbc5ec9d60d4fb3a0f5c865923ed3563e7
-	* tools/gpg-wks-client.c (get_key): Export only the requested uid.
-
-	tools: Call sendmail directly from the wks tools.
-	+ commit 7705f310f1406fe49b45e16c371b09863313f24f
-	* tools/send-mail.c, tools/send-mail.h: New.
-	* tools/wks-util.c: New.
-	* tools/Makefile.am (gpg_wks_server_SOURCES): Add them.
-	(gpg_wks_client_SOURCES): Ditto.
-	* tools/gpg-wks.h (opt): Add fields use_sendmail and output.
-	* tools/gpg-wks-client.c: Add options --send and --output. Rename
-	command --send to --create.
-	(command_send, send_confirmation_response): Output via wks_send_mime.
-	* tools/gpg-wks-server.c: Add options --send and --output.
-	(send_confirmation_request): Output via wks_send_mime.
-	(check_and_publish): Add hack for name-value bug.
-
-2016-07-02 Werner Koch <wk@gnupg.org>
-
-	tools: Add options to gpg-wks-server.
-	+ commit c619035d9cd0c9cef62facf5365321289051f9a0
-	* tools/gpg-wks.h (opt): Add 'default_from' and 'extra_headers'.
-	* tools/gpg-wks-server.c (oFrom, oHeader): New.
-	(parse_arguments): Set them and check args.
-	(get_submission_address): New.
-	(send_confirmation_request): Set correct From address. Add extra
-	headers.
-	(process_new_key): Return an error code.
-
-	tools: Extend mime-maker.c:mime_maker_add_header.
-	+ commit 0e36a1d1fb79c2b75c081616eed00075190b38aa
-	* tools/mime-maker.c (add_header): Check header name and allow
-	name-value syntax.
-	(mime_maker_add_header): Add mode for a syntax check.
-
-	doc: Describe filter expressions.
-	+ commit 442efa9b3ff211c692b6967a944b3d9371ad1bb7
-	* doc/gpg.texi: Remove some superfluous .E.
-	(FILTER EXPRESSIONS): New.
-
-	yat2m: Fix table formatting.
-	+ commit aae3cdb61555db4efb26f522030c8303a731d4a9
-	* doc/yat2m.c (proc_texi_cmd): Use .TQ for @itemx. Print a .P at the
-	end of a level 0 table.
-
-2016-07-01 Werner Koch <wk@gnupg.org>
-
-	gpg: New option --export-filter.
-	+ commit 7bfc86c938d11c14ea78b196c82ceba2a2f5317d
-	* g10/gpg.c (oExportFilter): New.
-	(opts): Add --export-filter.
-	(main): Handle option.
-	* g10/export.c: Include recsel.h, init.h, and mbox-util.h.
-	(export_keep_uid): New global var.
-	(cleanup_export_globals): New.
-	(parse_and_set_export_filter): New.
-	(filter_getval): New.
-	(apply_keep_uid_filter): New.
-	(do_export_stream): Apply filter if set.
-
-	gpg: New option --import-filter.
-	+ commit 5137bf73ccc98a72c2eeac148e4d4b5d58f0a854
-	* g10/gpg.c (oImportFilter): New.
-	(opts): Add --import-filter.
-	(main): Handle option.
-	* g10/import.c: Include recsel.h, init.h, and mbox-util.h.
-	(import_keep_uid): New global var.
-	(cleanup_import_globals): New.
-	(parse_and_set_import_filter): New.
-	(filter_getval): New.
-	(apply_keep_uid_filter): New.
-	(import_one): Apply filter if set.
-
-	gpg: Allow to cache the mbox in a user id struct.
-	+ commit f015552374d69e28292a12f2b91ab34d65c9b457
-	* g10/packet.h (PKT_user_id): Add field 'mbox'.
-	* g10/free-packet.c (free_user_id): Free that.
-
-	gpg: Make sure a user ID packet has always a terminating Nul in memory.
-	+ commit d8bce478be3ae9e401841a77d189ef3c81ccb757
-	* g10/keygen.c (write_uid): Avoid overflow.
-
-	common: Add function to select records etc.
-	+ commit 681c6ef757a73fc1a63a552186e038db179494aa
-	* common/recsel.c, common/recsel.h: New.
-	* common/t-recsel.c: New.
-
-	common: Smart up register_mem_cleanup_func.
-	+ commit 6446a6b3dfd3b2e68b4285870f902ed1f86b0866
-	* common/init.c (register_mem_cleanup_func): Avoid double registration.
-
-2016-07-01 Justus Winter <justus@g10code.com>
-
-	common: Annotate semi-static allocation.
-	+ commit 49fdd0887c84ed7f7b858b9e7ffa146fcb7f1e87
-	* common/argparse.c (optfile_parse): Allow string arguments to leak.
-
-	g10: Fix memory leak.
-	+ commit 78aeb236fe4ff3a6d51b3095148e7086f2a6e9a8
-	* g10/keyserver.c (parse_keyserver_uri): Free URI.
-
-	tools/gpgtar: Annotate semi-static allocation.
-	+ commit cff63da930b6b3f0253668911e0931713b2b584a
-	* tools/gpgtar.c (shell_parse_argv): Annotate argument vector as
-	leaked.
-
-	g10: Fix memory leak.
-	+ commit c454922ffa71929c810c6ff048d902498575302f
-	* g10/import.c (transfer_secret_keys): Release curve from the previous
-	iteration.
-
-	g10: Fix build with disabled kbnode cache.
-	+ commit ff77b92aae9c8e20cbc7fa7c294adcc6a8c2f614
-	* g10/kbnode.c (release_unused_nodes): Fix build with disabled kbnode
-	cache.
-
-	g10: Fix memory leak.
-	+ commit 44d4c695722d96b3bbef16f2843f62413b9670cd
-	* g10/trustdb.c (tdb_get_validity_core): Fix kbnode leak.
-
-	g10: Fix memory leak.
-	+ commit 5fafd18d474da7b763f5b82c73b6ca4288e136d7
-	* g10/keygen.c (keygen_set_std_prefs): Fix memory leak.
-
-	Fix trivial memory leaks in tests.
-	+ commit 6bfbc368f90b274192d3751274816091675f5109
-	* dirmngr/t-ldap-parse-uri.c (check_ldap_escape_filter): Free result.
-	* g10/t-stutter.c (main): Free file name.
-
-2016-06-30 Justus Winter <justus@g10code.com>
-
-	tools: Fix trivial memory leak.
-	+ commit 8f39185d7bfa0bc749f9ccf4a041d2da4eba24ff
-	* tools/gpg-connect-agent.c (main): Fix trivial memory leak.
-
-	g10: Fix memory leak.
-	+ commit 401db0eebbcd28dca8f4059706bfbd18d8cc7528
-	* g10/export.c (do_export_stream): Free secret parameters.
-
-	g10: Fix memory leak.
-	+ commit eb4cdbefb05795b77a8a72189eff246b84442caf
-	* g10/keygen.c (read_parameter_file): Free 'line'.
-
-	g10: Fix memory leak.
-	+ commit 1de362af9094e0a1a0be60f77fbea7c5190a4dcc
-	* g10/sign.c (mk_notation_policy_etc): Free 'mbox'.
-
-	common: Fix memory leak.
-	+ commit 6b9a89e4c7d6f19de62e0a908a8d80c98bf99819
-	* g10/textfilter.c (copy_clearsig_text): Free buffer.
-
-	common: Fix memory leak.
-	+ commit d2d19063d3adf29340aeb39f14e1b1e9aacf41e7
-	* common/iobuf.c (iobuf_set_partial_body_length_mode): Only create
-	context if necessary.
-
-	common: Fix memory leak.
-	+ commit 9037c23979866e6e085b3e32f973bcba590a2635
-	* common/simple-pwquery.c (agent_open): Free socket path.
-
-	g10: Fix keybox-related memory leaks.
-	+ commit 29beea6462cca32d3278b0f7f9364ff4342327b8
-	* g10/keydb.c (keydb_release): Clear keyblock cache.
-	(keydb_get_keyblock): Revert previous change.
-	* kbx/keybox-blob.c (create_blob_finish): Free previous buffer, free
-	fixups after applying them.
-	(_keybox_release_blob): Free buffer. Currently, the buffer has been
-	extracted before the keybox is released, but this is the right thing
-	to do here.
-
-	g10: Fix memory leak.
-	+ commit 5869f518cbd8b41b4c9880fc593216b9efeea430
-	* g10/compress.c (release_context): Free buffers.
-
-	g10: Fix memory leak.
-	+ commit 84f262102be19334534cccc66ed7eceea2714527
-	* g10/sign.c (write_plaintext_packet): Free packet.
-
-	g10: Fix memory leak.
-	+ commit abae8a9dc8a00cf46291ccb40644b3a7aa477307
-	* g10/mainproc.c (release_list): Do not exit early if list is NULL,
-	there are other resources that must be released.
-
-	gpgscm: Fix reallocating string ports.
-	+ commit 5003caa8fdc80afd5748835c06621014f83e6ec4
-	* tests/gpgscm/scheme.c (realloc_port_string): Use memcpy because
-	Scheme strings may contain 0s.
-
-	gpgscm: Free memory backing string ports.
-	+ commit 599ad21104e622acbd1230d90d6a23abf9145499
-	* tests/gpgscm/scheme.c (finalize_cell): Free memory backing string
-	ports.
-
-	gpgscm: Use the allocator from libgcrypt.
-	+ commit d4ede89981c769b0626ab2b37615da1d12a3b078
-	* tests/gpgscm/main.c (main): Use the allocator from libgcrypt.
-
-	w32: Fix build.
-	+ commit dbcb342eaf1738798a5378d9ecd83c7946140d54
-	* g10/keyedit.c (keyedit_quick_revuid): Fix call to
-	'check_trustdb_stale'.
-
-2016-06-30 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	g10: Implement gpg --quick-revuid.
-	+ commit 55d112eeb0743e90be46d15dbae67368ee7d4b50
-	* g10/revoke.c (get_default_uid_revocation_reason): New.
-	* g10/keyedit.c (menu_revuid): Break out creation of uid revocation
-	into new function core_revuid.
-	* g10/keyedit.c (keyedit_quick_revuid): New. Selects key and
-	uid, invokes core_revuid.
-	* g10/gpg.c (main): Handle --quick-revuid argument.
-	* doc/gpg.texi: Document --quick-revuid.
-
-2016-06-29 Werner Koch <wk@gnupg.org>
-
-	tools: Add gpg-wks-client and gpg-wks-server.
-	+ commit 5d6c83deaa11327366b0038928200b9f9f85b426
-	* configure.ac: Add option --enable-wks-tools
-	* tools/gpg-wks-client.c: New.
-	* tools/gpg-wks-server.c: New.
-	* tools/gpg-wks.h: new.
-	* tools/wks-receive.c: New.
-	* tools/call-dirmngr.c, tools/call-dirmngr.h: New.
-
-	build: Improve GNUPG_BUILD_PROGRAM macro.
-	+ commit d8ee0d79a702c92a257884bab86183d32d16ff0e
-	* acinclude.m4 (GNUPG_BUILD_PROGRAM): Allow for dash in options.
-
-	tools: Add modules for MIME parsing and creating.
-	+ commit c334fa8df0e3901857e1a277d3277a873ae4af74
-	* tools/mime-maker.c: New.
-	* tools/mime-maker.h: New.
-	* tools/mime-parser.c: New.
-	* tools/mime-parser.h: New.
-
-2016-06-28 Justus Winter <justus@g10code.com>
-
-	gpgscm: Fix memory leaks.
-	+ commit 9c67958c4737b34c60ef2076f57234eec155eb36
-	* tests/gpgscm/ffi-private.h (ffi_schemify_name): Fix prototype.
-	(ffi_define_function_name): Free schemified name.
-	(ffi_define_function): Likewise.
-	(ffi_define_constant): Likewise.
-	(ffi_define_variable_pointer): Likewise.
-	* tests/gpgscm/ffi.c (do_wait_processes): Free arrays.
-	(ffi_schemify_name): Fix type.
-	* tests/gpgscm/main.c (main): Free 'sc'.
-
-	gpgscm: Free file names.
-	+ commit 6cb2be91a7cc8a9b8ec42f3956adbb19347318e3
-	* tests/gpgscm/scheme.c (scheme_load_named_file): Free file name.
-
-	gpgscm: Fix buffer overflow.
-	+ commit 56cebdc30c10eaec179a6911e308074264d876ae
-	* tests/gpgscm/scheme.c (store_string): Avoid writing past allocated
-	buffer.
-
-	g10: Fix memory leaks.
-	+ commit c57501cc5fa84dbaf560c0fc18853c9540e918af
-	* g10/keydb.c (keydb_get_keyblock): Free 'sigstatus' and 'iobuf'.
-	* g10/t-keydb-get-keyblock.c: Fix trivial memory leaks.
-	* g10/t-keydb.c: Likewise.
-
-	common: Fix memory leaks.
-	+ commit c14ef10fc347d966a1efcb5c2000cbf3aaafa905
-	* common/ccparray.c (ccparray_put): Free old array.
-	* common/stringhelp.c (do_make_filename): Free 'home'.
-	* common/t-convert.c: Fix trivial memory leaks.
-	* common/t-iobuf.c: Likewise.
-	* common/t-mbox-util.c: Likewise.
-	* common/t-name-value.c: Likewise.
-	* common/t-stringhelp.c: Likewise.
-	* common/t-strlist.c: Likewise.
-
-2016-06-28 Werner Koch <wk@gnupg.org>
-
-	dirmngr: add option to retrieve extra WKS info.
-	+ commit b1e8e0d4b945e077966fb98175191aed056bd957
-	* dirmngr/server.c (cmd_wkd_get): Add option --submission-address.
-
-	gpg: Add hack to --quick-gen-key to create Curve25519 keys.
-	+ commit 20ca075d9605e27e25a780bcc465c7371400ca61
-	* g10/keygen.c (quick_generate_keypair): Add special algo string
-	"test-default".
-
-	common: New function rfctimestamp.
-	+ commit 1ddf5b846fc058171af5f2784dad866b73eb0205
-	* common/gettime.c (rfctimestamp): New.
-
-	common: Add missing header file for clarity.
-	+ commit 781e614e3b4586da27e54caca39b6a7ed42fc7c7
-	* common/zb32.c: Include zb32.h.
-
-2016-06-28 Justus Winter <justus@g10code.com>
-
-	tools/gpgtar: Fix handling of '-'.
-	+ commit 4819f687c48c7972c39ae29c7af1e891a4d57360
-	* tools/gpgtar-extract.c (gpgtar_extract): Use stdin if file is '-'.
-	* tools/gpgtar-list.c (gpgtar_list): Likewise.
-
-	common: Close input stream.
-	+ commit d36f664bfdc39c05927cb6e14fe1b3ecb7b64bfa
-	* common/exechelp-posix.c (gnupg_spawn_process): Also close the input
-	stream in the child.
-
-	common: Fix copying data from the spawned child.
-	+ commit 8f79c31b4d465eeaf81c8046c35bb8c34512dd8d
-	Fixes intermittent gpgtar failures.
-
-	* common/exectool.c (copy_buffer_do_copy): Initialize 'nwritten'.
-	(gnupg_exec_tool_stream): Loop until all data is copied.
-
-2016-06-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix --list-packets.
-	+ commit 52f65281f9743c42a48bf5a3354c9ab0ecdb681a
-	* g10/gpg.c (main): Call set_packet_list_mode after assignment of
-	opt.list_packets.
-	* g10/mainproc.c (do_proc_packets): Don't stop processing with
-	--list-packets as the comment says.
-	* g10/options.h (list_packets): Fix the comment.
-	* g10/parse-packet.c: Fix the condition for opt.list_packets.
-
-2016-06-25 Werner Koch <wk@gnupg.org>
-
-	build: Add aclocal macro from pkg-config.
-	+ commit b6872353bae778d11730f5d0afd2192750777647
-	* m4/pkg.m4: New.
-
-	yat2m: Silence lint warnings and fix a printf format bug.
-	+ commit 22b9bea1c3d0e944aa539a87d79e47d92ca5309f
-	* doc/yat2m.c (ATTR_PRINTF, ATTR_NR_PRINTF, ATTR_MALLOC): New.
-	(die, err, inf, xmalloc, xcalloc): New prototypes with attributes.
-	(get_section_buffer): Take care of !N_SECTIONS.
-	(proc_texi_cmd): Cast precision format arg.
-	(proc_texi_buffer): Do not set IN_CMD when not used afterwards.
-
-2016-06-24 Werner Koch <wk@gnupg.org>
-
-	gpg: New import option "import-export".
-	+ commit 7bca3be65e510eda40572327b87922834ebe07eb
-	* g10/import.c (parse_import_options): Add option "import-export".
-	(write_keyblock_to_output): New.
-	(import_one): Implement option.
-
-2016-06-23 Werner Koch <wk@gnupg.org>
-
-	gpg: New import option "import-show".
-	+ commit 1e5959ec059ba41f4de1e2f953300bc040efc16f
-	* g10/options.h (IMPORT_SHOW): New.
-	* g10/import.c (parse_import_options): Add "import-show".
-	(import_one): Implement that.
-
-	gpg: Do not print the validity after key generation.
-	+ commit 09c6f7135150efbbeb459d4ae0189a81e9d180f8
-	* g10/keylist.c (struct keylist_context): Add field NO_VALIDITY.
-	(list_keyblock_print): Take care of it.
-	(list_keyblock_direct): Add arg NO_VALIDITY.
-	* g10/keygen.c (do_generate_keypair): Merge keyblock and print w/o
-	validity.
-
-	common: Fix possible small memory leak in b64dec.c.
-	+ commit c229ba4d8b9b16052ee0b9573bed7905be602cdf
-	* common/b64dec.c (b64dec_finish): Always release TITLE.
-
-2016-06-23 Justus Winter <justus@g10code.com>
-
-	tests/openpgp: Fake the system time for the tofu test.
-	+ commit e584d6468a2e72cd01e55f46104f9f96b56c0b66
-	The keys in the tofu test are set to expire on 2016-09-17. Fake the
-	system time for this test.
-
-	This commit includes changes to the old test as well, for those who
-	need to backport it.
-
-	* tests/openpgp/gpg-agent.conf.tmpl: Drop trailing newlines.
-	* tests/openpgp/tofu.scm: Fake system time.
-	* tests/openpgp/tofu.test: Likewise.
-
-	gpgscm: Handle exceptions in the transformation monad.
-	+ commit 145910afc077e7a5df6cc8b10e180dfa6ce38cc3
-	* tests/gpgscm/tests.scm (pipe:do): Raise errors.
-	(tr:spawn): Catch and return errors.
-	(tr:call-with-content): Likewise.
-	(tr:{open,write-to,pipe-do,assert-identity,assert-weak-identity}):
-	Adapt.
-
-	tests/openpgp: Improve tests.
-	+ commit 1e822654c1dcfc23a9ef689f4e18c0ebba18baca
-	* tests/openpgp/multisig.scm: Simplify test.
-	* tests/openpgp/setup.scm (dearmor): Use pipe.
-
-	gpgscm: Add types for special objects.
-	+ commit 332fa86982dc811640ac8643332d8375816e5b81
-	* tests/gpgscm/scheme.c (enum scheme_types): Add types for boolean,
-	nil, eof, and the sink object.
-	(type_to_string): Handle new types.
-	(scheme_init_custom_alloc): Give special objects a type.
-
-	gpgscm: Fix Scheme initialization.
-	+ commit e6e56adf208f194ecafda29bb1c1c06655348432
-	This potentially causes a crash if the garbage collector marks an eof
-	object.
-
-	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize
-	'EOF_OBJ'.
-
-2016-06-23 Werner Koch <wk@gnupg.org>
-
-	common: Add dedicated private key functions to name-value.c.
-	+ commit 3ead21da80da4570e77036cc05303914c9b1f364
-	* common/name-value.c (struct name_value_container): Add field
-	'private_key_mode'.
-	(my_error): New. Use instead of gpg_error.
-	(nvc_new_private_key): New.
-	(nve_release): Add arg 'private_key_mode'.
-	(nvc_release): Call nve_release with private_key_mode flag.
-	(nvc_delete): Ditto.
-	(_nvc_add): Do no special case "Key:" in non-private_key_mode.
-	(nvc_get_private_key): Return error in non-private_key_mode.
-	(nvc_set_private_key): Ditto.
-	(nvc_parse): Factor all code out to ...
-	(do_nvc_parse): new. Add arg 'for_private_key'.
-	(nvc_parse_private_key): New.
-	* agent/findkey.c (write_extended_private_key): Replace nvc_parse by
-	nvc_parse_private_key.
-	(read_key_file): Ditto.
-
-	* common/t-name-value.c (private_key_mode): New variable.
-	(my_nvc_new): New. Replace all callers.
-	(test_key_extraction): Take mode in account.
-	(run_tests): Ditto.
-	(run_modification_tests): Ditto.
-	(parse): Ditto.
-	(main): Add option --parse and rename --parse to --parse-key.
-
-	common: Rename external symbols in name-value.c.
-	+ commit d74d23d860c1e5039bd595c31c846782c5cb8025
-	* common/name-value.c, common/name-value.h: Rename symbol prefixes
-	from "pkc_" to "nvc_" and from "pke_" to "nve_". Change all callers.
-
-	common: Rename private-keys.c to name-value.c.
-	+ commit b841a883a2a66807aa427e65d49067584bedfbe2
-	* common/private-keys.c: Rename to name-value.c.
-	* common/private-keys.h: Rename to name-value.h. Chage all users.
-	* common/t-private-keys.c: Rename to t-name-value.c.
-	* common/Makefile.am: Adjust accordingly.
-
-	common: Add PGP armor decoding to b64dec.
-	+ commit 3694579bc4eef27ed53e1845bf03be38c299ce76
-	* common/b64dec.c (decoder_states): Add new states.
-	(b64dec_proc): Handle PGP armored format.
-
-2016-06-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix regression of card-edit/fetch.
-	+ commit 6f5ff1cfe449cf1f4cb7287bc57570eb794216b2
-	* g10/card-util.c (fetch_url): Call keyserver_fetch instead of
-	keyserver_import_fprint.
-
-2016-06-21 Justus Winter <justus@g10code.com>
-
-	tests/migrations: Convert to Scheme and re-enable.
-	+ commit f548383d9af912bf93217068cc8aa99a9a6eda93
-	* configure.ac: Re-enable.
-	* tests/Makefile.am: Likewise.
-	* tests/migrations/Makefile.am (TESTS): Use Scheme tests.
-	* tests/migrations/common.scm: New file.
-	* tests/migrations/extended-private-key-format.scm: Likewise.
-	* tests/migrations/from-classic.scm: Likewise.
-	* tests/migrations/extended-private-key-format.test: Drop file.
-	* tests/migrations/from-classic.test: Drop file.
-
-	gpgscm: Add more file handling functions.
-	+ commit c5e0ca5a59ebd91b67944ca125cc8cd73a9d243e
-	* tests/gpgscm/ffi.c (do_glob): New function.
-	(ffi_init): Define new function.
-	* tests/gpgscm/tests.scm (basename-suffix): New function.x
-
-	tests/openpgp: Port the remaining tests to Scheme.
-	+ commit 0340fcdac864109e3dd6edee759efc96e4d3f84e
-	* tests/openpgp/Makefile.am (TESTS): Add new tests.
-	* tests/openpgp/defs.scm (gpg-with-colons): New function.
-	(get-config): Use new function.
-	* tests/openpgp/export.scm: New file.
-	* tests/openpgp/tofu.scm: Likewise.
-
-	gpgscm: Improve test framework.
-	+ commit 65081c31e7536d8fb5effcc2c9aeeffc120c9a69
-	* tests/gpgscm/lib.scm (echo): Move...
-	* tests/gpgscm/tests.scm (echo): ... here.
-	(info, error, skip): And use echo here.
-	(file-exists?): New function.
-	(tr:spawn): Check that source exists and if the sink has been created.
-	(tr:call-with-content): Hand in optional arguments.
-
-	gpgscm: Use native string searching functions.
-	+ commit 5fbbc4b334a73150e709a4802cac99abd8ada61d
-	* tests/gpgscm/ffi-private.h: Handle character arguments.
-	* tests/gpgscm/ffi.c (do_string_index): New function.
-	(do_string_rindex): Likewise.
-	(do_string_contains): Likewise.
-	(ffi_init): Define new functions.
-	* tests/gpgscm/ffi.scm (ffi-define): New macro.
-	* tests/gpgscm/lib.scm (string-index): Use native function,
-	demonstrate behavior.
-	(string-rindex): Likewise.
-	(string-contains?): Likewise.
-	Demonstrate behavior of various other functions.
-	(read-all): Rework so that it can handle large files.
-
-	gpgscm: Improve error reporting.
-	+ commit d99949fc8cf541018267964629992d55c97ca9ab
-	* tests/gpgscm/scheme.c (type_to_string): New function.
-	(Eval_Cycle): Include actual type in error message.
-
-	gpgscm: Make memory allocation failures fatal.
-	+ commit 616582071a2c76c4fb529d4da549aa95ee5d78d6
-	* tests/gpgscm/scheme.c (Eval_Cycle): Exit if we run out of memory.
-
-2016-06-21 Werner Koch <wk@gnupg.org>
-
-	sm: Do not install cacert and other root certificates.
-	+ commit c19b2061274cd50838e62a2acbdc7e7d24888e7e
-	* doc/Makefile.am (dist_pkgdata_DATA): Move qualified.txt and
-	com-certs.pem to ...
-	(EXTRA_DIST): here.
-
-2016-06-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Add experimental support for an issuer fpr.
-	+ commit 955baf04364721457cd99aad21942523cd50498c
-	* common/openpgpdefs.h (SIGSUBPKT_ISSUER_FPR): New.
-	* g10/build-packet.c (build_sig_subpkt_from_sig): Add arg PKSK and
-	insert the issuer fpr if needed.
-	* g10/sign.c (write_signature_packets): Pass signing key.
-	(make_keysig_packet): Ditto.
-	(update_keysig_packet): Ditto.
-	* g10/parse-packet.c (dump_sig_subpkt): Print issuer fpr.
-	(parse_one_sig_subpkt): Detect issuer fpr.
-	(can_handle_critical): Add issuer fpr.
-	* g10/mainproc.c (check_sig_and_print): Try to get key via fingerprint.
-	* g10/gpgv.c (keyserver_import_fprint): New stub.
-	* g10/test-stubs.c (keyserver_import_fprint): New stub.
-
-	gpg: New option --rfc4880bis.
-	+ commit ee2d9061d7abc36b857165a8395203a97380baa2
-	* g10/options.h (struct opt): Add field flags.rfc4880bis.
-	* g10/gpg.c (oRFC4880bis): new.
-	(opts): add --rfc4880bis.
-	(main): Implement that and print a warning.
-
-2016-06-19 Niibe Yutaka <gniibe@fsij.org>
-
-	scd: Reset nonnull_nad to zero for VENDOR_GEMPC.
-	+ commit 971064f8b7ad676326b2a468f688037a303717df
-	* (parse_ccid_descriptor): nonnull_nad = 0 for all GEMPC device.
-
-2016-06-17 Werner Koch <wk@gnupg.org>
-
-	tests: Make make distcheck work again.
-	+ commit ce1689ea0720552ac900d7b2c4139caf24452018
-	* Makefile.am (tests): Remove test code which would led to doubling
-	calls to for e.g. "make distclean".
-	* tests/Makefile.am: Typo fixes.
-	* tests/gpgscm/Makefile.am (EXTRA_DIST): Fix name of License file.
-	Add repl.scm.
-	(check): Replace by check-local because check is a standard automake
-	target.
-	* tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Replace gmake0sim by
-	automake generated macro.
-	(EXTRA_DIST): Add defs.scm
-
-	gpgscm: Silence compiler warnings.
-	+ commit dfe5282e5859409849a17d68b2b3a046370f65bd
-	* tests/gpgscm/scheme.c (mk_integer): Rename arg NUM to N.
-	(fill_vector): Ditto.
-	(mark): Rename var NUM to N.
-	(set_slot_in_env): Mark SC as unused.
-	(is_any): Mark P as unused.
-
-	Add license notices for TinySCHEME.
-	+ commit dc1db12d2c4f9f12bc3f7de37f76293b316c3f35
-	* tests/gpgscm/COPYING: Rename to ...
-	* tests/gpgscm/LICENSE.TinySCHEME: this.
-	* AUTHORS: Add a note about TinySCHEME.
-	* build-aux/speedo/w32/pkg-copyright.txt: Add TinySCHEME notice.
-
-2016-06-17 Justus Winter <justus@g10code.com>
-
-	tests/openpgp: Reimplement tests in Scheme.
-	+ commit 9609cb20e4caee739b9fc4fd36797029d2970041
-	* Makefile.am: Build the test infrastructure on Windows.
-	* tests/openpgp/Makefile.am (required_pgms): Add gpgscm.
-	(TESTS_ENVIRONMENT): Make sure gpgscm and the libraries are found.
-	(TESTS): Replace tests with the new Scheme implementations.
-	* tests/openpgp/4gb-packet.scm: New file.
-	* tests/openpgp/README: Likewise.
-	* tests/openpgp/armdetach.scm: Likewise.
-	* tests/openpgp/armdetachm.scm: Likewise.
-	* tests/openpgp/armencrypt.scm: Likewise.
-	* tests/openpgp/armencryptp.scm: Likewise.
-	* tests/openpgp/armor.scm: Likewise.
-	* tests/openpgp/armsignencrypt.scm: Likewise.
-	* tests/openpgp/armsigs.scm: Likewise.
-	* tests/openpgp/clearsig.scm: Likewise.
-	* tests/openpgp/conventional-mdc.scm: Likewise.
-	* tests/openpgp/conventional.scm: Likewise.
-	* tests/openpgp/decrypt-dsa.scm: Likewise.
-	* tests/openpgp/decrypt.scm: Likewise.
-	* tests/openpgp/default-key.scm: Likewise.
-	* tests/openpgp/defs.scm: Likewise.
-	* tests/openpgp/detach.scm: Likewise.
-	* tests/openpgp/detachm.scm: Likewise.
-	* tests/openpgp/ecc.scm: Likewise.
-	* tests/openpgp/encrypt-dsa.scm: Likewise.
-	* tests/openpgp/encrypt.scm: Likewise.
-	* tests/openpgp/encryptp.scm: Likewise.
-	* tests/openpgp/finish.scm: Likewise.
-	* tests/openpgp/genkey1024.scm: Likewise.
-	* tests/openpgp/gpgtar.scm: Likewise.
-	* tests/openpgp/import.scm: Likewise.
-	* tests/openpgp/mds.scm: Likewise.
-	* tests/openpgp/multisig.scm: Likewise.
-	* tests/openpgp/run-tests.scm: Likewise.
-	* tests/openpgp/seat.scm: Likewise.
-	* tests/openpgp/setup.scm: Likewise.
-	* tests/openpgp/signencrypt-dsa.scm: Likewise.
-	* tests/openpgp/signencrypt.scm: Likewise.
-	* tests/openpgp/sigs-dsa.scm: Likewise.
-	* tests/openpgp/sigs.scm: Likewise.
-	* tests/openpgp/use-exact-key.scm: Likewise.
-	* tests/openpgp/verify.scm: Likewise.
-	* tests/openpgp/version.scm: Likewise.
-
-	tests/gpgscm: Add a TinySCHEME-based test driver.
-	+ commit d2ce3f9eee34e380536049c0c9d26ed66273f094
-	* configure.ac: Add new component.
-	* tests/Makefile.am: Likewise.
-	* tests/gpgscm/Makefile.am: New file.
-	* tests/gpgscm/ffi-private.h: Likewise.
-	* tests/gpgscm/ffi.c: Likewise.
-	* tests/gpgscm/ffi.h: Likewise.
-	* tests/gpgscm/ffi.scm: Likewise.
-	* tests/gpgscm/lib.scm: Likewise.
-	* tests/gpgscm/main.c: Likewise.
-	* tests/gpgscm/private.h: Likewise.
-	* tests/gpgscm/repl.scm: Likewise.
-	* tests/gpgscm/scheme-config.h: Likewise.
-	* tests/gpgscm/t-child.c: Likewise.
-	* tests/gpgscm/t-child.scm: Likewise.
-	* tests/gpgscm/tests.scm: Likewise.
-
-	tests/gpgscm: Foreign objects support for TinySCHEME.
-	+ commit 56c36f2932fe2baf8e46efdea4315cf33f3c0338
-	* tests/gpgscm/scheme-private.h (struct cell): Add 'foreign_object'.
-	(is_foreign_object): New prototype.
-	(get_foreign_object_{vtable,data}): Likewise.
-	* tests/gpgscm/scheme.c (enum scheme_types): New type.
-	(is_foreign_object): New function.
-	(get_foreign_object_{vtable,data}): Likewise.
-	(mk_foreign_object): Likewise.
-	(finalize_cell): Free foreign objects.
-	(atom2str): Pretty-print foreign objects.
-	(vtbl): Add new functions.
-	* tests/gpgscm/scheme.h (struct foreign_object_vtable): New type.
-	(mk_foreign_object): New prototype.
-	(struct scheme_interface): Add new functions.
-
-	Patch from Thomas Munro,
-	https://sourceforge.net/p/tinyscheme/patches/13/
-
-	tests/gpgscm: Dynamically allocate string buffer.
-	+ commit 8e5ad9aabdd57457f76078924d33acb94b75a877
-	* tests/gpgscm/scheme-config.h (strbuff{,_size}): Make buffer dynamic.
-	* tests/gpgscm/scheme.c (expand_strbuff): New function.
-	(putcharacter): Adapt length test.
-	(readstrexp): Expand buffer if necessary.
-	(scheme_init_custom_alloc): Initialize buffer.
-	(scheme_deinit): Free buffer.
-
-	Patch from Thomas Munro,
-	https://sourceforge.net/p/tinyscheme/patches/11/
-
-	tests/gpgscm: Make exception value available.
-	+ commit 3b100da9ada9171d873a796eaf3351d4fceed394
-	* tests/gpgscm/init.scm (throw): Hand exception value to the handler.
-	(catch): And bind it to *error*.
-
-	tests/gpgscm: Add package macro.
-	+ commit 2907381f4a7b422823b2304ebe550acbb2f66480
-	* tests/gpgscm/init.scm: Add package macro from manual.
-
-	tests/gpgscm: Expose function to open streams as Scheme ports.
-	+ commit 55275b8e2b43a3420d85a1a931e02febaa1113e7
-	* tests/gpgscm/scheme.c (vtbl): Add 'port_from_file' to the vtable.
-	* tests/gpgscm/scheme.h (struct scheme_interface): New field
-	'mk_port_from_file'.
-
-	tests/gpgscm: Nicer error message.
-	+ commit 13bba1357478815a85f5c0db3607ebb6cd574f56
-	* tests/gpgscm/scheme.c (opexe_0): Include the value that we tried to
-	evaluate as function-like in the error message.
-
-	tests/gpgscm: Fix error hook.
-	+ commit e02c1ccae13e4eb55afef8de4f29022c709404eb
-	* tests/gpgscm/init.scm (*error-hook*): Fix error hook so that the
-	whole error message is displayed.
-
-	tests/gpgscm: Handle unhandled enumeration values.
-	+ commit 133f25703a47e9bbc28c4532934f405ecdeb2de0
-	* tests/gpgscm/scheme.c (opexe_{3,4}): Handle unhandled enumeration
-	values in the opcode dispatching code.
-
-	tests/gpgscm: Verbatim import of latest TinySCHEME.
-	+ commit cb989504cdd4f0ff902d31af871dc3ee0d9419ac
-	Revision 110 from svn://svn.code.sf.net/p/tinyscheme/code/trunk
-
-	* tests/gpgscm/COPYING: New file.
-	* tests/gpgscm/Manual.txt: Likewise.
-	* tests/gpgscm/init.scm: Likewise.
-	* tests/gpgscm/opdefines.h: Likewise.
-	* tests/gpgscm/scheme-private.h: Likewise.
-	* tests/gpgscm/scheme.c: Likewise.
-	* tests/gpgscm/scheme.h: Likewise.
-
-2016-06-17 Werner Koch <wk@gnupg.org>
-
-	scd: Make option --homedir work.
-	+ commit 4e41745b3ea3bb8ffc50af6bafeb1de9c928812f
-	* scd/scdaemon.c (opts): Add --homedir.
-
-2016-06-16 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.13.
-	+ commit b3df4e2ac6aa9b4154e923f71b4221533043e5ac
-
-
-2016-06-16 Yuri Chornoivan <yurchor@ukr.net>
-
-	po: Update Ukrainian translation.
-	+ commit d4ce1b04431cf02ebc1bdc7150ad587d599f2a95
-
-
-2016-06-16 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit 2273e4f999325cdc9d275507cd07c7e95d62a377
-
-
-2016-06-16 Werner Koch <wk@gnupg.org>
-
-	po: Update German translation.
-	+ commit 69f1b0b041c251abb66f000db173a602693bb18f
-
-
-	Add missing files so that make distcheck works again,
-	+ commit 4d7d292cd5b616b209dfd4302a1deffe11b7be0e
-	* tests/openpgp/Makefile.am (CLEANFILES): Add created file
-	"passphrases".
-	* tools/Makefile.am (EXTRA_DIST): Add no-libgcrypt.c.
-
-	tools: Fix typo in function name of symcryptrun.
-	+ commit e44dd878df58dab27c9cd411d80c4c81501e649a
-	* tools/symcryptrun.c (main): Fix typo.
-
-2016-06-15 Niibe Yutaka <gniibe@fsij.org>
-
-	g10: Fix another race condition for trustdb access.
-	+ commit 35a3ce2acf78a95fecbccfd8db0560cca24232df
-	* g10/tdbio.c (create_version_record): Call create_hashtable to always
-	make hashtable, together with the version record.
-	(get_trusthashrec): Remove call to create_hashtable.
-
-2016-06-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Print the subkey's curve and not the primary key curve.
-	+ commit b56aebe76657ce6efa9c6819d5a8c2a31c2bbbba
-	* g10/keylist.c (list_keyblock_colon): Use PK2 for the subkey's curve.
-
-	ldap: Improve info output for v3 fallback.
-	+ commit b7e3dfcf139284d30921cf44e7bab43d4244cc37
-	* dirmngr/dirmngr_ldap.c (fetch_ldap): Do not use log_debug in an
-	unprotected section. Replace log_debug by log_info in verbose mode.
-
-2016-06-14 Andre Heinecke <aheinecke@intevation.de>
-
-	dirmngr: Try ldap protocol V3 as fallback.
-	+ commit f989b6ee0db96c36f13f093cbbcfd1d5b472d03c
-	* dirmngr/dirmngr_ldap.c (fetch_ldap): Try V3 Protocol in case
-	default Protocol gives error.
-
-	dirmngr: Print ldap error if bind fails.
-	+ commit 5faddcb2927a997e05fb34eb270982096d1fe3a4
-	* dirmngr/dirmngr_ldap.c (fetch_ldap): Use ldap_err2string on bind
-	return.
-
-2016-06-14 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Allow ciphers AES192 and SERPENT256.
-	+ commit 5f9bd7a9e1ed4edcbb6c4e908d4bea5cd7dc9e68
-	* sm/gpgsm.c (main): Add AES192 cipher. Allow SERPENT256.
-
-	doc: Add files and envvars to a new index.
-	+ commit 2423238ee4c8a8c531dfe9e45c95f2760b638faa
-	* doc/gnupg.texi: Define new index "ef".
-	(Environment Index): New.
-
-	gpg: Avoid endless loop in a tofu error case.
-	+ commit f980cd2e0e4694a38038f518f290017087d4ce33
-	* g10/tofu.c (get_trust): Do not jump to out.
-
-	gpg: Split tofu's get_trust function into several smaller ones.
-	+ commit 1affdf1efc42ed22dc023c92ca5134d5bcbf2686
-	* g10/tofu.c (get_trust): Factor code out to ...
-	(format_conflict_msg_part1): new and to ...
-	(ask_about_binding): new.
-
-2016-06-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Un-deprecate option --auto-key-retrieve.
-	+ commit 9e126af215143fddbdc3949681abb9ffdb9153bb
-	* g10/gpg.c (main): Remove deprecation warning.
-
-	gpg: New option --disable-signer-uid, create Signer's UID sub-packet.
-	+ commit 61e7fd68c05ed185728e9da45f7a44a2323065ad
-	* g10/gpg.c (oDisableSignerUID): New.
-	(opts): New option '--disable-signer-uid'.
-	(main): Set option.
-	* g10/options.h (opt): Add field flags.disable_signer_uid.
-	* g10/sign.c: Include mbox-util.h.
-	(mk_notation_policy_etc): Embed the signer's uid.
-	* g10/mainproc.c (check_sig_and_print): Do not use WKD for auto key
-	retrieval if --disable-signer-uid is used.
-
-	gpg: Try Signer's User ID sub-packet with --auto-key-retrieve.
-	+ commit 08c82b1b55d28ffd09b859205b7686bcefae5011
-	* g10/packet.h (PKT_signature): Add field 'signers_uid'.
-	* g10/parse-packet.c (parse_signature): Set this field.
-	* g10/free-packet.c (free_seckey_enc): Free field.
-	(copy_signature): Copy field.
-	* g10/mainproc.c (akl_has_wkd_method): New.
-	(check_sig_and_print): Extend NEWSIG status. If WKD is enabled try to
-	locate a missing key via the signature's Signer's User ID sub-packet.
-	Do this right before trying a keyserver lookup.
-
-2016-06-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove C-99ism, re-indent, and simplify one function.
-	+ commit 334e993a71d3abb7d30cb5ee05d578cecf0c3f67
-	* g10/call-agent.c (struct keyinfo_data): Rename to
-	keyinfo_data_parm_s.
-	(agent_get_keyinfo): Replace C-99 style init.
-	(keyinfo_status_cb): Use new fucntion split_fields.
-	* g10/export.c (match_curve_skey_pk): Add missings returns error
-	cases.
-	(cleartext_secret_key_to_openpgp): Better clear PK->PKEY first.
-
-	common: New function split_fields.
-	+ commit 5ba99d9302cd86aee99958b71075d5288bb430aa
-	* common/stringhelp.c (split_fields): New.
-	* common/t-stringhelp.c: Include assert.h.
-	(test_split_fields): New.
-	(main): Call test.
-
-2016-06-11 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	g10: Export cleartext keys as cleartext.
-	+ commit c41c46fa84cabbed74a13ded51fc3a817a919367
-	* g10/export.c (do_export_stream): If a key is stored by the agent in
-	cleartext, then try to export it as cleartext.
-	* tests/openpgp/export.test: For secret keys that are stored in
-	cleartext, test should try to export without pinentry interaction.
-
-	g10: Allow receiving cleartext secret keys from agent.
-	+ commit a3cb72af79ee645eda212f31ab0b266f2c3d9f29
-	* g10/export.c (match_curve_skey_pk): New function, testing whether an
-	OpenPGP public key and an S-expression use the same curve.
-	* g10/export.c (cleartext_secret_key_to_openpgp): New function,
-	filling in the secret key parameters of a PKT_public_key object from
-	a corresponding cleartext S-expression.
-	* g10/export.c, g10/main.h (receive_seckey_from_agent): Add cleartext
-	parameter, enabling retrieval of the secret key, unlocked.
-	* g10/export.c (do_export_stream): Send cleartext as 0, keeping current
-	behavior.
-	* g10/keygen.c (card_store_key_with_backup): Use cleartext=0 to ensure
-	that smartcard backups are all passphrase-locked.
-
-	g10: Add openpgp_protected flag to agent secret key export functions.
-	+ commit 7de74320767d15d915942a98ff47c00175a078ed
-	* g10/call-agent.c, g10/call-agent.h (agent_export_key): Add
-	openpgp_protected flag.
-	* g10/export.c (receive_seckey_from_agent): Request openpgp_protected
-	secret keys from agent.
-	* agent/command.c (hlp_export_key): EXPORT_KEY help text: add a
-	brief description of the effect of --openpgp.
-
-	g10: report whether key in agent is passphrase-protected or not.
-	+ commit 00f30cc01c79bbdff5cdc3be795f009f15d3845e
-	* g10/call-agent.c, g10/call-agent.h (agent_get_keyinfo): add
-	 r_cleartext parameter to report whether a key is stored without
-	 passphrase protection.
-	* g10/gpgv.c, g10/test-stubs.c: augment dummy agent_get_keyinfo to
-	 match new API.
-	* g10/export.c, g10/keyedit.c, g10/keygen.c, g10/keylist.c,
-	 g10/sign.c: pass NULL to agent_get_keyinfo since we do not yet
-	 need to know whether agent is passphrase-protected.
-
-2016-06-08 Werner Koch <wk@gnupg.org>
-
-	Explicitly restrict socket permissions.
-	+ commit 8127043d549a5843ea1ba2dc6da4906fc2258d53
-	* agent/gpg-agent.c (create_server_socket): Call chmod before listen.
-	* scd/scdaemon.c (create_server_socket): Ditto.
-	* dirmngr/dirmngr.c (main): Ditto.
-
-	w32: Fix recent build regression.
-	+ commit 6790115fd9059e066b4e6feb6b1e3876a1c1d522
-	* common/homedir.c (_gnupg_socketdir_internal) W32: Add definition
-	for NAME.
-	* g10/gpg.c (main) W32: Fix use og gnupg_homedir.
-
-	* agent/gpg-agent.c (remove_socket): Remove unused var P.
-	* scd/scdaemon.c (cleanup): Ditto.
-
-	gpgconf: New commands --create-socketdir and --remove-socketdir.
-	+ commit cf4910419e09daf414f76ca2c8ab685c3d488ec1
-	* tools/gpgconf.c: Include unistd.h.
-	(aCreateSocketDir, aRemoveSocketDir): New.
-	(opts): Add --create-socketdir and --remove-socketdir.
-	(main): Implement them.
-
-	Implement /run/user/UID/gnupg based sockets.
-	+ commit aab8a0b05292b0d06e3001a0b289224cb7156dbd
-	* common/homedir.c: Include sys/stat.h and zb32.h.
-	(w32_portable_app, w32_bin_is_bin): Change type from int to byte.
-	(non_default_homedir): New.
-	(is_gnupg_default_homedir): New.
-	(default_homedir): Set non_default_homedir.
-	(gnupg_set_homedir): Set non_default_homedir and make
-	the_gnupg_homedir and absolute directory name.
-	(gnupg_homedir): Return an absolute directory name.
-	(_gnupg_socketdir_internal): New.
-	(gnupg_socketdir): Implement /run/user/ based sockets.
-	* tools/gpg-connect-agent.c (get_var_ext): Replace now obsolete
-	make_filename by xstrdup.
-	* tools/gpgconf.c (main): Sue gnupg_homedir for the "homedir:" output.
-
-	gpgconf: Add option --homedir.
-	+ commit def512eb67c8a380f3b873cee0f156deef0b6dda
-	* tools/gpgconf.c (opts): Add --homedir.
-	(main): Set homedir.
-
-	Do not use no-libgcrypt dummy for tools.
-	+ commit 173fa97102fec68670a46ae1b460231e2a183c81
-	* tools/Makefile.am (gpgconf_SOURCES): Remove no-libgcrypt.c.
-	(gpgconf_LDADD): Add LIBGCRYPT_LIBS.
-	(gpg_connect_agent_LDADD): Ditto.
-	(gpgtar_LDADD): Ditto.
-	* dirmngr/Makefile.am (dirmngr_client_LDADD): Ditto.
-	(t_common_ldadd): Ditto. Remove no-libgcrypt.o.
-
-	Do not try to remove the enclosing directory of sockets.
-	+ commit 0faf8951544f43790c412777a926c969540174bd
-	* agent/gpg-agent.c (remove_socket): Do not remove the enclosing
-	directory.
-	* scd/scdaemon.c (cleanup): Ditto.
-
-2016-06-07 Werner Koch <wk@gnupg.org>
-
-	common: New function gnupg_socketdir.
-	+ commit 36550dde998fa1d497098050ca2d4e1a952ed6b6
-	* common/homedir.c (gnupg_socketdir): New.
-	* agent/gpg-agent.c (create_socket_name): Use new function instead of
-	gnupg_homedir.
-	(check_own_socket): Ditto.
-	(check_for_running_agent): Ditto.
-	* agent/preset-passphrase.c (main): Ditto.
-	* common/asshelp.c (start_new_gpg_agent): Ditto.
-	* scd/scdaemon.c (create_socket_name): Ditto.
-	* tools/gpgconf.c (main): Ditto.
-	* tools/symcryptrun.c (main): Ditto.
-
-	common: Remove homedir arg from start_new_{dirmngr,gpg_agent}.
-	+ commit fb88f37c40dc156fa0b5bfba4ac85f1e553fd7e9
-	* common/asshelp.c (start_new_gpg_agent): Remove arg 'homedir' in
-	favor of gnupg_homedir (). Change all callers.
-	(start_new_dirmngr): Ditto.
-	* common/get-passphrase.c (gnupg_prepare_get_passphrase): Remove arg
-	'homedir'.
-
-	Replace use of opt.homedir by accessor functions.
-	+ commit 22a7ef01aa2c0eb77bcc40174d09104acc35cab1
-	* common/homedir.c (the_gnupg_homedir): New var.
-	(gnupg_set_homedir): New.
-	(gnupg_homedir): New.
-	* g10/options.h (struct opt): Remove 'homedir' and replace all users
-	by the new accessor functions.
-	* g13/g13-common.h (struct opt): Ditto.
-	* scd/scdaemon.h (struct opt): Ditto.
-	* sm/gpgsm.h (struct opt): Ditto.
-	* dirmngr/dirmngr.h (struct opt): Ditto.
-	* agent/preset-passphrase.c (opt_homedir): Ditto.
-	* agent/protect-tool.c (opt_homedir): Ditto.
-
-2016-06-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit 650abbab716750d6087a457a25fa2efaaa3567cd
-
-
-	gpg: Fix command line parsing of --quick-addkey and --quick-gen-key.
-	+ commit abeeb84a94be815a16e678b319cb5c8bffde2811
-	* g10/gpg.c (main): Compose a block by curly braces.
-
-2016-06-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Use --keyid-format=none by default.
-	+ commit 7257ea2d450238afa4d162fab8001f74782fe43f
-	* g10/gpg.c (main): Init keyid_format to KF_NONE.
-	* g10/keyid.c (format_keyid): Ditto.
-	(keystrlen): Ditto.
-
-	gpg: Add option --with-subkey-fingerprint.
-	+ commit 1d1cb86694fb2223de1da0b3bfffb5c62f505847
-	* g10/gpg.c (oWithSubkeyFingerprint): New.
-	(opts): Add --with-subkey-fingerprints.
-	(main): Set that option.
-	* g10/options.h (struct opt): Add 'with_subkey_fingerprint'.
-	* g10/keylist.c (list_keyblock_print): Print subkey fingerprint.
-	(print_fingerprint): Tweak printing to use compact format if
-	desirable.
-
-	gpg: Implement --keyid-format=none.
-	+ commit b047388d57443f584f1c1d6333aac5218b685042
-	* g10/gpg.c (main): Add option "none" to --keyid-format.
-	* g10/options.h (KF_NONE): New.
-	* g10/keyid.c (format_keyid): Implement that.
-	(keystr): Use format "long" is KF_NONE is in use.
-	(keystr_with_sub): Ditto.
-	* g10/keylist.c (list_keyblock_print): Adjust indentaion for KF_NONE.
-	Factor some code out to ...
-	(print_key_line): new.
-	(print_fingerprint): Add mode 20.
-	* g10/mainproc.c (list_node): Use print_key_line. Replace MAINKEY by
-	flags.primary in the PK. Fix putting a " revoked..." string into the
-	colons format.
-	* g10/pkclist.c (do_edit_ownertrust): Use print_key_line. This
-	slightly changes the putput format.
-	* g10/revoke.c (gen_standard_revoke): Use print_key_line. This may
-	also put "expires: " into the output.
-
-2016-06-04 Werner Koch <wk@gnupg.org>
-
-	w32: Require --enable-build-timestamp for the BUILD_HOSTNAME.
-	+ commit 79b7a8a9e0d41b743ceaee20dc47294359fe0d44
-	* configure.ac (BUILD_HOSTNAME): Set to "<anon>" bey default.
-	* build-aux/speedo.mk (speedo_pkg_gnupg_configure): Add
-	 --enable-build-timestamp.
-
-2016-06-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Add the fingerprint to KEY_CREATED for subkeys.
-	+ commit 8d976a6b07c5a356631791b46b590328c1451f31
-	* g10/keygen.c (print_status_key_created): Make more robust by
-	allowing a NULL for PK.
-	(generate_subkeypair): Use print_status_key_created.
-	(generate_card_subkeypair): Ditto.
-
-	gpg: Try to use the passphrase from the primary for --quick-addkey.
-	+ commit 1b460f049e5c1c102d8b55ad28781688252c5a6b
-	* agent/command.c (cmd_genkey): Add option --passwd-nonce.
-	(cmd_passwd): Return a PASSWD_NONCE in verify mode.
-	* g10/call-agent.c (agent_genkey): Add arg 'passwd_nonce_addr' and do
-	not send a RESET if given.
-	(agent_passwd): Add arg 'verify'.
-	* g10/keygen.c (common_gen): Add optional arg 'passwd_nonce_addr'.
-	(gen_elg, gen_dsa, gen_ecc, gen_rsa, do_create): Ditto.
-	(generate_subkeypair): Use sepeare hexgrip var for the to be created
-	for hexgrip feature. Verify primary key first. Make use of the
-	passwd nonce. Allow for a static passphrase.
-
-	gpg: Extend the --quick-gen-key command.
-	+ commit 01285f909e43e8d6a48fbcc77bb5af53d567d8a2
-	* g10/keygen.c (quickgen_set_para): Add arg 'use'.
-	(quick_generate_keypair): Add args 'algostr', 'usagestr', and
-	'expirestr'. Implement primary only key mode.
-	(parse_algo_usage_expire): Set NBITS for the default algo.
-	* g10/gpg.c (main): Extend --quick-gen-key command.
-
-	gpg: Improve the new parse_subkey_algostr_usagestr fucntion.
-	+ commit dcc4cd83821667be22e502af86139bb4bd41bdf7
-	* g10/keygen.c (parse_usagestr): Allow "cert".
-	(generate_subkeypair): Factor expire parsing out to ...
-	(parse_subkey_algostr_usagestr): here. Rename to ...
-	(parse_algo_usage_expire): this. Add arg 'for_subkey'. Set CERT for
-	primary key and check that it is not set for subkeys.
-
-	gpg: New command --quick-addkey.
-	+ commit 8f2a053a0ffa0430d01a53b4d491a3f0fff683eb
-	* g10/keygen.c (DEFAULT_STD_SUBKEYUSE): New.
-	(ask_keysize): Factor code out to ...
-	(get_keysize_range, fixup_keysize): new.
-	(parse_parameter_usage): Factor parsing out to ...
-	(parse_usagestr): new. Allow use of "encr" as alias for "encrypt".
-	(parse_subkey_algostr_usagestr): New.
-	(generate_subkeypair): Add new args. Implement unattended mode.
-
-	* g10/keyedit.c (keyedit_quick_sign): Factor some code out to ...
-	(find_by_primary_fpr): new.
-	(keyedit_quick_addkey): New.
-	* g10/gpg.c (aQuickAddKey): New.
-	(opts): Add --quick-addkey.
-	(main): Implement.
-
-	gpg: Do not abort on certain invalid packets.
-	+ commit d837f6b0eadb14ea08c1c6030b4d6adaaee8778e
-	* g10/build-packet.c (write_fake_data): Check for non-opaque data.
-	* g10/seskey.c (do_encode_md): Return NULL instead of abort.
-
-	common: New function openpgp_is_curve_supported.
-	+ commit 072acb69be55e366e2da921e3953404765fa3928
-	* common/openpgp-oid.c: Include openpgpdefs.h.
-	(oidtable): Add field pubkey_algo.
-	(openpgp_is_curve_supported): New.
-
-2016-06-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Allow User ID length >= 256.
-	+ commit db1ecc8212defdd183abbb6b1407fcc8d2dc9552
-	* build-packet.c (do_user_id): Call write_header2 with HDRLEN not set.
-
-2016-05-31 Werner Koch <wk@gnupg.org>
-
-	gpg: New status code NOTATION_FLAGS.
-	+ commit 67a4bc8d536f6997f14daff4c039abd48a172100
-	* common/status.h (STATUS_NOTATION_FLAGS: New.
-	* g10/packet.h (struct notation): Add flags.human.
-	(notation_t): New typedef.
-	* g10/build-packet.c (sig_to_notation): Set flags.human.
-	* g10/keylist.c (show_notation): Write STATUS_NOTATION_FLAGS.
-
-2016-05-28 Werner Koch <wk@gnupg.org>
-
-	common: Add a status callback to gnupg_exec_tool_stream.
-	+ commit 239a4d53916b47b5b0f0167a9b2c7a8915bb9c52
-	* common/exectool.h (exec_tool_status_cb_t): New.
-	* common/exectool.c: Include missing exectool.h.
-	(read_and_log_buffer_t): Replace array by pointer.
-	(gnupg_exec_tool_stream): Add args 'status_cb' and 'status_cb_value'.
-	Change all callers to pass NULL for them. Malloc buffer for
-	FDERRSTATE.
-	(read_and_log_stderr): Implement status_fd feature.
-
-2016-05-27 Werner Koch <wk@gnupg.org>
-
-	common: Allow a second input stream for gnupg_exec_tool_stream.
-	+ commit 44a32455c8e41400ea96db4507c8a42bdb65b3b6
-	* common/exechelp-posix.c (do_exec): Add arg 'except' and pass to
-	close_all_fds.
-	(gnupg_spawn_process): Add arg 'except'. Change callers to pass NULL
-	for it.
-	* common/exechelp-w32.c (gnupg_spawn_process): Add dummy arg 'except'.
-	* common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
-	* common/exectool.c (copy_buffer_do_copy): Allow NULL for SINK.
-	(gnupg_exec_tool_stream): Add arg 'inextra'. Change callers to pass
-	NULL for it. Allow NULL for OUTPUT.
-
-	common: Simplify the fd closing patch 512c56a.
-	+ commit e6d9a2d07ed7aeac3944d8a7d1317c4a117356b4
-	* common/exechelp-posix.c (get_max_fds): Use /proc/self.
-
-	common: Speedup closing fds before an exec.
-	+ commit 512c56af43027149e8beacf259746b8d7bf9b1a2
-	* common/exechelp-posix.c __linux__: Include dirent.h.
-	(get_max_fds) __linux__: Return the actual used highest fd.
-
-	tools: Improve debug output of rfc822parse.
-	+ commit ad75ca9c963bebbe02aae8d73e199a705764ae82
-	* tools/rfc822parse.c (show_event): Add missing events.
-
-	build: Remove obsolete tests for funopen and fopencookie.
-	+ commit d755bcb89dbeaf6c7c1eca73ccabdf89b536c535
-	* configure.ac (AC_CHECK_FUNCS): Remove tests for funopen.
-
-	common: Extend gnupg_create_inbound_pipe et al.
-	+ commit 5d991e333a1885adc40abd9d00c01fec4bd5d9d7
-	* common/exechelp-posix.c (gnupg_create_inbound_pipe): Add args 'r_fp'
-	and 'nonblock'.
-	(gnupg_create_outbound_pipe): Ditto.
-	* common/exechelp-w32.c (gnupg_create_inbound_pipe): Add non yet
-	functional args 'r_fp' and 'nonblock'.
-	(gnupg_create_outbound_pipe): Ditto.
-	* common/exechelp-w32ce.c (gnupg_create_inbound_pipe): Ditto.
-	(gnupg_create_outbound_pipe): Ditto.
-
-	common: Make use of default_errsource in exechelp.
-	+ commit 96c7901ec1c79be732570811223d3ea54875abfe
-	* common/exechelp-posix.c (my_error_from_syserror, my_error): New.
-	Use them instead of gpg_error and gpg_error_from_syserror.
-	(create_pipe_and_estream): Remove arg ERRSOURCE and fix use of
-	OUTBOUND which has a wrong name. Adjust callers.
-	(gnupg_spawn_process): Remove arg ERRSOURCE and replace by use of
-	DEFAULT_ERRSOURCE.
-	* common/exechelp-w32.c (gnupg_spawn_process): Ditto.
-	* common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
-	* common/exectool.c (gnupg_exec_tool_stream): Do not pass
-	GPG_ERROR_FROM_SYSERROR.
-	* tools/gpgconf-comp.c (gc_component_check_options): Ditto.
-	(retrieve_options_from_program): Ditto.
-
-	gpg: Keep current and total of PROGESS status lines small enough.
-	+ commit 6c957c3d880c069bb843cc58fdcebb9fc344727e
-	* g10/progress.c (progress_filter): Factor status wrote out to...
-	(write_status_progress): New. Scale values down.
-
-2016-05-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	configure: Detection of libusb on FreeBSD.
-	+ commit b3e043ba905fdf2efcdadbd7022ac53f4408b748
-	* configure.ac (LIBUSB_LIBS): Use LIBUSB_NAME for AC_CHECK_LIB.
-
-2016-05-25 Werner Koch <wk@gnupg.org>
-
-	build: Switch to new URL for swdb.lst.
-	+ commit 74028096e06d2904f77b74b373750264e5b7b1ea
-
-
-2016-05-24 Werner Koch <wk@gnupg.org>
-
-	gpgtar: Simplify code by using ccparray.
-	+ commit 91bc7833836f19256d56984c94cacf44853ff5c8
-	* tools/gpgtar-create.c (gpgtar_create): Use ccparray functions.
-	* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
-	* tools/gpgtar-list.c (gpgtar_list): Ditto.
-
-	common: Add simple dynamic array function.
-	+ commit 2421f7f7ed74ed20372efd63a2efd58d3b55005c
-	* common/ccparray.c: New.
-	* common/ccparray.h: New.
-	* common/t-ccparray.c: New.
-	* common/Makefile.am (common_sources): Add files.
-	(module_tests): Add test file.
-	(t_ccparray_LDADD): New.
-
-2016-05-23 Justus Winter <justus@g10code.com>
-
-	tests: Test the pinentry interactions when exporting keys.
-	+ commit b9d1e099c3ec3163c86afe627ecbe028db1facf6
-	* tests/openpgp/export.test: Test pinentry interactions.
-
-	tests: Add support for a passphrase queue to fake pinentry.
-	+ commit 4994153924e0948a657edddaef54a39a6001beff
-	* tests/openpgp/fake-pinentry.c (get_passphrase): New function.
-	(main): Add option --passphrasefile and read passphrases from it.
-
-	tests: Add logging to fake pinentry.
-	+ commit 41b10c66ec1dd33633386f4fc8013ddeab7737ca
-	* tests/openpgp/fake-pinentry.c (log_stream): New variable.
-	(reply): New function.
-	(spacep,skip_options,option_value): Copy from common.
-	(main): Parse arguments, add --logfile option, write logfile.
-
-	tests: Add export test.
-	+ commit a54e89a58576108fcae10ceeb4fc65822aecc170
-	* tests/openpgp/Makefile.am (TESTS): Add new file.
-	* tests/openpgp/export.test: New file.
-
-2016-05-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Speed up key listing in Tofu mode.
-	+ commit 78bb08425af5b1edb7f3ef0119013529b3a9e4ba
-	* g10/tofu.c (get_trust): Add arg PK. Uses this instead of a an extra
-	lookup of the public key by fingerrpint.
-	(tofu_register): Pass PK to get_trust.
-	(tofu_get_validity): Ditto.
-
-	*g10/tofu.c (tofu_register): Remove unused FINGERPRINT_PP.
-
-	gpg: Avoid name spaces clash with future sqlite versions.
-	+ commit b1ba460d8f3358342c2ee2927114d36e767a439f
-	* g10/sqlite.c: Rename to gpgsql.c. Change function prefixes to
-	gpgsql_.
-	* g10/sqlite.h: Rename to gpgsql.h.
-	* g10/tofu.c: Adjust for changes.
-
-	gpg: Explicitly close a combined Tofu DB.
-	+ commit 006a6126131ffd59d9a47889ac031f932ecc5d0b
-	* g10/tofu.c (tofu_closedbs): Close combined DB.
-
-	gpg: Store the Tofu meta handle for databases in CTRL.
-	+ commit 754b1c463034a634a678d8efc76c27fd46aad9b9
-	* g10/gpg.h (struct tofu_dbs_s, tofu_dbs_t): New declarations.
-	(struct server_control_s): Add field tofu.dbs.
-	* g10/tofu.c (struct dbs): Rename to tofu_dbs_s. Replace all users by
-	by tofu_dbs_t.
-	(opendbs): Add arg CTRL. Cache the DBS in CTRL.
-	(closedbs): Rename to tofu_closedbs and make global. Add arg CTRL.
-	(tofu_register): Add arg CTRL. Change all callers. Do not call
-	closedbs.
-	(tofu_get_validity): Ditto.
-	(tofu_set_policy): Ditto.
-	(tofu_get_policy): Ditto.
-	(tofu_set_policy_by_keyid): Add arg CTRL.
-	* g10/gpg.c (gpg_deinit_default_ctrl): Call tofu_closedbs.
-
-	gpg: Pass CTRL object down to the trust functions.
-	+ commit 027c4e55522b8e18711a3331932a9869ab89ca26
-
-
-	gpg: Fix the TOFU_STATS_LONG status.
-	+ commit fd973ee1c18aa8fe764e09ba4dff589309b2d78d
-	* g10/tofu.c (show_statistics): Print TOFU STATS with formatting
-	characters.
-
-2016-05-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Print " never " instead of err for validity.
-	+ commit 437c97ab6a34ff1936001dd05209193b4466a81d
-	* g10/trust.c (uid_trust_string_fixed): Handle NEVER.
-
-2016-05-18 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Adjust the WKD lookup to specs version -01.
-	+ commit cf97769906337d65289ad58225a5ecc53c715550
-	* dirmngr/server.c (cmd_wkd_get): Remove second occurrence of the
-	domain part.
-
-2016-05-17 Werner Koch <wk@gnupg.org>
-
-	gpg: Emit new status line KEY_CONSIDERED.
-	+ commit ff71521d9698c7c5df94831a1398e948213af433
-	* common/status.h (STATUS_KEY_CONSIDERED): New.
-	* g10/getkey.c: Include status.h.
-	(LOOKUP_NOT_SELECTED, LOOKUP_ALL_SUBKEYS_EXPIRED): New.
-	(finish_lookup): Add arg R_FLAGS. Count expired and revoked keys and
-	set flag. Check a requested usage before checking for expiraion or
-	revocation.
-	(print_status_key_considered): New.
-	(lookup): Print new status.
-
-2016-05-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix signature checking.
-	+ commit 83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb
-	* g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
-	walk_kbnode.
-
-2016-05-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow unattended deletion of secret keys.
-	+ commit ac9ff644b12c4dfa55d466af8ae6af54d1646893
-	* agent/command.c (cmd_delete_key): Make the --force option depend on
-	--disallow-loopback-passphrase.
-	* g10/call-agent.c (agent_delete_key): Add arg FORCE.
-	* g10/delkey.c (do_delete_key): Pass opt.answer_yes to
-	agent_delete_key.
-
-2016-05-09 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix buglet in the check_all_keysigs function.
-	+ commit 693838f0125d5d0c963fa3771b1bd117702af697
-	* g10/keyedit.c (sig_comparison): Actually compare the pubkey
-	algorithms.
-
-	gpg: Request a "save" after cmd "check" fixed something.
-	+ commit d33b35f7481caa0dcb25f9fa7d6c5bb27895297a
-	* g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
-
-2016-05-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit ff870d59f067d3c5415e231c02a50d5dceac7e48
-
-
-2016-05-04 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.12.
-	+ commit 00df5b1236cac5c7a48638a4613278c5aab486f8
-
-
-	speedo,w32: Remove the installation directory page.
-	+ commit fb1e9df48465c2f77a65dddd257572fdc79d9450
-	* build-aux/speedo/w32/inst.nsi (MUI_PAGE_DIRECTORY): Remove.
-
-	gpg: Fix const char pointer mismatch with gettext.
-	+ commit 920b1421b35d1404b8360bd8feac0be659840543
-	* g10/tofu.c (get_trust): Use const char *.
-
-	speedo: Build sqlite with static-libgcc.
-	+ commit edce430b039b313cc2d79402a7bd21347490c3be
-	* build-aux/speedo/patches/sqlite.patch: New.
-	* Makefile.am (EXTRA_DIST): Add file.
-
-	speedo: Also try patch files w/o version number.
-	+ commit 9ea258fa5b45bb5454ee3f5906df5d5eebdec0dd
-	* build-aux/speedo.mk (SPKG_template): Try such a patch file.
-
-2016-05-04 Andre Heinecke <aheinecke@intevation.de>
-
-	speedo,w32: Install sqlite.
-	+ commit 2b78223d7587c68e2e27a3d7b365219228da7947
-	* build-aux/speedo/w32/inst.nsi (-sqlite, -un.sqlite): New.
-
-	speedo,w32: Fix uninstallation.
-	+ commit 5ec76fd0c300b52366cf8d1407fe1c8de3a8a9d4
-	* build-aux/speedo/w32/inst.nsi (-un.gnupg): Delete distsigkey and
-	dirmngr-conf.skel
-
-	speedo,w32: Install localisation.
-	+ commit 3f58fc64666101e160e9b13fedb6cdaebeb91a7a
-	* build-aux/speedo/w32/inst.nsi (-libgpg-error, GnuPG): Install l10n.
-	(-un.libgpg-error, -un.gnupg): Uninstall l10n files.
-
-2016-05-04 Werner Koch <wk@gnupg.org>
-
-	tests: Disable the migrations tests.
-	+ commit d696eb396a9c88319358da4333feb653994d5408
-	* tests/Makefile.am (SUBDIRS): Remove migrations.
-	* configure.ac (AC_CONFIG_FILES): Remove migrations Makefile.
-
-2016-05-04 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit 4fd13ab78dd228d8ff85659cddc2076af8728ebe
-
-
-2016-05-04 Werner Koch <wk@gnupg.org>
-
-	po: Update German translation.
-	+ commit 75f31cdd42eed3555952ac478055d52af841f702
-
-
-	Some minor string changes and fixed a printf format.
-	+ commit d00625dae60f26617d2e1bd4f22c6b35a4e92c91
-	* g10/build-packet.c (notation_value_to_human_readable_string): Use
-	%zu for size_t.
-
-	build: Update config.{guess,sub} to 2016-04-02 and 2016-03-30.
-	+ commit 04cc7c3786d91881f83a72799dab058476602a31
-	* build-aux/config.guess: Update.
-	* build-aux/config.sub: Update.
-
-	agent: Make --allow-loopback-pinentry the default.
-	+ commit 3ef0938cfd8637e9801369f142eb8dd564f2ca61
-	* agent/gpg-agent.c (oNoAllowLoopbackPinentry): New.
-	(opts): Add --no-allow-loopback-pinentry. Hide
-	description of --allow-loopback-pinentry.
-	(parse_rereadable_options): Set opt.allow_loopback_pinentry by
-	default.
-	(main): Replace allow-loopback-pinentry by no-allow-loopback-pinentry
-	in the gpgconf list.
-	* tools/gpgconf-comp.c (gc_options_gpg_agent): Ditto.
-
-2016-05-03 Werner Koch <wk@gnupg.org>
-
-	common: Print https URLs in help messages.
-	+ commit 9e28617e260261de3972c20698b5a01561330e1c
-	* common/argparse.c (strusage): Print https URLS.
-
-	tests: Silence output of some tests.
-	+ commit 33aacc3d4bbd6a82d7e7ceca058970879741b7da
-	* common/t-exechelp.c (print_open_fds): Silence non-verbose output.
-	(test_close_all_fds): Ditto.
-	* common/t-session-env.c (show_stdnames): Indent output.
-	* g10/test.c (TEST): Silence non-verbose okay output.
-	(exit_tests): Ditto.
-	* tools/gpg-zip.in (tar_verbose_opt): Add option --quiet.
-	* tests/openpgp/gpgtar.test (GPGZIP): Pass option --quiet.
-	* tests/openpgp/mds.test: Indent MD5 notice.
-	* tests/openpgp/version.test: Indent --version output.
-
-	gpg: Emit status lines TOFU_STATS and TOFU_STATS_LONG.
-	+ commit 83865be35cff5355a5c4575cc3b50609819b0baa
-	* g10/tofu.c (NO_WARNING_THRESHOLD): Rename to BASIC_TRUST_THRESHOLD.
-	(FULL_TRUST_THRESHOLD): New.
-	(write_stats_status): New.
-	(show_statistics): Call new function. Print TOFU_STATS_LONG.
-
-2016-05-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Extend TRUST_foo status lines with the trust model.
-	+ commit ae1889320b822d48f7118a29391605e9ac992701
-	* g10/trustdb.h (TRUST_FLAG_TOFU_BASED): New.
-	* g10/trustdb.c (trust_model_string): Lowercase the strings. Add arg
-	"model" and change callers to call with OPT.TRUST_MODEL.
-	* g10/tofu.c (tofu_wot_trust_combine): Set TRUST_FLAG_TOFU_BASED.
-	* g10/pkclist.c (write_trust_status): New.
-	(check_signatures_trust): Call new function.
-
-	gpg: Improve line wrapping for a tofu message.
-	+ commit 5cef6118580fe658a27d32e85696d88775ad417a
-	* g10/tofu.c (time_ago_str): Mark non-breakable spaces.
-	(show_statistics): Remove marks.
-
-	gpg: Re-format some tofu messages.
-	+ commit d73e83c3b678add11a5754e199e528aeb39ec8ce
-	* common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
-	(STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
-	* g10/tofu.c (NO_WARNING_THRESHOLD): New.
-	(record_binding, tofu_register): Take care of --dry-run.
-	(show_statistics): Print STATUS_TOFU_USER. Reformat some messages.
-	Fix the ngettext/strcmp thing. Use log_string instead of log_info.
-	Use NO_WARNING_THRESHOLD constant.
-	(get_trust): Use format_text and print a compact fingerprint.
-
-2016-05-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: More fix of error return path.
-	+ commit 6677d8b61446eb5760a30a2488c992d6e895a9ed
-	* scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of
-	apdu_connect.
-
-2016-04-29 Werner Koch <wk@gnupg.org>
-
-	common: Extend log_string to indent lines.
-	+ commit 35f4b6aafdf1889ed1ae569af5852f47738fe993
-	* common/logging.c (do_logv): Add indentation when called via
-	log_string.
-
-	gpg: Factor some code code out of tofu.c.
-	+ commit dcad99c98616a6031ddfde313c920339e4012378
-	* g10/tofu.c (string_to_long): New.
-	(string_to_ulong): New.
-	(get_single_unsigned_long_cb): Replace strtol/strtoul by new function.
-	(get_single_long_cb): Ditto.
-	(signature_stats_collect_cb): Ditto.
-	(get_policy): Ditto.
-	(show_statistics): Ditto. Uese es_free instead of free.
-
-	gpg: Remove all assert.h and s/assert/log_assert/.
-	+ commit 64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c
-
-
-	common: Improve log_assert.
-	+ commit 9740dff9f4d18ba764dc7173d4902e94e3f0c2e8
-	* common/logging.c (bug_at): Do not i18n the string.
-	(_log_assert): New.
-	* common/logging.h (log_assert): Use new function and pass line
-	information.
-
-2016-04-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix error return path.
-	+ commit cb4fee8bb645745ff199f7428e19226d5bc63dab
-	* scd/ccid-driver.c (bulk_in): Remove EAGAIN handling.
-	Handle LIBUSB_ERROR_NO_DEVICE to return CCID_DRIVER_ERR_NO_READER.
-
-2016-04-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix memory leaks.
-	+ commit 508b0deb70d39d388149be9a63fab24cc956a239
-	* scd/ccid-driver.c (scan_or_find_usb_device): Return on
-	LIBUSB_ERROR_NO_MEM. Free CONFIG before return except on error.
-	(scan_or_find_devices): Free device list.
-
-2016-04-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Add experimental AKL method "wkd" and option --with-wkd-hash.
-	+ commit 87de9e19edf0311ca0342e15ef44ebe40e32861e
-	* g10/getkey.c (parse_auto_key_locate): Add method "wkd".
-	(get_pubkey_byname): Implement that method. Also rename a variable.
-	* g10/call-dirmngr.c (gpg_dirmngr_wkd_get): New.
-	* g10/keyserver.c (keyserver_import_wkd): New.
-	* g10/test-stubs.c (keyserver_import_wkd): Add stub.
-	* g10/gpgv.c (keyserver_import_wkd): Ditto.
-	* g10/options.h (opt): Add field 'with_wkd_hash'.
-	(AKL_WKD): New.
-
-	* g10/gpg.c (oWithWKDHash): New.
-	(opts): Add option --with-wkd-hash.
-	(main): Set that option.
-	* g10/keylist.c (list_keyblock_print): Implement that option.
-
-	dirmngr: Add experimental command WKD_GET.
-	+ commit c83c6f212e9bc98a9ea8dd8102bc16edd1a03050
-	* dirmngr/server.c (cmd_wkd_get): New.
-	(register_commands): Add command WKD_GET.
-
-	dirmngr: Use system provided root CAs with KS_FETCH.
-	+ commit c3aeda82b8d00b87a5af72b4075c487c10dfdf6b
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Use HTTP_FLAG_TRUST_SYS.
-
-2016-04-26 Werner Koch <wk@gnupg.org>
-
-	http: Allow to request system defined CAs for TLS.
-	+ commit fd765df6a7883c3d841abeb657330a1aab4b7756
-	* dirmngr/http.h (HTTP_FLAG_TRUST_DEF, HTTP_FLAG_TRUST_SYS): New.
-	* dirmngr/http.c (http_session_new): Add arg "flags".
-	* dirmngr/ks-engine-hkp.c (send_request): Use new flag
-	HTTP_FLAG_TRUST_DEF for the new arg of http_session_new.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-	* dirmngr/t-http.c (main): Ditto.
-
-2016-04-25 Werner Koch <wk@gnupg.org>
-
-	common: Minor fixes for the new private-keys.c.
-	+ commit b7fa4960c292ef1a290d32b7f46bb741bbfc0923
-	* common/private-keys.c (my_error_from_syserror): New. Use it in
-	place of gpg_error_from_syserror.
-	(_pkc_add, pkc_lookup, pke_next_value): Use ascii_strcasecmp.
-	(pkc_parse): Use xtrystrdup and append_to_strlist_try as intended.
-
-	(_pkc_add): Add braces around if-statement.
-
-	common: Use new function to print a failure of xtrymalloc.
-	+ commit 8776abbe02935e720018f3ef6ffd48f21435ff8b
-	* common/miscellaneous.c (xoutofcore): New.
-	* common/strlist.c (append_to_strlist): Use instead of abort.
-	(append_to_strlist_try): Use xtrymalloc instead of xmalloc.
-
-2016-04-21 Justus Winter <justus@g10code.com>
-
-	common: Add support for the new extended private key format.
-	+ commit 12af2630cf4d1a39179179925fac8f2cce7504ff
-	* agent/findkey.c (write_extended_private_key): New function.
-	(agent_write_private_key): Detect if an existing file is in extended
-	format and update the key within if it is.
-	(read_key_file): Handle the new format.
-	* agent/keyformat.txt: Document the new format.
-	* common/Makefile.am: Add the new files.
-	* common/private-keys.c: New file.
-	* common/private-keys.h: Likewise.
-	* common/t-private-keys.c: Likewise.
-	* common/util.h (alphap, alnump): New macros.
-	* tests/migrations: Add test demonstrating that we can cope with the
-	new format.
-
-	common: Add 'free_strlist_wipe' which wipes memory.
-	+ commit c6d1f2f08c68efe7e80887219064a8ce6365128f
-	* common/strlist.c (free_strlist_wipe): New function.
-	* common/strlist.h (free_strlist_wipe): New prototype.
-
-	common: Add 'append_to_strlist_try' which can fail.
-	+ commit 95303ee11df12f284e98d02dba993eda9e425383
-	* common/strlist.c (append_to_strlist): Use the new function.
-	(append_to_strlist_try): New function.
-	* common/strlist.h (append_to_strlist_try): New prototype.
-
-	agent: Convert key format document to org.
-	+ commit 342cc488890241b41e49f50886617115342721d6
-	* agent/keyformat.txt: Convert to org mode.
-
-	tests: Make migration test more robust and silent.
-	+ commit 0c35e09278514f1e3377a4b0a9b1f44dd39b1bf4
-	* tests/migrations/from-classic.test: Fix in-tree build, silence test.
-
-2016-04-21 Werner Koch <wk@gnupg.org>
-
-	w32: Use --enable-gpg2-is-gpg by default.
-	+ commit d81de224ecd542922dda649a492dd9550509d7bc
-	* autogen.rc: Add option also for plain Windows.
-
-	w32: Replace libiconv DLL by iconv feature of libgpg-error.
-	+ commit bd4d65615b3a5360d455b99e77bd113ad90f1539
-	* configure.ac: Do nor require libiconv for W32.
-	* common/utf8conv.c W32: Do not incluce iconv.h. Request
-	libgpg-error iconv macros.
-	(jnlib_iconv): Use ICONV_CONST macro.
-	* build-aux/speedo/w32/inst.nsi !WITH_GUI: Do not install libiconv.
-	* build-aux/speedo.mk (speedo_spkgs) !WITH_GUI: Likewise.
-
-2016-04-20 Justus Winter <justus@g10code.com>
-
-	agent: Sanitize permissions of the private key directory.
-	+ commit f8adf1a3234655877a4f985d627d98567507002c
-	* agent/gpg-agent.c (create_private_keys_directory): Set permissions.
-	* common/sysutils.c (modestr_to_mode): New function.
-	(gnupg_mkdir): Use new function.
-	(gnupg_chmod): New function.
-	* common/sysutils.h (gnupg_chmod): New prototype.
-	* tests/migrations/from-classic.test: Test migration with existing
-	directory.
-
-	tests: Test the migration from a classic GnuPG home directory.
-	+ commit defbc70b4a16264e067daf76678ecfb9d030dee4
-	* configure.ac: Add new directory.
-	* tests/Makefile.am (SUBDIRS): Likewise.
-	* tests/migrations/Makefile.am: New file.
-	* tests/migrations/from-classic.gpghome/pubring.gpg.asc: Likewise.
-	* tests/migrations/from-classic.gpghome/secring.gpg.asc: Likewise.
-	* tests/migrations/from-classic.gpghome/trustdb.gpg.asc: Likewise.
-	* tests/migrations/from-classic.test: Likewise.
-
-2016-04-20 Werner Koch <wk@gnupg.org>
-
-	speedo: Use swdb.lst to define the SQLite version.
-	+ commit 2385b9f1ddc4938e45c01a12a804f4b77d253305
-	* build-aux/speedo.mk: Change sqlite to use our mirror and the
-	swdb.lst file.
-	* build-aux/speedo/w32/inst.nsi: gpg is now build and installed as
-	gpg.
-
-2016-04-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve UID selction of --quick-sign-key.
-	+ commit d02de6c0a4a55a2720cfa5caddcbfc4ce988a2ec
-	* g10/keyedit.c (keyedit_quick_sign): Improve UID selection and print
-	error for non-found userids.
-
-	gpg: Avoid debug like output at start of --edit-key.
-	+ commit 085b19fc9aa7f2f9b82a97824b117e71390964ec
-	* g10/keyedit.c (check_all_keysigs): Print info only after something
-	has been modified.
-
-2016-04-15 Andre Heinecke <aheinecke@intevation.de>
-
-	dirmngr: Fix https never reported in general help.
-	+ commit 6272f24312f2efe8707a7712858c85cd5a42e6fa
-	* dirmngr/ks-engine-http.c (ks_hkp_help): Also print https
-	when supported and no uri provided.
-
-	dirmngr: Fix https incorrectly reported in help.
-	+ commit a0642856b25622c81d3464979c47ff2a30af58fa
-	* dirmngr/ks-engine-http.c (ks_hkp_help): Only print https if tls
-	is supported.
-
-2016-04-14 Werner Koch <wk@gnupg.org>
-
-	agent: Fix regression due to recent commit 4159567.
-	+ commit 8c3fb2360f154a971d2a390e4937acb22a44a8c2
-	* agent/protect.c (do_encryption): Fix CBC hashing.
-
-	agent: Allow gpg-protect-tool to handle openpgp-native protection.
-	+ commit 6df75ec70afeb1a5ad9a00557e1245e1514c37b5
-	* agent/protect-tool.c (read_and_unprotect): Add arg ctrl and pass to
-	agent_unprotect.
-	(main): Allocate a simple CTRL object and pass it to
-	read_and_unprotect.
-	(convert_from_openpgp_native): Remove stub.
-	(agent_key_available, agent_get_cache): New stubs.
-	(agent_askpin): New emulation for the one in call-pinentry.c.
-	(agent_write_private_key): New to dump key.
-	* agent/Makefile.am (gpg_protect_tool_SOURCES): Add cvt-openpgp.c
-
-	tests: Set fake-pinentry's stdout and stdin to _IOLBF.
-	+ commit 94504b3d5af126abb591dedda1ca0f0970822f55
-	* tests/openpgp/fake-pinentry.c (main): Call setvbuf. Show passphrase
-	at startup. Increase buffer.
-
-2016-04-12 Werner Koch <wk@gnupg.org>
-
-	agent: Implement new protection mode openpgp-s2k3-ocb-aes.
-	+ commit 4159567f7ed7a1139fdc3a6c92988e1648ad84ab
-	* agent/protect.c (agent_protect): Add arg use_ocb. Change all caller
-	to pass -1 for default.
-	* agent/protect-tool.c: New option --debug-use-ocb.
-	(oDebugUseOCB): New.
-	(opt_debug_use_ocb): New.
-	(main): Set option.
-	(read_and_protect): Implement option.
-
-	* agent/protect.c (OCB_MODE_SUPPORTED): New macro.
-	(PROT_DEFAULT_TO_OCB): New macro.
-	(do_encryption): Add args use_ocb, hashbegin, hashlen, timestamp_exp,
-	and timestamp_exp_len. Implement OCB.
-	(agent_protect): Change to support OCB.
-	(do_decryption): Add new args is_ocb, aadhole_begin, and aadhole_len.
-	Implement OCB.
-	(merge_lists): Allow NULL for sha1hash.
-	(agent_unprotect): Change to support OCB.
-	(agent_private_key_type): Remove debug output.
-
-	indent: Help Emacs not to get confused by conditional compilation.
-	+ commit 7faf131c8b8710419df3dc13a1228d1977c55f53
-	* agent/protect.c (calibrate_get_time) W32: Use separate function
-	calls for W32 and W32CE.
-
-2016-04-07 Justus Winter <justus@g10code.com>
-
-	g10: Fix exporting secret keys of certain sizes.
-	+ commit 02cf1357dd5ee34a57371f55b9d312b8b9e3a7e8
-	* g10/build-packet.c (do_key): Do not use the header length specified
-	by the public key packet from the keyring, but let 'write_header2'
-	compute the required length.
-
-2016-04-06 Justus Winter <justus@g10code.com>
-
-	Revert "g10: Support armored keyrings in gpgv."
-	+ commit 76ca869197e304daa5a8dd96ea43113ec7b28354
-	This reverts commit abb352de51bc964c06007fce43ed6f6caea87c15.
-
-2016-04-05 Justus Winter <justus@g10code.com>
-
-	dirmngr: Autodetect PEM format in dirmngr-client.
-	+ commit 9354293b8c9f234939bc04182f15e2fe512e914e
-	* dirmngr/dirmngr-client.c (init_asctobin): New function.
-	(main): Move the initialization code to the new function.
-	(read_pem_certificate): Initialize base64 table.
-	(read_certificate): Try to decode certificates given in files as PEM
-	first.
-
-2016-04-05 Werner Koch <wk@gnupg.org>
-
-	build: Fix for: Build gpgcompose only in maintainer mode.
-	+ commit f45ed07a0fffa3adbc75b9d5726108a066927599
-	* g10/Makefile.am (noinst_PROGRAMS): Always add module_tests.
-
-	doc: Install gpg and gpgv man pages under the correct name.
-	+ commit 4dc4fb1c14b3096bb1cdc5923c0d1eb419036805
-	* doc/mkdefsinc.c (main): Add double include guard. Set variable
-	gpgtwohack. Define macros gpgname and gpgvname.
-	* doc/gpg.texi: Remove macro definition for gpgname. Use Texinfo var
-	gpgtwohack to prepare the man pages. Use @gpgname everywhere.
-	* doc/gpgv.texi: Likewise.
-	* doc/Makefile.am (myman_pages): Remove gpg2.1 and gpgv2.1 but add
-	them depending on USE_GPG2_HACK.
-
-	build: Build gpgcompose only in maintainer mode.
-	+ commit 4b5341dc333983a15f649601fdddc42ba9161433
-	* g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose only in maintainer
-	mode.
-
-	gpg: Replace use of "gpg2" by GPG_NAME.
-	+ commit 7b58a1118d98543ed6854447d7b403877638ba54
-
-
-2016-04-04 Werner Koch <wk@gnupg.org>
-
-	Now build "gpg" binary but install as "gpg2"
-	+ commit 96bcd4220f1f1313afe12097d8dc62342ac8de0d
-	* configure.ac (USE_GPG2_HACK): New ac_define am_conditional.
-	* common/homedir.c (gnupg_module_name): Replace use of macro
-	NAME_OF_INSTALLED_GPG.
-	* g10/keygen.c (generate_keypair): Ditto.
-	* g10/Makefile.am (bin_PROGRAMS): Remove.
-	(noinst_PROGRAMS): Add gpg or gpg2 and gpgv or gpg2.
-	(gpg2_hack_list): New.
-	(use_gpg2_hack): New.
-	(gpg2_SOURCES): Rename to gpg_SOURCES.
-	(gpgv2_SOURCES): Rename to gpgv_SOURCES.
-	(gpg2_LDADD): Rename to gpg_LDADD.
-	(gpgv2_LDADD): Rename to gpgv_LDADD.
-	(gpg2_LDFLAGS): Rename to gpg_LDFLAGS.
-	(gpgv2_LDFLAGS): Rename to gpgv2_LDFLAGS.
-	(install-exec-hook): Remove WinCE specific rules and add new rules.
-	(uninstall-local): Uninstall gpg/gpg2 and gpgv/gpgv2.
-	* tests/openpgp/Makefile.am (required_pgms): s/gpg2/gpg/.
-	* tests/openpgp/defs.inc: Ditto.
-	* tests/openpgp/gpgtar.test: Ditto.
-	* tests/openpgp/mkdemodirs: Ditto.
-	* tests/openpgp/signdemokey: Ditto.
-
-	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove obsolete
-	--enable-mailto, add --enable-gpg2-is-gpg.
-
-	tests: Add missing file.
-	+ commit c6ed863491ec3a1e0fcf9cbe2c93c87468306c29
-	* tests/openpgp/Makefile.am (TEST_FILES): Add plain-largeo.asc.
-
-2016-04-04 Justus Winter <justus@g10code.com>
-
-	g10: Support armored keyrings in gpgv.
-	+ commit abb352de51bc964c06007fce43ed6f6caea87c15
-	* doc/gpgv.texi: Document the feature.
-	* g10/Makefile.am (gpgv2_SOURCES): Add dearmor.c.
-	* g10/dearmor.c (dearmor_file): Add sink argument.
-	* g10/gpg.c (main): Adapt accordingly.
-	* g10/gpgv.c (make_temp_dir): New function.
-	(main): De-armor keyrings.
-	* g10/main.h (dearmor_file): Adapt prototype.
-
-	tests: Fix default key test.
-	+ commit dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c
-	* tests/openpgp/default-key.test: Avoid using the option
-	'--trust-model' unconditionally.
-
-2016-04-01 Justus Winter <justus@g10code.com>
-
-	build: Check for conflicting trust model options.
-	+ commit 6060ea898fda499211c9d5030fff41d58f899fb0
-	* configure.ac: Disable TOFU if configured without trust models, and
-	check for conflicting options.
-
-	g10: Remove option --always-trust if compiled without trust models.
-	+ commit b74185b6eaeaae4754726ff203e11977777f568c
-	* g10/gpg.c (opts): Remove option --always-trust if compiled without
-	trust models.
-
-2016-03-31 Justus Winter <justus@g10code.com>
-
-	speedo,w32: Build libsqlite3.
-	+ commit e7171f559590422cc52dbcb8d78d94569b31012f
-	* build-aux/speedo.mk (speedo_spkgs): Add libsqlite3 on w32.
-	(libsqlite3_ver): New variable.
-	(speedo_pkg_libsqlite3_tar): Likewise.
-
-	g10: Use gpg-error abstraction of sched_yield.
-	+ commit 8be9dab2dd2f83ca922c01542c63b404e34bdfd9
-	* g10/tofu.c (begin_transaction): Use 'gpgrt_yield'.
-
-2016-03-29 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix NULL-segv for missing tofu DB.
-	+ commit e2c5781788f765815532410a77077ddbb72513e9
-	* g10/tofu.c (opendb): Guard call to timeout function.
-
-2016-03-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve message when asking for key capabilities.
-	+ commit fc30c079a348436868968850dabf653b91f82419
-	* g10/keygen.c (ask_key_flags): Improve message.
-
-	gpg: Remove the extra prompt for Curve25519.
-	+ commit 7f919063d3e426104fe58ae779a9a066140014c1
-	* g10/keygen.c (MY_USE_ECDSADH): New macro local to ask_curve.
-	(ask_curve): Use a fixed table of curve names and reserve a slot for
-	Curve448. Simplify CurveNNNN/EdNNNN switching.
-	(ask_curve): Remove the Curve25519 is non-standard prompt.
-
-2016-03-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Silence trustdb computation with --quiet.
-	+ commit af9a4afbf0b518c8acff98e50135b2beb6c722c3
-	* g10/trustdb.c (validate_keys): Do not print log_info stuff in quiet
-	mode.
-
-2016-03-17 Werner Koch <wk@gnupg.org>
-
-	sm: Always create a keybox header when creating a new keybox.
-	+ commit 1aad5c6277ea3852ff57bbf680f61c9136ce4d5c
-	* sm/keydb.c (maybe_create_keybox): Create the header blob.
-
-2016-03-17 Neal H. Walfield <neal@g10code.com>
-
-	doc: Improve documentation of --enable-large-rsa.
-	+ commit 1dc7f55a4095ee42ce2d8c3eb41b7162edf2ca2e
-	* doc/gpg.texi (--enable-large-rsa): Improve text.
-
-2016-03-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: allow removal of the shadowed key.
-	+ commit 8588c2dbc4c4d1b53796f3dbe8489b932dca7a60
-	* agent/findkey.c (agent_delete_key): Remove the key when asked.
-
-2016-03-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Add const qualifier.
-	+ commit b752d2c93778e6a1c1de3eddf8fc725b0ddd354e
-	* g10/gpgcompose.c (show_help): Those are strings not to be modified.
-
-2016-03-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not rely on a certain evaluation order.
-	+ commit 60b34f96f4f390670462d719c0d797e622cee4d4
-	* g10/keyedit.c (print_and_check_one_sig): Call check_key_signature
-	before derefing IS_SELFSIG.
-
-2016-03-14 Werner Koch <wk@gnupg.org>
-
-	scd: Add manufacturer id 0x000a.
-	+ commit 834b84c0ee4990393daa5e44afbab5b0aaed0758
-	* g10/card-util.c (get_manufacturer): Add it.
-
-2016-03-10 Kevin J. McCarthy <kevin@8t8.us>
-
-	g10: Silence message if --quiet is given.
-	+ commit 4f578cb2fc192f44070bb0d18dffaa3863ed0d92
-	* g10/getkey.c (parse_def_secret_key): Silence message if --quiet is
-	given.
-
-2016-03-08 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Add a new test.
-	+ commit b17577eac6b7599a4bab6fd3ecb04715aa01367c
-	* g10/Makefile.am (EXTRA_DIST): Add t-stutter-data.asc.
-	(module_tests): Add t-stutter.
-	(t_stutter_SOURCES): New variable.
-	(t_stutter_LDADD): New variable.
-
-2016-03-07 Justus Winter <justus@g10code.com>
-
-	sm: Implement pinentry loopback and reading passphrases from fd.
-	+ commit eea139c56ef55081d8cd8df2a35ce507386e0f17
-	* doc/gpgsm.texi: Document '--pinentry-mode' and '--passphrase-fd'.
-	* sm/Makefile.am (gpgsm_SOURCES): Add new files
-	* sm/call-agent.c (struct default_inq_parm_s): New definition.
-	(start_agent): Pass in the pinentry mode.
-	(default_inq_cb): Handle 'PASSPHRASE' and 'NEW_PASSPHRASE' inquiries.
-	Adapt all call sites to the new callback cookie.
-	* sm/gpgsm.c (cmd_and_opt_values): Add new values.
-	(opts): Add new options.
-	(main): Handle new options.
-	* sm/gpgsm.h (struct opt): Add field 'pinentry_mode'.
-	* sm/passphrase.c: New file.
-	* sm/passphrase.h: Likewise.
-
-	sm: Remove unused argument '--fixed-passphrase'.
-	+ commit 53ed98eda77ff2dcf390cebd0cec9f2665661863
-	* doc/gpgsm.texi: Drop description.
-	* sm/gpgsm.c (cmd_and_opt_values): Drop enum value.
-	(opts): Drop argument.
-	(main): Drop argument handling.
-	* sm/gpgsm.h (struct opt): Drop field 'fixed_passphrase'.
-
-	kbx: Avoid undefined behavior.
-	+ commit a68ca5a90457ac97eee4efd7fdea596d27c54697
-	* kbx/keybox-file.c (_keybox_read_blob2): Cast to unsigned int before
-	shifting.
-
-2016-03-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Bug fix for a device with multiple interfaces.
-	+ commit 7a32f87cccddb40521bfdd4eb2d0dc9c88fb3fe5
-	* scd/ccid-driver.c (scan_or_find_usb_device): Use IFC_NO when
-	accessing interface information.
-
-2016-03-04 Justus Winter <justus@g10code.com>
-
-	build: Make libusb a hard requirement if the ccid driver is requested.
-	+ commit e997552161b2dd8aabf350adee14e208e1545aef
-	* configure.ac: Print an error message and die if the internal ccid
-	driver is requested but no suitable libusb is found.
-
-	g10: Drop superfluous declaration.
-	+ commit 1e4b7823008daea1a22a6f0f9b379fdec37a4cd4
-	* g10/main.h (disable_core_dumps): Drop declaration.
-
-	g10: Guard code against errors.
-	+ commit 40f6529ceeea806fc011135a9fa3a3590a9534ac
-	* g10/keygen.c (do_generate_keypair): Check for errors, in which case
-	'pri_psk' is NULL.
-
-2016-03-03 Justus Winter <justus@g10code.com>
-
-	dirmngr: Add more missing CFLAGS.
-	+ commit 9f0ba5089e664447c36cee3d9249f95e4ea39957
-	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
-	'GCRYPT_CFLAGS'.
-	(t_dns_stuff_CFLAGS): Likewise.
-
-	tests/openpgp: Skip gpgtar test if it has not been built.
-	+ commit a883d4c0f8125e809c144ec69e76c9f522102d8f
-	* tests/openpgp/gpgtar.test: Check if executable exists.
-
-2016-03-02 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Add new program gpgcompose.
-	+ commit d040628ddf2c09ddc9581ff365680a568ad24278
-	* g10/packet.h: Include "util.h".
-	* g10/encrypt.c (encrypt_seskey): Don't mark as static.
-	* g10/gpgcompose.c: New file.
-	* g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose.
-	(gpg2_SOURCES): Split everything but gpg.c into...
-	(gpg_sources): ... this new variable.
-	(gpgcompose_SOURCES): New variable.
-	(gpgcompose_LDADD): Likewise.
-	(gpgcompose_LDFLAGS): Likewise.
-
-	gpg: More robustly detect valid non-armored OpenPGP messages.
-	+ commit 605276ef8cd449bfd574ae6c498fa5d7d265c5c7
-	* g10/armor.c (is_armored): More robustly detect valid non-armored
-	OpenPGP messages.
-
-	common: Provide a function for mapping packet types to strings.
-	+ commit 24e0f1d56e6f56e7fb52b5c6bdb100131e12dfe3
-	* common/openpgpdefs.h (pkttype_str): New function.
-
-	gpg: Rename pop_filter to iobuf_pop_filter and export it.
-	+ commit 1463f9b9624fae97cc89df3aa4546655ee893f7c
-	* common/iobuf.c (pop_filter): Rename from this...
-	(iobuf_pop_filter): ... to this. Don't mark it as static.
-
-	gpg: Split write_pubkey_enc_from_list.
-	+ commit 7eac4942b537c4b3710d34e6adb9c5d36338f38b
-	* g10/encrypt.c (write_pubkey_enc_from_list): Split the body of this
-	function out into...
-	(write_pubkey_enc): ... this new function.
-
-	gpg: Allow the caller to write the contents of a plaintext packet.
-	+ commit 2fdb950471bd36f046672254ff26ca94797cc9f1
-	* g10/build-packet.c (do_plaintext): Change the semantics such that if
-	PT->BUF is NULL, it is the caller's responsibility to write the
-	content (and disable partial body length mode, if appropriate).
-
-	gpg: Add a new function for creating binary notations.
-	+ commit 1a624586149f9e34206e5d5e1ba0b7d2b7004c80
-	* g10/build-packet.c (blob_to_notation): New function.
-
-	gpg: Refactor the printing of binary notations.
-	+ commit fd2d00ccf558b1ac1184967d8702ef01cd60bf60
-	* g10/build-packet.c (sig_to_notation): Break printing of binary
-	notations into...
-	(notation_value_to_human_readable_string): ... this new function.
-	Provide a small preview of the binary data substituting non-printable
-	characters with '?'.
-
-2016-03-02 Uldis Anšmits <uldis.ansmits@tieto.com>
-
-	tests/openpgp: Make tests more portable.
-	+ commit 1cdb744d91ab33563fc0b3156fb05694caa55278
-	* tests/openpgp/default-key.test: Avoid 'grep -q'.
-	* tests/openpgp/gpgtar.test: Avoid 'grep -qe' and 'diff -q'.
-	* tests/openpgp/use-exact-key.test: Avoid 'grep -q'.
-
-2016-03-02 Justus Winter <justus@g10code.com>
-
-	common: Consolidate Assuan server argument handling.
-	+ commit e77c85577d1bdd77ad3b81907145fd68f2653c01
-	* common/Makefile.am (common_sources): Add new files.
-	* common/server-help.c: New file.
-	* common/server-help.h: Likewise.
-	* agent/command.c: Drop argument handling primitives in favor of using
-	the consolidated ones.
-	* dirmngr/server.c: Likewise.
-	* g10/server.c: Likewise.
-	* g13/server.c: Likewise.
-	* scd/command.c: Likewise.
-	* sm/server.c: Likewise.
-
-2016-03-01 Justus Winter <justus@g10code.com>
-
-	dirmngr: Add missing CFLAGS.
-	+ commit 9a1778abcae0a7afe33be8e02b6d9a909463cd54
-	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
-	'GPG_ERROR_CFLAGS'.
-	(t_dns_stuff_CFLAGS): Likewise.
-
-	tools: Drop superfluous include.
-	+ commit 3a1d142f9b71721a631cf2037665e9def60aa384
-	* tools/gpgtar.c: Do not include unused 'npth.h'.
-
-2016-02-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Prettify a 2 octet hex output.
-	+ commit 2de0d41219a522e01f050d475b3ddecb9173fc7d
-	* g10/sig-check.c (check_key_signature2): Wrap line and use %02x.
-
-2016-02-25 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Show debugging info if a sig with an unsupported sig class is used.
-	+ commit 87515e39295e4b7eaec1641c38e1ac32e8d39a91
-	* g10/sig-check.c (check_key_signature2): If SIG->CLASS is
-	unsupported, show some debugging information. Don't use BUG to fail.
-	Just return GPG_ERR_BAD_SIGNATURE.
-
-	gpg: More carefully encode a packet's length.
-	+ commit 960f5e26f2cda3ac6e6b30548fa808a690c39ffc
-	* g10/build-packet.c (write_header2): Make sure the length bits are
-	cleared. Fail if HDRLEN is set and the specified length can't be
-	encoded in the available space.
-
-	gpg: Avoid directly twiddling bits.
-	+ commit 105a5629c7e938ec7b3c9c338ebe7bdfee4cfdad
-	* g10/build-packet.c (do_plaintext): Use ctb_new_format_p to check the
-	packet's format.
-	(write_header2): Likewise.
-
-	gpg: Add some asserts.
-	+ commit c9636a1acc952eb8e1355089bc2e229dece98165
-	* g10/build-packet.c (ctb_new_format_p): New function.
-	(ctb_pkttype): New function.
-	(do_user_id): Add some asserts.
-	(do_key): Likewise.
-	(do_symkey_enc): Likewise.
-	(do_pubkey_enc): Likewise.
-	(do_plaintext): Likewise.
-	(do_encrypted): Likewise.
-	(do_encrypted_mdc): Likewise.
-	(do_compressed): Likewise.
-	(do_signature): Likewise.
-	(do_signature): Likewise.
-	(write_header2): Likewise.
-
-	gpg: Avoid an unnecessary copy.
-	+ commit 512bc72e1f8544341529174142273d857f45540c
-	* g10/build-packet.c (sig_to_notation): Avoid an unnecessary copy of
-	the data: the size of the packet is fixed.
-
-2016-02-23 Neal H. Walfield <neal@g10code.com>
-
-	common: Reduce buffer size.
-	+ commit 75861b663bbb37214143c2ff7b1b4d1d10ba2657
-	* common/iobuf.c (iobuf_copy): Change buffer size from 1 MB to 32 KB.
-
-	common: Improve a function's documentation and comments.
-	+ commit 14d27b2cadf9b0bb413f2b8bad2d81c1d370c2e7
-	* common/iobuf.c (iobuf_set_partial_body_length_mode): Fix
-	documentation and comment. Add an assert.
-
-	common: Add log_assert.
-	+ commit f57a91afb69c58f9d8d9632801650f28c7dc1e0d
-	* common/logging.h (log_assert): New macro.
-
-	gpg: Use higher-level functions.
-	+ commit 33ac735a781325c4d47cdf6216813866ab93562e
-	* g10/build-packet.c (do_symkey_enc): Use iobuf_write instead of
-	iobuf_put in a loop. Use iobuf_copy instead of iobuf_read and
-	iobuf_write in a loop. Move the memory wiping from here...
-	* common/iobuf.c (iobuf_copy): ... to here.
-
-	common: Check for an error before reading.
-	+ commit 8066f8a3470f9d2f3682a28641a7b09eca29a105
-	* common/iobuf.c (iobuf_copy): If DEST has a pending error, don't
-	start copying.
-
-	common: More accurately name function.
-	+ commit 903466e124841cb29f518afa6b7706d490737ac3
-	* common/iobuf.c (iobuf_set_partial_block_mode): Rename from this...
-	(iobuf_set_partial_body_length_mode): ... to this. Update callers.
-
-2016-02-23 Werner Koch <wk@gnupg.org>
-
-	g13: Add commands --suspend and --remove.
-	+ commit f7968db30b0e0ccae038e354568accb0a05d877c
-	* g13/g13.c (aSuspend, aResume): New.
-	(opts): Add commands --suspend and --resume.
-	(main): Implement dummy command aUmount. Implement commands aResume
-	and aSuspend.
-	* g13/sh-cmd.c (cmd_suspend): New.
-	(cmd_resume): New.
-	(register_commands): Add commands RESUME and SUSPEND.
-	* g13/server.c (cmd_suspend): New.
-	(cmd_resume): New.
-	(register_commands): Add commands RESUME and SUSPEND.
-	* g13/be-dmcrypt.c (be_dmcrypt_suspend_container): New.
-	(be_dmcrypt_resume_container): New.
-	* g13/backend.c (be_suspend_container): New.
-	(be_resume_container): New.
-	* g13/suspend.c, g13/suspend.h: New.
-	* g13/mount.c (parse_header, read_keyblob_prefix, read_keyblob)
-	(decrypt_keyblob, g13_is_container): Move to ...
-	* g13/keyblob.c: new file.
-	(keyblob_read): Rename to g13_keyblob_read and make global.
-	(keyblob_decrypt): Rename to g13_keyblob_decrypt and make global.
-	* g13/sh-dmcrypt.c (check_blockdev): Add arg expect_busy.
-	(sh_dmcrypt_suspend_container): New.
-	(sh_dmcrypt_resume_container): New.
-	* g13/call-syshelp.c (call_syshelp_run_suspend): New.
-	(call_syshelp_run_resume): New.
-
-	g13: Run mount after dmsetup.
-	+ commit f26867928c451443769fecc41c3283e077e8c49f
-	* g13/g13-syshelp.c (main): Reject userids with a slash.
-	* g13/sh-dmcrypt.c (sh_dmcrypt_mount_container): Run mount if a
-	mountpoint is known.
-
-2016-02-23 Justus Winter <justus@g10code.com>
-
-	tests/openpgp: Qualify executables with extension.
-	+ commit ede0061febe5b2edde6a1a79d599e3c7c0faed5a
-	* tests/openpgp/Makefile.am (required_pgms): Qualify executables with
-	'$EXEEXT'.
-
-	tests/openpgp: Reimplement 'pinentry.sh' in c.
-	+ commit 01dcc2cf2f2f00235ffa7d0718ecb468370980cc
-	* tests/openpgp/Makefile.am: Build new program.
-	* tests/openpgp/defs.inc: Use the new program.
-	* tests/openpgp/fake-pinentry.c: New file.
-
-	tests/openpgp: Avoid dependency on source files.
-	+ commit 785a7f463ec4e937304ce1263c5e6a46e8079137
-	* tests/openpgp/plain-largeo.asc: New file.
-	* tests/openpgp/version.test: Dearmor the new file instead of relying
-	on the source being present.
-
-	tests/openpgp: Fix file removal.
-	+ commit 629284120ff359b98a178b6cddf0e005e5f4db1a
-	* tests/openpgp/version.test: Fix file removal.
-
-	common/exechelp: Provide a way to wait for multiple processes.
-	+ commit 5ba4f6047b84e4cfdb3e6bc88e574ca7a455da81
-	* common/exechelp-posix.c (gnupg_wait_process): Generalize to
-	'gnupg_wait_processes'.
-	* common/exechelp-w32.c (gnupg_wait_process): Likewise.
-	* common/exechelp-w32ce.c (gnupg_wait_process): New function stub.
-	* common/exechelp.h (gnupg_wait_process): New prototype.
-
-	common/exechelp: Add general pipe function.
-	+ commit 9f4a8d4ea173b4b4cb4d4f06b4004d43e2f4b97a
-	* common/exechelp-posix.c (gnupg_create_pipe): New function.
-	* common/exechelp-w32.c (INHERIT_{READ,WRITE,BOTH}): New macros.
-	(create_inheritable_pipe): Generalize so that both ends can be
-	inherited.
-	(do_create_pipe): Rename argument accordingly.
-	(gnupg_create_{in,out}bound_pipe): Use new flags.
-	(gnupg_create_pipe): New function.
-	(gnupg_spawn_process): Use new flags.
-	* common/exechelp-w32ce.c (gnupg_create_pipe): New stub.
-	* common/exechelp.h (gnupg_create_pipe): New prototype.
-
-	common/exechelp: Mute the Windows version.
-	+ commit 54acc87c1e0b100accbfd02cfce59a897f2f0ce1
-	* common/exechelp-w32.c (gnupg_wait_process): Do not print an error if
-	the exit code can be returned. This makes the Windows version behave
-	like the POSIX version.
-
-	common/exechelp: Avoid magic numbers.
-	+ commit 709e2a7e9a3197e8ded4be0b05c138e8d5adbca6
-	* common/exechelp-w32.c (do_create_pipe): Use symbolic names.
-
-	common/exechelp: Disable debugging by default.
-	+ commit 5d8f7b16c8490d6951772fa98c1f075a952cc571
-	* common/exechelp-w32.c (DEBUG_W32_SPAWN): Set to 0.
-
-	common/exechelp: Fix handle leak.
-	+ commit dd670366d7aedb07e9420d1f8575197acfae1914
-	* common/exechelp-w32.c (gnupg_spawn_process_detached): Close process
-	handle.
-
-	common/exechelp: Fix opening the 'nul' device.
-	+ commit 8857590006266da200427f2d4f9e8c27fbc89ed9
-	* common/exechelp-w32.c (gnupg_spawn_process): Fix opening the 'nul'
-	device.
-
-	common/exechelp: Fix error handling.
-	+ commit f5a4b6a3a39a2b78d33769184d6133d5e256e02c
-	* common/exechelp-w32.c (gnupg_spawn_process): Close the right handle.
-
-	common/exechelp: Fix pipe creation.
-	+ commit b0125ae9850973b89010517b1dbce04125a51d51
-	* common/exechelp-w32.c (gnupg_spawn_process): Fix the creation of the
-	input pipe.
-
-	tools/mk-tdata: Fix data generation on Windows.
-	+ commit 661ba477e01b796db161fa612b46c353393c6b10
-	* tools/mk-tdata.c (main): Set stdout to binary mode to avoid newline
-	conversion.
-
-2016-02-19 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Systematically detect and fix signatures that are out of order.
-	+ commit 2d1d795481bc011447284f8ce0a3ae96a08daf17
-	* g10/keyedit.c (sig_comparison): New function.
-	(fix_key_signature_order): Merge functionality into...
-	(check_all_keysigs): ... this function. Rewrite to eliminate
-	duplicates and use a systematic approach to detecting and moving
-	signatures that are out of order instead of a heuristic.
-	(fix_keyblock): Don't call fix_key_signature_order. Call
-	check_all_keysigs instead after collapsing the uids.
-
-	gpg: Split check_key_signature2.
-	+ commit 44cdb9d73f1a0b7d2c8483a119b9c4d6caabc1ec
-	* g10/sig-check.c (hash_uid_node): Rename from this...
-	(hash_uid_packet): ... to this. Take a PKT_user_id instead of a
-	KBNODE.
-	(check_key_signature2): Split the basic signature checking
-	functionality into...
-	(check_signature_over_key_or_uid): ... this new function.
-
-	gpg: Split print_and_check_one_sig.
-	+ commit 5fbd80579aea0f75ca1d2700515c5b8747a75c7d
-	* g10/keyedit.c (print_and_check_one_sig): Split the print
-	functionality into...
-	(print_one_sig): ... this new function.
-
-	gpg: Split the function check_signature_end.
-	+ commit ac5aea95455372145f3f06df2b4c1584d759d660
-	* g10/sig-check.c (check_signature_end): Break the basic signature
-	check into...
-	(check_signature_end_simple): ... this new function.
-
-	gpg: Use format_keyid rather than manually formatting the keyid.
-	+ commit 10671c3a4c18ea26035a5819a9f2b8fd6c7e41ea
-	* g10/keyedit.c (menu_addrevoker): Use format_keyid rather than
-	manually formatting the keyid.
-	* g10/keygen.c (card_write_key_to_backup_file): Likewise.
-
-	gpg: Initialize the primary key when generating a key.
-	+ commit bf9d1248c80205795e26156f67aff0b3f796cfce
-	* g10/keygen.c (do_generate_keypair): Initialize
-	pri_psk->flags.primary, pri_psk->keyid and pri_psk->main_keyid.
-
-	gpg: Add accessor & utility functions for pk->keyid and pk->main_keyid.
-	+ commit c45633a571bf663bc7f3610fc481acded6acfc19
-	* g10/keydb.h (keyid_cmp): New function.
-	* g10/keyid.c (pk_keyid): New function.
-	(pk_main_keyid): New function.
-	(keyid_copy): New function.
-	(pk_keyid_str): New function.
-	* g10/packet.h (PKT_public_key): Update comments for main_keyid and
-	keyid.
-
-2016-02-18 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpgparsemail: Allow weirdly-mixed pkcs7 signatures.
-	+ commit 7e7f35a2d7d40267a4dd30791df77420efeebfa7
-	* tools/gpgparsemail.c: Add and check info->signing_protocol_2.
-
-	gpg: Clean up dangling agent_open and agent_closed declarations.
-	+ commit 813df2fe6656e55bea4d0be07cc964a140218412
-	* g10/keydb.h: Remove agent_open, agent_close declarations/
-	* g10/migrate.c: #include <unistd.h> for access()
-
-2016-02-16 Werner Koch <wk@gnupg.org>
-
-	w32: Make scdaemon build again due to libusb problem.
-	+ commit e1ceff16765b0342531709cf97d03ef0158c29d5
-	* configure.ac: Add hack to disable libusb for Windows. Also use
-	$host instead of $target in the switch
-	 --
-
-	The new test for libusb does not support cross-compiling. As a quick
-	workaround we disable libusb for Windows because we can't use it anyway.
-
-	w32: Do not error out if gpgconf is not installed.
-	+ commit 44b02e1beb4f38f26551d932827d5317fddd27c2
-	* common/homedir.c (check_portable_app): Remove error message.
-
-2016-02-16 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Make ASCII armor decoding more robust to encoding errors.
-	+ commit 2f02ed75a9671a7aae36968d5a1618f71b491325
-	* g10/armor.c (radix64_read): If the = is followed by the string "3D",
-	check if the following four characters are valid radix 64 and are
-	followed by a new line. If so, warn and ignore the '3D'.
-
-2016-02-16 Werner Koch <wk@gnupg.org>
-
-	doc: Add a gnupg-module-overview picture.
-	+ commit a1c11283af759c1045a8bb75815db325f415ded4
-	* doc/gnupg-module-overview.svg: New.
-	* doc/debugging.texi (Component interaction): New.
-	* doc/Makefile.am (EXTRA_DIST): Add PNG and PDF versions of
-	gnupg-module-overview.svg. Remove two eps files.
-	(BUILT_SOURCES): Add gnupg-module-overview.pdf and .png. Remove
-	gnupg-card-architecture.epsl
-	(gnupg_TEXINFOS): Add gnupg-module-overview.svg
-	(gnupg.dvi): New.
-	(DISTCLEANFILES): Remove build eps files.
-
-2016-02-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	common, g10: Fix indentation to silence GCC-6.
-	+ commit ea9cfcfbf76de232221f31787c53d5f46361a9f0
-	* common/iobuf.c (iobuf_ioctl): Fix.
-	* g10/encrypt.c (encrypt_filter): Likewise.
-	* g10/keyring.c (prepare_search): Likewise.
-
-	dirmngr: fix for memory alignment.
-	+ commit 6fbe12a51e8fe2649ffe5a8a02aa93026a8f02cd
-	* dirmngr/dns-stuff.c (get_dns_cert): Cast through void *.
-	(getsrv, get_dns_cname): Make sure it's aligned for HEADER.
-
-2016-02-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Add hidden key-edit subcommand "change-usage".
-	+ commit 9b28b82e7c40d1eacc446d5932cd613c56378ed8
-	* g10/keyedit.c (cmdCHANGEUSAGE): New.
-	(cmds): Add command "change-usage".
-	(keyedit_menu): Handle that command.
-	(menu_changeusage): New.
-	* g10/keygen.c (keygen_add_key_flags): New.
-	(ask_key_flags): Add optional arg current.
-
-2016-02-14 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Improve API documentation.
-	+ commit 9663b088480cef6734a3c5892d5ddbbd60ecc1a4
-	* g10/seskey.c (make_session_key): Improve documentation.
-	(encode_session_key): Improve documentation.
-	* g10/encrypt.c (encrypt_seskey): Remove gratuitous initialization.
-	* g10/dek.h (DEK): Improve documenation.
-
-	gpg: Fix calc_header_length when LEN is 0 and improve documentation.
-	+ commit 5cdde08ea869ef02111f618ad782d392a296eb7f
-	* g10/build-packet.c (calc_header_length): Return the correct haeder
-	size when LEN is 0. Fix documentation.
-
-	gpg: Fix format_keyid when dynamically allocating the buffer.
-	+ commit c0268c449d0f3d23be5ec7b92fe92e7e078166cf
-	* g10/keyid.c (format_keyid): Return a char *, not a const char *. If
-	BUFFER is NULL, then set LEN to the static buffer's size.
-
-	common: Fix comment.
-	+ commit ad43dc6cfc2b610a4e34fe55811bd937f9c3238b
-	* common/iobuf.c (iobuf_flush_temp): Fix comment.
-
-2016-02-13 Werner Koch <wk@gnupg.org>
-
-	g13: Require a confirmation before g13 is used for DM-Crypt.
-	+ commit 86f3bb144ad75461eb9b7ac1e59046ac75efccac
-	* g13/g13-syshelp.c (g13_syshelp_i_know_what_i_am_doing):
-	* g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Call it.
-	(sh_dmcrypt_mount_container): Call it.
-
-	g13: Second chunk of code to support dm-crypt.
-	+ commit b0e6ab1109d05fc664f46e17d721fe9b01d38115
-	* g13/be-dmcrypt.c, g13/be-dmcrypt.h: New.
-	* g13/Makefile.am (g13_SOURCES): Add them.
-	* g13/backend.c: Include be-dmcrypt.h and call-syshelp.h.
-	(no_such_backend): Rename to _no_such_backend and provide replacement
-	macro.
-	(be_is_supported_conttype): Support DM-Crypt.
-	(be_take_lock_for_create): Call set_segvice for DM-Crypt.
-	(be_create_new_keys): Make it a dummy for DM-Crypt.
-	(be_create_container): Call be_dmcrypt_create_container.
-	(be_mount_container): call be_dmcrypt_mount_container.
-	* g13/g13-syshelp.c (main): Enable verbose mode.
-	* g13/g13tuple.c (get_tupledesc_data): New.
-	* g13/g13tuple.h (unref_tupledesc): New.
-	* g13/g13.h (server_control_): Add field "recipients".
-	* g13/g13.c (main): Fix setting of recipients via cmdline.
-	(g13_deinit_default_ctrl): Release recipients list.
-	(g13_request_shutdown): New. Replace all direct update of
-	shutdown_pending by calls this function.
-	* g13/server.c (server_local_s): Remove field recipients which is now
-	part of CTRL.
-	(reset_notify, cmd_recipient, cmd_create): Adjust for this change.
-	* g13/create.c (encrypt_keyblob): Rename to g13_encrypt_keyblob.
-	(g13_create_container): Support DM-Crypt.
-	* g13/mount.c (parse_header): Allow for meta data copies.
-	(g13_mount_container): Support DM-Crypt.
-	* g13/sh-cmd.c (cmd_create): Make it work.
-	(cmd_mount): New.
-	* g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Make it work.
-	(sh_dmcrypt_mount_container): New.
-
-	g13: Improve dump_keyblob.
-	+ commit 13f745b50dc7031755faadb2d3476a6b6aafc739
-	* g13/g13tuple.c: Include keyblob.h.
-	(find_tuple_uint): Factor code out to ...
-	(convert_uint): new.
-	(all_printable): New.
-	* g13/mount.c (dump_keyblob: Move and rename to ...
-	* g13/g13tuple.c (dump_tupledesc): here. Revamp and pretyy print uint
-	values.
-
-	g13: Define 3 new tags.
-	+ commit 59fc3507d18072833559f227ecab8aa00cad9466
-	* g13/keyblob.h (KEYBLOB_TAG_CONT_NSEC): New.
-	(KEYBLOB_TAG_ENC_NSEC): New.
-	(KEYBLOB_TAG_ENC_OFF): New.
-
-	g13: Rename utils.c to g13tuple.c.
-	+ commit 82d12156ef5f948d44934ed44d79d24cc9e94366
-	* g13/utils.c: Rename to g13tuple.c.
-	* g13/utils.h: Rename to g13tuple.h. Change all users.
-	* g13/Makefile.am: Adjust accordingly
-
-	g13: Add functions to handle uint in a keyblob.
-	+ commit 4f152f3276b6d40d2568a27e74903dd18b41d752
-	* g13/utils.c (append_tuple_uint): New.
-	(find_tuple_uint): New.
-	* g13/t-utils.c: New.
-	* g13/Makefile.am (noinst_PROGRAMS, TESTS): New.
-	(module_tests, t_common_ldadd): New.
-	(t_utils_SOURCES, t_utils_LDADD): New.
-
-	g13: Re-factor high level create code.
-	+ commit dc1dbc43a6bfb2f3e6a1cc2ca089e0318b3af0ed
-	* g13/create.c (g13_create_container): Factor some code out to ...
-	* g13/backend.c (be_take_lock_for_create): new.
-
-	g13: Return an error for non-existing device.
-	+ commit 3087197008d2b12bf9f0d7d1f2aca500db816e7c
-	* g13/sh-cmd.c (cmd_device): Set ERR.
-
-	g13: Fix releasing of a syshelp context.
-	+ commit 6390beca54f55e8d36ff767b99ae9ff68b15f10e
-	* g13/call-syshelp.c (call_syshelp_release): Allow a NULL arg.
-
-	g13: Switch over to common/exectool.c.
-	+ commit c5d7045dafcfb569c11c90c04ea7a75328c80084
-	* g13/sh-exectool.c: Remove. It has been replaced by common/exectool.c.
-	* g13/Makefile.am (g13_syshelp_SOURCES): Remove sh-exectool.c
-	* g13/sh-blockdev.c: Include exectool.h. Change sh_exec_tool to
-	gnupg_exec-tool.
-	* g13/sh-dmcrypt.c: Ditto.
-
-	common: Make gnupg_exec_tool conform to spec.
-	+ commit d19d6e1856c9a1acbf48e8b2e39b3d9171aa9f7f
-	* common/exectool.c (gnupg_exec_tool): Allocate extra byte. Allow
-	zero length read. Append hidden byte. Release memory on error.
-
-	g13: First chunk of code to support dm-crypt.
-	+ commit 81494fd30d3815502247a721f50d9eadf86a73fa
-	* g13/call-syshelp.c, g13/call-syshelp.h: New.
-	* g13/g13-syshelp.c, g13/g13-syshelp.h: New.
-	* g13/sh-cmd.c: New.
-	* g13/sh-blockdev.c: New.
-	* g13/sh-exectool.c: New.
-	* g13/sh-dmcrypt.c: New.
-	* g13/Makefile.am (sbin_PROGRAMS): Add g13-syshelp.c
-	(g13_syshelp_SOURCES): New.
-	(g13_syshelp_LDADD): New.
-
-	* g13/g13.c (opts): Add option --type.
-	(g13_deinit_default_ctrl): New.
-	(main): Implement that option. Call g13_deinit_default_ctrl.
-	* g13/g13.h (struct call_syshelp_s): New declaration.
-	(server_control_s): Add field syshelp_local.
-	* g13/keyblob.h (KEYBLOB_TAG_CREATED): New.
-	(KEYBLOB_TAG_ALGOSTR): New.
-	(KEYBLOB_TAG_HDRCOPY): New.
-	* g13/backend.c (be_parse_conttype_name): New.
-	(be_get_detached_name): Add CONTTYPE_DM_CRYPT.
-
-	tests: Remove some harmless warnings in regression tests.
-	+ commit d711f5c7697cd4bc5dc6d9fd01706cabc771dad2
-	* tests/openpgp/gpg-agent.conf.tmpl: Remove --use-standard-socket.
-
-2016-02-12 Neal H. Walfield <neal@g10code.com>
-
-	common: Change simple_query to ignore status messages.
-	+ commit acac103ba5772ae738ce5409d17feab80596cde6
-	* common/simple-pwquery.c (simple_query): Ignore status messages.
-
-2016-02-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Make sure to have the directory for trustdb.
-	+ commit d9f9b3be036747c9f55060aed47896f951bfb853
-	* g10/tdbio.c (tdbio_set_dbname): Return earlier if !CREATE. Check
-	the directory and create it if none before calling take_write_lock.
-
-2016-02-02 Neal H. Walfield <neal@g10code.com>
-
-	doc: Note that rngd can also be used to quickly generate insecure keys.
-	+ commit 75311cfe18071b94c66121a9785b133b6df345a3
-	* doc/gpg-agent.texi (Agent Options): Add comment to the description
-	of --debug-quick-random that rngd can also be used to quickly generate
-	key.
-
-2016-01-27 Werner Koch <wk@gnupg.org>
-
-	scd: Fix size_t/int mismatch in libusb.
-	+ commit 3d952a2fe5da9d84c20d3debdcc1e425b08781c6
-	* scd/ccid-driver.c (bulk_in, abort_cmd, ccid_poll): Change msglen to
-	int.
-
-	scd: Fix detection of libusb.
-	+ commit 1b90b52a56b4f808ad29a7ef79aeafc03c7424b4
-	* configure.ac (HAVE_LIBUSB): Clear if no header file was found.
-	(LIBUSB_LIBS): Ditto.
-
-	dirmngr: Build fix for FreeBSD (EAI macros)
-	+ commit 4d67144142f04184b835e50314eb21b882b9e00a
-	* dirmngr/dns-stuff.c (map_eai_to_gpg_error): Map EAI_NODATA and
-	EAI_ADDRFAMILY only if defined.
-
-2016-01-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Migrate to new API of libusb 1.0.
-	+ commit d0d97089706286fafd3c8ff56f3b5bf7ac07c6e0
-	* configure.ac (LIBUSB_CPPFLAGS): New.
-	* scd/Makefile.am (AM_CPPFLAGS): Add LIBUSB_CPPFLAGS.
-	* scd/ccid-driver.c: Use libusb 1.0 API.
-
-2016-01-26 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.11.
-	+ commit e9e5e83ec14459c2fc9060c54fc8e7381b541acd
-
-
-2016-01-26 Andre Heinecke <aheinecke@intevation.de>
-
-	gpgtar,w32: Fix gpgtar 8 bit encoding handling on W32.
-	+ commit 3e50236d4ecc3601b2641bf4273a0ff64bb5fdc4
-	* common/utf8conv.c (wchar_to_utf8): Factor code out to ...
-	(wchar_to_cp): new.
-	(utf8_to_wchar): Factor code out to ...
-	(cp_to_wchar): new.
-	(wchar_to_native): New.
-	(native_to_wchar): New.
-	* tools/gpgtar-create.c (fillup_entry_w32): Use native_to_wchar.
-	(scan_directory): Use wchar_to_native.
-
-2016-01-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix segfault on unsupported curve.
-	+ commit b8bb16c6c08d3c2947f1ff67419b36eb203c5c1a
-	* g10/call-agent.c (learn_status_cb): Don't use NULL for strcmp.
-
-	sm: small fix for GCC 6.
-	+ commit d33a34004bef028068538f099c32a0e292a004c3
-	* sm/export.c (insert_duptable): Use unsigned 0.
-
-2016-01-25 Werner Koch <wk@gnupg.org>
-	 Daiki Ueno <ueno@gnu.org>
-
-	gpg: Print PROGRESS status lines during key generation.
-	+ commit fbe1cf67aadc5a33cf815ddbcfc9669e43caa123
-	* g10/call-agent.c (cache_nonce_status_cb): Rewrite by using
-	has_leading_keyword. Handle PROGRESS lines.
-
-2016-01-25 Werner Koch <wk@gnupg.org>
-
-	agent: Send PROGRESS status lines to the client.
-	+ commit ee87c653bf4b495714e8e6b024d0a8ace3a33452
-	* agent/gpg-agent.c (struct progress_dispatch_s): New.
-	(progress_dispatch_list): New.
-	(main): Register libgcrypt pogress handler.
-	(agent_libgcrypt_progress_cb): New.
-	(agent_set_progress_cb): New.
-	(unregister_progress_cb): New.
-	(agent_deinit_default_ctrl): Call unregister.
-	* agent/command.c (progress_cb): New.
-	(start_command_handler): Register progress callback.
-
-	speedo: Allow use of SHA-256 checksums.
-	+ commit 039a55716b8abd22ce23a96dce34cf2dc4be1862
-	* build-aux/getswdb.sh: Add option --find-sha256sum.
-	* build-aux/speedo.mk (libgpg_error_sha2): New var. Also for all
-	other packages.
-	(SHA2SUM): New.
-	(SETVARS, SETVARS_W64): Prefer sha256sum over sha1sum.
-	(installer-from-source): Create swdb fragment.
-
-2016-01-22 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Indicate that serial numbers are hexadecimal.
-	+ commit 12c665b36cdc4b7189549698fc4cc1b3523b18f5
-	* dirmngr/misc.c (hexify_data): Add arg with_prefix. Adjust all
-	callers.
-	* dirmngr/crlcache.c (cache_isvalid): Print "0x" in front of the S/N.
-
-	dirmngr: Provide the keyserver pool name even if there is no CNAME.
-	+ commit 77bceb2902dd489443073d91836ea54376c60bf6
-	* dirmngr/ks-engine-hkp.c (map_host): Fix setting of r_poolname.
-
-2016-01-22 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-	 wk@gnupg.org
-
-	dirmngr: Use sks-keyservers CA by default for the hkps pool.
-	+ commit afb8696126ff0babaab23e884ff5da008281e3b7
-	* dirmngr/Makefile.am (dist_pkgdata_DATA): Add sks-keyservers.netCA.pem.
-	* dirmngr/http.c (http_session_new): Add optional arg
-	intended_hostname and set a default cert.
-	* dirmngr/ks-engine-hkp.c (send_request): Pass httphost to
-	http_session_new.
-
-2016-01-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow new user ids with only the mail address.
-	+ commit fc0c71dfe5ea8f1c683101948c23f5d2064ee4cd
-	* g10/keygen.c (ask_user_id): Allow empty name.
-
-2016-01-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve header text of the auto-created revocations.
-	+ commit bb99b40bd1e624f58ca806ca16dc73d4d594a30a
-	* g10/revoke.c (gen_standard_revoke): Improve header text for the
-	file. Add info output.
-
-	gpg: Make --auto-key-retrieve work with dirmngr configured server.
-	+ commit 09117e769a093467cb47154f36d7dda613313e33
-	* g10/call-dirmngr.c (gpg_dirmngr_ks_list): Make R_KEYSERVER optional.
-	* g10/keyserver.c (keyserver_any_configured): New.
-	(keyserver_put): Remove arg keyserver because this will always receive
-	opt.keyserver which is anyway used when connecting dirmngr. Do not
-	check opt.keyserver.
-	(keyserver_import_cert): Replace opt.keyserver by
-	keyserver_any_configured.
-	* g10/mainproc.c (check_sig_and_print): Ditto.
-	* g10/import.c (revocation_present): Ditto.
-	* g10/getkey.c (get_pubkey_byname): Ditto.
-	* g10/gpgv.c (keyserver_any_configured): Add stub.
-	* g10/test-stubs.c (keyserver_any_configured): Add stub.
-
-2016-01-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Silence message about ignoring revoked user ids.
-	+ commit bdb61351776c038d668310d9b5e5c32588ef6519
-	* g10/trustdb.c (tdb_get_validity_core): Print message only in debug
-	mode.
-
-	agent: New option --pinentry-timeout.
-	+ commit 499743387f4d07847a2842358bc54f9237e0c2a7
-	* agent/gpg-agent.c (oPinentryTimeout): New.
-	(opts): Add new option.
-	(parse_rereadable_options): PArse that option.
-	(main): Tell gpgconf about this option.
-	* agent/call-pinentry.c (start_pinentry): Send option to Pinentry.
-	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add Option.
-
-2016-01-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Streamline use of error messages in tofu.c.
-	+ commit cfa41890bb5ff306c07dad295136601fe47566a7
-	* g10/tofu.c: Make use of print_further_info to reduce the number of
-	different error messages to be translated. Also streamline some
-	messages.
-
-	common: Add substitute code for libgpg-error < 1.22.
-	+ commit 8b7f64f9dfc80b2a0ad235996b47369c2ba9b48f
-	* common/util.h (GPG_ERR_DB_CORRUPTED): New.
-
-	gpg: Add function print_further_info.
-	+ commit d96e76d15f61812b950b64a60bc47117785a9dac
-	* g10/misc.c (print_further_info): New.
-
-2016-01-18 Werner Koch <wk@gnupg.org>
-
-	g10: Improve strings printed by tofu.c.
-	+ commit 79778a8dd5f61a6b7abeeb44b75d82932db788b7
-	* g10/tofu.c: Include ttyio.h. Change many strings to help
-	translating. Make use of ngettext wehere needed.
-	(CONTROL_L): New.
-	(TIME_AGO_UNIT_SMALL_NAME): Remove this and all similar *_NAME macros.
-	(time_ago_unit): Remove.
-	(get_trust): Use tty_prints and cpr_get only for the actual prompt.
-	Add Ctrl-L hack.
-	(show_statistics): Use two English strings for singular and plural.
-
-	* po/POTFILES.in: Add tofu.c.
-
-	gpg: Use "days" in "...newer than..." diagnostics.
-	+ commit 9309bda9581715d304305c8c5116f2cbb31aec77
-	* g10/sig-check.c (check_signature_metadata_validity): Use days if
-	useful.
-
-	Use ngettext for some strings.
-	+ commit 437965e5622612941ed0fa55584811c65069242e
-	* scd/app-openpgp.c (build_enter_admin_pin_prompt): Use ngettext for
-	some diagnostics.
-	(do_genkey): Ditto.
-	* g10/keyedit.c (check_all_keysigs, menu_delsig, menu_clean): Ditto.
-	* g10/keylist.c (print_signature_stats): Ditto.
-	* g10/keyserver.c (keyserver_refresh): Ditto.
-	* g10/sig-check.c (check_signature_metadata_validity): Ditto.
-	* g10/sign.c (do_sign): Ditto.
-	* g10/trustdb.c (reset_trust_records): Ditto.
-	(validate_keys): Use a table like diagnostic output.
-
-2016-01-15 Werner Koch <wk@gnupg.org>
-
-	kbx,w32: Use shorter retry intervals for keybox_file_rename.
-	+ commit 3cccd5a83b96e4558642dcdf5d974f64ebdb9817
-	* kbx/keybox-util.c (keybox_file_rename): Restart retry intervals
-	after 800ms.
-
-2016-01-14 Werner Koch <wk@gnupg.org>
-
-	w32: Fix deadlock introduced by keybox_file_rename.
-	+ commit 663c5d129a8f400cc6eb8ab7b91772d6e578152d
-	* g10/keyring.c (keyring_lock) W32: Flush the close cache before
-	locking.
-	* kbx/keybox-init.c (keybox_lock) W32: Close the file before
-	locking.
-
-	gpg: Detect race between pubring.gpg and pubring.kbx use.
-	+ commit 3b1248e007a6bf830a3230ee2d9cc548205ec31a
-	* g10/keydb.c (maybe_create_keyring_or_box): Detect race condition.
-
-	kbx: New function keybox_file_rename to replace rename.
-	+ commit 8241ed59d05e06252647b26477ed5c2f84895a26
-	* kbx/keybox-util.c: Include windows.h.
-	(keybox_file_rename): New.
-	* kbx/keybox-update.c (rename_tmp_file): Replace remove+rename by
-	keybox_file_rename.
-	* g10/keyring.c (rename_tmp_file): Ditto.
-
-	kbx: Add function keybox_tmp_names to avoid code duplication.
-	+ commit f5cceef115f0307664956d01c48b1b397fdad4b3
-	* kbx/keybox-update.c (create_tmp_file): Move some code to...
-	* kbx/keybox-util.c (keybox_tmp_names): new.
-	* g10/keyring.c: Include keybox.h.
-	(create_tmp_file): Replace parts by keybox_tmp_names.
-
-	gpg: Make --list-options show-usage the default.
-	+ commit 360534bde770f4845669de223154216d249b954b
-	* g10/gpg.c (main): Add LIST_SHOW_USAGE.
-
-2016-01-13 Werner Koch <wk@gnupg.org>
-
-	kbx: Change return type of search functions to gpg_error_t.
-	+ commit c7ca0f73dbe7c080b79f93f90f00ba2396fc4bd0
-	* kbx/keybox-search.c (keybox_search_reset): Change return type to
-	gpg_error_t.
-	(keybox_search): Ditto. Also handle GPG_ERR_EOF.
-	* sm/keydb.c (keydb_search_reset): Ditto.
-
-	gpg: Improve error code from lock_all.
-	+ commit 9b6c91469a804c60289a2ed21334dfd856c294bb
-	* g10/keydb.c (lock_all): Do not clobber RC during failur cleanup.
-
-	kbx: Improve and fix keybox_lock.
-	+ commit 8f1368d5e3f7654ad9cb100053535f728dff2344
-	* kbx/keybox-init.c (keybox_lock): Make sure ERR is initialized. Get
-	error codes from dotlock functions.
-
-	common: Make sure dotlock functions set a proper ERRNO.
-	+ commit 4aceebf36f103eb380e21d12a1f08b7d6ea7cc8e
-	* common/dotlock.c (map_w32_to_errno): New.
-	(read_lockfile): Return a proper ERRNO.
-	(dotlock_create_unix): Do not let log functions clobber ERRNO.
-	(dotlock_take_unix): Ditto.
-	(dotlock_release_unix): Ditto.
-	(dotlock_create_w32): Set proper ERRNO.
-	(dotlock_take_w32): Ditto.
-	(dotlock_release_w32): Ditto.
-
-	kbx: Implement keybox_lock for use by gpg.
-	+ commit 160862978628b07ed5150ec2c8abad6af1656bc3
-	* kbx/keybox-defs.h: Include dotlock.h and logging.h.
-	(CONST_KB_NAME): Remove. Replace usage by KB_NAME.
-	(struct keybox_name): Add field "lockhd".
-	* kbx/keybox-init.c (keybox_register_file): Init LOCKHD.
-	(keybox_lock): Chnage to return gpg_error_t. Implement locking.
-
-	gpg: Make sure to mark a duplicate registered keybox as primary.
-	+ commit 9dc355ad3ae0026ab04c424dc984d748b8fad393
-	* kbx/keybox-init.c (keybox_register_file): Change interface to return
-	the token even if the file has already been registered.
-	* g10/keydb.c (primary_keyring): Rename to primary_keydb.
-	(maybe_create_keyring_or_box): Change return type to gpg_error_t.
-	(keydb_add_resource): Ditto. s/rc/err/.
-	(keydb_add_resource): Mark an already registered as primary.
-	* sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t.
-	(keydb_add_resource): Ditto. s/rc/err/.
-	(keydb_add_resource): Adjust for changed keybox_register_file.
-
-2016-01-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	Fix to support git worktree.
-	+ commit 96237b9a63a50aed1884cb06f84279b977d6a8fa
-	* autogen.sh, Makefile.am, doc/Makefile.am: Use -e for testing .git.
-
-2016-01-12 Werner Koch <wk@gnupg.org>
-
-	ssh: Accept OpenSSH *cert-v01 key variants.
-	+ commit e2f984b4afffaa89bdeba2f5d447b5681237177e
-	* agent/command-ssh.c (SPEC_FLAG_WITH_CERT): New.
-	(ssh_key_types): Add OpenSSH cert types.
-	(stream_read_string): Allow a dummy read.
-	(ssh_receive_mpint_list): Pass SPEC by reference.
-	(ssh_receive_mpint_list): New arg CERT and use it.
-	(ssh_receive_key): Read certificate into an estream object and modify
-	parser to make use of that object.
-
-2016-01-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix iobuf API of filter function for alignment.
-	+ commit 4b4639b0b04dc82c550fa711dd7193e13fc4a428
-	* common/iobuf.h: Fix comment.
-
-	common: Fix iobuf API of filter function for alignment.
-	+ commit 3f52c7da3940ec06572270d511000dc7fe9c27d2
-	* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
-	* common/iobuf.c (iobuf_desc): Add the second argument DESC.
-	(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
-	(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
-	of iobuf_desc.
-	(file_filter, file_es_filter, sock_filter, block_filter): Fill the
-	description.
-	* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
-	* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
-	g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
-	g10/textfilter.c: Likewise.
-
-2016-01-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix NULL de-ref for ambiguous key check in --export-ssh-keys.
-	+ commit b280aa6423c9492e8c5a9afa57339d06d957996d
-	* g10/getkey.c: Allow arg RET_KEYBLOCK to be NULL.
-
-2016-01-09 Werner Koch <wk@gnupg.org>
-
-	tools: Remove gpgkey2ssh.
-	+ commit eb9c021631174fde4c1c444bbc533a7a46d570cd
-	* tools/gpgkey2ssh.c: Remove.
-	* tools/Makefile.am (bin_PROGRAMS): Ditto.
-
-2016-01-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Support ECDSA keys with --export-ssh-key.
-	+ commit b2da3951a395366bf1644bc4c4eb42d657effe17
-	* g10/export.c (key_to_sshblob): Add hack for ECDSA.
-
-	gpg: New command --export-ssh-key.
-	+ commit 4970868d8d84d3a64b067e5aafc9f097621758d3
-	* g10/export.c: Include membuf.h and host2net.h.
-	(key_to_sshblob): New.
-	(export_ssh_key): New.
-	* g10/gpg.c (aExportSshKey): New.
-	(opts): Add command.
-	(main): Implement that command.
-
-	gpg: Add an exact search flag to the PK struct.
-	+ commit 34bca9cd4b8517795833cb754b0d5b1dd33b08ed
-	* g10/getkey.c (merge_selfsigs_subkey): Clear exact flag.
-	(finish_lookup): Set exact flag.
-	* g10/packet.h (PKT_public_key): Add field flags.exact.
-
-	Print warnings if old daemon versions are used.
-	+ commit 2aa42baaf3dd7c3ae613ae0c61760a17c8adfcd0
-	* common/status.h (STATUS_WARNING): New.
-	* g10/call-agent.c (warn_version_mismatch): New.
-	(start_agent): Call warn function.
-	* g10/call-dirmngr.c: Include status.h.
-	(warn_version_mismatch): New.
-	(create_context): Call warn function.
-	* sm/call-agent.c (warn_version_mismatch): New.
-	(start_agent): Call warn function.
-	(gpgsm_agent_learn): Call warn function.
-	* sm/call-dirmngr.c (warn_version_mismatch): New.
-	(prepare_dirmngr): Call warn function.
-
-	common: New function compare_version_strings.
-	+ commit 4d7ac43ff71fdadfd2e04621f74840a82fbe788a
-	* common/stringhelp.c (parse_version_number): New.
-	(parse_version_string): New.
-	(compare_version_strings): New.
-	* common/t-stringhelp.c (test_compare_version_strings): New.
-	(main): Call test. Return ERRCOUNT instead of 0.
-
-	common: New function get_assuan_server_version.
-	+ commit 496643291e1e346434e9c98405c5a370957eb7d3
-	* common/asshelp.c: Include membuf.h.
-	(get_assuan_server_version): New.
-	* g10/call-agent.c (agent_get_version): Use new function.
-
-	common: New put_membuf_cb to replace static membuf_data_cb.
-	+ commit 833ba5faa1340aff80a205acbb701d4ae1d594d0
-	* common/membuf.c (put_membuf_cb): New.
-	* agent/call-scd.c (membuf_data_cb): Remove. Change callers to use
-	put_membuf_cb.
-	* common/get-passphrase.c (membuf_data_cb): Ditto.
-	* g10/call-agent.c (membuf_data_cb): Ditto.
-	* sm/call-agent.c (membuf_data_cb): Ditto.
-
-2016-01-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Return an error code from keygrip_from_pk.
-	+ commit 8fd406c317ad7c2e375ae4f7d20656dadf6d7fcc
-	* g10/keyid.c (keygrip_from_pk): Return an error code.
-
-	gpg: Avoid warnings about possible NULL deref.
-	+ commit 8a56a38387c10c02ba0790c655dd5c1d08e4a724
-	* g10/getkey.c (cache_public_key): Protect deref of CE which actually
-	can't happen.
-	* g10/keygen.c (quickgen_set_para): s/sprintf/snprintf/.
-	* g10/tofu.c (end_transaction, rollback_transaction): Allow NULL for
-	DB.
-	* g10/trustdb.c (update_min_ownertrust): Remove useless clearling of
-	ERR.
-
-	gpg: Fix warnings about useless assignments.
-	+ commit 008aa6e6d4b213c3a0d15509eb46cf168b6f2c94
-	* g10/armor.c (parse_hash_header): Remove duplicate var assignment.
-	* g10/getkey.c (cache_user_id): Ditto.
-	* g10/keygen.c (ask_curve): Ditto. This also fixes a small memory
-	leak.
-
-	* g10/keygen.c (proc_parameter_file): Remove useless assignment or
-	pointer increment.
-	(generate_keypair): Ditto.
-	* g10/getkey.c (finish_lookup, lookup): Ditto.
-	* g10/card-util.c (change_pin): Ditto.
-	* g10/gpg.c (main) <aVerify>: Ditto.
-	* g10/import.c (import): Ditto.
-	(print_import_check): Ditto
-	* g10/keyring.c (do_copy): Ditto.
-	* g10/tdbio.c (tdbio_read_record): Ditto.
-	* g10/trustdb.c (tdb_update_ownertrust): Ditto.
-	(update_validity): Ditto.
-
-	* g10/server.c (cmd_passwd): Remove useless call to skip_options.
-
-	sm: Avoid warnings about useless assignments.
-	+ commit 126aebbb82667d160c8c4435898efeb3b43c4ec8
-	* sm/call-dirmngr.c (prepare_dirmngr): Remove setting of ERR.
-	(unhexify_fpr): Remove useless computation on N.
-	* sm/certchain.c (do_validate_chain): Remove clearing of RC. Remove
-	useless setting of RC.
-	* sm/fingerprint.c (gpgsm_get_keygrip): Remove setting of RC.
-	* sm/gpgsm.c (build_list): Replace final stpcpy by strcpy.
-	* sm/keydb.c (keydb_clear_some_cert_flags): Remove clearing of RC.
-	* sm/server.c (cmd_getauditlog): Comment unused skip_options.
-
-	kbx: Avoid warnings about useless assignments.
-	+ commit 0de7d61437bd0bfbe645d5eed7a62df03129fb32
-	* kbx/keybox-dump.c (_keybox_dump_blob): Remove setting of IN_RANGE
-	and the last increment of P.
-
-	gpg: Fix DNS cert lookup returning an URL.
-	+ commit a41638acf4808caa619f4f3f4c0dcd12be00d6f8
-	* g10/call-dirmngr.c (dns_cert_status_cb): Store URL status in the URL
-	param. The old code was entirely buggy (c+p error).
-
-2016-01-06 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	Fix keystrlen to work when OPT.KEYID_FORMAT is KF_DEFAULT.
-	+ commit 2c3e67430d9b523c85c81ae562223fd51e3608cc
-	* g10/keyid.c (keystrlen): If opt.keyid_format is KF_DEFAULT unset,
-	default to KF_SHORT.
-	(format_keyid): Default to KF_SHORT, not KF_0xLONG.
-
-2016-01-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Silence some regression tests.
-	+ commit c7389ae90fa4a70766400cc241ff6a45aa750324
-	* g10/test.c (TEST): Print diagnostics only in verbose mode.
-
-	gpg: Avoid using an uninitialized SALT on premature EOF.
-	+ commit 85cc7449fb00ac85b0c2eecd22bd38b23f33edf5
-	* g10/parse-packet.c (parse_key): Check for premature end of salt.
-
-	gpg: Silence warnings found by static analyzer.
-	+ commit 09accc0e3d74e6289bed40b5bfc6479981cabfe4
-	* g10/keyedit.c (change_passphrase): Remove useless init of ANY.
-	(keyedit_quick_adduid): Remove useless setting of ERR.
-	* g10/parse-packet.c (parse_key): Remove PKTLEN from condition because
-	it has been checked before the loop.
-	(parse_plaintext): Remove useless init of PKTLEN.
-
-	kbx: Avoid faulty fclose in an error case.
-	+ commit db82b6131d437bf6ba34db0e08b7dfa9edb11e45
-	* kbx/keybox-update.c (blob_filecopy): Do not close an uninitialized
-	file pointer after a failure to create a temp file.
-	* kbx/keybox-openpgp.c (next_packet): Remove duplicate assignment of
-	PKTLEN.
-
-	dirmngr: Silence one regression test.
-	+ commit 6deafb92abe100ff67e3a0a230a39e8c0ad41900
-	* dirmngr/t-dns-stuff.c (main): Do not print info during standard
-	"make check".
-
-	common: Avoid warnings about useless assignments.
-	+ commit e64317c15e9960f3173d374e589f7c3565a4ad08
-	* common/b64enc.c (b64enc_finish): Remove var assignment which is not
-	used later.
-	* common/iobuf.c (file_filter): Ditto.
-	* common/tlv.c (do_find_tlv): Ditto.
-	* common/userids.c (classify_user_id): Ditto.
-
-	tests: Use info and error instead of a plain echo.
-	+ commit 1fbfa1bf0a6ad0dc7ed67d12252643c2c6c7370a
-	* tests/openpgp/4gb-packet.test: Use error and info.
-
-	common: Do not deref vars in tests after a fail().
-	+ commit 0a00115ee2049ab2357b7a14a51c7da185ffcabd
-	* common/t-convert.c (test_bin2hex): Turn if conditions into if-else
-	chains to avoid accessing unchecked data.
-	(test_bin2hexcolon): Ditto.
-	* common/t-mapstrings.c (test_map_static_macro_string): Ditto.
-	* common/t-stringhelp.c (test_percent_escape): Ditto.
-	(test_make_filename_try): Ditto.
-	(test_make_absfilename_try): Ditto.
-	* common/t-timestuff.c (test_timegm): Ditto.
-
-2016-01-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Align notes about minimal keysize with actual checks.
-	+ commit e70f7a54f29d727def2cfe9ea5ab9d461b4ce842
-	* g10/keygen.c (ask_keysize): Use 768 for the minimal value for DSA in
-	export mode. Improve readability.
-
-2016-01-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix RSA verification for card.
-	+ commit ff3b607fc879b70665c187500022cc63e2a0cd86
-	* agent/pksign.c (agent_pksign_do): Use S-exp of public key, instead
-	of shadowed key.
-
-2016-01-04 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix double free.
-	+ commit 575c15a090913d86cf8d75b2bc4471e371f234b9
-	* g10/getkey.c (get_pubkeys): Fix double free.
-
-2015-12-24 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: IMPORT_KEY with --force option fix.
-	+ commit 79b51bb8727bd3485229ac8ff5987558156d5d83
-	* agent/cvt-openpgp.c (convert_from_openpgp_main): Add an option not
-	to check existing key.
-	(convert_from_openpgp): Ditto.
-	(convert_from_openpgp_native): Call convert_from_openpgp_main with
-	dontcare_exist=0.
-	* agent/command.c (cmd_import_key): Call with dontcare_exist=force.
-
-	g10: Use --force when importing key for bkuptocard.
-	+ commit 5ca57f1a697e875bae5a5c73f1a580c42ca75343
-	* g10/call-agent.c (agent_import_key): Add an argument FORCE.
-	* g10/import.c (transfer_secret_keys): Likewise.
-	(import_secret_one): Call transfer_secret_keys with FORCE=0.
-	* g10/keyedit.c (keyedit_menu): Call with FORCE=1.
-
-	g10: Remove subcommand checkbkupkey for --key-edit.
-	+ commit 44aee35e69540510617aea4b886ef845590960fe
-	* g10/keyedit.c (keyedit_menu): Remove cmdCHECKBKUPKEY support.
-
-	g10: Allow relative path for specifying the file for bkuptocard.
-	+ commit ee433d2b00c93b5a4e4ed54b9fb5806361df1b71
-	* g10/keyedit.c (keyedit_menu): Assume the file is under GNUPGHOME.
-	Also support tilda expansion.
-
-	g10: fix regression of bkuptocard subcommand in --edit-key.
-	+ commit 40959add1ba0efc1f4aa87fa075fa42423eff73c
-	* g10/keyedit.c (keyedit_menu): Call transfer_secret_keys.
-	* g10/import.c (transfer_secret_keys): Make it global function.
-	Allow stats==NULL.
-
-	agent: Support --force option for IMPORT_KEY.
-	+ commit e684c634df814b12d399dcdc375c35d3e9a137af
-	* agent/command.c (cmd_keywrap_key): New option --force.
-
-2015-12-23 Werner Koch <wk@gnupg.org>
-
-	gpg: Rename struct pubkey to pukey_s and add pubkey_t.
-	+ commit a9cbdcfd9c364557787f4a173cc59f14c067946e
-	* g10/keydb.h (struct pubkey): Rename to pubkey_s.
-	(pubkey_t): New. Change all struct pubkey_s to use this type.
-	* g10/getkey.c (get_pubkeys): Rename arg keys to r_keys.
-
-	gpg: Simplify status message code from commit b30c15bf.
-	+ commit 363ed2e892adc97fae97111bb56b64f9f809e8d5
-	* g10/keygen.c (card_write_key_to_backup_file): Simplify by using
-	hexfingerprint.
-
-	gpg: Add standard free() semantic to pubkey_free.
-	+ commit 04c9cddda95f2a8ca5c0cf10bb3dd6accf56cf45
-	* g10/getkey.c (pubkey_free): Check for NULL arg.
-
-	gpg: Fix use of assert from commit dc417bf0.
-	+ commit ef7b7e91600f35b4d682a6267001a8d30f0fa49f
-	* g10/keydb.c (keydb_update_keyblock): De-ref after the assert. Use
-	%zu for size_t.
-
-	gpg: Do not translate debug output.
-	+ commit b0c9867fb74d5a00335e6606d5bdcc5342ce26cd
-	* g10/getkey.c (parse_def_secret_key): Do not make strings passed to
-	log_debug translatable.
-
-2015-12-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix commit b30c15bf (again).
-	+ commit aecf1a3c57ca8bf8050a3743b62fe142ccf9eb22
-	* g10/keygen.c (do_generate_keypair): Clear the variable S.
-
-2015-12-22 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix type.
-	+ commit 5c759924fb92b6de7ab3baed7871e5114ebd2505
-	* g10/keygen.c (card_write_key_to_backup_file): Change n to a size_t.
-
-	gpg: Fix error message.
-	+ commit 4654384fe7a4dcee113dacf27c398b13dea5d0be
-	* g10/getkey.c (parse_def_secret_key): Fix error message.
-
-	gpg: Don't check for ambiguous keys.
-	+ commit 7195b94345b0bb937477dc47fc5ec27fb108a099
-	* g10/gpg.c (struct result): Move from here...
-	* g10/keydb.h (struct pubkey): ... to here. Update users.
-	* g10/gpg.c (check_user_ids): Move from here...
-	* g10/getkey.c (get_pubkeys): ... to here. Update users. Use
-	get_pubkey_byname to look up the keys (this also prunes invalid keys).
-	(pubkey_free): New function.
-	(pubkeys_free): New function.
-	* g10/gpg.c (main): Don't check for ambiguous key specifications.
-
-	gpg: Lazily evaluate --default-key.
-	+ commit dc52995d85048ed12ae8b9f330e9ca41a4030aae
-	* g10/gpg.c (main): If --encrypt-to-default-key is specified, don't
-	add --default-key's value to REMUSR here...
-	* g10/pkclist.c (build_pk_list): ... do it here.
-	* tests/openpgp/Makefile.am (TESTS): Add default-key.test.
-	* tests/openpgp/default-key.test: New file.
-
-	gpg: Remove unused parameter.
-	+ commit ffe0b7a6dd6bfaec62f81f511b3caf08978bb269
-	* g10/pkclist.c (build_pk_list): Remove parameter use, which is always
-	called set to PUBKEY_USAGE_ENC. Update callers.
-
-	gpg: Improve check for ambiguous keys.
-	+ commit 4103850c2e51274984f69443dee34295cbb8c282
-	* g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
-	encryption-only keys when a signing key is needed and vice-versa.
-
-	gpg: Fix TOCTTOU when updating keyblocks.
-	+ commit dc417bf0c555a7416d0aedde6645fd1087660f92
-	* g10/keydb.c (keydb_update_keyblock): Don't replace the record at the
-	current offset. After taking the lock, extract the fingerprint from
-	the keyblock, find it and then replace it.
-
-	Only add the user supplied CFLAGS after running any autoconf tests.
-	+ commit 02eb9fc9d5863abcfed6af704e618f8cac7cc2e8
-	* configure.ac: Only add the user supplied CFLAGS after running any
-	autoconf tests.
-
-	gpg: Suppress a warning.
-	+ commit 1cceba163b17b5e9fd7c89e5b40e3d7e1cffc885
-	* dirmngr/dns-stuff.c (enable_dns_tormode): Reference new_circuit to
-	avoid a warning when ADNS is not available.
-
-	gpg: Remove dead code.
-	+ commit 4143cc1c3783c54a6f733f08a4739e4e5fb0c8b3
-	* kbx/keybox-defs.h (struct keybox_found_s): Remove unused fields
-	offset and n_packets.
-
-	gpg: Display the key that is invalid, not the search description.
-	+ commit 7fe4be0416cdc9269011bc4213b8a22d6ced295c
-	* g10/getkey.c (parse_def_secret_key): Display the key that is
-	invalid, not the search description.
-
-	gpg: Mark more options as coming from the config file (when this holds)
-	+ commit 478ca6c75bbf529f95974224dfb7d71bd5860a96
-	* g10/gpg.c (main): When --default-key or --encrypt-to-default-key is
-	taken from the config file, note this.
-
-	gpg: Use enums instead of defines.
-	+ commit ee8a8ec1cf4605e5af427f9c8b01b3609c82cbe7
-	* g10/keydb.h (PK_LIST_ENCRYPT_TO): Change from a macro to an enum.
-	(PK_LIST_HIDDEN): Likewise.
-	(PK_LIST_CONFIG): Likewise.
-	(PK_LIST_SHIFT): Likewise.n
-
-2015-12-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit d8392299f311f8cfcf8bc02679dd3ae7ef8cc6d7
-
-
-	g10: clean up of headers for card.
-	+ commit ab9a9bce77d014159c68460f5a7c263fb72f3c1c
-	* g10/main.h (save_unprotected_key_to_card): Remove.
-	* g10/options.h (ctapi_driver, pcsc_driver, disable_ccid): Remove.
-
-2015-12-21 Werner Koch <wk@gnupg.org>
-
-	common: New file fwddecl.h.
-	+ commit 98f9e14323bf806f674b3cc259e19ef6219b4378
-	* common/util.h (server_control_s, ctrl_t): Move to ...
-	* common/fwddecl.h: New file.
-	* common/call-gpg.h: Replace typedef by fwddecl.h. Change include
-	protection macro name.
-	* common/Makefile.am (common_sources): Add fwddecl.h.
-
-2015-12-18 Werner Koch <wk@gnupg.org>
-
-	build: Add required macro for pkg-config.
-	+ commit af142854a73567836a0ca44ad62900469c23d531
-	* configure.ac (PKG_PROG_PKG_CONFIG): New.
-
-2015-12-18 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Remove deprecated internal functions.
-	+ commit 72eaff1aa610f3c89a755f212760157e1932d847
-	* g10/keygen.c (do_ask_passphrase, generate_raw_key)
-	(gen_card_key_with_backup, save_unprotected_key_to_card): Remove.
-
-	g10: Fix a regression for generating card key with backup.
-	+ commit b30c15bf7c5336c4abb1f9dcd974cd77ba6c61a7
-	* g10/main.h (receive_seckey_from_agent): Declare.
-	* g10/keygen.c (card_write_key_to_backup_file): New.
-	(card_store_key_with_backup): New.
-	(do_generate_keypair): Create a key on host for encryption key when
-	backup is requested. Then, call card_store_key_with_backup.
-
-2015-12-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: factor out a function for secret key retrieval.
-	+ commit e644aa7f5943174e3f7ba9408af71531fd125a0b
-	* g10/export.c (receive_seckey_from_agent): New.
-	(do_export_stream): Use it.
-
-2015-12-16 Neal H. Walfield <neal@g10code.com>
-
-	gpg: When checking for ambiguous keys, ignore invalid keys.
-	+ commit fc010b6c7fe14e609734e448775fa384421bdef1
-	* g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
-	disabled, revoked and expired keys (if appropriate for the provided
-	option).
-
-2015-12-15 Werner Koch <wk@gnupg.org>
-
-	common: Use default_errsource for call-gpg and exectool.
-	+ commit 4ffe44c5874ed655d82adfa7a85439fab91cde03
-	* common/call-gpg.c (my_error_from_syserror, my_error_from_errno): New.
-	Use these wrappers.
-	* common/exectool.c (my_error_from_syserror): New. Use these
-	wrappers.
-
-	gpg: Reduce number of strings to translate.
-	+ commit 345ec7323d643528d2f904765708b5ecfe51f57b
-	* g10/getkey.c (parse_def_secret_key): Do not make debug messages
-	translatable. Make use of print_reported_error.
-
-	gpg: New function to printed a detailed error code.
-	+ commit 2ea1aebc924c3f0b2269f83cb1b80c75d9fa069c
-	* g10/misc.c (print_reported_error): New.
-
-2015-12-15 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Improve the keyblock cache's transparency.
-	+ commit f369efd6712148dc7ed40dba6d1ff5b0e169431a
-	* kbx/keybox-search.c (keybox_seek): New function.
-	* g10/keydb.c (keydb_search): When reading from the cache, seek to
-	just after the cached record.
-
-	gpg: Improve the keyblock cache's transparency.
-	+ commit 2e4e10c1dcd8dfeafec51f44ebf26acfeb770c41
-	* kbx/keybox-search.c (keybox_offset): New function.
-	* g10/keydb.c (struct keyblock_cache): Add fields resource and offset.
-	(keyblock_cache_clear): Reset HD->KEYBLOCK_CACHE.RESOURCE and
-	HD->KEYBLOCK_CACHE.OFFSET.
-	(keydb_search): Don't use the cached result if it comes before the
-	current file position. When caching an entry, also record the
-	position at which it was found.
-
-	gpg: Use more descriptive names.
-	+ commit 0ea186db645da2b51a7e71f46793d447f2de5e3d
-	* g10/keyring.c (KR_NAME): Rename this...
-	(KR_RESOURCE): ... to this. Update users.
-	(struct keyring_name): Rename this...
-	(struct keyring_resource): ... to this. Update users.
-	(struct off_item): Rename this...
-	(struct key_present): ... to this. Update users.
-	(OffsetHashTable): Rename this...
-	(key_present_hash_t): ... to this. Update users.
-	(kr_offtbl): Rename this...
-	(key_present_hash): ... to this. Update users.
-	(kr_offtbl_ready): Rename this...
-	(key_present_hash_ready): ... to this. Update users.
-	(KEY_PRESENT_HASH_BUCKETS): New define. Replace use of literals
-	with this.
-	(new_offset_item): Rename this...
-	(key_present_value_new): ... to this. Update users.
-	(release_offset_items): Drop dead code.
-	(new_offset_hash_table): Rename this...
-	(key_present_hash_new): ... to this. Update users.
-	(release_offset_hash_table): Drop dead code.
-	(lookup_offset_hash_table): Rename this...
-	(key_present_hash_lookup): ... to this. Update users.
-	(update_offset_hash_table): Rename this...
-	(key_present_hash_update): ... to this. Drop unused parameter off.
-	Update users.
-	(update_offset_hash_table_from_kb): Rename this...
-	(key_present_hash_update_from_kb): ... to this. Drop unused parameter
-	off. Update users.
-
-2015-12-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	sm: Handle gcry_pk_encrypt return value.
-	+ commit 4ee881bff4c8fdfa4b3b7a4b7afab611471e97f1
-	* sm/encrypt.c (encrypt_dek): Don't ignore failure of gcry_pk_encrypt.
-
-2015-12-14 Werner Koch <wk@gnupg.org>
-
-	common: Change license of isascii.c to all-premissive,
-	+ commit 7baca033070e7811f75e2021100adf8e6a48907f
-	* common/isascii.c: Change.
-
-	common: Change license of some modules to LGPLv3+/GPLv2+.
-	+ commit 7d129a7391115ff1d6a3541078a37a630ab7819f
-	* common/status.c: Change from GPLv3 to LGPLv3+/GPLv2+.
-	* common/status.h: Ditto.
-	* common/yesno.c: Ditto.
-	* common/common-defs.h: Ditto.
-	* common/gettime.h: Ditto.
-	* common/keyserver.h: Ditto.
-
-	common: Change license for exectool to LGPLv3+/GPLv2+.
-	+ commit 467e18b74b4790dcbdf3c816206d2fbaf170a12a
-	* common/exectool.c, common/exectool.h: Change license.
-
-	common: Rename sh-exectool to exectool.
-	+ commit d80e1bc430bf64debdb6b08f0b7e5c42836781fa
-	* common/sh-exectool.c: Rename to exectool.c.
-	* common/sh-exectool.h: Rename to exectool.h.
-	* common/Makefile.am (common_sources): Adjust for rename.
-	* common/exectool.c (sh_exec_tool_stream): Rename to
-	gnupg_exec-tool-stream.
-	(sh_exec_tool): Rename to gnupg_exec_tool.
-	* tools/gpgtar-create.c (gpgtar_create): Adjust for changes.
-	* tools/gpgtar-extract.c: Adjust for changes.
-	* tools/gpgtar-list.c: Adjust for changes.
-
-2015-12-14 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	gpg: Print ownertrust in TOFU+PGP trust model.
-	+ commit f5aa51aaacfe13ab9528aa9b88d8ce8eb61362fc
-	* g10/keyedit.c: Print ownertrust in TOFU+PGP trust model.
-
-2015-12-14 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix --default-key checks.
-	+ commit e573e6188dada4d70f6897aa2fda3c3af8c50441
-	* g10/getkey.c (parse_def_secret_key): Don't just check if a secret
-	key is available for the public key, also consider subkeys. Also
-	check that the key has the signing capability, is not revoked, is not
-	expired and is not disabled. Print a warning if there was a least one
-	value passed to --default-key and all were ignored.
-
-2015-12-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix regression for generating RSA keys on card.
-	+ commit d40975cbe8ff86fcc4a1b4963fdffc66ddee85ce
-	* scd/app-openpgp.c (do_genkey): Strip leading zeros for fingerprint
-	computation.
-
-2015-12-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Use a regular type instead of a void* for import stats.
-	+ commit 4d3395ef1fcde0b8c454c09956863959d590ede6
-	* g10/import.c (struct stats_s): Rename to import_stats_s. Change all
-	users.
-	* g10/main.h (import_stats_t): New. Change fucntions to use this
-	instead of a void pointer.
-
-	Remove replacements for libgpg-error < 1.21.
-	+ commit f0ae40b0c901e5f5c04c6ed5b2ab96ab7340b2bd
-	* common/util.h: Remove replacement macros for libgpg-error<1.21.
-	* common/types.h: Ditto.
-	* common/mischelp.h: Ditto.
-	* common/t-mapstrings.c: Include t-support.h before stringhelp.h
-	* common/t-stringhelp.c: Ditto.
-	* common/t-support.h: Always include gpg-error.h.
-	* kbx/keybox-search.c: Do not include stringhelp.h so that keybox-defs
-	comes first.
-
-2015-12-11 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix buffer overflow.
-	+ commit 1605e34fc365edd473aac15c9b4e5aadc1d95cf5
-	* g10/keydb.c (keydb_search_desc_dump): Fix buffer overflow.
-
-2015-12-11 Justus Winter <justus@g10code.com>
-
-	agent: Improve error handling.
-	+ commit 25f0f053cd306200a6211b5cf397838a59835ee7
-	* agent/pksign.c (agent_pksign_do): Improve error handling.
-
-	Fix required libgpg-error version.
-	+ commit d6e01493cad6ff32f356185c7a2d2b5c2b86a937
-	* configure.ac (NEED_GPG_ERROR_VERSION): We need version 1.21 for the
-	poll interface.
-
-2015-12-11 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Don't error out if a key occurs multiple times in the keyring.
-	+ commit 6dc37c5fb60acbfd5ba2ab979852383eac8944e0
-	* g10/gpg.c (check_user_ids): Don't error out if a key occurs multiple
-	times in the keyring. Instead, print a warning. When printing out
-	fingerprint prints, use format_hexfingerprint to format them.
-
-2015-12-10 Daniel Hoffend <dh@dotlan.net>
-
-	scd: Fix removal of unplugged usb readers on Windows.
-	+ commit d1a97585c5e73fbc7d4cf90e38f76ffc5aea305f
-	* scd/apdu.c (pcsc_error_to_sw): map PCSC_E_NO_SERVICE and
-	PCSC_E_SERVICE_STOPPED to the internal SW_HOST_NO_READER error code.
-
-2015-12-07 Justus Winter <justus@g10code.com>
-
-	tests: Add some more gpgtar tests.
-	+ commit 1c8eae95a8b3b89bc0f49cb5f4938101634583dc
-	* tests/openpgp/gpgtar.test: Add more tests.
-
-	dirmngr: Initialize http status code.
-	+ commit 71726b627dcff015dc12568021b31d8ccede788a
-	* dirmngr/ks-action.c (ks_action_search): Initialize 'http_status' as
-	it is unused if LDAP is used to search for keys.
-
-2015-12-04 Daiki Ueno <ueno@gnu.org>
-
-	gpg: Write ERROR status on delete-key cancellation.
-	+ commit b5cd68852d0e3485c9e13a8ddb70f05f36a65cb9
-	* g10/delkey.c (do_delete_key): Write ERROR status code with the error
-	location "delete_key.secret", when the user cancelled the operation on
-	Pinentry.
-
-2015-12-04 Justus Winter <justus@g10code.com>
-
-	dirmngr: Stricter handling of http error codes.
-	+ commit 6d64ef869dfbcb7aaa802b80ed648393147e40d8
-	* dirmngr/ks-action.c (ks_action_search): Only retry if the keyserver
-	responded with a '404 Not Found'.
-	* dirmngr/ks-engine-hkp.c (send_request): Return http status code.
-	(ks_hkp_search): Likewise.
-	(ks_hkp_{get,put}): Adapt call to 'send_request'.
-	* dirmngr/ks-engine.h (ks_hkp_search): Update prototype.
-
-	dirmngr: Really search all keyservers for patterns.
-	+ commit 6ac57a482f7ae02db1bee4e4b861288fc6905adc
-	* dirmngr/ks-action.c (ks_action_search): Search all configured
-	keyservers for the given patterns.
-
-	dirmngr: Handle http status '501 Not Implemented'.
-	+ commit a8308ba5231682ce7c7d591a17e7e940fbd63189
-	* dirmngr/ks-engine-hkp.c (send_request): Handle status 501 and return
-	GPG_ERR_NOT_IMPLEMENTED.
-
-	tools/gpgtar: Implement symmetric encryption.
-	+ commit 582e684a48eb4f3716cecf7dc73eb93046efcfad
-	* tests/openpgp/gpgtar.test: Add test case.
-	* tools/gpgtar-create.c (gpgtar_create): Pass '--symmetric' flag to
-	gpg.
-	* tools/gpgtar.c (parse_arguments): We do handle the argument now.
-
-	tools/gpgtar: Implement signing.
-	+ commit 45c814f348c89acd8d21d0607ffcf68e5c5c399e
-	* tests/openpgp/gpgtar.test: Test signing.
-	* tools/gpgtar-create.c (gpgtar_create): Add 'sign' option, add the
-	appropriate gpg arguments to implement signing and selecting the local
-	user.
-	* tools/gpgtar.c (parse_options): We do handle '--local-user' now.
-	(main): Handle signing, encrypting, and doing both when creating an
-	archive.
-	* tools/gpgtar.h (gpgtar_create): Update prototype.
-
-	tools/gpgtar: Use the new exectool helper.
-	+ commit 0c0dafd8e89bb702e856c661c1561e10cdcaf37f
-	* tools/Makefile.am: gpgtar now requires neither npth nor libassuan.
-	* tools/gpgtar-create.c (gpgtar_create): Use the new 'sh-exectool'
-	helper.
-	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
-	* tools/gpgtar-list.c (gpgtar_list): Likewise.
-	* tools/gpgtar.c (main): Set default gpg program. Drop the
-	initialization of npth and libassuan.
-
-	common: Add a stream interface to 'sh-exectool'.
-	+ commit a81aca6e1c2a4529d416d1989f15d7338d2ee81e
-	* common/sh-exectool.c (struct copy_buffer): Add infrastructure for
-	copying between streams.
-	(copy_buffer_{init,shred,do_copy,flush}): New functions.
-	(sh_exec_tool_stream): Rework 'sh_exec_tool' to operate on streams.
-	(nop_free): New function.
-	(sh_exec_tool): Express this in terms of 'sh_exec_tool_stream'.
-	* common/sh-exectool.h (sh_exec_tool_stream): New prototype.
-
-	common: Add header file and build the new code.
-	+ commit d955cb5e0700c6d2b6b26cb210b5a176d22d4235
-	* common/Makefile.am (common_sources): Add new files.
-	* common/sh-exectool.h: New file.
-
-2015-12-04 Werner Koch <wk@gnupg.org>
-
-	common: Add code to execute a helper.
-	+ commit 2ae07f826aa551db8adf714158fce962790a6b54
-	* common/sh-exectool.c: New file.
-
-	Release 2.1.10.
-	+ commit 9fadfdb3109f7ea42aaaa9d745b64c6c90cb8233
-
-
-2015-12-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Japanese translation.
-	+ commit 762fcc027b0b4cc88c1f633804de619273d6a8b9
-
-
-2015-12-04 Werner Koch <wk@gnupg.org>
-
-	speedo,w32: Improve installer.
-	+ commit 0fe3614d9afe42ecf80bbc932366ceeaba0a0ecc
-	* build-aux/speedo/w32/inst.nsi (SEC_gnupg): Install dirmngr.conf and
-	distsigkey.gpg.
-	(un.gnupglast): Stop dirmngr.
-
-	gpg: Do not pre-check keys given on the command line.
-	+ commit 28311d1fa56bfbd801103a8475597459132874f4
-	* g10/keydb.h (PK_LIST_ENCRYPT_TO, PK_LIST_HIDDEN, PK_LIST_CONFIG)
-	(PK_LIST_SHIFT): New.
-	* g10/pkclist.c (build_pk_list): Use them here.
-	* g10/gpg.c (check_user_ids, main): Ditto.
-
-	* g10/gpg.c (main): Set PK_LIST_CONFIG for REMUSR and LOCUSR.
-	(check_user_ids): Skip check for command line specified options.
-
-	dirmngr: Add command to print the resolver version.
-	+ commit 4ff2cae7dee36ffee854c5f05c3e8ee9eb0308dd
-	* dirmngr/server.c (cmd_getinfo): Add sub-command "dnsinfo".
-
-	gpg: Allow "help" as value for --tofu-policy.
-	+ commit 59f6192cb766612ad215bc6a3af13d5b137139e4
-	* g10/gpg.c (parse_tofu_policy): Add keyword "help".
-	(parse_tofu_db_format): Ditto.
-
-	Do not translate messages printed with log_debug.
-	+ commit 218a52787a87be6b7481a39f87d212d6ef594e97
-	* common/asshelp.c (start_new_gpg_agent): Do not i18n string.
-	(start_new_dirmngr): Ditto.
-	* g10/mainproc.c (proc_encrypted): Ditto. Print only if debug is
-	enabled.
-
-2015-12-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for removing the prefix.
-	+ commit f03976f1101f539a2782cd9e87d640fc32a022db
-	* scd/app-openopg.c (do_decipher): Fix the condition.
-
-	scd: Simplify saving application context.
-	+ commit 9639af5f16a7ed908cbce2415330b9fcd88edc90
-	* scd/app.c (lock_table): Remove LAST_APP field.
-	(lock_reader, app_dump_state, application_notify_card_reset)
-	(release_application): Follow the change.
-	(check_conflict): New.
-	(check_application_conflict): Lock the slot and call check_conflict.
-	(select_application): Call check_conflict and not use LAST_APP.
-
-	scd: More fix for Curve25519 prefix handling.
-	+ commit f747adfa21551e083bc947540c64c94a96dcc059
-	* scd/app-openpgp.c (do_decipher): Handle trancated cipher text.
-	Also fix xfree bug introduced.
-
-2015-12-03 Werner Koch <wk@gnupg.org>
-
-	scd: Another fix for Curve25519 prefix handling.
-	+ commit e28f2e7a2f265af8bbdb4979e9679b4396dccdd5
-	* scd/app-openpgp.c (do_decipher): Check 0x02 also for 16+1 byte long
-	INDATA.
-	(do_decipher): Fix integer arithmetic in void pointer.
-	(do_decipher): Add missing memcpy.
-
-	build: Avoid dependecy problems in "make distcheck".
-	+ commit 0f61599ed0bd1cc6842067d040bb58ec0a451715
-	* doc/Makefile.am (gnupg.texi): Depend on defs.inc.
-
-	build: Change how caller provided CFLAGS are used by configure.
-	+ commit 4e9957250eee3521dc979912a4818e58ffddc5b8
-	* configure.ac: Append instead of prepend caller provided CFLAGS.
-
-	gpg: Add variant of 'key "%s" not found: %s' error message.
-	+ commit 5e2c5e9ec5b75fae886e1294adbdb7ad2ac12827
-	* g10/gpg.c (check_user_ids): Change error message.
-	* g10/delkey.c (do_delete_key): Ditto.
-
-	gpg: Make keyidlist more robust in case of errors.
-	+ commit 50a568e7380752454c029eac2b57d8803b1cb287
-	* g10/keyserver.c (keyidlist): Clear *KLIST on error.
-
-	gpg: Take care of keydb_new returning NULL.
-	+ commit a28ac99efead8be73ea1704abe1611ccc4811c54
-	* g10/keydb.c (keydb_new): Print an error message if needed. Also use
-	xtrycalloc because we return an error anyway.
-	* g10/delkey.c (do_delete_key): Handle error retruned by keydb_new.
-	* g10/export.c (do_export_stream): Ditto.
-	* g10/getkey.c (get_pubkey): Ditto.
-	(get_pubkey_fast): Ditto.
-	(get_pubkeyblock): Ditto.
-	(get_seckey): Ditto.
-	(key_byname): Ditto.
-	(get_pubkey_byfprint): Ditto.
-	(get_pubkey_byfprint_fast): Ditto.
-	(parse_def_secret_key): Ditto.
-	(have_secret_key_with_kid): Ditto.
-	* g10/import.c (import_one): Ditto.
-	(import_revoke_cert): Ditto.
-	* g10/keyedit.c (keyedit_quick_adduid): Ditto.
-	* g10/keygen.c (quick_generate_keypair): Ditto.
-	(do_generate_keypair): Ditto.
-	* g10/trustdb.c (validate_keys): Ditto.
-	* g10/keyserver.c (keyidlist): Ditto.
-	* g10/revoke.c (gen_desig_revoke): Ditto.
-	(gen_revoke): Ditto.
-	* g10/gpg.c (check_user_ids): Ditto.
-	(main): Do not print an error message for keydb_new error.
-	* g10/keylist.c (list_all): Use actual error code returned by
-	keydb_new.
-
-	* g10/t-keydb-get-keyblock.c (do_test): Abort on keydb_new error.
-	* g10/t-keydb.c (do_test): Ditto.
-
-	* g10/keyring.c (keyring_new): Actually return an error so that the
-	existing keydb_new error checking makes sense for a keyring resource.
-	(keyring_rebuild_cache): Take care of keyring_new returning an error.
-
-	gpg: Change some error messages.
-	+ commit 9fcc047d921bde95b6807325b7fd2b697e89907f
-	* g10/getkey.c (parse_def_secret_key): Change error message. Replace
-	log_debug by log_info.
-	* g10/gpg.c (check_user_ids): Make function static. Change error
-	messages.
-	(main): Change error messages.
-	* g10/revoke.c (gen_revoke): Ditto.
-
-2015-12-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix "Conflicting usage" bug.
-	+ commit f42c50dbf00c2e6298ca6830cbe6d36805fa54a3
-	* scd/apdu.c (apdu_close_reader): Call CLOSE_READER method even if we
-	 got an error from apdu_disconnect.
-	* scd/app-common.h (no_reuse): Remove.
-	* scd/app.c (application_notify_card_reset): Deallocate APP here.
-	(select_application, release_application): Don't use NO_REUSE.
-
-	scd: Fix for Curve25519 prefix handling.
-	+ commit 11b2691eddc42e91651e4f95dd2731255a3e9211
-	* scd/app-openpgp.c (do_decipher): More condition for AES decipher.
-	 Handle the prefix in cipher text. Always add the prefix in result.
-
-2015-12-03 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Use the matching key if the search description is exact.
-	+ commit cedbd4709eed6fead9d1b271f96860c00547c77c
-	* g10/gpg.c (check_user_ids): If the search description is for an
-	exact match (a keyid or fingerprint that ends in '!'), then use the
-	matching key, not the primary key.
-	* tests/openpgp/Makefile.am (TESTS): Add use-exact-key.test.
-	(priv_keys): Add privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc,
-	privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc,
-	privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc,
-	privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc and
-	privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc.
-	(sample_keys): Add
-	samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc.
-	* tests/openpgp/privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc:
-	New file.
-	* tests/openpgp/privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc:
-	New file.
-	* tests/openpgp/privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc:
-	New file.
-	* tests/openpgp/privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc:
-	New file.
-	* tests/openpgp/privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc:
-	New file.
-	* tests/openpgp/samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc:
-	New file.
-	* tests/openpgp/use-exact-key.test: New file.
-	* tests/openpgp/version.test: Install the new private keys.
-
-2015-12-02 Werner Koch <wk@gnupg.org>
-
-	build: Require at least Libassuan 2.4.1.
-	+ commit 69db3285e4612ad24462149a4d64cc32c090a491
-	* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1.
-	* agent/gpg-agent.c (create_server_socket): Remove check for
-	libassuan >= 2.3.0 and >= 2.1.4.
-	(main): Remove check for libassuan >= 2.1.4.
-	* scd/scdaemon.c (create_server_socket): Remove check for
-	libassuan >= 2.1.4.
-	* dirmngr/dirmngr.c (set_tor_mode): Remove check for
-	libassuan >= 2.3.0.
-	* dirmngr/http.c (http_raw_connect, send_request): Remove checks for
-	libassuan >= 2.3.0.
-
-2015-12-02 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Improve documentation.
-	+ commit 28195f8d27aa0fc9daf5b74fb24de87c36e04739
-	* g10/tofu.c (initdb): Improve documentation.
-
-	gpg: Fix type mismatch resulting in a buffer overflow.
-	+ commit c73d75103cbd34975e2bd28e9924caee05eaf829
-	* g10/tofu.c (record_binding): Change policy_old's type from an enum
-	tofu_policy to a long: this variable is passed by reference and a long
-	is expected.
-
-2015-12-02 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Switch to an onion address if Tor is running.
-	+ commit 28e2513721ff0cec920564d4087f3600cce8672e
-	* dirmngr/dirmngr.h (opt): Turn field 'keyserver' into an strlist.
-	* dirmngr/dirmngr.c (parse_rereadable_options): Allow multiple
-	--keyserver options.
-	* dirmngr/server.c (server_local_s): Add field 'tor_state'.
-	(release_uri_item_list): New.
-	(release_ctrl_keyservers): Use it.
-	(start_command_handler): Release list of keyservers.
-	(is_tor_running): New.
-	(cmd_getinfo): Re-implement "tor" subcommand using new fucntion.
-	(ensure_keyserver): Rewrite.
-	* g10/dirmngr-conf.skel: Add two keyserver options.
-
-	http: Enhance parser to detect .onion addresses.
-	+ commit 17ac843871d5f350f26edff0187f94ced923f534
-	* dirmngr/http.h (parsed_uri_s): Add flag 'onion'.
-	* dirmngr/http.c (do_parse_uri): Set that flag.
-	* dirmngr/t-http.c (main): Print flags.
-
-2015-12-02 Neal H. Walfield <neal@g10code.com>
-
-	common,gpg: Fix processing of search descriptions ending in '!'.
-	+ commit 10cca02c4c70eee993d4df0a1d20ae841992efe9
-	* g10/gpg.c (check_user_ids): If the search description describes a
-	keyid or fingerprint and ends in a '!', include the '!' in the
-	rewritten description.
-	* common/userids.c (classify_user_id): Accept keyids and fingerprints
-	ending in '!'.
-
-2015-12-01 Justus Winter <justus@g10code.com>
-
-	dirmngr: Improve error handling.
-	+ commit 9c34711539fc2c34aea8da0fd49ae6aa28991518
-	* dirmngr/dns-stuff.c (getsrv): Avoid looking at 'header' before
-	checking for errors, but silently ignore errors when looking up SRV
-	records.
-
-2015-12-01 Werner Koch <wk@gnupg.org>
-
-	build: Let configure show the the status of Tor support.
-	+ commit 3be12d1e1b8334fb2bba307ec9efbc004f1dbf8d
-	* configure.ac (show_tor_support): New
-
-2015-11-30 Werner Koch <wk@gnupg.org>
-
-	doc: Make make distcheck work again.
-	+ commit 4ecb5db804003c10c57bdc0dc7f1d9649c5ba6f8
-	* doc/Makefile.am (DISTCLEANFILES): Add gpgkey2ssh.1
-
-	yat2m: Add keyword @url.
-	+ commit b4756a54a55fcd51717c149e19191a2eeaa6a919
-	* doc/yat2m.c (proc_texi_cmd): Add keyword @url.
-
-	doc: Build man pages with the same date as the info files.
-	+ commit 081c902f16a2f251df4593f090b3978dfa473a26
-	* doc/Makefile.am (yat2m-stamp): Use option --date.
-
-	yat2m: New option --date.
-	+ commit 75eb071354d1f862bac09c56c8ab81dae8883270
-	* doc/yat2m.c (opt_date): new.
-	(isodatestring): Use it if set.
-	(main): New option --date.
-
-2015-11-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid extra translation strings.
-	+ commit 686f31c3d5aee0d2825265869ae92ca95cdcabae
-	* g10/keyedit.c (menu_expire): Use only one prompt.
-
-	kbx: Include gpg-error prior to mischelp.h.
-	+ commit 436a154ea85e4dffbde7c3b316fbfca1b066aa2a
-	* kbx/keybox-init.c: Change order of includes.
-
-	gpg,w32: Fix a format string error.
-	+ commit 7c856f99144b84ac30e0c9a192f09dc36d93190a
-	* g10/keyring.c (keyring_search): Fix format string for off_t.
-
-	Silence compiler warnings related to not using assuan_fd_t.
-	+ commit 501436ab0f9d8e7d56b2f5e344006be5f5a3c653
-	* common/call-gpg.c (start_gpg): Use assuan_fd_t. Note that the
-	declaration was already fixed by a previous change.
-	* dirmngr/server.c (cmd_getinfo): Use assuan_fd_t.
-
-	Avoid incompatible pointer assignment warnings on Windows.
-	+ commit 64e87083394d38998feab359caac917bcc6139d3
-	* common/logging.c (fun_writer): Use gpgrt_ssize_t instead of ssize_t.
-	* dirmngr/server.c (data_line_cookie_write): Ditto.
-	* sm/certdump.c (format_name_writer): Ditto.
-	* sm/server.c (data_line_cookie_write): Ditto.
-	* dirmngr/http.c (cookie_read, cookie_write): Ditto.
-
-	dirmngr: Avoid a declarations after statements.
-	+ commit 100f34e869df899a695f5e5ef1b8e092baf91751
-	* tools/gpgtar.c (parse_arguments): Use a block for a local varibale
-	definition.
-
-	dirmngr: Avoid casting away a const from an char**.
-	+ commit 6501741d2c1beb8060198a39a1aa950cb11b386f
-	* dirmngr/ldap.c (start_cert_fetch_ldap): Do not use pointers from
-	global variables.
-
-	dirmngr: Allow testing for a running Tor via "getinfo tor".
-	+ commit da5a232199ef93be219e933a7eaf4ccfc6d24d61
-	* dirmngr/server.c (cmd_getinfo): Print an S line if Tor is not
-	running.
-
-2015-11-26 Werner Koch <wk@gnupg.org>
-
-	g13: Fix commit 1a045b13.
-	+ commit 82f6abb4807c89388052ab442368d9e09fb84aea
-	* g13/g13.c (main): Use existsing function.
-
-	common: Fix off-by-one access in the new format_text.
-	+ commit 61941a984964308b09c7fc1b3438fb99d0b3c917
-	* common/stringhelp.c (format_text): Use existsing fucntion to trim
-	trailing spaces. Fix off-by-one access.
-
-	dirmngr: Improve output of "getinfo tor".
-	+ commit d226e67856e7197c581dcd2cef0f1e687bee0ac9
-	* dirmngr/server.c (cmd_getinfo): Print a message along with OK.
-
-	dirmngr: Let Libassuan employ nPth wrappers for connect.
-	+ commit f95cff1cc9e7a4d9f6b7c45188ec47e70f9874dc
-	* dirmngr/http.c (my_unprotect, my_protect): Remove.
-	(connect_server): Do not use these wrappers.
-
-2015-11-26 Justus Winter <justus@g10code.com>
-
-	tools/gpgtar: Add '--dry-run'.
-	+ commit 676b2d7081291f7e47a66755ab07af259fea130b
-	* tools/gpgtar-extract.c (extract_{regular,directory}): Honor
-	'--dry-run'.
-	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
-	(opts): Add '--dry-run'.
-	(parse_arguments): Handle '--dry-run'.
-	* tools/gpgtar.h (opt): Add field 'dry_run'.
-
-	tools/gpgtar: Handle '--gpg-args'.
-	+ commit 69a8440f44fa025e33a4cc32d17695c9ac385043
-	* tools/gpgtar-create.c (gpgtar_create): Use given arguments.
-	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
-	* tools/gpgtar-list.c (gpgtar_list): Likewise.
-	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
-	(opts): Add 'gpg-args'.
-	(parse_arguments): Handle arguments.
-	* tools/gpgtar.h (opt): Add field 'gpg_arguments'.
-	* tests/openpgp/gpgtar.test: Simplify accordingly.
-
-	common: Make the GPG arguments configurable in call-gpg.
-	+ commit 1a045b1324efabe7423a8d00245f01718ed72556
-	* common/call-gpg.c (start_gpg): Add parameter 'gpg_arguments'.
-	(_gpg_encrypt, gpg_encrypt_blob, gpg_encrypt_stream): Likewise.
-	(_gpg_decrypt, gpg_decrypt_blob, gpg_decrypt_stream): Likewise.
-	* common/call-gpg.h: Adapt prototypes.
-	* g13/create.c (encrypt_keyblob): Adapt callsite.
-	* g13/g13-common.h (opt): Add field 'gpg_arguments'.
-	* g13/g13.c (main): Construct default arguments.
-	* g13/mount.c (decrypt_keyblob): Adapt callsite.
-	* tools/gpgtar-create.c (gpgtar_create): Likewise.
-	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
-	* tools/gpgtar-list.c (gpgtar_list): Likewise.
-
-	tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip.
-	+ commit 2eb3248058330dd5c37560d9887db5b5266c54fe
-	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
-	(opts): Add new group for tar options, rearrange a little, add
-	'--tar-args'.
-	(tar_opts): New variable.
-	(shell_parse_stringlist): New function.
-	(shell_parse_argv): Likewise.
-	(parse_arguments): Add option argument, handle '--tar-args'.
-	(main): Fix invokation of 'parse_arguments'.
-	* tests/openpgp/gpgtar.test: Simplify decryption.
-
-	tools/gpgtar: Rework argument parsing.
-	+ commit 35c0c8b211bc891335e822379b33ea34fbc1f84f
-	* tools/gpgtar.c (main): Move argument parsing into its own function.
-
-2015-11-25 Justus Winter <justus@g10code.com>
-
-	tests: Add tests for gpgtar and gpg-zip.
-	+ commit 556e8c44267fe3b829ca06286e9b5637ca1a6a73
-	* tests/openpgp/Makefile.am (TESTS): Add new file.
-	* tests/openpgp/gpgtar.test: New file.
-
-	tools/gpgtar: Handle '--directory' argument.
-	+ commit 127aba9a4d6c1aabb4a18a74b16d3bddc6eb5c54
-	* tools/gpgtar-extract.c (gpgtar_extract): Only generate a directory
-	name if none is given via arguments.
-	* tools/gpgtar.c (enum cmd_and_opt_values): New constant.
-	(opts): Add argument.
-	(main): Parse argument.
-	* tools/gpgtar.h (opt): New field 'directory'.
-
-	tools/gpgtar: Handle '--gpg' argument.
-	+ commit 89e104eb38c3a6896892ff09db11cb1bae2bb0d3
-	* tools/gpgtar-create.c (gpgtar_create): Use given gpg program.
-	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
-	* tools/gpgtar-list.c (gpgtar_list): Likewise.
-	* tools/gpgtar.c (enum cmd_and_opt_values): New constant.
-	(opts): Add argument.
-	(main): Handle argument.
-	* tools/gpgtar.h (opt): Add field 'gpg_program'.
-
-	tools/gpgtar: Improve error handling.
-	+ commit f76fb047c15914ba44dc9423d235484758bcd721
-	* tools/gpgtar-create.c (gpgtar_create): Return an error code, fix
-	error handling.
-	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
-	* tools/gpgtar-list.c (read_header): Return an error code.
-	(gpgtar_list): Return an error code, fix error handling.
-	(gpgtar_read_header): Return an error code.
-	* tools/gpgtar.c: Add missing include.
-	(main): Print an generic error message if a command failed and no
-	error has been printed yet.
-	* tools/gpgtar.h (gpgtar_{create,extract,list,read_header}): Fix the
-	prototypes accordingly.
-
-	tools: Add encryption and decryption support to gpgtar.
-	+ commit 40dbee86f3043aff8a8c2055521e270318e33068
-	* tools/Makefile.am: Amend CFLAGS and LDADD.
-	* tools/gpgtar-create.c (gpgtar_create): Add encrypt flag and encrypt
-	stream if requested.
-	* tools/gpgtar-extract.c (gpgtar_extract): Likewise for decryption.
-	* tools/gpgtar-list.c (gpgtar_list): Likewise.
-	* tools/gpgtar.c (main): Initialize npth and assuan. Parse recipient
-	and local user, and note which flags are currently ignored. Adapt
-	calls to gpgtar_list and friends.
-	(tar_and_encrypt): Drop stub function and prototype.
-	(decrypt_and_untar): Likewise.
-	(decrypt_and_list): Likewise.
-	* tools/gpgtar.h (gpgtar_{create,extract,list}): Add encryption or
-	decryption argument.
-
-	common: Add stream interface to call-pgp.
-	+ commit 03bf88f32c8d203d5b3bfbbc48cc45e6c08cc187
-	* common/call-gpg.c (struct writer_thread_parms): Add field 'stream'.
-	(writer_thread_main): Support reading from a stream.
-	(start_writer): Add stream argument.
-	(struct reader_thread_parms): Add field 'stream'.
-	(reader_thread_main): Support writing to a stream.
-	(start_reader): Add stream argument.
-	(_gpg_encrypt): Add stream api.
-	(gpg_encrypt_blob): Adapt accordingly.
-	(gpg_encrypt_stream): New function.
-	(_gpg_decrypt): Add stream api.
-	(gpg_decrypt_blob): Adapt accordingly.
-	(gpg_decrypt_stream): New function.
-	* common/call-gpg.h (gpg_encrypt_stream): New prototype.
-	(gpg_decrypt_stream): Likewise.
-
-	common: Refactor the call-gpg code.
-	+ commit cb18d802308bde4e28219417bb4d107a4c0001b4
-	* common/call-gpg.c (gpg_{en,de}crypt_blob): Move most of the code
-	into two new functions, _gpg_encrypt and _gpg_decrypt.
-
-	g13: Move 'call-gpg.c' to common.
-	+ commit ba1a5cc17d43d9cba32447876f06a8ab8f97e5ae
-	* common/Makefile.am (common_sources): Add files.
-	* g13/call-gpg.c: Move to 'common' and adapt slightly. Add a
-	parameter to let callees override the gpg program to execute.
-	* g13/call-gpg.h: Likewise.
-	* g13/Makefile.am (g13_SOURCES): Drop files.
-	* g13/create.c (encrypt_keyblob): Hand in the gpg program to execute.
-	* g13/mount.c (decrypt_keyblob): Likewise.
-
-2015-11-24 Neal H. Walfield <neal@g10code.com>
-
-	gpg: When comparing keyids, use the keyid, not the fingerprint's suffix.
-	+ commit e9c16fee2576c772de9d4fb5d53fee28e4b84202
-	* g10/keyedit.c (menu_select_key): Use spacep and hexdigitp instead of
-	inline tests. Don't compare P to the suffix of the fingerprint. If P
-	appears to be a keyid, do an exact compare against the keyid. If it
-	appears to be a fingerprint, do an exact compare against the
-	fingerprint.
-
-2015-11-23 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Reflow long texts.
-	+ commit 19362a8dd7ee986c082a5afc5a446f939991ec0f
-	* common/stringhelp.c (format_text): New function.
-	* common/t-stringhelp.c (stresc): New function.
-	(test_format_text): New function. Test format_text.
-	* g10/tofu.c (get_trust): Use format_text to reflow long texts.
-	(show_statistics): Likewise.
-
-	common: Extend utf8_charcount to include the string's length.
-	+ commit 5b84b0d660c8329e184d98682665aaea7e1703d2
-	* common/stringhelp.c (utf8_charcount): Take additional parameter,
-	len. Process at most LEN bytes.
-
-2015-11-23 Justus Winter <justus@g10code.com>
-
-	dirmngr: Fix http lookups when libadns is used.
-	+ commit b75e1b3d8b1643640d046f7f8e89adf5b1caa7a3
-	* dirmngr/dns-stuff.c (resolve_name_adns): Fill in the port.
-
-	dirmngr: Fix SRV record lookups when using the system resolver.
-	+ commit 946faaff04f3340ed6db9e89c5036dc5f9beca6a
-	* dirmngr/dns-stuff.c (getsrv): Fix error handling.
-
-	dirmngr: Honor ports specified in SRV records.
-	+ commit 73c1a86ad937d7be027eece991c69aaeb6a1f092
-	* dirmngr/ks-engine-hkp.c (struct hostinfo_s): New field 'port'.
-	(create_new_hostinfo): Initialize 'port'.
-	(add_host): Add host parameter and update the hosttable entry.
-	(map_host): Return port if known, adjust calls to 'add_host'.
-	(make_host_part): Let 'map_host' specify the port if known.
-
-	dirmngr: Support hkp server pools using SRV records.
-	+ commit c9f5aa15793b3c05c1b92af401b23ab34d3e6196
-	* dirmngr/ks-engine-hkp.c (map_host): Handle SRV records.
-
-	dirmngr: Refactor 'map_host'.
-	+ commit 3f52f6bcacfe3877d30a21464e93e9240bc75085
-	* dirmngr/ks-engine-hkp.c (add_host): New function.
-	(map_host): Use the new function.
-
-	dirmngr: Fix pool detection.
-	+ commit 23ea641ba2a063cc99c82869061703d48bc674b2
-	* dirmngr/ks-engine-hkp (arecords_is_pool): Fix counting IP addresses.
-
-	dirmngr: Refactor 'map_host'.
-	+ commit 2b43a0515868b8720009e48d7a1f32d571767f14
-	* dirmngr/ks-engine-hkp.c (arecords_is_pool): New function.
-	(map_host): Use the new function.
-
-	dirmngr: Start dirmngr on demand.
-	+ commit a9e0b1dd6c106e243e3fbbaa1838b56a1f1c8584
-	* common/asshelp.h: Include 'util.h'.
-	* dirmngr/dirmngr-client.c (main): Use 'start_new_dirmngr' to connect
-	to the dirmngr.
-	(start_dirmngr): Drop now unused declaration and function.
-
-2015-11-23 Neal H. Walfield <neal@g10code.com>
-
-	gpg: If sqlite is not available, don't build things depending on it.
-	+ commit 770c06ed4e6c1097d6e305a0a9427c3c783b787c
-	* configure.ac: Define the automake conditional SQLITE3.
-	* tests/openpgp/Makefile.am (TESTS): Move the sqlite3 dependent tests
-	to...
-	(sqlite3_dependent_tests): ... this new variable. If SQLITE3 is not
-	defined, then clear this variable.
-
-	gpg: Allow updating the expiration time of multiple subkeys at once.
-	+ commit b64b33bb80a8cf5dcc1fdbc62023d019fe2c8cb1
-	* g10/keyedit.c (menu_expire): Allow updating the expiration time of
-	multiple subkeys at once.
-
-	gpg: Don't crash if key is not passed an argument.
-	+ commit 19f099463c82c119288a05eaefc42bf09d617377
-	* g10/keyedit.c (menu_select_key): Don't crash if P is NULL.
-
-2015-11-20 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fail if the search description passed to --gen-revoke is ambiguous.
-	+ commit 178af9c3f56d385fe28a9e5e8bde0ab34c0b260e
-	* g10/revoke.c (gen_revoke): Error out if the search description is
-	ambiguous.
-
-	gpg: Refactor print_seckey_info.
-	+ commit f8a65ac96b27a0963892892ce6e93b37b8df1ad7
-	* g10/keylist.c (print_seckey_info): Break formatting functionality
-	into...
-	(format_seckey_info): ... this new function.
-
-	gpg: Improve an error message.
-	+ commit 46e128d44a0456dc603bc9e25a4c5d8da903b078
-	* g10/revoke.c (gen_revoke): Provide a more descriptive error message
-	if searching for a key fails.
-
-2015-11-19 Justus Winter <justus@g10code.com>
-
-	dirmngr: Improve error handling.
-	+ commit 6b14df5525777ee0330a34a7b335359f562616a4
-	* dirmngr/crlcache.c (crl_cache_cert_isvalid): Add missing break.
-
-	dirmngr: Fix memory leak.
-	+ commit b223cde311e4e02f7983e33fe3d7214287dfb678
-	* dirmngr/ldap.c (start_cert_fetch_ldap): Avoid leaking all malloc'ed
-	arguments.
-
-	agent: Improve error handling.
-	+ commit a1650b1edf80c2526c0576547b3a574e8d30f1fa
-	* agent/trustlist.c (istrusted_internal): Initialize 'err'.
-
-	common: Avoid undefined behavior.
-	+ commit eb957ffc4797fb019c505510295af244baf5be38
-	* common/iobuf.c (iobuf_esopen): Initialize 'len' as 'file_es_filter'
-	will make use of it.
-
-	g10: Avoid undefined behavior.
-	+ commit 52f7f195b119dc01bdf3ae200fdc8e04a0bb9bcb
-	* g10/trust.c (clean_one_uid): Avoid a computation involving an
-	uninitialized value.
-
-	scd: Improve error handling.
-	+ commit 6a37b45a7f13cf5d2ae7d6c9cd796a4bd197b80d
-	* scd/app-openpgp.c (get_public_key): Improve error handling.
-
-2015-11-18 Justus Winter <justus@g10code.com>
-
-	dirmngr: Gracefully handle premature termination of TLS streams.
-	+ commit eb54fca4bf3ef8e0cd50b01df5b40e0d6d318d7e
-	* dirmngr/http.c (close_tls_session): New function.
-	(session_unref): Use the new function to close the TLS stream.
-	(cookie_read): If the stream terminated prematurely, close it and
-	return a short read.
-
-2015-11-17 Neal H. Walfield <neal@g10code.com>
-	 Michael Mönch <michael.moench@marktjagd.de>
-
-	tools: Fix option parsing for gpg-zip.
-	+ commit 84ebf15b06e435453b2f58775f97a3a1c61a7e55
-	* tools/gpg-zip.in: Correctly set GPG when --gpg is specified.
-	Correctly set TAR when --tar is specified. Pass TAR_ARGS to tar.
-
-2015-11-17 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Allow selecting subkeys using a keyid.
-	+ commit 0b86c7463c8c057496b38e06c00f0ae4288dad49
-	* g10/keyedit.c (menu_select_key): Take an additional argument, p.
-	Update callers. If P is a hex string, then assume that P is a key id
-	or fingerprint and select subkeys with matching key ids or
-	fingerprints.
-	* doc/gpg.texi: Update documentation for the key subcommand.
-
-2015-11-17 Justus Winter <justus@g10code.com>
-
-	dirmngr: Fix specifying keyservers by IP address.
-	+ commit 1e3dbb15affd6d75a477aa17715d8e5470988c08
-	* dirmngr/ks-engine-hkp.c (map_host): Update the original 'hosttable'
-	entry instead of creating another one.
-
-2015-11-17 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Change keydb_search to not return legacy keys.
-	+ commit 58e4a492e2c8e908d16135486ed601f602f1e38d
-	* g10/keyring.c (keyring_search): Take new argument, ignore_legacy.
-	If set, skip any legacy keys. Update callers.
-	* g10/keydb.c (keydb_search): Skip any legacy keys.
-	(keydb_search_first): Don't skip legacy keys. Treat them
-	as an error.
-	(keydb_search_next): Likewise.
-	(keydb_search_fpr): Likewise.
-	* g10/export.c (do_export_stream): Likewise.
-	* g10/getkey.c (lookup): Likewise.
-	(have_secret_key_with_kid): Likewise.
-	* g10/keylist.c (list_all): Likewise.
-	(keyring_rebuild_cache): Likewise.
-	* g10/keyserver.c (keyidlist): Likewise.
-	* g10/trustdb.c (validate_key_list): Likewise.
-
-	gpg: Correctly handle an error.
-	+ commit 848726f5c02faddb0b0fd24ce1a66893f5325675
-	* g10/keyring.c (keyring_search): If a compare function returns an
-	error, treat it as an error.
-
-	gpg: Correctly handle keyblocks followed by legacy keys.
-	+ commit ad9befab12376b3a49cde410996ac9f0013d0871
-	* g10/keyring.c (keyring_get_keyblock): If we encounter a legacy
-	packet after already having some non-legacy packets, then treat the
-	legacy packet as a keyblock boundary, not as part of the keyblock.
-	* g10/t-keydb-get-keyblock.c: New file.
-	* g10/t-keydb-get-keyblock.gpg: New file.
-	* g10/Makefile.am (EXTRA_DIST): Add t-keydb-get-keyblock.gpg.
-	(module_tests): Add t-keydb-get-keyblock.
-	(t_keydb_get_keyblock_SOURCES): New variable.
-	(t_keydb_get_keyblock_LDADD): Likewise.
-
-	gpg: Make debugging search descriptors easier.
-	+ commit 11ec4785df1646643966d872b1b53ef675092c98
-	* g10/keydb.c (dump_search_desc): Rename from this...
-	(keydb_search_desc_dump): ... to this. Only process a single search
-	descriptor. Improve output. Don't mark as static. Update callers.
-
-	gpg: Add function format_keyid.
-	+ commit a052c30d31c0f6b532fea081f4a9bee083f5440f
-	* g10/options.h (opt.keyid_format): Add new value KF_DEFAULT.
-	* g10/keyid.c (format_keyid): New function.
-	(keystr): Use it.
-
-	gpg: Use a more appropriate error code.
-	+ commit eae982ed6d69644258afe9c4ad1be553853d8403
-	* g10/gpg.c (check_user_ids): Return a more appropriate error code if
-	a user id is ambiguous.
-
-2015-11-17 Justus Winter <justus@g10code.com>
-
-	Fix typos found using codespell.
-	+ commit a9e0905342e847e8961ec4fe9b3aaedf05e33423
-	* agent/cache.c: Fix typos.
-	* agent/call-pinentry.c: Likewise.
-	* agent/call-scd.c: Likewise.
-	* agent/command-ssh.c: Likewise.
-	* agent/command.c: Likewise.
-	* agent/divert-scd.c: Likewise.
-	* agent/findkey.c: Likewise.
-	* agent/gpg-agent.c: Likewise.
-	* agent/w32main.c: Likewise.
-	* common/argparse.c: Likewise.
-	* common/audit.c: Likewise.
-	* common/audit.h: Likewise.
-	* common/convert.c: Likewise.
-	* common/dotlock.c: Likewise.
-	* common/exechelp-posix.c: Likewise.
-	* common/exechelp-w32.c: Likewise.
-	* common/exechelp-w32ce.c: Likewise.
-	* common/exechelp.h: Likewise.
-	* common/helpfile.c: Likewise.
-	* common/i18n.h: Likewise.
-	* common/iobuf.c: Likewise.
-	* common/iobuf.h: Likewise.
-	* common/localename.c: Likewise.
-	* common/logging.c: Likewise.
-	* common/openpgp-oid.c: Likewise.
-	* common/session-env.c: Likewise.
-	* common/sexputil.c: Likewise.
-	* common/sysutils.c: Likewise.
-	* common/t-sexputil.c: Likewise.
-	* common/ttyio.c: Likewise.
-	* common/util.h: Likewise.
-	* dirmngr/cdblib.c: Likewise.
-	* dirmngr/certcache.c: Likewise.
-	* dirmngr/crlcache.c: Likewise.
-	* dirmngr/dirmngr-client.c: Likewise.
-	* dirmngr/dirmngr.c: Likewise.
-	* dirmngr/dirmngr_ldap.c: Likewise.
-	* dirmngr/dns-stuff.c: Likewise.
-	* dirmngr/http.c: Likewise.
-	* dirmngr/ks-engine-hkp.c: Likewise.
-	* dirmngr/ks-engine-ldap.c: Likewise.
-	* dirmngr/ldap-wrapper.c: Likewise.
-	* dirmngr/ldap.c: Likewise.
-	* dirmngr/misc.c: Likewise.
-	* dirmngr/ocsp.c: Likewise.
-	* dirmngr/validate.c: Likewise.
-	* g10/encrypt.c: Likewise.
-	* g10/getkey.c: Likewise.
-	* g10/gpg.c: Likewise.
-	* g10/gpgv.c: Likewise.
-	* g10/import.c: Likewise.
-	* g10/keydb.c: Likewise.
-	* g10/keydb.h: Likewise.
-	* g10/keygen.c: Likewise.
-	* g10/keyid.c: Likewise.
-	* g10/keylist.c: Likewise.
-	* g10/keyring.c: Likewise.
-	* g10/mainproc.c: Likewise.
-	* g10/misc.c: Likewise.
-	* g10/options.h: Likewise.
-	* g10/packet.h: Likewise.
-	* g10/parse-packet.c: Likewise.
-	* g10/pkclist.c: Likewise.
-	* g10/pkglue.c: Likewise.
-	* g10/plaintext.c: Likewise.
-	* g10/server.c: Likewise.
-	* g10/sig-check.c: Likewise.
-	* g10/sqlite.c: Likewise.
-	* g10/tdbio.c: Likewise.
-	* g10/test-stubs.c: Likewise.
-	* g10/tofu.c: Likewise.
-	* g10/trust.c: Likewise.
-	* g10/trustdb.c: Likewise.
-	* g13/create.c: Likewise.
-	* g13/mountinfo.c: Likewise.
-	* kbx/keybox-blob.c: Likewise.
-	* kbx/keybox-file.c: Likewise.
-	* kbx/keybox-init.c: Likewise.
-	* kbx/keybox-search-desc.h: Likewise.
-	* kbx/keybox-search.c: Likewise.
-	* kbx/keybox-update.c: Likewise.
-	* scd/apdu.c: Likewise.
-	* scd/app-openpgp.c: Likewise.
-	* scd/app-p15.c: Likewise.
-	* scd/app.c: Likewise.
-	* scd/ccid-driver.c: Likewise.
-	* scd/command.c: Likewise.
-	* scd/iso7816.c: Likewise.
-	* sm/base64.c: Likewise.
-	* sm/call-agent.c: Likewise.
-	* sm/call-dirmngr.c: Likewise.
-	* sm/certchain.c: Likewise.
-	* sm/gpgsm.c: Likewise.
-	* sm/import.c: Likewise.
-	* sm/keydb.c: Likewise.
-	* sm/minip12.c: Likewise.
-	* sm/qualified.c: Likewise.
-	* sm/server.c: Likewise.
-	* tools/gpg-check-pattern.c: Likewise.
-	* tools/gpgconf-comp.c: Likewise.
-	* tools/gpgkey2ssh.c: Likewise.
-	* tools/gpgparsemail.c: Likewise.
-	* tools/gpgtar.c: Likewise.
-	* tools/rfc822parse.c: Likewise.
-	* tools/symcryptrun.c: Likewise.
-
-2015-11-16 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix error checking and improve error reporting.
-	+ commit 8e2bea22b0927f4f95a248cc7517f407a705d8a8
-	* g10/gpg.c (check_user_ids): Differentiate between a second result
-	and an error. If the key specification is ambiguous or an error
-	occurs, set RC appropriately.
-
-2015-11-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Use only one fingerprint formatting function.
-	+ commit 3689c2105aab6a4304e9464c5b20207d69b9a133
-	* g10/gpg.h (MAX_FORMATTED_FINGERPRINT_LEN): New.
-	* g10/keyid.c (hexfingerprint): Add optional args BUFFER and BUFLEN.
-	Change all callers.
-	(format_hexfingerprint): New.
-	* g10/keylist.c (print_fingerprint): Change to use hexfingerprint.
-	* g10/tofu.c (fingerprint_format): Remove. Replace calls by
-	format_hexfingerprint.
-
-2015-11-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Simplify the tofu interface by using the public key packet.
-	+ commit e7d7160ab7cd4e6b460bfe36fd3a7275adadb4e2
-	* g10/tofu.c (fingerprint_str): Remove.
-	(tofu_register): Take a public key instead of a fingerprint as arg.
-	Use hexfingerprint() to get a fpr from the PK.
-	(tofu_get_validity): Ditto.
-	(tofu_set_policy, tofu_get_policy): Simplify by using hexfingerprint.
-	* g10/trustdb.c (tdb_get_validity_core): Pass the primary key PK to
-	instead of the fingerprint to the tofu functions.
-
-	gpg: Make trusted-key override for Tofu robust against swapped tofu.db.
-	+ commit 7de8376430625c1f6f3a58ae16276deca8ff6a82
-	* g10/tofu.c (get_trust): For the UTK check lookup the key by
-	fingerprint.
-
-	gpg: Fix regression in --locate-keys (in 2.1.9).
-	+ commit 7e59fb21f728b5f54468cd35b1415a2f86003d4f
-	* g10/getkey.c (getkey_ctx_s): Add field "extra_list".
-	(get_pubkey_byname): Store strings in the context.
-	(getkey_end): Free EXTRA_LIST.
-
-2015-11-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Print a new EXPORTED status line.
-	+ commit 2038adf16d0e7eeb614043aae17b16a867de6b70
-	* common/status.h (STATUS_EXPORTED): New.
-	* g10/export.c (print_status_exported): New.
-	(do_export_stream): Call that function.
-
-	gpg: Print export statistics to the status-fd.
-	+ commit e3c48335f9c5081c6080bceafa7a04140403427a
-	* common/status.h (STATUS_EXPORT_RES): New.
-	* g10/main.h (export_stats_t): New.
-	* g10/export.c (export_stats_s): New.
-	(export_new_stats, export_release_stats): New.
-	(export_print_stats): New.
-	(export_pubkeys, export_seckeys, export_secsubkeys)
-	(export_pubkey_buffer, do_export): Add arg "stats".
-	(do_export_stream): Add arg stats and update it.
-	* g10/gpg.c (main) <aExport, aExportSecret, aExportSecretSub>: Create,
-	pass, and print a stats object to the export function calls.
-
-	* g10/export.c (export_pubkeys_stream): Remove unused function.
-
-	dirmngr: Do not block during ADNS calls.
-	+ commit a3b26d6c0839ec18d1dc226bb537d5067c86d574
-	* dirmngr/dns-stuff.c: Include npth.h
-	(my_unprotect, my_protect): New wrapper.
-	(resolve_name_adns): Put unprotect/protect around adns calls.
-	(get_dns_cert): Ditto.
-	(getsrv): Ditto.
-	(get_dns_cname): Ditto.
-
-	dirmngr: New option --nameserver.
-	+ commit a2cc1d57552ccac7b2f9a0c6423b171b2a168b2a
-	* dirmngr/dirmngr.c (oNameServer): New.
-	(opts): Add --nameserver.
-	(parse_rereadable_options): Act upon oNameServer.
-	* dirmngr/dns-stuff.c (DEFAULT_NAMESERVER): New.
-	(tor_nameserver): New.
-	(set_dns_nameserver): New.
-	(my_adns_init): Make name server configurable.
-
-2015-11-11 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix cache consistency problem.
-	+ commit 7546e818791988c00b8635dab5b899265d8d9f42
-	g10/keyring.c (keyring_search): Only mark the cache as completely
-	filled if we start the scan from the beginning of the keyring.
-
-2015-11-10 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Default to the the PGP trust model.
-	+ commit 67c701d1e53f56305e3b8771c683c45bb9672305
-	* g10/trustdb.c (init_trustdb): If we can't read the trust model from
-	the trust DB, default to TM_PGP, not TM_TOFU_PGP.
-
-	gpg: Default to the flat TOFU DB format.
-	+ commit 951f277b6bf8178560105538d38e2a07a96865bd
-	* g10/tofu.c (opendbs): If the TOFU DB format is set to auto and there
-	is no TOFU DB, default to the flat format.
-
-2015-11-09 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Change to new ADNS Tor mode init scheme.
-	+ commit 288c9919dc45496b2380eeac487a8539692d6842
-	* dirmngr/dns-stuff.c (tor_credentials): New.
-	(enable_dns_tormode): Add arg new_circuit and update tor_credentials.
-	(my_adns_init): Rework to set Tor mode using a config file options and
-	always use credentials.
-	* dirmngr/server.c (cmd_dns_cert): Improve error message.
-	* dirmngr/t-dns-stuff.c (main): Add option --new-circuit.
-
-	dirmngr: Improve detection of ADNS.
-	+ commit f92e95175e90120362a7d6376fb32307e11267b5
-	* configure.ac (HAVE_ADNS_FREE): New ac_define.
-
-2015-11-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Add reder information to --card-status.
-	+ commit bce0e3f71df0709a7d323a688ddf2690c1727a6c
-	* g10/call-agent.h, g10/call-agent.c (agent_release_card_info)
-	g10/card-util.c (card_status): Add READER.
-	* scd/apdu.c (close_ccid_reader, open_ccid_reader): Handle RDRNAME.
-	(apdu_get_reader_name): New.
-	* scd/ccid-driver.c (ccid_open_reader): Add argument to RDRNAME_P.
-	* scd/command.c (cmd_learn): Return READER information.
-
-2015-11-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid new strings.
-	+ commit 2242658efe0c975a46c3316bc9171ddbce085e2c
-	* g10/decrypt-data.c (decrypt_data): Use already translated strings.
-
-	common: Fix commit f99830b.
-	+ commit 20125333e7b822e8c70ac8cef986649f0654eb56
-	* common/userids.c (classify_user_id): Avoid underflow. Use spacep to
-	also trim tabs.
-
-2015-11-06 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix formatting string.
-	+ commit 28e198201e580b39bceb9c151df07fc0e936a91d
-	* g10/decrypt-data.c (decrypt_data): Fix formatting string.
-
-	gpg: Add new option --only-sign-text-ids.
-	+ commit a74aeb5dae1f673fcd98b39a6a0496f3c622709a
-	* g10/options.h (opt): Add field only_sign_text_ids.
-	* g10/gpg.c (enum cmd_and_opt_values): Add value oOnlySignTextIDs.
-	(opts): Handle oOnlySignTextIDs.
-	(main): Likewise.
-	* g10/keyedit.c (sign_uids): If OPT.ONLY_SIGN_TEXT_IDS is set, don't
-	select non-text based IDs automatically.
-	(keyedit_menu): Adapt the prompt asking to sign all user ids according
-	to OPT.ONLY_SIGN_TEXT_IDS.
-	* doc/gpg.texi: Document the new option --only-sign-text-ids.
-
-	common: When classifying keyids and fingerprints, reject trailing junk.
-	+ commit f99830b72812395da5451152bdd2f2d90a7cb7fb
-	* common/userids.c (classify_user_id): Trim any trailing whitespace.
-	Before assuming that a hexstring corresponds to a key id or
-	fingerprint, make sure that it is NUL terminated.
-
-	gpg: Check for ambiguous or non-matching key specs.
-	+ commit e8c53fca954d33366e3494a6d4eecc3868282bcc
-	* g10/gpg.c (check_user_ids): New function.
-	(main): Check that any user id specifications passed to --local-user
-	and --remote-user correspond to exactly 1 user. Check that any user
-	id specifications passed to --default-key correspond to at most 1
-	user. Warn if any user id specifications passed to --local-user or
-	--default-user are possible ambiguous (are not specified by long keyid
-	or fingerprint).
-	* g10/getkey.c (parse_def_secret_key): Don't warn about possible
-	ambiguous key descriptions here.
-
-	common: Add new function strlist_rev.
-	+ commit f38bac8883ea2e9ed8e2836f97a953efb85e774c
-	* common/strlist.c (strlist_rev): New function.
-	* common/t-strlist.c: New file.
-	* common/Makefile.am (common_sources): Add strlist.c and strlist.h.
-	(module_tests): Add t-strlist.
-	(t_strlist_LDADD): New variable.
-
-	common: Include required, but not included headers in t-support.h.
-	+ commit 23e163473f050d1f2c08f589beb9dab283b7d624
-	* common/t-support.h: Include <stdlib.h> and <stdio.h>.
-
-2015-11-05 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Indicate which characters are invalid.
-	+ commit a958ffd148a46f3757d1c309bb13555638044640
-	* g10/keygen.c (ask_user_id): Indicate which characters are invalid.
-
-	gpg: Add support for unwrapping the outer level of encryption.
-	+ commit ec409e62aea6cc829299be794f9d035d033cb51b
-	* g10/decrypt-data.c (decrypt_data): If OPT.UNWRAP_ENCRYPTION is set,
-	copy the data to the output file instead of continuing to process it.
-	* g10/gpg.c (enum cmd_and_opt_values): Add new value oUnwrap.
-	(opts): Handle oUnwrap.
-	(main): Likewise.
-	* g10/options.h (opt): Add field unwrap_encryption.
-	* g10/plaintext.c (handle_plaintext): Break the output file selection
-	functionality into ...
-	(get_output_file): ... this new function.
-
-	common: Add a function for copying data from one iobuf to another.
-	+ commit fd4b9e232805b2e30b29903568c95cc0aad8bbec
-	* common/iobuf.c (iobuf_copy): New function.
-
-	doc: Note that gpgkey2ssh is deprecated.
-	+ commit 2b0e0a53b4db8c44e299f57a9f4f9fc1b825e707
-	* doc/tools.texi (gpgkey2ssh): Note that gpgkey2ssh is deprecated.
-
-	tools: Fix gpgkey2ssh's most gratuitous errors. Use gpg2, not gpg.
-	+ commit cd2d685230ecafb7df504ef2b16cf1ec9a014300
-	* tools/gpgkey2ssh.c (main): Add support for --help. Replace the most
-	gratuitous asserts with error messages. Invoke gpg2, not gpg.
-
-2015-11-05 Neal H. Walfield <neal@g10code.com>
-	 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	doc: Add documentation for gpgkey2ssh.
-	+ commit 2b27acc3435e73fad7460b551a36b4064cdd58be
-	* doc/tools.texi: Add documentation for gpgkey2ssh.
-
-2015-11-04 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Print a better error message for --multifile --sign --encrypt.
-	+ commit 6897bbf1aa9bf0a61b186ea1a9bcb463fb1fd10e
-	* g10/gpg.c (main): Print a better error message for --multifile
-	--sign --encrypt.
-
-	gpg: Add --encrypt-to-default-key.
-	+ commit de9b2340153d70b083494d1a277a384dcf43bff0
-	* g10/getkey.c (parse_def_secret_key): Drop the static qualifier and
-	export the function.
-	* g10/gpg.c (enum cmd_and_opt_values): Add value oEncryptToDefaultKey.
-	(opts): Handle oEncryptToDefaultKey.
-	(main): Likewise.
-	* g10/options.h (opt): Add field encrypt_to_default_key.
-
-	gpg: Allow multiple --default-key options. Take the last available key.
-	+ commit e16d7168c54e5f7bc2f0037806ee4f730930eaf0
-	* g10/getkey.c (parse_def_secret_key): New function.
-	(get_seckey_default): Add parameter ctrl. Update callers. Use
-	parse_def_secret_key to get the default secret key, if any.
-	(getkey_byname): Likewise.
-	(enum_secret_keys): Likewise.
-	* g10/options.h (opt): Change def_secret_key's type from a char * to a
-	strlist_t.
-	* g10/gpg.c (main): When processing --default-key, add the key to
-	OPT.DEF_SECRET_KEY.
-	* g10/gpgv.c (get_session_key): Add parameter ctrl. Update callers.
-	* g10/mainproc.c (proc_pubkey_enc): Likewise.
-	(do_proc_packets): Likewise.
-	* g10/pkclist.c (default_recipient): Likewise.
-	* g10/pubkey-enc.c (get_session_key): Likewise.
-	* g10/sign.c (clearsign_file): Likewise.
-	(sign_symencrypt_file): Likewise.
-	* g10/skclist.c (build_sk_list): Likewise.
-	* g10/test-stubs.c (get_session_key): Likewise.
-
-2015-11-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix error handling with libusb-compat library.
-	+ commit 1e94a672efb8bf66f416bc63bf6670e509a21fe5
-	* scd/ccid-driver.c (bulk_out): Use LIBUSB_ERRNO_NO_SUCH_DEVICE.
-
-	scd: fix change_keyattr.
-	+ commit c5a9fedba66361ddd9f596528882750068543298
-	* scd/app-openpgp.c (change_keyattr_from_string): Fix parsing.
-
-2015-11-03 Werner Koch <wk@gnupg.org>
-
-	gpg: Change out of core error message.
-	+ commit 44ad9f29d43f40bbc1840454880f4af3df1c5295
-	* g10/tofu.c (fingerprint_str): Die with the error code returned by
-	the failed function.
-	(time_ago_str): Ditto. Do not make a comma translatable.
-	(fingerprint_format): Use "%zu" for a size_t.
-
-	gpg: Make translation easier.
-	+ commit 62b8cd5495dcac9a0f8a3d88c7bd4cd80997fd3f
-	* g10/import.c (import_secret_one): Split info string for easier
-	translation.
-
-2015-11-03 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Also show when the most recently signed message was observed.
-	+ commit 621afac37e5555fd68054531e611ead444b62928
-	* g10/tofu.c (show_statistics): Also show when the most recently
-	signed message was observed.
-
-	gpg: Split a utility function out of a large function.
-	+ commit 36326112290b6eef47c9dada30dddbdf408680e4
-	* g10/tofu.c (show_statistics): Break the time delta to string code
-	into...
-	(time_ago_str): ... this new function.
-
-	gpg: Fix message formatting.
-	+ commit c8ef9f9a64d13ea8b9b4ade62525243abe2976ba
-	* g10/tofu.c (get_trust): Fix message formatting.
-
-	gpg: Don't store formatting fingerprints in the TOFU DB.
-	+ commit 8ae3946d28c43e30ef692ba6cf1a7fa4ed65ecc5
-	* g10/tofu.c (fingerprint_pp): Split this function into...
-	(fingerprint_str): ... this function...
-	(fingerprint_format): ... and this function.
-	(record_binding): Store the unformatted fingerprint in the DB. Only
-	use the formatting fingerprint when displaying a message to the user.
-	(get_trust): Likewise.
-	(show_statistics): Likewise.
-	(tofu_register): Likewise.
-	(tofu_get_validity): Likewise.
-	(tofu_set_policy): Likewise.
-	(tofu_get_policy): Likewise.
-
-2015-11-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: notify a user when importing stub is skipped.
-	+ commit 06f3eadb22986d9ebde9efff2794eb1d45d6c6d4
-	* g10/import.c (transfer_secret_keys): Return GPG_ERR_NOT_PROCESSED
-	when stub_key_skipped.
-	(import_secret_one): Notify a user, suggesting --card-status.
-
-2015-10-31 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Consider newlines to be whitespace in an SQL statement.
-	+ commit 18cd09246f5dcddcafb8662afd84fa046e36de3f
-	* g10/sqlite.c (sqlite3_stepx): When making sure that there is no
-	second SQL statement, ignore newlines.
-
-2015-10-30 Werner Koch <wk@gnupg.org>
-
-	common: Improve t-zb32 to be used for manual encoding.
-	+ commit d89a9fca46d9bba497dde0793b57217c800b0e8d
-	* common/t-support.h (no_exit_on_fail, errcount): New.
-	(fail): Bump errcount.
-	* common/t-zb32.c (main): Add options to allow manual use.
-
-	common: Add separate header for zb32.c.
-	+ commit 5aadb4b62d26e1bfb40a1ce444a81c2a5a56159c
-	* common/util.h (zb32_encode): Move prototype to ...
-	* common/zb32.h: new. Include this for all callers of zb32_encode.
-
-2015-10-29 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Display the correct error message.
-	+ commit 641df615da4937b0073c420a0503c5810c237972
-	* g10/trustdb.c (validate_keys): If tdbio_update_version_record fails,
-	RC does not contain the error code. Save the error code in rc2 and
-	use that.
-
-	gpg: Eliminate a memory leak.
-	+ commit d68bdc553a206e54234d5d53ad35c4ba34133118
-	* g10/trustdb.c (validate_key_list): Don't leak the keyblocks on
-	failure.
-
-	gpg: Remove unused prototype.
-	+ commit ef052591ba51ee16bafc3c5b79d837ed8f01b520
-	g10/keyring.h (keyring_locate_writable): Remove unused prototype.
-
-	gpg: Eliminate a memory leak.
-	+ commit 89eee5f6b7ca3da7ebdcc3e5d069701d0834b39e
-	* g10/gpg.c (main): Don't leak OPT.DEF_RECIPIENT.
-
-	gpg: Fix keyring support.
-	+ commit 99c84b49b787dab8da26cf61eed24dd4a2b77fd9
-	* g10/keydb.c (keydb_rebuild_caches): Only mark the cached as prepared
-	if it is actually prepared, which it only is if the resource is a
-	keybox.
-
-	gpg: Change sqlite3_stepx to pass the sqlite3_stmt * to the callback.
-	+ commit 421827424fe87855307fe3e803b42ffa02738600
-	* g10/sqlite.h (enum sqlite_arg_type): Add SQLITE_ARG_BLOB.
-	(sqlite3_stepx_callback): New declaration.
-	(sqlite3_stepx): Change the callback's type to sqlite3_stepx_callback,
-	which passes an additional parameter, the sqlite3_stmt *. Update
-	users.
-
-	gpg: Move sqlite helper functions into their own file.
-	+ commit 351f4213e192aa11500c0c590d11183edbe326c5
-	* g10/tofu.c (sqlite3_exec_printf): Move from here...
-	* g10/sqlite.c (sqlite3_exec_printf): ... to this new file. Don't
-	mark as static.
-	* g10/tofu.c (sqlite3_stepx): Move from here...
-	* g10/sqlite.c (sqlite3_stepx): ... to this new file. Don't
-	mark as static.
-	* g10/tofu.c (enum sqlite_arg_type): Move from here...
-	* g10/sqlite.h (enum sqlite_arg_type): ... to this new file.
-
-2015-10-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	doc: Don't install gpg-zip.1.
-	+ commit d25e29ad9374da1c11ccfc38f392dbab2d707042
-	* doc/Makefile.am (myman_pages): Remove gpg-zip.1.
-	(DISTCLEANFILES): Add gpg-zip.1.
-
-2015-10-28 Werner Koch <wk@gnupg.org>
-
-	sm: Allow combination of usage flags --gen-key.
-	+ commit 8b6c83dcb086ef09b2676e4d5b0111c88b7b8bf8
-	* sm/certreqgen.c (create_request): Re-implement building of the
-	key-usage extension.
-
-2015-10-28 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	doc: Document some changed default options.
-	+ commit e095a3fcf2ccc6cc4e258111dc395558069a1164
-	* doc/gpg.texi: Update the description of some options which are
-	 now enabled by default.
-
-2015-10-28 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix NULL-deref while loading a CRL.
-	+ commit fa15a71daff8414bf4112bc2826dc495ff2fb01f
-	* dirmngr/crlcache.c (crl_parse_insert): Set error before leaping to
-	failure.
-
-	dirmngr: Minor cleanup of the SRV RR code.
-	+ commit 949a5cfdabcafab93c1ac092c0459b59318805b9
-	* dirmngr/dns-stuff.c: Include unistd.h.
-	(getsrv): Run srand only once.
-	* dirmngr/t-dns-stuff.c (main): Allow passing another name for --srv
-	and change output format.
-
-	dirmngr: Add a getaddrinfo wrapper backend using ADNS.
-	+ commit e026efb4363bc6e3c41ed533daf06f103ebd2e32
-	* dirmngr/dns-stuff.c: Replace all use of default_errsource.
-	(my_adns_init): Move to top.
-	(resolve_name_adns): New.
-	(resolve_dns_name) USE_ADNS: Divert to new func.
-
-2015-10-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not call an extra get_validity if no-show-uid-validity is used.
-	+ commit a6c2c098435a703ca02abf651ff4fa45e5a4db9a
-	* g10/mainproc.c (check_sig_and_print): Do not call the informational
-	get_validity if we are not going to use it.
-
-2015-10-26 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: Ensure all weak digest rejection notices are shown.
-	+ commit 91015d021b3dcbe21ad0e580a4f34c523abf9e72
-	* g10/main.h: Add rejection_shown flag to each weakhash struct
-	* g10/misc.c (print_digest_algo_note, additional_weak_digest): Do not
-	treat MD5 separately; (print_digest_rejected_note): Use
-	weakhash.rejection_shown instead of static shown.
-	* g10/options.h (opt): Change from additional_weak_digests to
-	weak_digests.
-	* g10/sig-check.c: Do not treat MD5 separately.
-	* g10/gpg.c (main): Explicitly set MD5 as weak.
-	* g10/gpgv.c (main): Explicitly set MD5 as weak.
-
-2015-10-26 Werner Koch <wk@gnupg.org>
-
-	w32: Make it build again if Tofu support is not available.
-	+ commit 0d37a40fc34519e93af3ceffff2cd726d29576d3
-	* g10/keylist.c (public_key_list) !USE_TOFU: Do not call tofu
-	functions.
-
-	dirmngr: Support Tor hidden services.
-	+ commit 4524a2a3714f263d56bb7db349c169b456994fd9
-	* dirmngr/dns-stuff.c (is_onion_address): New.
-	* dirmngr/ks-engine-hkp.c (hostinfo_s): Add field "onion".
-	(map_host): Special case onion addresses.
-	(ks_hkp_print_hosttable): Print an 'O' for an onion address.
-	* dirmngr/http.c (connect_server): Special case onion addresses.
-
-	dirmngr,w32: Remove gethostbyname hack and make it build again.
-	+ commit 7735bbe539af35ce16e270946d5ae798c5989d6e
-	* dirmngr/http.c (connect_server) W32: Remove gethostbyname hack;
-	we require getaddrinfo anyway.
-	* dirmngr/dns-stuff.c (AI_ADDRCONFIG): Add replacement if not defined.
-	(map_eai_to_gpg_error) W32: Take care of unsupported codes.
-
-2015-10-26 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Make sure we only have a single SQL statement.
-	+ commit c18fb0d99b633bb267dead6e7c46229f4b780bc3
-	* g10/tofu.c (sqlite3_stepx): Make sure SQL only contains a single SQL
-	statement.
-
-	gpg: When the TOFU DB is in batch mode, periodically drop the locks.
-	+ commit 5b0ed7674dc718ee98e0c80aa93ce014f2b51411
-	* g10/tofu.c: Include <sched.h>.
-	(batch_update_started): New variable.
-	(begin_transaction): If we've been in batch mode for a while, then
-	commit any extant batch transactions.
-	(tofu_begin_batch_update): If we are not in batch mode, initialize
-	batch_update_started.
-
-2015-10-25 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Add workaround for broken getaddrinfo.
-	+ commit 5e7ac031f513ad3b60e4f092fa72b3bec0676515
-	* dirmngr/dns-stuff.c (resolve_name_standard): On failure retry by
-	first resolving the CNAME.
-	(get_dns_cname): New.
-
-	* dirmngr/t-dns-stuff.c (main): Add option --cname.
-
-	dirmngr: Better handle systems without IPv6 or IPv4.
-	+ commit 0e3c9f184a5fb3e41277700d690febc2eee9600a
-	* dirmngr/dns-stuff.c (resolve_name_standard): Use AI_ADDRCONFIG.
-
-	dirmngr: Replace use of getnameinfo by resolve_dns_addr.
-	+ commit 927f34603d942868af6a7bd0f347681bbad76a94
-	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Remove.
-	(map_host): Use resolve_dns_addr.
-
-	dirmngr: Implement a getnameinfo wrapper.
-	+ commit 816505958ac4308ee0dfe787d1b706982428b6cc
-	* dirmngr/dns-stuff.h (DNS_NUMERICHOST): New.
-	(DNS_WITHBRACKET): New.
-	* dirmngr/dns-stuff.c (resolve_name_standard): Factor code out to...
-	(map_eai_to_gpg_error): new.
-	(resolve_addr_standard): New.
-	(resolve_dns_addr): New.
-
-	* dirmngr/ks-engine-hkp.c (is_ip_address): Move to ...
-	* dirmngr/dns-stuff.c (is_ip_address): here. Add support for non
-	bracketed v6 addresses.
-
-	* dirmngr/t-dns-stuff.c: Remove header netdb.h.
-	(main): Add option --bracket. Use resolve_dns_name instead of
-	getnameinfo.
-
-2015-10-23 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Provide an interface to patch TOFU updates.
-	+ commit 7f65e84ac035e8f7a25639a6b09eb6000115e337
-	* g10/tofu.c (struct db): Rename begin_transaction to savepoint_batch.
-	Rename end_transaction to savepoint_batch_commit. Update users.
-	Remove field rollback. Add fields savepoint_inner and
-	savepoint_inner_commit. Add field batch_update.
-	(dump_cache): New function.
-	(batch_update): New variable.
-	(begin_transaction). New function.
-	(end_transaction): New function.
-	(rollback_transaction): New function.
-	(tofu_begin_batch_update): New function.
-	(tofu_end_batch_update): New function.
-	(closedb): End any pending batch transaction.
-	(closedbs): Assert that none of the DBs have a started batch
-	transaction if we not in batch mode.
-	(record_binding): Use the begin_transaction, end_transaction and
-	rollback_transaction functions instead of including the SQL inline.
-	Also start a batch mode transaction if we are using the flat format.
-	(tofu_register): Use the begin_transaction, end_transaction and
-	rollback_transaction functions instead of including the SQL inline.
-	* g10/gpgv.c (tofu_begin_batch_update): New function.
-	(tofu_end_batch_update): New function.
-	* g10/test-stubs.c (tofu_begin_batch_update): New function.
-	(tofu_end_batch_update): New function.
-
-	gpg: Cache prepared SQL queries and open DB connections.
-	+ commit 297cf8660ce346638e42934d84d746768f8bb10a
-	* g10/tofu.c: Include <stdarg.h>.
-	(prepares_saved) DEBUG_TOFU_CACHE: New variable.
-	(queries) DEBUG_TOFU_CACHE: New variable.
-	(struct db): Add fields prevp, begin_transaction, end_transaction,
-	rollback, record_binding_get_old_policy, record_binding_update,
-	record_binding_update2, get_policy_select_policy_and_conflict,
-	get_trust_bindings_with_this_email, get_trust_gather_other_user_ids,
-	get_trust_gather_other_keys, register_already_seen, and
-	register_insert.
-	DEBUG_TOFU_CACHE: Add field hits.
-	(STRINGIFY): New macro.
-	(STRINGIFY2): New macro.
-	(enum sqlite_arg_type): New enum.
-	(sqlite3_stepx): New function.
-	(combined_db): Remove variable.
-	(opendb): Don't cache the combined db.
-	(struct dbs): New struct. Update users to use this as the head of the
-	local DB list rather than overloading struct db.
-	(unlink_db): New function.
-	(link_db): New function.
-	(db_cache): New variable.
-	(db_cache_count): New variable.
-	(DB_CACHE_ENTRIES): Define.
-	(getdb): If the dbs specific cache doesn't include the DB, look at
-	DB_CACHE. Only if that also doesn't include the DB open the
-	corresponding DB.
-	(closedb): New function.
-	(opendbs): Don't open the combined DB. Just return an initialized
-	struct dbs.
-	(closedbs): Don't close the dbs specific dbs. Attach them to the
-	front of DB_CACHE. If DB_CACHE contains more than DB_CACHE_ENTRIES,
-	close enough dbs from the end of the DB_CACHE list such that DB_CACHE
-	only contains DB_CACHE_ENTRIES. Don't directly close the dbs, instead
-	use the new closedb function.
-	DEBUG_TOFU_CACHE: Print out some statistics.
-	(record_binding): Use sqlite3_stepx instead of sqlite3_exec or
-	sqlite3_exec_printf.
-	(get_policy): Likewise.
-	(get_trust): Likewise.
-	(tofu_register): Likewise.
-
-	gpg: Return the DBs meta-handle rather than the sqlite3 handle.
-	+ commit cd879d4bd69a578be5a1ff96497f8c1181885563
-	* g10/tofu.c (getdb): Return a struct db * instead of an sqlite *.
-	Update users.
-
-	gpg: Use the proper type.
-	+ commit 3c4c89cc35280164b509977c5288b0a06d6f530e
-	* g10/options.h: Include "tofu.h".
-	(opt.tofu_default_policy): Change type to enum tofu_policy.
-	* g10/gpgv.c (enum tofu_policy): Don't redeclare.
-	* g10/test-stubs.c (enum tofu_policy): Likewise.
-
-2015-10-22 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Implement Tor mode for SRV RRs.
-	+ commit 8b06d7f41aec6cb993445935dba7c60e033d026a
-	* dirmngr/dns-stuff.c (get_dns_cert): Factor adns init out to...
-	(my_adns_init): new.
-	(getsrv)USE_ADNS: Use my_adns_init.
-	(getsrv)!USE_ADNS: Return an error if Tor mode is active.
-
-	* dirmngr/t-dns-stuff.c: Add option --use-tor.
-
-	dirmngr: Do not use MAXDNAME.
-	+ commit e03a4a94bb67d4a6c958b37671f83456e203f325
-	* dirmngr/dns-stuff.c (getsrv): Replace MAXDNAME.
-	* dirmngr/dns-stuff.h (MAXDNAME): Remove.
-	(struct srventry): Use a fixed value instead of MAXDNAME.
-	* dirmngr/http.c (connect_server): Use DIMof instead of MAXDNAME.
-	Malloc a helper array.
-
-	Move SRV RR code from common/ to dirmngr/.
-	+ commit 41bb01ae792af78edd28bf1b735cacc0b3ac428a
-	* common/srv.c: Merge into dirmngr/dns-stuff.c. Delete file.
-	* common/srv.h: Merge into dirmngr/dns-stuff.h. Delete file.
-	* common/Makefile.am (common_sources): Remove srv.c and srv.h.
-	* g10/keyserver.c: Do not include srv.h. The code using it is anyway
-	disabled.
-	* dirmngr/http.c: Remove header srv.h and stubs.
-	* dirmngr/t-dns-stuff.c: Add option --srv.
-
-2015-10-21 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Use the new DNS wrapper for the HTTP module.
-	+ commit 1e34007c972c1d7730cfcacd88f6bbebba7dec1d
-	* dirmngr/t-http.c (main): Init assuan sockets.
-	* dirmngr/http.c: Include dns-stuff.h.
-	(connect_server)!HAVE_GETADDRINFO: Remove all code.
-	(connect_server): Change to use resolve_dns_name.
-
-	dirmngr: Allow use of http.c if USE_NPTH is not defined.
-	+ commit b6af3377e14fad35b9c6041b11888cabce6e8a56
-	* dirmngr/http.c (send_request): Always set the gnutls pull/push
-	functions.
-	(my_npth_read): Rename to ...
-	(my_gnutls_read) .. this. Use system read if !USE_NPTH.
-	(my_npth_write): Rename to ...
-	(my_gnutls_write) .. this. Use system write if !USE_NPTH.
-
-	dirmngr: Check that getaddrinfo is available.
-	+ commit 6fafda979df8e7e117f8e6929bcce89513a6e746
-	* dirmngr/Makefile.am (t_http_SOURCES): Add dns-stuff.c.
-	(t_ldap_parse_uri_SOURCES): Ditto.
-	* dirmngr/dns-stuff.c: Bail out if neither ADNS nor getaddrinfo is
-	available.
-
-	dirmngr: Use the new DNS wrapper for the HKP engine.
-	+ commit afbe87fa2d259b665b2d67a038a8535cfcfee094
-	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Change arg type to
-	dns_addrinfo_t.
-	(map_host): Replace getaddrinfo by resolve_dns_name.
-
-	dirmngr: Implement a getaddrinfo wrapper.
-	+ commit 8bccbf477878fd99baa96e11db9db99aaf1e8d91
-	* dirmngr/dns-stuff.h: Include some header files.
-	(dns_addinfo_t, dns_addrinfo_s): New.
-	* dirmngr/dns-stuff.c: Always include DNS related headers.
-	(free_dns_addrinfo): New.
-	(resolve_name_standard): New.
-	(resolve_dns_name): New.
-
-	* dirmngr/t-dns-stuff.c: Include netdb.h.
-	(main): Keep old default mode with no args but else print outout of
-	resolve_dns_name. Revamp option parser.
-
-	common: Add more replacement error codes.
-	+ commit ffe60eb3d2b8f7d6c506804ce4645d695c91f237
-	* common/util.h (GPG_ERR_SERVER_FAILED): New.
-	(GPG_ERR_NO_KEY): New.
-	(GPG_ERR_NO_NAME): New.
-
-2015-10-21 Neal H. Walfield <neal@g10code.com>
-
-	gpg: If the saved trust model is unknown, default to tofu+pgp.
-	+ commit 9afeb4cca10c3632495fe71b23df99a4878bd3a5
-	* g10/trustdb.c (init_trustdb): If the saved trust model is unknown,
-	default to tofu+pgp instead of pgp.
-
-	gpg: Don't accidentally free UTK_LIST.
-	+ commit 8c3b7915d675ca5346c17244654d5c6ab583ac44
-	* g10/trustdb.c (validate_keys): Don't free UTK_LIST.
-
-	gpg: When evaluating trust reg exps, treat tofu+pgp like pgp.
-	+ commit cbaca254ac818c49c18d4480d3c7bd246cc57ae8
-	* g10/trustdb.c (validate_one_keyblock): When checking trust regular
-	expressions, treat the tofu+pgp trust model the same as the pgp trust
-	model.
-
-	gpg: If a key is ultimate trusted, return that in the tofu model.
-	+ commit df57390d68482c5b3fa5ff3a42a29ae1b6cbb23c
-	* g10/tofu.c (get_trust): If the policy is auto or none, check if the
-	key is ultimately trusted. If so, return that.
-	(tofu_register): If the key is ultimately trusted, don't show any
-	statistics.
-	(tofu_get_validity): Likewise.
-
-	gpg: Keep the trust DB up to date for the tofu and tofu+pgp models.
-	+ commit d05ff81732e20e6f9d6d7a6281a96a312b001abb
-	* g10/trustdb.c (init_trustdb): Recognize tofu and tofu+pgp as
-	possibly saved trust models. Also register the ultimately trusted
-	keys if the trust model is tofu or tofu+pgp.
-	(check_trustdb): Don't skip if the trust model is tofu or tofu+pgp.
-	(update_trustdb): Likewise.
-	(tdb_check_trustdb_stale): Likewise.
-	(validate_keys): If the trust model is TOFU, just write out the
-	ultimately trusted keys.
-
-	gpg: Factor out code into a standalone function.
-	+ commit 243f90afba87e99ca42e2451ac5cc59d00a044ac
-	* g10/trustdb.c (tdb_keyid_is_utk): New function.
-	(add_utk): Use it.
-
-	dirmngr: Allow building with libassuan < 2.3.
-	+ commit a79045e38d239a7f6e787cf7c1132772c737cc0e
-	* dirmngr/http.c (send_request): Use newer assuan function only if
-	available.
-
-2015-10-21 Neal H. Walfield <neal@g10code.com>
-	 Andre Heinecke <aheinecke@intevation.de>
-
-	gpg: Make the tofu DB check and initialization atomic.
-	+ commit 85bd7d9491f8cc13c2b03f19b4f70ea13b45c704
-	* g10/tofu.c (initdb): Make the version check and the database
-	initialization atomic.
-
-2015-10-21 Werner Koch <wk@gnupg.org>
-
-	build: Make --disable-g13 the default.
-	+ commit 485e0a221deb5c68f29b6a7a110b349dbe41c027
-	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-g13. Remove
-	--enable-gpgtar because that is enabled anyway.
-	* configure.ac: Do not build g13 by default.
-
-	dirmngr: Rename file dns-cert.c.
-	+ commit 5055b617a94587580bc16a56bb82333077b05693
-	* dirmngr/dns-cert.c: Rename to dirmngr/dns-stuff.c.
-	* dirmngr/dns-cert.h: Rename to dirmngr/dns-stuff.h and change
-	includers.
-	* dirmngr/t-dns-cert.c: Rename to dirmngr/t-dns-stuff.c.
-	* dirmngr/Makefile.am: Adjust.
-
-	common: Add status code for use by g13.
-	+ commit 42571a38344e39f747315f754700a8181b8744fe
-	* common/status.h (STATUS_PLAINTEXT_FOLLOWS): New.
-
-2015-10-20 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Prefer ADNS over system resolver.
-	+ commit 58ebe50bdf4837e9ab2d3f8c6e5fcf28c66f26e9
-	* configure.ac (HAVE_ADNS_IF_TORMODE): New ac_define.
-	(USE_DNS_CERT): Prefer ADNS over the system resolver.
-	* dirmngr/dns-cert.c (tor_mode): New global var.
-	(enable_dns_tormode): New func.
-	(get_dns_cert): Use DNS resolver at 8.8.8.8 in tor-mode.
-	* dirmngr/server.c (cmd_dns_cert): If supported allow DNS requests.
-
-	w32: Allow building again.
-	+ commit c83b627174f46e841f1ccc018322fe499969c267
-	* dirmngr/http.c (connect_server): Fix called function name.
-
-	build: Allow building without SQLlite support.
-	+ commit 734c61dc9d4915605816803182c9adcc1594e008
-	* configure.ac: Add option --dsiable-tofu and --disable-sqlite.
-	(NEED_SQLITE_VERSION): New var.
-	(USE_TOFU): New ac_define and am_conditional.
-	* autogen.sh (build-w32): Add PKG_CONFIG_LIBDIR to configure so that
-	pkg-config find the correct .pc file.
-
-	* g10/Makefile.am (tofu_source): New. Build only if enabled.
-	* g10/gpg.c (parse_trust_model)!USE_TOFU: Disable tofu models.
-	(parse_tofu_policy)!USE_TOFU: Disable all.
-	(parse_tofu_db_format)!USE_TOFU: Disable all.
-	(main) <aTOFUPolicy>!USE_TOFU: Skip.
-	* g10/keyedit.c (show_key_with_all_names_colon)!USE_TOFU: Do not
-	call tofu functions.
-	* g10/keylist.c (list_keyblock_colon)!USE_TOFU: Ditto.
-	* g10/trustdb.c (tdb_get_validity_core)!USE_TOFU: Skip tofu
-	processing.
-
-2015-10-20 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Don't die immediately if the TOFU DB is locked.
-	+ commit 26d457c218c2e93b2e2cf316f0c1074c70894d0f
-	* g10/tofu.c (opendb): Don't die immediately if the DB is locked.
-
-	gpg: Improve output.
-	+ commit bc9ff6c85e2d89be4ee873b8a72a214759a66157
-	* g10/tofu.c (get_trust): Also show the binding when indicating a
-	conflict occurred.
-
-	gpg: Synchronize translation template.
-	+ commit 251c070f91e2c65baa3f1195f14a176440a8aafa
-	* g10/tofu.c (show_statistics): Synchronize translation template.
-
-	gpg: When showing conflicts, also show bindings with no recorded sigs.
-	+ commit d3eca517745a862432fcfeaa729e5333b15ffa6a
-	* g10/tofu.c (signature_stats_collect_cb): If the time_ago column is
-	NULL, then both time_ago and count should be 0.
-	(get_trust): Reverse the direction of the join so that we also get
-	statistics about bindings without any signatures.
-
-	gpg: Improve text.
-	+ commit 445f94bc81b20959a667a4ad80ea6c73059540bf
-	* g10/tofu.c (show_statistics): Improve text.
-
-	gpg: Use the right variable to display the information.
-	+ commit 4957e3236796979b58f35628351505ea5f4e936a
-	* g10/tofu.c (get_trust): Use the right variable to display the
-	conflicting key.
-
-	gpg: Make failing to create a directory a soft error.
-	+ commit eb8a0b051faa03584b3820200e10301936e82f51
-	* g10/tofu.c (getdb): Don't exit if we can't create the directory.
-	Just return an error.
-
-	common: Make sure tilde expansion works for the mkdir functions.
-	+ commit c3bb9fccb7963a0918b9ec6a4f10d568fac7c125
-	* common/mkdir_p.c (gnupg_amkdir_p): Use make_filename_try on the
-	first directory component as well.
-
-	gpg: Remove unused prototype digest_algo_from_sig.
-	+ commit d1a0b520b15bb941cdbf66c2e832c617af778ac8
-	* g10/packet.h (digest_algo_from_sig): Remove prototype without a
-	corresponding implementation.
-
-2015-10-19 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Allow building with libassuan < 2.3.
-	+ commit 4e42ad300b3de9fab25095a9e82431b1ea2740e7
-	* dirmngr/dirmngr.c (set_tor_mode): Use newer assuan function only if
-	available.
-	* dirmngr/http.c (http_raw_connect): Ditto.
-
-2015-10-19 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix --desig-revoke.
-	+ commit c37621166e9cc2a818de73bc99287a393dbb5744
-	* g10/revoke.c (gen_desig_revoke): Add additional parameter ctrl.
-	Check that the secret key is available. If not, display an error
-	message.
-
-	gpg: Improve function documentation and some comments.
-	+ commit a608ee750dd83bf77a5fb4f0ab5bcf812436ba4d
-	* g10/main.h: Improve function documentation.
-	* g10/packet.h.h: Improve function documentation.
-	* g10/sig-check.c: Improve function documentation and some comments.
-
-	gpg: Improve and regularize naming of signature checking functions.
-	+ commit 0433e667029508d6933e8798d3d95bcdde70a7aa
-	* g10/packet.h (signature_check): Rename from this...
-	(check_signature): ... to this. Update users.
-	(signature_check2): Rename from this...
-	(check_signature2): ... to this. Update users.
-	* g10/sig-check.c (do_check): Rename from this...
-	(check_signature_end): ... to this. Update users.
-	(do_check_messages): Rename from this...
-	(check_signature_metadata_validity): ... to this. Update users.
-
-	gpg: Mark local function as static.
-	+ commit 547a1b3fb881bb8581d03dbf4eacf49163eaa4b5
-	* g10/tdbio.c (put_record_into_cache): Mark as static.
-
-2015-10-19 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: Print warning when rejecting weak digests.
-	+ commit b98939812abf6c643c752ce7c325f98039a1a9e2
-	* g10/misc.c (print_md5_rejected_note): Rename to ..
-	(print_digest_rejected_note): this. Parameterize function to take an
-	enum gcry_md_algos.
-	* g10/sig-check.c: Use print_digest_rejected_note() when rejecting
-	signatures.
-
-	gpg: Add option --weak-digest to gpg and gpgv.
-	+ commit 76afaed65e3b0ddfa4923cb577ada43217dd4b18
-	* g10/options.h: Add additional_weak_digests linked list to opts.
-	* g10/main.h: Declare weakhash linked list struct and
-	additional_weak_digest() function to insert newly-declared weak
-	digests into opts.
-	* g10/misc.c: (additional_weak_digest): New function.
-	(print_digest_algo_note): Check for deprecated digests; use proper
-	gcry_md_algos type.
-	* g10/sig-check.c: (do_check): Reject weak digests in addition to MD5.
-	* g10/gpg.c: Add --weak-digest option to gpg.
-	* doc/gpg.texi: Document gpg --weak-digest option.
-	* g10/gpgv.c: Add --weak-digest option to gpgv.
-	* doc/gpgv.texi: Document gpgv --weak-digest option.
-
-2015-10-19 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Make --use-tor work - still leaks DNS.
-	+ commit 6983fd131f648ba4acd57b266de9868911874d14
-	* dirmngr/dirmngr.c (set_tor_mode): New.
-	(main, reread_configuration): Call it.
-	* dirmngr/http.c (http_raw_connect, send_request): Check whether TOR
-	mode is enabled if the FORCE_TOR flag is given.
-
-	dirmngr: Use Assuan socket wrappers for http.c.
-	+ commit 8c609eaf35b547f02979ef0b206520dd0853b294
-	* dirmngr/http.c: Include assuan.h. Changed all code taking a socket
-	descriptor from int to assuan_fd_t.
-	(my_unprotect, my_protect): New.
-	(my_connect): Remove.
-	(_my_socket_new, _my_socket_unref): use assuan_sock_close.
-	(connect_server): Use assuan_sock_connect, assuan_sock_new, and
-	assuan_sock_close.
-	* dirmngr/Makefile.am (t_common_ldadd): Add LIBASSUAN_LIBS.
-
-2015-10-19 Neal H. Walfield <neal@g10code.com>
-
-	gpg: Fix formatting.
-	+ commit 253afa244487dd8129816615ac2865c9fe812aaf
-	* g10/tofu.c (get_trust): Fix formatting.
-
-	gpg: Don't forget to free some memory.
-	+ commit e56a116f9a1171ccf8b3293887a217953a46fc20
-	* g10/tofu.c (tofu_register): Free SIG_DIGEST before returning.
-
-	gpg: If a conflict occurs in batch mode, record that.
-	+ commit 55d88454652543c98d74376977d855e394df6c92
-	* g10/tofu.c (get_trust): If a conflict occurs when MAY_ASK is false,
-	set conflict to the key. When prompting the user, don't show the
-	conflicting key if the conflicting key is the current key.
-
-2015-10-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Silence two more warnings.
-	+ commit c2c400714854d5a127a6966200d345d0d6cfc7d4
-	* g10/trustdb.c (tdb_get_validity_core): Silence a warning.
-	* g10/tofu.c (tofu_register): Move SIG_DIGEST computation to the top
-	so that it is not uninitialized in case of an early error.
-
-	gpg: Fix harmless compiler warnings.
-	+ commit 558bcd43ae0a841cf1e58e06f5d72a19d5bc70cd
-	* g10/tofu.h (_tofu_GET_POLICY_ERROR): New. This avoids warnings
-	about undefined enum values in a switch.
-	* g10/trustdb.h (_tofu_GET_TRUST_ERROR): New.
-	* g10/tofu.c (TIME_AGO_FUTURE_IGNORE): Move to the top.
-	(opendbs): Avoid compiler warning (use braces).
-	(GET_POLICY_ERROR): Replace define by enum _tofu_GET_POLICY_ERROR.
-	(get_policy): Remove assert.
-	(GET_TRUST_ERROR): Replace by _tofu_GET_TRUST_ERROR macro.
-	(show_statistics): Undef MIN_SECS et al. after use.
-
-	common: Avoid warning about const char ** assignment.
-	+ commit e64c805b0c270d859ddf2c35d573110cf25e8d48
-	* common/mkdir_p.c (gnupg_amkdir_p): Also strdup first item. Return
-	an error on malloc failure.
-	(gnupg_mkdir_p): Fix type of dirs and tmp_dirs.
-
-	Move http module from common/ to dirmngr/.
-	+ commit 5aa1b392b1bf6fcf4cd380862c5affac39a4f34d
-	* common/http.c: Move to ../dirmngr/.
-	* common/http.h: Move to ../dirmngr/.
-	* common/t-http.c: Move to ../dirmngr/.
-	* common/tls-ca.pem: Move to ../dirmngr/.
-	* common/Makefile.am: Do not build libcommontls.a libcommontlsnpth.a.
-	Remove http.c related stuff.
-	* po/POTFILES.in: Move http.c to dirmngr/.
-	* dirmngr/Makefile.am (EXTRA_DIST): Add tls-ca.pem.
-	(module_maint_tests): New.
-	(noinst_PROGRAMS): Add module_maint_tests.
-	(dirmngr_SOURCES): Add http.c and http.h.
-	(dirmngr_LDADD): Remove libcommontlsnpth.
-	(t_common_ldadd): Ditto.
-	(t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
-	(t_ldap_parse_uri_SOURCES): Add http.c.
-	(t_ldap_parse_uri_CFLAGS): Build without npth.
-	($(PROGRAMS)): Do not require libcommontls.a libcommontlsnpth.a.
-	* dirmngr/dirmngr.h, dirmngr/ks-engine.h: Fix include of http.h.
-
-2015-10-18 Neal H. Walfield <neal@g10code.com>
-
-	g10: Fix assert.
-	+ commit 128a456e775edf393d47e40bb9ae8b62434e2978
-	* g10/tofu.c (get_trust): Fix assert.
-
-	g10: Add TOFU support.
-	+ commit f77913e0ff7be4cd9c6337a70ac715e6f4a43572
-	* configure.ac: Check for sqlite3.
-	(SQLITE3_CFLAGS): AC_SUBST it.
-	(SQLITE3_LIBS): Likewise.
-	* g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
-	(gpg2_SOURCES): Add tofu.h and tofu.c.
-	(gpg2_LDADD): Add $(SQLITE3_LIBS).
-	* g10/tofu.c: New file.
-	* g10/tofu.h: New file.
-	* g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
-	(tofu_db_format): Define.
-	* g10/packet.h (PKT_signature): Add fields digest and digest_len.
-	* g10/gpg.c: Include "tofu.h".
-	(cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
-	oTOFUDBFormat.
-	(opts): Add them.
-	(parse_trust_model): Recognize the tofu and tofu+pgp trust models.
-	(parse_tofu_policy): New function.
-	(parse_tofu_db_format): New function.
-	(main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
-	Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
-	* g10/mainproc.c (do_check_sig): If the signature is good, copy the
-	hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
-	* g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
-	callers.
-	(tdb_get_validity_core): Add arguments sig and may_ask. Update
-	callers.
-	* g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
-	to tdb_get_validity_core.
-	* g10/trustdb.c: Include "tofu.h".
-	(trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
-	(tdb_get_validity_core): Add arguments sig and may_ask. If
-	OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
-	level. Combine it with the computed PGP trust level, if appropriate.
-	* g10/keyedit.c: Include "tofu.h".
-	(show_key_with_all_names_colon): If the trust mode is tofu or
-	tofu+pgp, then show the trust policy.
-	* g10/keylist.c: Include "tofu.h".
-	(public_key_list): Also show the PGP stats if the trust model is
-	TM_TOFU_PGP.
-	(list_keyblock_colon): If the trust mode is tofu or
-	tofu+pgp, then show the trust policy.
-	* g10/pkclist.c: Include "tofu.h".
-	* g10/gpgv.c (get_validity): Add arguments sig and may_ask.
-	(enum tofu_policy): Define.
-	(tofu_get_policy): New stub.
-	(tofu_policy_str): Likewise.
-	* g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
-	(enum tofu_policy): Define.
-	(tofu_get_policy): New stub.
-	(tofu_policy_str): Likewise.
-	* doc/DETAILS: Describe the TOFU Policy field.
-	* doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
-	--trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
-	* tests/openpgp/Makefile.am (TESTS): Add tofu.test.
-	(TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
-	tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
-	(CLEANFILES): Add tofu.db.
-	(clean-local): Add tofu.d.
-	* tests/openpgp/tofu.test: New file.
-	* tests/openpgp/tofu-2183839A-1.txt: New file.
-	* tests/openpgp/tofu-BC15C85A-1.txt: New file.
-	* tests/openpgp/tofu-EE37CF96-1.txt: New file.
-	* tests/openpgp/tofu-keys.asc: New file.
-	* tests/openpgp/tofu-keys-secret.asc: New file.
-
-2015-10-16 Neal H. Walfield <neal@g10code.com>
-
-	common: Prefix the mkdir functions with gnupg_. Make args const.
-	+ commit 93e855553eba03f5c31682e0aaf39f18f29860b7
-	* common/mkdir_p.h (mkdir_p): Rename from this...
-	(gnupg_mkdir_p): ... to this. Change directory_component's type from
-	char * to const char *.
-	(amkdir_p): Rename from this...
-	(gnupg_amkdir_p): ... to this. Change directory_component's type from
-	char * to const char *.
-	* common/mkdir_p.c (mkdir_p): Rename from this...
-	(gnupg_mkdir_p): ... to this. Change directory_component's type from
-	char * to const char *.
-	(amkdir_p): Rename from this...
-	(gnupg_amkdir_p): ... to this. Change directory_component's type from
-	char * to const char *.
-
-2015-10-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	cleanup: Fix confusion between gpg_error_t and gpg_err_code_t.
-	+ commit 3de5ef759895837fe499cff7fb1fa7798e6d5754
-	* dirmngr/crlcache.c (hash_dbfile): Use gpg_error_t for ERR.
-	* kbx/keybox-update.c (keybox_set_flags): Call
-	gpg_err_code_from_syserror.
-
-2015-10-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit 0b4ebc398cc8aad3f25f84034cd6b129e55f1368
-
-
-2015-10-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Try hard to use MDC also for sign+symenc.
-	+ commit 4584125802be11833a5b289e864b45eedc2b45fd
-	* g10/encrypt.c (use_mdc): Make it a global func.
-	* g10/sign.c (sign_symencrypt_file): Use that function to decide
-	whether to use an MDC.
-	* tests/openpgp/conventional-mdc.test: Add a simple test case.
-
-2015-10-09 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.9.
-	+ commit 086b8738f71ba26d36287db81f6d78116053ba66
-
-
-2015-10-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: simplify agent_get_passphrase.
-	+ commit 5a12c45666cd16bc750d7f0e63620c295feb77ea
-	* agent/call-pinentry.c (agent_get_passphrase): Simplify.
-
-	agent: fix agent_askpin.
-	+ commit 818fa4f71e1056831b35d0f8aff715c0e1d537e6
-	* agent/call-pinentry.c (agent_askpin): Fix off-by-one error.
-
-	agent: Fix function return type for check_cb and agent_askpin.
-	+ commit f70f6695368444d8058305ab696e5e5a1bace18c
-	* agent/call-pinentry.c (unlock_pinentry): Return gpg_error_t.
-	(start_pinentry, setup_qualitybar): Likewise.
-	(agent_askpin): Fix return value check of check_cb.
-	* agent/command-ssh.c (reenter_compare_cb): Return gpg_error_t.
-	(ssh_identity_register): Fix return value check of agent_askpin.
-	* agent/cvt-openpgp.c (try_do_unprotect_cb): Return gpg_error_t.
-	* agent/findkey.c (try_unprotect_cb): Likewise.
-	* agent/genkey.c (reenter_compare_cb): Return gpg_error_t.
-	(agent_ask_new_passphrase): Fix return value check of agent_askpin.
-
-2015-10-08 Andre Heinecke <aheinecke@intevation.de>
-
-	dirmngr: Default to http protocol for http-proxy.
-	+ commit ea079d283de6bf4ac70d7530fac70938e7c5e8f5
-	* common/http.c (send_request): Fix handling for hostname:port string.
-
-2015-10-08 Werner Koch <wk@gnupg.org>
-
-	common: Allow building of mkdir_p.c for Windows.
-	+ commit 4c298525903f844eee95ecbcdc45f5ac034fa148
-	* common/mkdir_p.c: Change license and comment debug statements.
-	(amkdir_p, mkdir_p): Fail on malloc error and use default_errsource to
-	build an error code. Change return value to gpg_error_t.
-	(amkdir_p): Use gnupg_mkdir.
-
-	* common/membuf.c: Include util.h first to avoid redefined macro
-	warnings.
-
-	gpg: Add option --print-dane-records.
-	+ commit d7b8e76f9930750d669405dee3108c9bc8e87b91
-	* g10/options.h (opt): Add field "print_dane_records".
-	* g10/gpg.c (oPrintDANERecords): new.
-	(opts): Add --print-dane-records.
-	(main): Set that option.
-	* g10/export.c (do_export): Remove EXPORT_DANE_FORMAT handling.
-	(do_export_stream): Add EXPORT_DANE_FORMAT handling.
-	* g10/keylist.c (list_keyblock_pka): Implement DANE record printing.
-
-	* g10/gpgv.c (export_pubkey_buffer): New stub.
-	* g10/test-stubs.c (export_pubkey_buffer): New stub.
-
-	gpg: Pass CTRL parameter to all key listing functions.
-	+ commit b6d621583fc9cbda6f9376a24f2f4cf11499a4fd
-	* g10/keylist.c (public_key_list): Add arg CTRL.
-	(secret_key_list): Ditto.
-	(list_all, list_one): Ditto.
-	(locate_one): Ditto.
-	(list_keyblock_pka): Ditto.
-	(list_keyblock): Ditto.
-	(list_keyblock_direct): Ditto.
-	* g10/keygen.c (proc_parameter_file): Add arg CTRL.
-	(read_parameter_file): Ditto.
-	(quick_generate_keypair): Ditto.
-	(do_generate_keypair): Ditto.
-	(generate_keypair): Pass arg CTRL.
-	* g10/gpg.c (main): Pass arg CTRL to quick_generate_keypair.
-
-2015-10-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove unfinished experimental code to export as S-expressions.
-	+ commit a400958323d93036dca9c63135b167012ea64f8b
-	* g10/options.h (EXPORT_SEXP_FORMAT): Remove.
-	(EXPORT_DANE_FORMAT): New.
-	* g10/export.c (parse_export_options): Remove "export-sexp-format".
-	(export_seckeys): Adjust for removed option.
-	(export_secsubkeys): Ditto.
-	(do_export): Prepare for DANE format.
-	(build_sexp, build_sexp_seckey): Remove.
-	(do_export_stream): Remove use of removed functions.
-
-2015-10-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Add new --auto-key-locate mechanism "dane".
-	+ commit 9ac31f91b10059474da1c9580fb99e94278d4c11
-	* g10/call-dirmngr.c (gpg_dirmngr_dns_cert): Allow fetching via DANE.
-	* g10/keyserver.c (keyserver_import_cert): Add arg "dane_mode".
-	* g10/options.h (AKL_DANE): New.
-	* g10/getkey.c (get_pubkey_byname): Implement AKL_DANE.
-	(parse_auto_key_locate): Ditto.
-
-	dirmngr: Addlow fetching keys using OpenPGP DANE.
-	+ commit 264a81d82737369ee8beef771cf2bd2cd874320a
-	* dirmngr/server.c (cmd_dns_cert): Add option --dane.
-
-	dirmngr: Improve DNS code to retrieve arbitrary records.
-	+ commit 211b8084ee4391baec35e8c5bd75a9ecbcb889a7
-	* dirmngr/dns-cert.c (get_dns_cert): Add hack to retrieve arbitrary
-	resource records.
-	* dirmngr/dns-cert.h (DNS_CERTTYPE_RRBASE): New.
-	(DNS_CERTTYPE_RR61): New.
-
-	dirmngr: Change DNS code to make additions easier.
-	+ commit 6cf80dc77ec5df3722924301ff4be2475966937b
-	* dirmngr/dns-cert.c (get_dns_cert) !USE_ADNS: Change loop to allow
-	adding more resource types.
-
-	dirmngr: Make commands RELOADDIRMNGR and KILLDIRMNGR work properly.
-	+ commit 7faf45effcd47d2d04d35090a1e01a1dbb99ec70
-	* dirmngr/server.c (cmd_killdirmngr): Set assuan close flag.
-	(cmd_reloaddirmngr): Use check_owner_permission.
-
-	dirmngr: Do tilde expansion for --hkp-cacert.
-	+ commit 9db6547a00cded92c00c8f8382b1b605be1027d2
-	* dirmngr/dirmngr.c (parse_rereadable_options): Do tilde expansion and
-	check for cert file existance in option --hkp-cacert.
-
-	gpg: Fail decryption for AES etc message w/o MDC.
-	+ commit 625e292108cc0fd9077769587a8c22abe7805e33
-	* g10/mainproc.c (proc_encrypted): Fail for modern messages w/o MDC.
-
-2015-10-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix verification of signature for smartcard.
-	+ commit 4a5bd1720f5a3dbb26f5daeb03725cae29be7e24
-	* agent/pksign.c (agent_pksign_do): Use public key smartcard.
-
-	agent: Fix non-allocation for pinentry_loopback.
-	+ commit ce2a84b58833fd308d5fe11756721f39c953280a
-	* agent/call-pinentry.c (agent_get_passphrase): Don't allocate, it will
-	be allocated by pinentry_loopback.
-
-2015-10-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Install a dirmngr.conf file.
-	+ commit f3959f14b6c496c726bbca5230becb7b6844a234
-	* g10/dirmngr-conf.skel: New.
-	* g10/Makefile.am (EXTRA_DIST): Add file.
-	(install-data-local, uninstall-local): Install that file.
-	* g10/openfile.c (copy_options_file): Add arg "name", return a value,
-	simplify with xstrconcat, and factor warning message out to:
-	(try_make_homedir): here. Also install dirmngr.conf.
-	* g10/options.skel: Remove --keyserver entry.
-
-	gpg: Deprecate the --keyserver option.
-	+ commit ae471fa978589fb61ecb0f89bbfe4d43cf2d5eac
-	* g10/keyserver.c (keyserver_refresh): Change return type to
-	gpg_error_t. Use gpg_dirmngr_ks_list to print the name of the
-	keyserver to use.
-	(keyserver_search): Do not print the "no keyserver" error
-	message. The same error is anyway returned from dirmngr.
-	* g10/call-dirmngr.c (ks_status_parm_s): Add field "keyword".
-	(ks_status_cb): Handle other status keywords.
-	(gpg_dirmngr_ks_list): New.
-	* tools/gpgconf-comp.c (gc_options_gpg): Deprecate "keyserver".
-	(gc_options_dirmngr): Add "Keyserver" group and "keyserver".
-
-	dirmngr: Add option --keyserver.
-	+ commit a48e6de603c3a312f02b1b5fdb813032eeae9074
-	* dirmngr/dirmngr.c (oKeyServer): New.
-	(opts): Add "keyserver".
-	(parse_rereadable_options): Parse that options
-	(main): Add option to the gpgconf list.
-	* dirmngr/dirmngr.h (opt): Add field "keyserver".
-	* dirmngr/server.c (ensure_keyserver): New.
-	(make_keyserver_item): New. Factored out from
-	(cmd_keyserver): here. Call ensure_keyserver.
-	(cmd_ks_search): Call ensure_keyserver.
-	(cmd_ks_get): Ditto.
-	(cmd_ks_fetch): Ditto.
-	(cmd_ks_put): Ditto.
-
-	dirmngr: Make clear that --use-tor is not yet ready for use.
-	+ commit 438730323a5d9bbf8dd5cd60d479b6c03f8721d0
-	* dirmngr/dirmngr.c (main): Print a warning if --use-tor has been
-	given.
-	* tools/gpgconf-comp.c (gc_options_dirmngr): Make --use-tor invisible.
-
-	gpgconf: Change displayed name of Dirmngr to "Key Acquirer".
-	+ commit c6400c1aa82239f1c154ca27596600cae964515d
-	* tools/gpgconf-comp.c (gc_component): Change printed name.
-
-2015-10-02 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix use-after-free due to a realloc shrinking.
-	+ commit 75c64c2b6d77856b90903cc3b7c6a2f62ff8eb7b
-	* dirmngr/ks-engine-hkp.c (map_host): Do not use original pointer
-	after realloc.
-
-	agent: Fix alignment problem with the second passphrase struct.
-	+ commit ddf9dd135acd2b3635bb986f6dfc0e4e446d5fad
-	* agent/genkey.c (agent_ask_new_passphrase): Use a separate malloc for
-	PI2. Check return value of the malloc function.
-	* agent/command-ssh.c (ssh_identity_register): Use a separate malloc
-	for PI2. Wipe PI2.
-
-2015-10-01 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix a practical hang after use of --faked-system-time.
-	+ commit 2acceba5cc299796c7b5b1851a9baeb75d9f32a1
-	* g10/sign.c (update_keysig_packet): Bail out if we would need to long
-	for a new timestamp.
-
-	gpg: Print more info with "check selfsig".
-	+ commit 2c60663a72f090573c4869e305b098b4b1fb23bd
-	* g10/keyedit.c (print_and_check_one_sig): Print more Some sigsub
-	packets.
-
-	gpg: Add debug helper to --edit-keys's check sub-command.
-	+ commit 13a3f65968f4a8205ca664cc46b1a53de4dc489b
-	* g10/keyedit.c (print_and_check_one_sig): Add arg "extended" and
-	print an asterisk for the chosen selfsig.
-	(check_all_keysigs): Add arg "only_selfsig"
-	(keyedit_menu) <cmdCHECK>: Add optional arg "selfsig".
-
-2015-10-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: Fix strsplit.
-	+ commit a9895a5a72a851c5fcc70f16d5f8f588cc885751
-	* common/stringhelp.c (strsplit): Fix arguments order.
-
-2015-09-30 Neal H. Walfield <neal@g10code.com>
-
-	common: Add mkdir_p.
-	+ commit c8584a1e559bc720412e1a2fc546a54ff4517205
-	* common/mkdir_p.c: New file.
-	* common/mkdir_p.h: New file.
-	* common/Makefile.am (common_sources): Add mkdir_p.c and mkdir_p.h.
-
-	common: Remove unused files.
-	+ commit 5576146ede40b42bc632fd9697dd429a4d1409cf
-	* common/xmalloc.c: Remove file.
-	* common/xmalloc.h: Remove file.
-
-	common: Include <gpg-error.h>.
-	+ commit 270d3f55f9193ebda5e1b642d58daf905019914d
-	* common/logging.h: Include <gpg-error.h>.
-
-2015-09-29 Neal H. Walfield <neal@g10code.com>
-
-	g10: Remove unused struct cmp_help_context_s.
-	+ commit 8ab63e4b5018044ecfb0b9910412487066886826
-	* g10/sig-check.c (struct cmp_help_context_s) Remove unused struct.
-
-	g10: Avoid an unnecessary copy.
-	+ commit 12443eafa6e19b94a8b554126423e2a5ccc2dd7e
-	* g10/sig-check.c (signature_check2): Avoid copying PK to RET_PK.
-	Instead, directly use the provided storage. If none is provided
-	allocate some.
-
-2015-09-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	ssh: Fix fingerprint computation for EdDSA key.
-	+ commit 5c067d54d349fdfb3243634789c8841515d2c28f
-	* common/ssh-utils.c (get_fingerprint): Handle the prefix of 0x40.
-	* common/t-ssh-utils.c (sample_keys): Add a new key.
-
-	agent: RSA signature verification by gpg-agent.
-	+ commit cfbe6ba9cf1414e9aa4977e2bbaecaa43154b2ae
-	* g10/sign.c (do_sign): Let verify signature by gpg-agent.
-	* agent/pksign.c (agent_pksign_do): Call gcry_pk_verify for RSA.
-
-2015-09-28 Werner Koch <wk@gnupg.org>
-
-	common: Provide two new error code replacements.
-	+ commit f1effdc5ecd0cc52a28db7ae28a5c28f33486542
-	* common/util.h (GPG_ERR_FALSE, GPG_ERR_TRUE): Rew replcements.
-
-	common: Change calling convention for gnupg_spawn_process.
-	+ commit 83811e3f1f0c615b2b63bafdb49a35a0fc198088
-	* common/exechelp.h (GNUPG_SPAWN_NONBLOCK): New.
-	(GNUPG_SPAWN_RUN_ASFW, GNUPG_SPAWN_DETACHED): Macro to replace the
-	numbers.
-	* common/exechelp.h (gnupg_spawn_process): Change function to not take
-	an optional stream for stdin but to return one.
-	* common/exechelp-posix.c (gnupg_spawn_process): Implement change.
-	(create_pipe_and_estream): Add args outbound and nonblock.
-	* common/exechelp-w32.c (gnupg_spawn_process): Implement change.
-
-2015-09-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Handle error correctly.
-	+ commit 6bb7206e357acfd7276a8f1334c0f0c9cc6ed100
-	* scd/apdu.c (apdu_connect): Initialize variables and check an error
-	of apdu_get_status_internal.
-
-2015-09-22 Werner Koch <wk@gnupg.org>
-
-	ssh: Add 256, 384 and 521 bit test keys for the fingerprint.
-	+ commit 12ff806d1b63d08cb43d131065d51353495d9346
-	* common/t-ssh-utils.c (sample_keys): Add 3 new keys.
-
-	ssh: Fix fingerprint computation for 384 bit ECDSA keys.
-	+ commit 2167951b275bae51cf669c02547e2e7ea8fbe2ee
-	* common/ssh-utils.c (get_fingerprint): Fix hashed string.
-
-2015-09-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix importing ECC key.
-	+ commit 1542dc604b9c3e6a6a99750c48f7800e72584a89
-	* agent/cvt-openpgp.c (convert_from_openpgp_main): Only encrypted
-	parameters are stored as opaque.
-	(apply_protection): ARRAY members are all normal, non-opaque MPI.
-	(extract_private_key): Get public key as normal, non-opaque MPI.
-	Remove support of ECC key with '(flags param)'.
-	Remove support of "ecdsa" and "ecdh" keys of our experiment.
-
-	scd: Fix KEYTOCARD handling for ECC key.
-	+ commit 708b7eccdef8d274bd5578b9a5fd908e9685c795
-	* scd/app-openpgp.c (ecc_writekey): Only public key can be native
-	format.
-
-2015-09-19 Neal H. Walfield <neal@g10code.com>
-
-	common: Add new function strlist_length.
-	+ commit 8499c4f84a664bedbdf5a5689cb02420909f1968
-	* common/strlist.c (strlist_length): New function.
-
-2015-09-18 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Change displayed name of Dirmngr to "Network Manager".
-	+ commit 819bba75aaed11ecef2e274add173718358212b9
-	* tools/gpgconf-comp.c (gc_component): Change printed name.
-
-	dirmngr: Add option --use-tor as a stub.
-	+ commit c091816b4a90d7eea6f8601ec1522a0a006794e8
-	* dirmngr/dirmngr.h (opt): Add field "use_tor".
-	* dirmngr/dirmngr.c (oUseTor): New.
-	(opts): Add --use-tor.
-	(parse_rereadable_options): Set option.
-	(main): Tell gpgconf about that option.
-
-	* dirmngr/crlfetch.c (crl_fetch): Pass TOR flag to the http module and
-	return an error if LDAP is used in TOR mode.
-	(ca_cert_fetch): Return an error in TOR mode.
-	(start_cert_fetch): Ditto.
-	* dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass TOR flag to the
-	http module.
-	* dirmngr/ks-engine-hkp.c (send_request): Ditto.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-	* dirmngr/ks-engine-ldap.c (ks_ldap_get): Return an error in TOR mode.
-	(ks_ldap_search): Ditto.
-	(ks_ldap_put): Ditto.
-	* dirmngr/ocsp.c (do_ocsp_request): Ditto. Also pass TOR flag to the
-	http module.
-
-	* dirmngr/server.c (option_handler): Add "honor-keyserver-url-used".
-	(cmd_dns_cert): Return an error in TOR mode.
-	(cmd_getinfo): Add subcommand "tor"
-	* tools/gpgconf-comp.c (gc_options_dirmngr): Add TOR group.
-
-	gpg: Report a conflict between honor-keyserver-url and TOR.
-	+ commit d5a3142b8f2e5603357182f34f0b081b47eda23c
-	* g10/call-dirmngr.c (create_context): Send option and print a verbose
-	error.
-
-	http: Add flag to force use of TOR (part 1)
-	+ commit b4bc1c8b10c7a794fa108678b80f76366a65c47d
-	* common/http.h (HTTP_FLAG_FORCE_TOR): New.
-	* common/http.c (http_raw_connect, send_request): Detect flag and
-	return an error for now.
-
-2015-09-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit f986b23e13eaa2d7705733b4bf6b5210311f181a
-
-
-	scd: Fix ccid-driver timeout for OpenPGPcard v2.1.
-	+ commit 6510df3a7cd2b5bf44fac1e4d50ee54b8c897daa
-	* scd/ccid-driver.c (CCID_CMD_TIMEOUT): New.
-	(ccid_transceive_apdu_level, ccid_transceive): Use.
-
-2015-09-16 Werner Koch <wk@gnupg.org>
-
-	agent: New option --pinentry-invisible-char.
-	+ commit 93d257c81952cbb08a744a9cea6749639aa32cd7
-	* agent/gpg-agent.c (oPinentryInvisibleChar): New.
-	(opts): Add option.
-	(parse_rereadable_options): Set option.
-	* agent/agent.h (opt): Add field pinentry_invisible_char.
-	* agent/call-pinentry.c (start_pinentry): Pass option to pinentry.
-
-	g13: Move some code to a separate module.
-	+ commit 9e65bbd255c43f0e59f35b0003052234d69042be
-	* g13/g13-common.c, g13/g13-common.h: New.
-	* g13/Makefile.am (g13_SOURCES): Add new files.
-	* g13/g13.c (g13_errors_seen): Move to g13-common.c.
-	(cmdline_conttype): New.
-	(main): Use g13_init_signals and g13_install_emergency_cleanup.
-	(emergency_cleanup, g13_exit): Move to g13-common.c.
-	* g13/g13.h: Move OPT and some other code to g13-common.h.
-
-	gpg: Fix skip function dummy parameter.
-	+ commit 8eb3a1797a1e7cb59a8342a8aa917756fe67949f
-	* g10/trustdb.c (search_skipfnc): Fix dummy argument
-
-	gpg: Change last commit to avoid extra translations.
-	+ commit f71ed902def81f9408d9094289d8a97abaa0f609
-	* g10/keyedit.c (keyedit_menu): Do not print usage hints in expert
-	mode.
-
-2015-09-16 Neal H. Walfield <neal@g10code.com>
-
-	g10: Improve error message.
-	+ commit 172af881a1cfe82dfec1c43102d6c464e67ef230
-	* g10/keyedit.c (keyedit_menu): When complaining that a user ID or key
-	must be selected, indicate what command to use to do this.
-
-	g10: Be more careful when merging self-signed data.
-	+ commit 6845737736d3264d7ee8b7364d908951010084c9
-	* g10/getkey.c (merge_selfsigs_main): Stop looking for self-signed
-	data belonging to the public key when we encounter an attribute packet
-	or a subkey packet, not just a user id packet. When looking for
-	self-signed data belonging to a user id packet, stop when we see a
-	user attribute packet.
-
-	g10: Simplify some complicated boolean expressions.
-	+ commit c31e089129c0102c1710522d71fbe1880e84d68e
-	* g10/getkey.c (finish_lookup): Simplify logic.
-
-	g10: Also mark revoked and expired keys as unusable.
-	+ commit 77c2ad4a817c129b899708399ed2078a52b452b8
-	* g10/getkey.c (skip_unusable): Also mark the key as unusable if it
-	has been revoked or has expired.
-
-	g10: Release resources when returning an error in get_seckey.
-	+ commit 1b601de06a57c78537a336093d2531d8c58bc0d2
-	* g10/getkey.c (get_seckey): If the key doesn't have a secret key,
-	release *PK.
-
-	g10: Improve documentation and comments for getkey.c.
-	+ commit cab581c486e1987445092b1afdf2cba1f62d017d
-	* g10/getkey.c: Improve documentation and comments for most
-	functions. Move documentation for public functions from here...
-	* g10/keydb.h: ... to here.
-
-	g10: Remove unused function have_any_secret_key.
-	+ commit 7333e704efde6923d4b914b37e9a92c4a5bab156
-	* g10/getkey.c (have_any_secret_key): Remove function.
-
-	g10: Bring cache semantics closer to non-cache semantics.
-	+ commit 5e233e12f55be00f5659c63bc32fbdca2ec93136
-	* g10/getkey.c (get_pubkey_fast): When reading from the cache, only
-	consider primary keys.
-
-	g10: Break out of the loop earlier.
-	+ commit 3940f10af7915b080bf4ed25ceb7e20b52e3cd3e
-	* g10/getkey.c (have_secret_key_with_kid): Once we find the relevent
-	key or subkey, stop searching.
-
-	g10: Don't skip legacy keys if the search mode is KEYDB_SEARCH_MODE_NEXT
-	+ commit 50affffe93a07643f2610c7a5f3d6f61988855e8
-	* g10/getkey.c (lookup): Also don't skip legacy keys if the search
-	mode is KEYDB_SEARCH_MODE_NEXT.
-
-	g10: Remove unused function get_seckeyblock_byfprint.
-	+ commit efbaa8f891812e13ae9e689299aa2cd51781ccb3
-	* g10/keydb.h (get_seckeyblock_byfprint): Remove prototype.
-	* g10/getkey.c (get_seckeyblock_byfprint): Remove function.
-
-	g10: Remove unused function get_seckey_byfprint.
-	+ commit e2b300801ed7143fa924df5442ec2b61079c0bbb
-	* g10/keydb.h (get_seckey_byfprint): Remove prototype.
-	* g10/getkey.c (get_seckey_byfprint): Remove function.
-
-	g10: Simplify get_seckey_byname: it was never called with NAME not NULL.
-	+ commit 80dbf8006ffe52e77930b0a6dca9d8caba8c3fd5
-	* g10/keydb.h (get_seckey_byname): Rename from this...
-	(get_seckey_default): ... to this. Drop the parameter name. Update
-	users.
-	* g10/getkey.c (get_seckey_byname): Rename from this...
-	(get_seckey_default): ... to this. Drop the parameter name. Drop the
-	code which assumed that NAME is not NULL.
-
-	g10: Eliminate the redundant function get_keyblock_byfprint.
-	+ commit dc69804ab0576fbc87297215d63b37a680d74d4d
-	* g10/keydb.h (get_keyblock_byfprint): Remove prototype. Replace use
-	of this function with get_pubkey_byfprint.
-	* g10/getkey.c (get_pubkey_byname): Remove function.
-
-	g10: Simplify semantics of get_pubkey_byname.
-	+ commit 911fcca36d61afd061e9e6dc0584bb069353db89
-	* g10/getkey.c (get_pubkey_byname): If R_KEYBLOCK is not NULL, return
-	the keyblock in R_KEYBLOCK independent of whether PK is set or not.
-
-	g10: Eliminate the redundant function get_pubkey_byname.
-	+ commit b4672e4d48fb1e1e4d17551c4c828763d1dfbb57
-	* g10/getkey.c (get_pubkey_byname): Remove function.
-	(lookup): Replace use of get_pubkey_byname by get_pubkey_byfprint.
-
-	g10: Eliminate the redundant function get_pubkey_end.
-	+ commit 65e58ae6748c280c8633d2ca5f227ebe1220805d
-	* g10/keydb.h (get_pubkey_end): Remove declaration. Replace use of
-	function with getkey_end.
-	* g10/getkey.c (get_pubkey_byname): Remove function.
-
-	g10: Eliminate the redundant function get_pubkey_next.
-	+ commit be6743b2e19241f66148bf89c3442d8e2ebcd63e
-	* g10/keydb.h (get_pubkey_next): Remove prototype.
-	* g10/getkey.c (get_pubkey_next): Remove function.
-	* g10/keylist.c (locate_one): Use getkey_next instead of
-	get_pubkey_next.
-
-	kbx: Change skipfnc's prototype so that we can provide all information.
-	+ commit 9acbeac23668a1d0dabca27d7825430d76e095c2
-	* kbx/keybox-search-desc.h (struct keydb_search_desc.skipfnc): Change
-	third parameter to be the index of the user id packet in the keyblock
-	rather than the packet itself. Update users.
-
-	g10: Remove unused prototype (get_pubkey_byfpr).
-	+ commit 83e17ab1b4cf4420f2abaf9e1f4017a9473fb281
-	* g10/keydb.h (get_pubkey_byfpr): Remove unused prototype.
-
-	g10: Remove unused function (get_pubkey_bynames).
-	+ commit b06f96ba4f57f55194efcd37a0e3a2aa5450b974
-	* g10/keydb.h (get_pubkey_bynames): Remove prototype.
-	* g10/getkey.c (get_pubkey_bynames): Remove function.
-
-	g10: Simplify code. Turn struct getkey_ctx_s.found_key into an argument
-	+ commit d47e84946ee010917cfc3501062721b74afbb771
-	* g10/getkey.c (struct getkey_ctx_s): Remove field found_key.
-	(lookup): Add argument ret_found_key. If not NULL, set it to the
-	found key. Update callers.
-	(pk_from_block): Add argument found_key. Use it instead of
-	CTX->FOUND_KEY. Update callers.
-	(finish_lookup): Return a KBNODE (the found key) instead of an int.
-	Don't set CTX->FOUND_KEY. Return the found key instead.
-
-	g10: Remove unused field struct getkey_ctx_s.kbpos.
-	+ commit c110e186e07fb1035dc757d322274f939df1c86d
-	* g10/getkey.c (struct getkey_ctx_s): Remove field kbpos.
-	(getkey_end): Don't clear CTX->KBPOS.
-
-	g10: Simplify code: remove field struct getkey_ctx_s.keyblock.
-	+ commit 3798f73c07f33576bd02ba4a3256c626bd80752f
-	* g10/getkey.c (struct getkey_ctx_s): Remove field keyblock.
-	(finish_lookup): Add parameter keyblock. Update caller to pass this.
-	(lookup): Add new local variable keyblock. Use this instead of
-	ctx->keyblock for referencing the keyblock.
-
-2015-09-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix registering SSH Key of Ed25519.
-	+ commit 7d5999f0964c9412c0e18eb1adefdb729be68cd4
-	* agent/command-ssh.c (stream_read_string): Add the prefix of 0x40.
-
-2015-09-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit faee25e670cfeb0d0166d7c59cc6a0b3842ee34d
-
-
-2015-09-10 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.8.
-	+ commit 311816f6cf9d411dba060603e3c5d01c72824645
-
-
-	tests: Silence the 5gb-packet test.
-	+ commit 7a0c3cc760367024305d23e2124ea4cbc7e802df
-	* tests/openpgp/4gb-packet.test: Send output to /dev/null.
-
-	g10: Fix make distcheck problem.
-	+ commit e92a8ab021672b19e5cd397fa555fcc8a3401e8b
-	* g10/test.c: Include string.h.
-	(prepend_srcdir): New. Taken from Libgcrypt.
-	(test_free): New.
-	* g10/t-keydb.c (do_test): Malloc the filename.
-	* g10/Makefile.am (AM_CPPFLAGS): Remove -DSOURCE_DIR
-	(EXTRA_DIST): Add t-keydb-keyring.kbx.
-
-	g10: Improve portability of the new test driver.
-	+ commit fbf24cd09abcdc3dec21db4114ab2db99ce21e4c
-	* g10/test.c: Include stdio.h and stdlib.h.
-	(verbose): New.
-	(print_results): Rename to exit_tests.
-	(main): Remove atexit and call exit_tests. Set verbose.
-	(ASSERT, ABORT): Call exit_tests instead of exit.
-
-2015-09-09 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Allow sending much larger keyblocks.
-	+ commit 19545e3a2d2990cba6d62f98cdb1f665b38ba4f1
-	* dirmngr/server.c (MAX_CERT_LENGTH): Increase to 16k.
-	(MAX_KEYBLOCK_LENGTH): Increase to 20M.
-
-2015-09-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Force key attribute change for writekey.
-	+ commit f10b427d0e2be333776fee2df8150145da36e587
-	* scd/app-openpgp.c (change_rsa_keyattr): New.
-	(change_keyattr_from_string): Use change_rsa_keyattr.
-	(rsa_writekey): Call change_rsa_keyattr when different size.
-	(ecc_writekey): Try to change key attribute.
-
-	scd: KEYNO cleanup.
-	+ commit fd689e85423d0d80d725f0315c52d94f0e9766f8
-	* scd/app-openpgp.c (get_public_key, send_keypair_info, do_readkey)
-	(change_keyattr, change_keyattr_from_string, ecc_writekey, do_genkey)
-	(compare_fingerprint, check_against_given_fingerprint): KEYNO starts
-	from 0.
-
-2015-09-02 Neal H. Walfield <neal@g10code.com>
-
-	g10: Remove unused field req_algo.
-	+ commit bd0c902f1de46eda03a065da41487e7e01ab4c50
-	* g10/packet.h (PKT_public_key): Remove unused field req_algo. Remove
-	users.
-	* g10/getkey.c (struct getkey_ctx_s): Remove unused field req_algo.
-	Remove users.
-
-	g10: Use a symbolic constant instead of a literal.
-	+ commit 1f03d4cd940fed26fc3ffa1742728d68c55ee5d1
-	* g10/trustdb.c (KEY_HASH_TABLE_SIZE): Define.
-	(new_key_hash_table): Use KEY_HASH_TABLE_SIZE instead of a literal.
-	(release_key_hash_table): Likewise.
-	(test_key_hash_table): Likewise.
-	(add_key_hash_table): Likewise.
-
-	g10: Add test for keydb as well as new testing infrastructure.
-	+ commit ee7ec1256b24dc340656c331ef92fc59cad817b6
-	* g10/Makefile.am (EXTRA_DIST): Add test.c.
-	(AM_CPPFLAGS): Add -DSOURCE_DIR="\"$(srcdir)\"".
-	(module_tests): Add t-keydb.
-	(t_keydb_SOURCES): New variable.
-	(t_keydb_LDADD): Likewise.
-	* g10/t-keydb.c: New file.
-	* g10/t-keydb-keyring.kbx: New file.
-	* g10/test-stubs.c: New file.
-	* g10/test.c: New file.
-
-	g10: Make the keyblock cache per-handle rather than global.
-	+ commit 60bc518645d3acfd4dcb79e61a2be6ce001e93aa
-	* g10/keydb.c (keyblock_cache): Don't declare this variable. Instead...
-	(struct keyblock_cache): ... turn its type into this first class
-	object...
-	(struct keydb_handle): ... and instantiate it once per database
-	handle. Update all users.
-	(keydb_rebuild_caches): Don't invalidate the keyblock cache.
-
-	g10: If iobuf_seek fails when reading from the cache, do a hard read.
-	+ commit f076fa190e09eab5c586650d81e241e0bb85ce25
-	* g10/keydb.c (keydb_get_keyblock): If the iobuf_seek fails when
-	reading from the cache, then simply clear the cache and try reading
-	from the database.
-
-	iobuf: Reduce verbosity of test.
-	+ commit 219de84df9a8408fffedbb2600f5eb4c441950b6
-	* common/t-iobuf.c (main): Reduce verbosity.
-
-	iobuf: Add the IOBUF_INPUT_TEMP type to improve input temp handling.
-	+ commit f2d75ac7dc58f5ea59b231be6b83fea939b43ab8
-	* common/iobuf.h (enum iobuf_use): Add new member, IOBUF_INPUT_TEMP.
-	* common/iobuf.c (iobuf_temp_with_content): Create the iobuf as an
-	IOBUF_INPUT_TEMP, not an IOBUF_INPUT buffer. Assert that LENGTH ==
-	A->D.SIZE.
-	(iobuf_push_filter2): If A is an IOBUF_INPUT_TEMP, then make the new
-	filter an IOBUF_INPUT filter and set its buffer size to
-	IOBUF_BUFFER_SIZE.
-	(underflow): If A is an IOBUF_INPUT_TEMP, then just return EOF; don't
-	remove already read data.
-	(iobuf_seek): If A is an IOBUF_INPUT_TEMP, don't discard the buffered
-	data.
-	(iobuf_alloc): Allow USE == IOBUF_INPUT_TEMP.
-	(pop_filter): Allow USE == IOBUF_INPUT_TEMP.
-	(iobuf_peek): Allow USE == IOBUF_INPUT_TEMP.
-	(iobuf_writebyte): Fail if USE == IOBUF_INPUT_TEMP.
-	(iobuf_write): Fail if USE == IOBUF_INPUT_TEMP.
-	(iobuf_writestr): Fail if USE == IOBUF_INPUT_TEMP.
-	(iobuf_flush_temp): Fail if USE == IOBUF_INPUT_TEMP.
-
-	iobuf: Rename IOBUF_TEMP to IOBUF_OUTPUT_TEMP.
-	+ commit 5ff5e72b9c275fbd978136b1028bbf251af26e57
-	* common/iobuf.h (enum iobuf_use): Rename IOBUF_TEMP to
-	IOBUF_OUTPUT_TEMP. Update users.
-
-	iobuf: Use a first-class enum.
-	+ commit 24259d856b6cbdd679035512a8fb7c042de8f02e
-	* common/iobuf.h (enum iobuf_use): Name the IOBUF_OUTPUT, etc. enum.
-	(struct iobuf_struct): Change the field use's type to it.
-
-	iobuf: Fix test.
-	+ commit 8522cdc2264804d0677b7c0a447a0b45cf4195e3
-	* common/t-iobuf.c (content_filter): If there is nothing to read,
-	don't forget to set *LEN to 0.
-	(main): Fix checks.
-
-2015-09-01 Werner Koch <wk@gnupg.org>
-
-	agent: Protect commit 135b1e3 against misbehaving Libgcrypt.
-	+ commit 9ba4ccdaf5e128fbea51ff142c63d4b359c7264d
-	* agent/command-ssh.c (ssh_key_to_blob): Check DATALEN.
-
-	gpg: Remove option --no-sig-create-check.
-	+ commit f9c83d84e7d33df76898975f5ac852efa9c4882a
-	* g10/gpg.c (opts): Remove --no-sig-create-check.
-	* g10/options.h (struct opt): Remove field no_sig_create_check.
-	* g10/sign.c (do_sign): Always check unless it is RSA and we are using
-	Libgcrypt 1.7.
-
-	common: Assume an utf-8 locale on iconv errors.
-	+ commit 99c9bf7defd6c1ac9cc49c84e6c78eeb886a6952
-	* common/utf8conv.c (handle_iconv_error): Use utf-8 as fallback.
-
-	common: Fix regression in building argpase.c standalone.
-	+ commit bc23e69b70191f887dcb937007833d0187af181f
-	* common/argparse.c (is_native_utf8) GNUPG_MAJOR_VERSION: New.
-
-2015-08-31 Neal H. Walfield <neal@g10code.com>
-
-	g10: Don't leak memory if we fail to initialize a new database handle.
-	+ commit 04a6b903d0354be2c69c7f2c98987de17d68416e
-	* g10/keydb.c (keydb_new): If we fail to open a keyring or keybox
-	correctly release all resources.
-
-	g10: Improve interface documentation of the keydb API.
-	+ commit 360b699e9b4b8f99bd790b3cd158cd6f0fd7c131
-	* g10/keydb.c: Improve code comments and documentation of internal
-	interfaces. Improve documentation of public APIs and move that to...
-	* g10/keydb.h: ... this file.
-
-	g10: Don't cache search results if the search didn't scan the whole DB.
-	+ commit efd1ead9e779eb3bd37384258e08ad921a934612
-	* g10/keydb.c (struct keydb_handle): Add new field is_reset.
-	(keydb_new): Initialize hd->is_reset to 1.
-	(keydb_locate_writable): Set hd->is_reset to 1.
-	(keydb_search): Set hd->is_reset to 0. Don't cache a key not found if
-	the search started from the beginning of the database.
-
-	g10: Have keydb_search_first call keydb_search_reset before searching.
-	+ commit 11d8ffc939a4d20cfb0082b2d966b1e1a7d61f8d
-	* g10/keydb.c (keydb_search_first): Reset the handle before starting
-	the search.
-
-	g10: Remove unused parameter.
-	+ commit 0377db4b3581561b1ffc5bb7c3b4d698e8993b3a
-	* g10/keydb.h (keydb_locate_writable): Remove unused parameter
-	reserved. Update users.
-
-2015-08-31 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix SSH public key for EdDSA.
-	+ commit 135b1e32f01beaceba8a4ecc774e23b56aca1d24
-	* agent/command-ssh.c (ssh_key_to_blob): Remove the prefix 0x40.
-
-2015-08-26 Neal H. Walfield <neal@g10code.com>
-
-	g10: Simplify cache. Only include data that is actually used.
-	+ commit fad91071cadff43d77ce2e524dfb03999ba6678e
-	* g10/keydb.c (struct kid_list_s): Rename from this...
-	(struct kid_not_found_cache_bucket): ... to this. Update users.
-	Remove field state.
-	(kid_list_t): Remove type.
-	(KID_NOT_FOUND_CACHE_BUCKETS): Define. Use this instead of a literal.
-	(kid_found_table): Rename from this...
-	(kid_not_found_cache_bucket): ... to this. Update users.
-	(kid_found_table_count): Rename from this...
-	(kid_not_found_cache_count): ... to this. Update users.
-	(kid_not_found_p): Only return whether a key with the specified key id
-	is definitely not in the database.
-	(kid_not_found_insert): Remove parameter found. Update callers.
-	(keydb_search): Only insert a key id in the not found cache if it is
-	not found. Rename local variable once_found to already_in_cache.
-
-2015-08-25 Werner Koch <wk@gnupg.org>
-
-	Add configure option --enable-build-timestamp.
-	+ commit 9d07f6930aaa40dce92104e8c99241713d92eed2
-	* configure.ac (BUILD_TIMESTAMP): Set to "<none>" by default.
-
-	gpg: Emit ERROR status for key signing failures.
-	+ commit 51b9b8fba4ee326013c2cc911c70cde4c5f81fc7
-	* g10/keyedit.c (sign_uids): Write an ERROR status for a signing
-	failure.
-	(menu_adduid, menu_addrevoker, menu_revsig): Ditto.
-	(menu_revuid, menu_revkey, menu_revsubkey): Ditto.
-
-	gpg: Print a new FAILURE status after most commands.
-	+ commit 9cdff09743c473a12359bfdb914578ede0e4e3e2
-	* common/status.h (STATUS_FAILURE): New.
-	* g10/cpr.c (write_status_failure): New.
-	* g10/gpg.c (main): Call write_status_failure for all commands which
-	print an error message here.
-	* g10/call-agent.c (start_agent): Print an STATUS_ERROR if we can't
-	set the pinentry mode.
-
-2015-08-24 Neal H. Walfield <neal@g10code.com>
-
-	agent: Raise the maximum password length. Don't hard code it.
-	+ commit 348a6ebb63523305ce9f47d0f3e8a9086c338fed
-	* agent/agent.h (MAX_PASSPHRASE_LEN): Define.
-	* agent/command-ssh.c (ssh_identity_register): Use it instead of a
-	hard-coded literal.
-	* agent/cvt-openpgp.c (convert_from_openpgp_main): Likewise.
-	* agent/findkey.c (unprotect): Likewise.
-	* agent/genkey.c (agent_ask_new_passphrase): Likewise.
-
-2015-08-24 Werner Koch <wk@gnupg.org>
-
-	sm: Support secret key export via the Assuan interface.
-	+ commit 3cf02192a890d04f8f558cb72d46f9bd7a378322
-	* sm/server.c (cmd_export): Add options --secret, --raw, and --pkcs12.
-
-2015-08-23 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Allow sending of Zack's key.
-	+ commit 84f4c8811fc5bdd78693c4dc289389a8337cc257
-	* dirmngr/server.c (MAX_KEYBLOCK_LENGTH): Increase to 1 MiB.
-
-	gpg: Fix regression in packet parser from Aug 19.
-	+ commit 88317ae8c829bfeb1689415efbd32b7a232d7bd0
-	* g10/parse-packet.c (parse): Use an int to compare to -1. Use
-	buf32_to_ulong.
-
-	gpg: Show not found keys with --locate-key --verbose.
-	+ commit 00def10d365a88ce2d034ea9a5d6be4b03285fa4
-	* g10/keylist.c (locate_one): Print a diagnostic for a not-found key.
-
-2015-08-21 Neal H. Walfield <neal@g10code.com>
-
-	common: Don't incorrectly reject 4 GB - 1 sized packets.
-	+ commit 09f2a7bca624d0492e1d7ab29ce19542249c13ff
-	* g10/parse-packet.c (parse): Don't reject 4 GB - 1 sized packets.
-	Add the constraint that the type must be 63.
-	* kbx/keybox-openpgp.c (next_packet): Likewise.
-	* tests/openpgp/4gb-packet.asc: New file.
-	* tests/openpgp/4gb-packet.test: New file.
-	* tests/openpgp/Makefile.am (TESTS): Add 4gb-packet.test.
-	(TEST_FILES): Add 4gb-packet.asc.
-
-	common: Don't assume on-disk layout matches in-memory layout.
-	+ commit 4f37820334fadd8c5036ea6c42f3dc242665c4a9
-	* g10/packet.h (PKT_signature): Change revkey's type from a struct
-	revocation_key ** to a struct revocation_key *. Update users.
-
-	common: Don't incorrectly copy packets with partial lengths.
-	+ commit b3226cadf9bbef4a367072396e5b0abf37afff2d
-	* g10/parse-packet.c (parse): We don't handle copying packets with a
-	partial body length to an output stream. If this occurs, log an error
-	and abort.
-
-	common: Check parameters more rigorously.
-	+ commit 0143d5c1ca4d12ac252c14f01931f48131591065
-	* g10/parse-packet.c (dbg_copy_all_packets): Check that OUT is not
-	NULL.
-	(copy_all_packets): Likewise.
-
-	common: Don't continuing processing on error.
-	+ commit 48e792cc951a9d00fad0691ef7411c9e22cf675a
-	* g10/parse-packet.c (dbg_parse_packet): Also return if parse returns
-	an error.
-	(parse_packet): Likewise.
-	(dbg_search_packet): Likewise.
-	(search_packet): Likewise.
-
-	common: Better respect the packet's length when reading it.
-	+ commit 73af66a0aada8f30d8f400fdc4f69e233fb53089
-	* g10/parse-packet.c (parse_signature): Make sure PKTLEN doesn't
-	underflow. Be more careful that a read doesn't read more data than
-	PKTLEN says is available.
-
-2015-08-20 Werner Koch <wk@gnupg.org>
-
-	po: Add lost translation of validity strings.
-	+ commit 0d5a4138f27187e7828ef8216758edc9b48b2c64
-	* po/POTFILES.in (trust.c): Add missing file.
-	* po/de.po: Changed German validity strings.
-	* doc/help.de.txt: Ditto.
-
-2015-08-20 Neal H. Walfield <neal@g10code.com>
-
-	g10/parse-packet.c:parse: Try harder to not ignore an EOF.
-	+ commit 0add91ae1ca3718e8140af09294c595f47c958d3
-	* g10/parse-packet.c (parse): Be more robust: make sure to process any
-	EOF.
-
-	g10/parse-packet.c: Replace literal with symbolic expression.
-	+ commit 24a72dffa75a04611c98343140c4eb0fbfe2a59f
-	* g10/parse-packet.c (dump_hex_line): Use sizeof rather than the
-	buffer's size.
-
-	Add documentation for g10/parse-packet.c.
-	+ commit 026feff4a8e3090fb152af72c73aaa80c78e4551
-	* g10/packet.h: Add documentation for functions defined in
-	parse-packet.c.
-	* g10/parse-packet.c: Improve comments for many functions.
-
-	g10/packet.h: Remove unused argument from enum_sig_subpkt.
-	+ commit c46e8bfe9a1ae3f1e5327d0451cffd6e4567b449
-	* g10/packet.h (enum_sig_subpkt): Remove argument RET_N. Update
-	callers.
-	* g10/parse-packet.c (enum_sig_subpkt): Remove argument RET_N.
-
-	g10/parse-packet.c:mpi_read: Detect EOF and correct boundary conditions.
-	+ commit c271feb53664dbf2b4ccbae90a31b8e726481e2d
-	* g10/parse-packet.c (mpi_read): Improve documentation. Correctly
-	handle an EOF. On overflow, correctly return the number of bytes read
-	from the pipeline.
-
-	common/iobuf.c: Make control flow more obvious.
-	+ commit 49f922286fa8adb2d2ca730eb7bbe67e684b20de
-	* common/iobuf.c (iobuf_read): Make control flow more obvious.
-	(iobuf_get_filelength): Likewise.
-	(iobuf_get_fd): Likewise.
-	(iobuf_seek): Likewise.
-
-	common/iobuf.c: Add some sanity checks to catch programmer bugs.
-	+ commit c5da750cf3d53277fe6d86776bfe0d2304b05151
-	* common/iobuf.c (iobuf_alloc): Check that BUFSIZE is not 0.
-	(iobuf_readbyte): Check that A is an input filter. Check that the
-	amount of read data is at most the amount of buffered data.
-	(iobuf_read): Check that A is an input filter.
-	(iobuf_writebyte): Check that A is not an input filter.
-	(iobuf_writestr): Check that A is not an input filter.
-	(iobuf_flush_temp): Check that A is not an input filter.
-
-	common/iobuf.c:iobuf_write_temp: Elide redundant code.
-	+ commit e291b631c3b1aedf529078190cd51e2acfcd1d92
-	* common/iobuf.c (iobuf_write_temp): Don't repeat iobuf_flush_temp.
-	Use it directly.
-
-	common/iobuf.c: Have iobuf_writestr use iobuf_write, not iobuf_writebyte
-	+ commit a6d4bca3b576c3c5dba1aa6e8c1039089e14147b
-	* common/iobuf.c (iobuf_write): Don't write a byte at a time. Use
-	iobuf_write.
-
-	common/iobuf: Improve documentation and code comments.
-	+ commit 1bfd1e43246c16e20f819bf5381ca21abde54458
-	common/iobuf.h: Improve documentation and code comments.
-	common/iobuf.c: Likewise.
-
-	common/iobuf.c: Adjust buffer size of filters in front of temp filters.
-	+ commit 0d40c4e83f6fbfea2f494f1f88412d3132ff98bd
-	* common/iobuf.c (iobuf_push_filter2): If the head filter is a temp
-	filter, use IOBUF_BUFFER_SIZE for the new filter.
-
-	common/iobuf.c: Buffered data should not be processed by new filters.
-	+ commit 827cc922d84d8113d4f13ebbed1314e03da5f7d2
-	* common/iobuf.c (iobuf_push_filter2): If the pipeline is an output or
-	temp pipeline, the new filter shouldn't assume ownership of the old
-	head's internal buffer: the data was written before the filter was
-	added.
-	* common/t-iobuf.c (double_filter): New function.
-	(main): Add test cases for the above bug.
-
-	common/iobuf.c: Flush the pipeline in iobuf_temp_to_buffer.
-	+ commit 616181f3c757160af8539869a6d929faca4962c4
-	* common/iobuf.c (iobuf_temp_to_buffer): Flush each filter in the
-	pipeline and copy the data from the last (not the first) filter's
-	internal buffer.
-
-	common/iobuf.c: Combine iobuf_open, iobuf_create and iobuf_openrw.
-	+ commit 15ae99f887f4694de8468625d455d487d283f719
-	* common/iobuf.c (do_open): New function, which is a generalization of
-	iobuf_open, iobuf_Create, iobuf_openrw.
-	(iobuf_open): Call do_open.
-	(iobuf_create): Likewise.
-	(iobuf_openrw): Likewise.
-
-	common/iobuf.h: Remove iobuf_open_fd_or_name.
-	+ commit 8402815d8e0e04a44362968f88b3d484d2395402
-	* common/iobuf.h (iobuf_open_fd_or_name): Remove prototype. Replace
-	use with either iobuf_open or iobuf_fdopen_nc, as appropriate.
-	* common/iobuf.c (iobuf_open): Remove function.
-
-	common/iobuf.c: Rename iobuf_flush and make it a static function.
-	+ commit 6d49a2b6691f2dd0d8ac34a15f18cc2a0c3ba5d3
-	* common/iobuf.h (iobuf_flush): Remove prototype.
-	* common/iobuf.c (filter_flush): New static prototype.
-	(iobuf_flush): Rename...
-	(filter_flush): ... to this. Make static. Simplify code. Update
-	callers.
-
-	common/iobuf.c: Don't abort freeing a pipeline if freeing a filter fails
-	+ commit 1f94646a86348128f585301fcd605e5e703fd77d
-	* common/iobuf.c (iobuf_cancel): Don't abort freeing a pipeline if
-	freeing a filter fails. This needs to a memory leak. Instead, keep
-	freeing and return the error code of the first filter that fails.
-
-	common/iobuf.c: Improve iobuf_peek.
-	+ commit a250f73783c06d7789ac65a395d9247f4ab44c26
-	* common/iobuf.c (underflow): Take additional parameter
-	clear_pending_eof. If not set, don't clear a pending eof when
-	returning EOF. Update callers.
-	(iobuf_peek): Fill the internal buffer, if needed, to be able to
-	better satisfy any request.
-
-	common/iobuf.c: When requested, fill the buffer even if it is not empty.
-	+ commit c7ad36eb0d7f872fc15e793aa1d0b6b89bc471d6
-	* common/iobuf.c (underflow): Don't require that the buffer be empty.
-	When called, fill any available space.
-
-	common/t-iobuf.c: Add a test case for multiple EOFs.
-	+ commit e76c75d8726558dc9084710253f0f6780e06fad3
-	common/t-iobuf.c (main): Add a test case for multiple EOFs in an INPUT
-	pipeline.
-
-	common/iobuf.c: Better respect boundary conditions in iobuf_read_line.
-	+ commit 4e32c602f5c40cca5f8f40e642ccb10d3f8c5614
-	* common/iobuf.c (iobuf_read_line): Be more careful with boundary
-	conditions.
-	* common/iobuf.h: Include <gpg-error.h>.
-	* common/t-iobuf.c: New file.
-	* common/Makefile.am (module_tests): Add t-iobuf.
-	(t_mbox_util_LDADD): New variable.
-
-	common/iobuf.c: Fix filter type for iobuf_temp_with_content.
-	+ commit fa9fda23c2c8cf6982b7263f6882ed8687d98c16
-	* common/iobuf.c (iobuf_temp_with_content): Set the filter type to
-	IOBUF_INPUT, not IOBUF_TEMP, which is only for output filters that
-	write into a dynamic buffer.
-
-	common/iobuf.h: Remove unimplemented prototypes.
-	+ commit 75fd86bbd175e085a93c1ad62f50ae936494b307
-	* common/iobuf.h (iobuf_unread): Remove unimplemented prototype.
-	(iobuf_clear_eof): Likewise.
-	(iobuf_append): Likewise.
-
-	common/iobuf.c: Refactor code to not need the desc field.
-	+ commit 679acc671e621847f50d6b4dca10a22c62500b9a
-	* common/iobuf.h (struct iobuf_struct): Remove field desc.
-	* common/iobuf.c (iobuf_desc): New function. When a filter's
-	description is needed, use this instead of the filter's desc field.
-
-	common/iobuf.h: Clarify semantics of nofast. Simplify implementation.
-	+ commit 12fc56bcb51d984a6e86fc1eb7952f9976c67043
-	* common/iobuf.h (struct iobuf_struct): Clarify semantics of nofast.
-	Simplify use of nofast to implement just these semantics.
-
-	common/iobuf.c: Remove dead code (directfp).
-	+ commit e8c0b6abf88309c23a70df0abbd38d42fa22a786
-	* common/iobuf.h (struct iobuf_struct): Remove field directfp. Remove
-	all uses of it.
-
-	common/iobuf.c: Remove dead code (opaque).
-	+ commit f05d60b3813a97e316a067680d7598b74621a522
-	* common/iobuf.h (struct iobuf_struct): Remove field opaque. Remove
-	all uses of it.
-
-	common/iobuf.h: Replace further use of literals with symbolic constants.
-	+ commit c06eabac8e85f7f79414363836f093415e8da62e
-	* common/iobuf.c: Move BLOCK_FILTER_INPUT,
-	BLOCK_FILTER_OUTPUT_BLOCK_FILTER_TEMP from here...
-	* common/iobuf.h: ... to here and rename to IOBUF_INPUT, IOBUF_OUTPUT
-	and IOBUF_TEMP, respectively. Where appropriate, use these macros
-	instead of a literal.
-
-2015-08-17 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid linking to Libksba.
-	+ commit 91357b7722f2bf0d3765ec72855bdc96732df9d6
-	* kbx/keybox.h (KEYBOX_WITH_X509): Do not define.
-	* sm/Makefile.am (AM_CPPFLAGS): Define it here.
-	(common_libs): Change to libkeybox509.a
-	* g10/Makefile.am (AM_CFLAGS): remove KSBA_CFLAGS.
-	(gpg2_LDADD, gpgv2_LDADD): Remove KSBA_LIBS
-	* kbx/Makefile.am (noinst_LIBRARIES): Add libkeybox509.a.
-	(libkeybox509_a_SOURCES): New.
-	(libkeybox_a_CFLAGS): New.
-	(libkeybox509_a_CFLAGS): New.
-	(kbxutil_CFLAGS): New.
-	* kbx/keybox-search.c (has_keygrip) !KEYBOX_WITH_X509: Declare args
-	as unused.
-
-2015-08-16 Ben Kibbey <bjk@luxsci.net>
-
-	Fix pinentry loopback and passphrase contraints.
-	+ commit bba74cdd95ea98b5a7c3a12823b229341e91504e
-	* agent/command.c (cmd_get_passphrase): Don't repeat passphrase for
-	pinentry loopback mode.
-	* agent/genkey.c (check_passphrase_constraints): Immediately return when
-	pinentry mode is loopback.
-
-	Fix sending INQUIRE_MAXLEN for symmetric data.
-	+ commit 93f5295df512269dd8fecbd649b11cbacf78e864
-	* g10/passphrase.c (passphrase_to_dek_ext): Write the status message.
-
-2015-08-15 Ben Kibbey <bjk@luxsci.net>
-
-	Inform a user about inquire length limit.
-	+ commit f126ca61565922b3b938c3486614b9bd7e6e454c
-	* common/status.h (INQUIRE_MAXLEN): New.
-	* g10/call-agent.c (default_inquire_cb): Send STATUS_INQUIRE_MAXLEN.
-	client when inquiring a passphrase over pinentry-loopback.
-
-	Allow --gen-key to inquire a passphrase.
-	+ commit 233b5fedabd80a34452e748132e65b5944310428
-	* g10/gpg.c (main): test for --command-fd during --gen-key parse.
-
-	When --command-fd is set then imply --batch to let gpg inquire a
-	passphrase rather than requiring a pinentry.
-
-2015-08-11 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.7.
-	+ commit b5e081973b56b21214fc0c65ba9015dd026328b4
-
-
-2015-08-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: fix ECC key handling.
-	+ commit 8704c70108218a60f8fb2ee0e558ca8ed125600d
-	* agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
-	(convert_transfer_key): CURVE is the name of curve.
-
-2015-08-08 Neal H. Walfield <neal@g10code.com>
-
-	common/iobuf.c: Replace use of literals with symbolic constants.
-	+ commit c80643c5ecbee89f343ef087313870cee1334fe4
-	* common/iobuf.c (BLOCK_FILTER_INPUT): Define. Where appropriate, use
-	this instead of a literal.
-	(BLOCK_FILTER_OUTPUT): Likewise.
-	(BLOCK_FILTER_TEMP): Likewise.
-
-2015-08-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow gpgv to work with a trustedkeys.kbx file.
-	+ commit 5b7a80b1ab91d2f199065e5dd14e85f42918975d
-	* g10/keydb.h (KEYDB_RESOURCE_FLAG_GPGVDEF): New.
-	* g10/keydb.c (keydb_add_resource): Take care of new flag.
-	* g10/gpgv.c (main): Use new flag.
-
-	agent: Add option --force to the DELETE_KEY command.
-	+ commit a68c5c5c7fe4ec8665e252e5062292f6c7b94fdd
-	* agent/findkey.c (agent_delete_key): Add arg "force".
-	* agent/command.c (cmd_delete_key): Add option --force.
-
-	common: Change alias for Curve25519 to "cv25519".
-	+ commit 9f31ab3d216ed74d6f392a62e3f95e0591174119
-	* common/openpgp-oid.c (oidtable): Change alias.
-
-2015-08-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove duplicated printing of the curve name in "sub" lines.
-	+ commit fb754dc6170d12edf3d35c48340b8d7b1ded20f7
-	* g10/keylist.c (list_keyblock_print): Do not print extra curve name.
-
-	gpg: Add commands "fpr *" and "grip" to --edit-key.
-	+ commit fbb6c25ab5dbb5f2b1f1eb342ca7caa3f955d8c9
-	* g10/keyedit.c (cmdGRIP): New.
-	(cmds): Add command "grip".
-	(keyedit_menu) <cmdFPR>: Print subkeys with argument "*".
-	(keyedit_menu) <cmdGRIP>: Print keygrip.
-	(show_key_and_fingerprint): Add arg "with_subkeys".
-	(show_key_and_grip): New.
-	* g10/keylist.c (print_fingerprint): Add mode 4.
-
-	gpg: Adjust UID line indentation for common key algos.
-	+ commit 969542c8c2f48a60c1d68b7bf70b0c00374bacba
-	* g10/keylist.c (list_keyblock_print): Change UID line indentation
-	* g10/mainproc.c (list_node): Ditto.
-
-2015-08-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	Curve25519 support.
-	+ commit e5891a82c39997b65ce9ff90eb6120db7bedd399
-	* agent/cvt-openpgp.c (get_keygrip): Handle Curve25519.
-	(convert_secret_key, convert_transfer_key): Ditto.
-	* common/openpgp-oid.c (oidtable): Add Curve25519.
-	(oid_crv25519, openpgp_oid_is_crv25519): New.
-	* common/util.h (openpgp_oid_is_crv25519): New.
-	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Handle the case
-	with Montgomery curve which uses x-only coordinate.
-	* g10/keygen.c (gen_ecc): Handle Curve25519.
-	(ask_curve): Change the API and second arg is to return subkey algo.
-	(generate_keypair, generate_subkeypair): Follow chage of ask_curve.
-	* g10/keyid.c (keygrip_from_pk): Handle Curve25519.
-	* g10/pkglue.c (pk_encrypt): Handle Curve25519.
-	* g10/pubkey-enc.c (get_it): Handle the case with Montgomery curve.
-	* scd/app-openpgp.c (ECC_FLAG_DJB_TWEAK): New.
-	(send_key_attr): Work with general ECC, Ed25519, and Curve25519.
-	(get_public_key): Likewise.
-	(ecc_writekey): Handle flag_djb_tweak.
-
-	common: extend API of openpgp_oid_to_curve for canonical name.
-	+ commit a6e40530898622fbc5d76557a7da5e69368ecaa4
-	* common/openpgp-oid.c (openpgp_oid_to_curve): Add CANON argument.
-	* common/util.h: Update.
-	* g10/import.c (transfer_secret_keys): Follow the change.
-	* g10/keyid.c (pubkey_string): Likewise.
-	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Likewise.
-	* parse-packet.c (parse_key): Likewise.
-	* scd/app-openpgp.c (send_key_attr, get_public_key): Likewise.
-
-2015-08-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix ecc_oid.
-	+ commit d088d2c81690a89051349ddc8a82fe222625f4e0
-	* scd/app-openpgp.c (ecc_oid): Call with OIDBUF.
-
-	scd: Fix ECC support.
-	+ commit 0751571cac0f5aef2862c34a184f7f09ad9cb203
-	* scd/app-openpgp.c (send_key_attr): Send KEYNO.
-	(get_public_key): Fix SEXP composing.
-	(ecc_writekey): Fix OID length calculation.
-	(ecc_oid): Prepend the length before query.
-	(parse_algorithm_attribute): Handle the case the curve is not available.
-
-2015-08-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix duplicate key import due to legacy key in keyring.
-	+ commit 4a326d7c9a3b09efcccf4de00d6c003829ad89e8
-	* g10/keydb.c (keydb_search_fpr): Skip legacy keys.
-
-	gpg: Properly handle legacy keys while looking for a secret key.
-	+ commit f05a63b10428df2878b1bb6fde57a2fc2aa99105
-	* g10/getkey.c (have_secret_key_with_kid): Skip legacy keys.
-
-2015-07-31 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix endless loop for expired keys given by fpr.
-	+ commit 328a6b6459a5ce4a70b374262f221ada20c40878
-	* g10/getkey.c (lookup): Disable keydb caching when continuing a
-	search.
-
-2015-07-29 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not return "Legacy Key" from lookup if a key is expired.
-	+ commit 23d8609f4b5ec3432323a676fd7ef225c0ef71a1
-	* g10/getkey.c (lookup): Map GPG_ERR_LEGACY_KEY.
-
-	gpg: Indicate secret keys and cards in a key-edit listing.
-	+ commit 8b2b988309cbc5af339beb0a55ff71d7464eb646
-	* g10/keyedit.c (sign_uids): Add arg "ctrl".
-	(show_key_with_all_names_colon): Ditto.
-	(show_key_with_all_names): Ditto.
-
-	* g10/keyedit.c (show_key_with_all_names): Print key record
-	indicators by checking with gpg-agent.
-	(show_key_with_all_names): Ditto. May now also print sec/sbb.
-
-2015-07-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove the edit-key toggle command.
-	+ commit 7ef09afd1a6a37c7f22e7c3d898f0c917b08f940
-	* g10/keyedit.c (cmds): Remove helptext from "toggle".
-	(keyedit_menu): Remove "toggle" var and remove the sub/pub check
-	against toggle.
-
-	common,w32: Avoid unused var warning about msgcache.
-	+ commit 4bc75337f31374b7424d7bdebf839dd91ec80c0a
-	* common/i18n.c (USE_MSGCACHE): New.
-	(msgcache) !USE_MSGCACHE: Do not define.
-	(i18n_localegettext): Repalce #if conditions by USE_MSGCACHE.
-
-	w32: Try more places to find an installed Pinentry.
-	+ commit 18f1e627c697d75175b79fe095305fa775f20841
-	* common/homedir.c (get_default_pinentry_name): Re-implement to
-	support several choices for Windows.
-
-2015-07-26 Werner Koch <wk@gnupg.org>
-
-	scd: Fix size_t/unsigned int mismatch.
-	+ commit 55e64f47a52d76e097a01eb4044a88a4e10d6a87
-	* scd/app-openpgp.c (ecc_writekey): Use extra var n.
-
-	Replace GNUPG_GCC_A_ macros by GPGRT_ATTR_ macros.
-	+ commit d382242fb6789973ce8d246ec154a4a1468c24c0
-	* common/util.h: Provide replacement for GPGRT_ATTR_ macros when using
-	libgpg-error < 1.20.
-	* common/mischelp.h: Ditto.
-	* common/types.h: Ditto.
-
-2015-07-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: support any curves defined by libgcrypt.
-	+ commit ef080d5c7fb7f3b75c3c57c011f78a312b8e13a9
-	* g10/call-agent.h (struct agent_card_info_s): Add curve field.
-	* g10/call-agent.c (learn_status_cb): Use curve name.
-	* g10/card-util.c (card_status): Show pubkey name.
-	* scd/app-openpgp.c (struct app_local_s): Record OID and flags.
-	(store_fpr): Use ALGO instead of key type.
-	(send_key_attr): Use curve name instead of OID.
-	(get_public_key): Clean up by OID to curve name.
-	(ecc_writekey): Support any curves in libgcrypt.
-	(do_genkey, do_auth, ): Follow the change.
-	(ecc_oid): New.
-	(parse_algorithm_attribute): Show OID here.
-
-2015-07-23 Peter Wu <peter@lekensteyn.nl>
-
-	build: ignore scissor line for the commit-msg hook.
-	+ commit d24165bce2823c2f5dcb39b7b84c9aa00802a8ee
-	* build-aux/git-hooks/commit-msg: Stop processing more lines when the
-	 scissor line is encountered.
-
-2015-07-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Format change to specify "rsa2048" for KEY-ATTR.
-	+ commit dbf4534f49a1fe3823bd6d6d7bb4d9df863b4789
-	* g10/card-util.c (do_change_keysize): Put "rsa".
-	* scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
-	Change the command format.
-	(rsa_writekey): Check key type.
-	(do_writekey): Remove "ecdh" and "ecdsa" support which was available
-	in experimental libgcrypt before 1.6.0.
-
-2015-07-22 Werner Koch <wk@gnupg.org>
-
-	Avoid a leading double slash in make_filename.
-	+ commit 69d2c9b09bd9d0b86b9f2feb585037a2c11795b0
-	* common/stringhelp.c (do_make_filename): Special case leading '/'.
-
-2015-07-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: change_keyattr_from_string for ECC.
-	+ commit 9901be395684dd1b35d83685a719291347684ab1
-	* scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
-	Support ECC.
-	(rsa_writekey): Don't change key attribute.
-
-2015-07-17 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Use openpgpdefs.h for constants.
-	+ commit f5d356fb5bbbd0e05a753612455253e4bc335266
-	* scd/app-openpgp.c: Include openpgpdefs.h.
-
-2015-07-16 Neal H. Walfield <neal@g10code.com>
-
-	Don't segfault if the first 'auto-key-locate' option is 'clear'.
-	+ commit f2ee673c99825d5189631031ddec2dbf54dbd482
-	* g10/getkey.c (free_akl): If AKL is NULL, just return.
-
-2015-07-10 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Support non-NLS build.
-	+ commit b3286af36d452fc801be573a057b0838d53a2edd
-	* agent/agent.h: Use ENABLE_NLS and define L_() macro.
-
-2015-07-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Remove unused files.
-	+ commit 67b2dc7636e47baefd5aafe0eb45b4730f974481
-	* scd/Makefile.am (sc_copykeys_*): Remove.
-	* scd/sc-copykeys.c: Remove.
-	* scd/pcsc-wrapper.c: Remove.
-	* scd/{card-common.h,card-dinsig.c,card-p15.c,card.c}: Remove.
-
-2015-07-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Use canonical name for curve.
-	+ commit 5b46726931049e060d8fbfa879db7907078a9aed
-	* g10/import.c (transfer_secret_keys): Use canonical name.
-	* common/openpgp-oid.c (openpgp_curve_to_oid): Return NULL on error.
-	* g10/keyid.c (pubkey_string): Follow change of openpgp_curve_to_oid.
-	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
-	* g10/parse-packet.c (parse_key): Ditto.
-
-2015-07-03 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	drop long-deprecated gpgsm-gencert.sh.
-	+ commit 1be2cebf7ff5837c8b548b4f4afbf1b8b28211bc
-	 * tools/gpgsm-gencert.sh: remove deprecated script entirely. It is
-	 fully replaced by gpgsm --gen-key
-	 * doc/tools.texi: remove gpgsm-gencert.sh documentation
-	 * .gitignore: no longer ignore gpgsm-gencert.sh manpage
-	 * doc/Makefile.am: quit making the manpage
-	 * tools/Makefile.am: quit distributing the script
-	 * doc/howto-create-a-server-cert.texi: overhaul documentation to use
-	 gpgsm --gen-key and tweak explanations
-
-2015-07-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit 3502b3cc0f5ff92ab89a0da8b1e344a8ad615737
-
-
-	scd: Support AES decryption for OpenPGPcard v3.0.
-	+ commit 45c49a0030c7a01ec011ce810ddb3aaef734e9bf
-	* scd/app-openpgp.c (do_decipher): Support AES decryption.
-
-2015-07-01 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.6.
-	+ commit a499eeb6a6545d87ac9f1b64e32017bfdb4f67e6
-
-
-2015-07-01 Daiki Ueno <ueno@gnu.org>
-
-	agent: Unset INSIDE_EMACS on gpg-agent startup.
-	+ commit f1490a3a0ecf4a5a03373c9563f7709630232ee3
-	* agent/gpg-agent.c (main): Unset INSIDE_EMACS envvar.
-
-2015-07-01 Werner Koch <wk@gnupg.org>
-
-	common: Implement i18n_localegettext.
-	+ commit a65447f0d64d0c53ddbdcfc988f26ecc9a8a6f08
-	* common/i18n.c (msg_cache_s, msg_cache_head_s): New.
-	(msgcache): New.
-	(i18n_localegettext): Implement locale dependent lookup.
-
-2015-06-30 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	Pass DBUS_SESSION_BUS_ADDRESS for gnome3.
-	+ commit 816824953c91959c23a57c047bdba6a902ffdde6
-	* common/session-env.c (stdenvnames): Add DBUS_SESSION_BUS_ADDRESS.
-
-2015-06-30 Werner Koch <wk@gnupg.org>
-
-	Flag the L_() function with attribute format_arg.
-	+ commit 232af382e563fcbe15589a3ccae7d6908a17c44d
-	* agent/agent.h (LunderscorePROTO): New.
-	* common/util.h (GNUPG_GCC_ATTR_FORMAT_ARG): New.
-	* common/i18n.h (GNUPG_GCC_ATTR_FORMAT_ARG): New. Use for
-	i18n_localegettext. Expand LunderscorePROTO.
-	* agent/genkey.c (check_passphrase_constraints): Use xtryasprintf
-	again to keep the old translations.
-
-	agent: Use different translation func for Pinentry strings.
-	+ commit e76d4c05b24211f3981ab69cddb3fccc17d21e0e
-	* po/Makevars (XGETTEXT_OPTIONS): Add keyword "L_".
-	* common/i18n.c (i18n_localegettext): New stub.
-	* common/i18n.h: Expand the LunderscoreIMPL macro.
-	* agent/agent.h (L_): New.
-	(LunderscoreIMPL): New.
-	* agent/call-pinentry.c (setup_qualitybar): Add arg ctrl anc change
-	caller.
-	* agent/findkey.c (try_unprotect_cb): Add local var ctrl.
-	* agent/genkey.c (check_passphrase_constraints): Replace xtryasprintf
-	by xtrystrdup to avoid gcc warning. Unfortinately this changes the
-	string.
-	(agent_ask_new_passphrase): Cleanup the use of initial_errtext.
-
-	gpg: Make show-sig-subpackets work again.
-	+ commit 010e4281c3e15e2f86589dd1da419531ead519ef
-	* g10/gpg.c (parse_list_options): Fix offset for subpackets.
-
-2015-06-29 Werner Koch <wk@gnupg.org>
-
-	agent: Prepare for Libassuan with Cygwin support.
-	+ commit b6076579311029aa76c00377d9a804b1578bf58f
-	* agent/gpg-agent.c (create_server_socket): Add arg "cygwin". Call
-	assuan_sock_set_flag if Assuan version is recent enough.
-	(main): Create ssh server socket with Cygwin flag set.
-
-2015-06-29 Neal H. Walfield <neal@gnu.org>
-
-	Show passphrase constraints errors as password prompt errors.
-	+ commit 2778c6f8f40d73272075ce04c07097f65c94054e
-	* agent/agent.h (check_passphrase_constraints): Add parameter
-	failed_constraint and remove parameter silent. Update callers.
-	* agent/genkey.c (check_passphrase_constraints): Add parameter
-	failed_constraint and remove parameter silent. If FAILED_CONSTRAINT
-	is not NULL and OPT.ENFORCE_PASSPHRASE_CONSTRAINTS is FALSE, save the
-	error text in *FAILED_CONSTRAINT and don't call take_this_one_anyway
-	or take_this_one_anyway2. If FAILED_CONSTRAINT is NULL, act as if
-	SILENT was set.
-	(agent_ask_new_passphrase): Change initial_errtext's type from a const
-	char * to a char *. Pass it to check_passphrase_constraints. If it
-	contains malloc's memory, free it.
-
-2015-06-29 Neal H. Walfield <neal@g10code.com>
-
-	Improve documentation for default-cache-ttl and default-cache-ttl-ssh.
-	+ commit 0416aed4abf6cea94458d2e38eb4a5e6bfea2d8b
-	* doc/gpg-agent.texi (Agent Options): Improve documentation for
-	default-cache-ttl and default-cache-ttl-ssh.
-
-	Don't raise max-cache-ttl to default-cache-ttl.
-	+ commit 60cf69ff9d61a2cd37fc4468f232fd41aa70a651
-	* agent/gpg-agent.c (finalize_rereadable_options): Don't raise
-	max-cache-ttl to default-cache-ttl. Likewise for max-cache-ttl-ssh
-	and default-cache-ttl-ssh.
-
-	Improve the description of old packets with an indeterminate length.
-	+ commit 68c217f457a772984d0afbdd341f18de7c867505
-	* g10/parse-packet.c (parse): Make the description more accurate when
-	listing packets: old format packets don't support partial lengths,
-	only indeterminate lengths (RFC 4880, Section 4.2).
-
-2015-06-29 Werner Koch <wk@gnupg.org>
-
-	agent: Add --verify to the PASSWD command.
-	+ commit 9bca96dbc5c32bdd00196462fde8c9ab94aeb28d
-	* agent/command.c (cmd_passwd): Add option --verify.
-
-	agent,w32: Do not create a useless socket with --enable-putty-support.
-	+ commit 7a387331645736eaeaaef57770beef5fa741bc22
-	* agent/agent.h (opt): Remove field ssh_support.
-	* agent/gpg-agent.c (ssh_support): New. Replace all opt.ssh_support
-	by this.
-	(main): Do not set ssh_support along with setting putty_support.
-
-	gpgsm: Add command option "offline".
-	+ commit 2c9c46e2a2b8f9a1bdc1ef46a135b5fc7d1a8073
-	* sm/server.c (option_handler): Add "offline".
-	(cmd_getinfo): Ditto.
-	* sm/certchain.c (is_cert_still_valid):
-	(do_validate_chain):
-	* sm/gpgsm.c (gpgsm_init_default_ctrl): Default "offline" to the value
-	of --disable-dirmngr.
-	* sm/call-dirmngr.c (start_dirmngr_ext): Better also check for
-	ctrl->offline.
-
-2015-06-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Support button flag and AES key data for OpenPGPcard v3.0.
-	+ commit d2fdf2e1b6cd447bb1c36df0ac7d8e669802fa22
-	* scd/app-openpgp.c (do_getattr, show_caps, app_select_openpgp):
-	Support button and symmetric decryption.
-	(do_setattr): Support setting AESKEY.
-
-2015-06-25 Andre Heinecke <aheinecke@intevation.de>
-
-	sm: Fix cert storage for ephemeral certs.
-	+ commit 5e1a844ae9b6730b4b8a2c9178ea9bc121560c28
-	* sm/keydb.c (keydb_store_cert): Clear ephemeral flag for
-	existing certs if store should not be ephemeral.
-
-2015-06-23 Werner Koch <wk@gnupg.org>
-
-	Allow use of debug flag names for all tools.
-	+ commit 54a0ed3d9b10a3c6dfb3d6a4d20b693a3183f8f6
-	* g13/g13.c: Make use of debug_parse_flag.
-	* scd/scdaemon.c: Ditto.
-	* sm/gpgsm.c: Ditto
-	* agent/gpg-agent.c: Ditto. But do not terminate on "help"
-	* dirmngr/dirmngr.c: Ditto.
-
-	common: Improve fucntion parse_debug_flag.
-	+ commit 8195e55d0c134a45f7c9bd95c8b5741781841c18
-	* common/miscellaneous.c (parse_debug_flag): Add hack not to call
-	exit. Add "none" and "all" flags.
-
-2015-06-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: pinpad workaround for PC/SC implementations.
-	+ commit 5e1d2fe6555d06f9dcd2daac713b2edfbc0428a5
-	* scd/adpu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Bigger buffer
-	for TPDU card reader.
-
-2015-06-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow debug flag names for --debug.
-	+ commit 4698e5b203bd983503b5fd784fcd09dd3bc3a15e
-	* g10/gpg.c (opts): Change arg for oDebug to a string.
-	(debug_flags): New; factored out from set_debug.
-	(set_debug): Remove "--debug-level help". Use parse_debug_flag to
-	print the used flags.
-	(main): Use parse_debug_flag for oDebug.
-
-	common: Add function parse_debug_flag.
-	+ commit 22147952b744958ec46d356e942540356ff7d93e
-	* common/miscellaneous.c (parse_debug_flag): New.
-	* common/util.h (struct debug_flags_s): New.
-
-	common: Add function strtokenize.
-	+ commit d37f47081d41584efc0c397432811f9cfa5d5867
-	* common/stringhelp.c: Include assert.h.
-	(strtokenize): New.
-	* common/t-stringhelp.c (test_strtokenize): New.
-
-	gpg: Fix regression due to recent commit 6500f33.
-	+ commit e0873a3372800d51c90ca656450f937dbae9c169
-	* g10/keydb.c (kid_list_s): Keep a state in the table.
-	(kid_not_found_table): Rename to kid_found_table.
-	(n_kid_not_found_table): Rename to kid_found_table_count.
-	(kid_not_found_p): Return found state.
-	(kid_not_found_insert): Add arg found.
-	(keydb_search): Store found state in the table.
-
-2015-06-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix Cherry ST-2000 support for pinpad input.
-	+ commit 444e9232aa9e00aacd939cbf7bdb881b550dfebe
-	* scd/apdu.c (pcsc_vendor_specific_init): Set pinmax to 15.
-	* scd/ccid-driver.c (ccid_transceive_secure): Add zero for the
-	template of APDU.
-
-2015-06-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Print number of good signatures with --check-sigs.
-	+ commit 0948c4f217308ffa0ec61ce189d387fd61b02bbd
-	* g10/keylist.c (keylist_context): Add field good_sigs.
-	(list_keyblock_print): Updated good_sigs.
-	(print_signature_stats): Print number of good signatures and use
-	log_info instead of tty_printf.
-
-	gpg: Improve speed of --check-sigs and --lish-sigs.
-	+ commit 6500f338a35f4148606480c79f3a0c1b0d15f13a
-	* g10/keydb.c (kid_list_t): New.
-	(kid_not_found_table, n_kid_not_found_table): New.
-	(kid_not_found_p, kid_not_found_insert, kid_not_found_flush): New.
-	(keydb_insert_keyblock): Flush the new cache.
-	(keydb_delete_keyblock): Ditto.
-	(keydb_update_keyblock): Ditto.
-	(keydb_search): Use the new cache.
-	(keydb_dump_stats): New.
-	* g10/gpg.c (g10_exit): Dump keydb stats.
-
-2015-06-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Add more log_clock calls to keydb.c.
-	+ commit 53e9b86085ac70ede8a0b1de9018ccbfe55b0932
-	* g10/keydb.c (keydb_get_keyblock): Add log_clock calls.
-
-	gpg: Print available debug flags using "--debug-level help".
-	+ commit 663a31f1ea2fc5a43c822e916cf20fece5243851
-	* g10/gpg.c (set_debug): Add "help" option and use a table for the
-	flags.
-
-	gpg: Fix export problem in case an old keyring has PGP-2 keys.
-	+ commit c5604eeee4b64a44a1ca1d517ace14fc1cbda298
-	* g10/export.c (do_export_stream): Skip legacy keys.
-
-2015-06-18 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix the cleanup zombies fix (685b782).
-	+ commit c97198371b7307e64afdd323231977b2247f64ec
-	* dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Do not close the
-	stdout reader after EOF from read_log_data.
-	* dirmngr/crlcache.c (crl_cache_reload_crl): Close the reader before
-	the next iteration.
-
-2015-06-17 Werner Koch <wk@gnupg.org>
-
-	agent: Print a warning for obsolete options.
-	+ commit 010d26a85bfe15c4aa12eefeab851dbde0609c26
-	* g10/misc.c (obsolete_scdaemon_option): Move to
-	* common/miscellaneous.c (obsolete_option): ... here.
-	* agent/gpg-agent.c (main): Use obsolete_option for the 3 obsolete
-	options.
-
-2015-06-16 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Cleanup zombies and fix hang on shutdown.
-	+ commit 685b782a18adb90bbf78956682e4e7f89fed678c
-	* dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Move nfds computation
-	into the loop. Check the queue also on timeout. Close log_fd and
-	reader context on EOF or error.
-
-	dirmngr: Avoid accessing uninitialized memory in log callback.
-	+ commit 82c72e2db7bc5b633768d59822f2e2a353fa6e32
-	* dirmngr/dirmngr.c (pid_suffix_callback): Clear int_and_ptr_u before
-	use.
-	(start_connection_thread): Ditto.
-	(handle_connections): Ditto.
-
-2015-06-16 Neal H. Walfield <neal@g10code.com>
-
-	Don't prompt for the password multiple times in pinentry loopback mode.
-	+ commit eac081ba1278855fa223b031b527498fec558bc7
-	* g10/gpg.c (main): If OPT.PINENTRY_MODE is PINENTRY_MODE_LOOPBACK,
-	clear OPT.PASSPHRASE_REPEAT.
-
-2015-06-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese Translation.
-	+ commit 15540f6233bd041b06708862a6d9535cbcabe330
-
-
-2015-06-15 Werner Koch <wk@gnupg.org>
-
-	doc: Add defs.inc to BUILT_SOURCES.
-	+ commit ef273a9afc7840b75cfb9b8af78d117b7d672c6a
-
-
-2015-06-11 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.5.
-	+ commit 9b7bdfae82f74a147a5dbf0fac0f78cde77a207b
-
-
-	agent: Fix --extra-socket on Windows.
-	+ commit 985918aab025cf0ac9db411b88a47c4b985e5e95
-	* agent/gpg-agent.c (start_connection_thread): Rename to ...
-	(do_start_connection_thread): this. Factor nonce checking out to ...
-	(start_connection_thread_std): this,
-	(start_connection_thread_extra): this,
-	(start_connection_thread_browser): and this.
-
-	agent: Add experimental option --browser-socket.
-	+ commit 008435b95cbca19adc217178dc9d793eca584345
-	* agent/agent.h (opt): Add field "browser_socket".
-	* agent/command.c (cmd_setkeydesc): Use a different message for
-	restricted==2.
-	* agent/gpg-agent.c (oBrowserSocket): New.
-	(opts): Add --browser-socket.
-	(socket_name_browser, redir_socket_name_browser): New.
-	(socket_nonce_browser): New.
-	(cleanup): Cleanup browser socket.
-	(main): Implement option.
-	(start_connection_thread_browser): New.
-	(handle_connections): Add arg listen_fd_browser and use it.
-
-2015-06-10 Daiki Ueno <ueno@gnu.org>
-
-	agent: Add option --allow-emacs-pinentry.
-	+ commit 691dae270b3b741178912599724d69adabdb48b9
-	* agent/agent.h (opt): Add field allow_emacs_pinentry.
-	* agent/call-pinentry.c (start_pinentry): Act upon new var.
-	* agent/gpg-agent.c (oAllowEmacsPinentry): New.
-	(opts): Add option --allow-emacs-pinentry.
-	(parse_rereadable_options): Set this option.
-	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add new option.
-
-2015-06-09 Werner Koch <wk@gnupg.org>
-
-	doc: Do not used fixed file names in the manuals.
-	+ commit 25331bba5554a39d226d32433add7784b2e170b8
-	* doc/mkdefsinc.c: New.
-	* doc/Makefile.am: Include cmacros.am.
-	(EXTRA_DIST): Add mkdefsinc.c defsincdate.
-	(BUILT_SOURCES): Add defsincdate
-	(CLEANFILES): Add mkdefsinc and defs.inc.
-	(mkdefsinc): New rule.
-	(yat2m-stamp): Depend on defs.inc.
-	($(myman_pages) gnupg.7): Ditto.
-	(gnupg.texi): Remove rule to touch itself.
-	(dist-hook): New.
-	(defsincdate): New.
-	(defs.inc): New.
-	* doc/gnupg.texi: Remove inclusion of version.texi. Include defs.inc.
-	Also include defs.inc in all files used to build man files. Change
-	fixed directory names to those from defs.inc.
-
-	dirmngr: Avoid crash due to an empty crls.d/DIR.txt.
-	+ commit 255dadd76d5a2101d2c5450741326b67253fa9ea
-	* dirmngr/crlcache.c (check_dir_version): Avoid segv.
-
-2015-06-08 Werner Koch <wk@gnupg.org>
-
-	doc: Change the manual source to be only for GnuPG 2.1.
-	+ commit abbefdd04d7ee30218506caeae1fd858569c9f0a
-
-
-	Convey envvar INSIDE_EMACS to the pinentry.
-	+ commit c672572bd50966187cc823585efed673b66ff942
-	* common/session-env.c (stdenvnames): Add it.
-
-	agent: Add command "getinfo std_env_names".
-	+ commit 8425db6a26bf66dad16dfbc26be9af7d272f31d3
-	* agent/command.c (cmd_getinfo): Add new sub-command.
-
-2015-06-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: do_decipher change for OpenPGPcard v3.0.
-	+ commit cf508a1f7f4c8926dc554be68a2d46f5ce272ac0
-	* scd/app-openpgp.c (do_decipher): Add a header for ECDH.
-
-2015-06-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Replace -1 by GPG_ERR_NOT_FOUND in tdbio.c.
-	+ commit a4a15195c2a3729025a3ba3439ac8860083fceeb
-	* g10/tdbio.c (lookup_hashtable): Return GPG_ERR_NOT_FOUND.
-	* g10/tdbdump.c (import_ownertrust): Test for GPG_ERR_NOT_FOUND.
-	* g10/trustdb.c (read_trust_record): Ditto.
-	(tdb_get_ownertrust, tdb_get_min_ownertrust): Ditto.
-	(tdb_update_ownertrust, update_min_ownertrust): Ditto.
-	(tdb_clear_ownertrusts, update_validity): Ditto.
-	(tdb_cache_disabled_value): Ditto.
-
-	gpg: Cleanup error code path in case of a bad trustdb.
-	+ commit f170240ef735edc481f60e51527cbb5ee1acfd55
-	* g10/tdbio.c (tdbio_read_record): Fix returning of the error.
-
-	gpg: Fix output in case of a corrupted trustdb.
-	+ commit bf06d04f53296f4b4b73b9360cf1571559bb2295
-	* g10/tdbdump.c (list_trustdb): Add arg FP and change callers to pass
-	es_stdout.
-	* g10/tdbio.c (upd_hashtable): On a corrupted trustdb call
-	list_trustdb only in verbose > 1 mode and let it dump to stderr.
-
-2015-05-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix key template of ECC.
-	+ commit e5c69e87beebe99d362ac721ce4ea6b057a30a99
-	* scd/app-openpgp.c (build_ecc_privkey_template): Use correct value.
-
-2015-05-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix a race condition initially creating trustdb.
-	+ commit fe5c6edaed78839303d67e01e141cfc6b5de9aec
-	* g10/tdbio.c (take_write_lock, release_write_lock): New.
-	(put_record_into_cache, tdbio_sync, tdbio_end_transaction): Use
-	new lock functions.
-	(tdbio_set_dbname): Fix the race.
-	(open_db): Don't call dotlock_create.
-
-2015-05-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Remove g10/signal.c.
-	+ commit 6cb18a8f975b7ff7ca79c1fb0cddcd4b66be90fb
-	* g10/signal.c: Remove.
-	* g10/main.h: Remove old function API.
-	* g10/tdbio.c: Use new API, even in the dead code.
-
-2015-05-20 Werner Koch <wk@gnupg.org>
-
-	agent: Cleanup caching code for command GET_PASSPHRASE.
-	+ commit 23d2ef83cda644c6a83499f9327350d3371e8a17
-	* agent/command.c (cmd_get_passphrase): Read from the user cache.
-
-2015-05-19 Neal H. Walfield <neal@g10code.com>
-
-	agent: When the password cache is cleared, also clear the ext. cache.
-	+ commit 3a9305439b75ccd4446378d4fd87da087fd9c892
-	* agent/agent.h (agent_clear_passphrase): New declaration.
-	* agent/call-pinentry.c (agent_clear_passphrase): New function.
-	* agent/command.c (cmd_clear_passphrase): Call agent_clear_passphrase.
-
-	agent: Modify agent_clear_passphrase to support an ext. password cache.
-	+ commit e201c20f25e7bed29088186c5f717d43047a0f4b
-	* agent/agent.h (agent_get_passphrase): Add arguments keyinfo and
-	cache_mode. Update callers.
-	* agent/call-pinentry.c (agent_get_passphrase): Add arguments keyinfo
-	and cache_mode. If KEYINFO and CACHE_MODE describe a cachable key,
-	then send SETKEYINFO to the pinentry.
-
-2015-05-19 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: detects public key encryption packet error properly.
-	+ commit c771963140cad7c1c25349bcde27e427effc0058
-	g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
-	encryption.
-
-2015-05-15 Werner Koch <wk@gnupg.org>
-
-	build: Make --disable-gpgsm work.
-	+ commit 43ea8f5d884dd108bb27d8e1610fa28802295a06
-	* Makefile.am: Always build kbx/
-	* g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS.
-
-2015-05-12 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.4.
-	+ commit a67ead6525d7597a9e0b152c5971f6290f7912f3
-
-
-	speedo: Add make option SELFCHECK=0 to build a new release.
-	+ commit 21b0701e2e044894c53ff59d22c5c6a172780c25
-	* build-aux/getswdb.sh: Add option --skip-selfcheck.
-	* build-aux/speedo.mk: Add option SELFCHECK.
-
-2015-05-11 Werner Koch <wk@gnupg.org>
-
-	common: Cope with AIX problem on number of open files.
-	+ commit 987532b038a2d9b9e76c0de425ee036ca2bffa1b
-	* common/exechelp-posix.c: Limit returned value for too hight values.
-
-	gpg-connect-agent: Fix quoting of internal percent+ function.
-	+ commit 26e2eb98d3d8405b335b43c8e86deacf622cd957
-	* tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also
-	escape '+'.
-
-	agent: Add option --no-allow-external-cache.
-	+ commit d7293cb317acc40cc9e5189cef33fe9d8b47e62a
-	* agent/agent.h (opt): Add field allow_external_cache.
-	* agent/call-pinentry.c (start_pinentry): Act upon new var.
-	* agent/gpg-agent.c (oNoAllowExternalCache): New.
-	(opts): Add option --no-allow-external-cache.
-	(parse_rereadable_options): Set this option.
-
-	agent: Add strings for use by future Pinentry versions.
-	+ commit 02d5e1205489aa5027a87a64552eaf15984dc22d
-	* agent/call-pinentry.c (start_pinentry): Add more strings.
-
-	agent: Add option --debug-pinentry.
-	+ commit 14232c3870c5ef5d2fa15e8ed3f302b1ba29d25c
-	* agent/gpg-agent.c (oDebugPinentry): New.
-	(opts): Add --debug-pinentry.
-	(parse_rereadable_options): Set that option.
-	* agent/call-pinentry.c (start_pinentry): Pass option to
-	assuan_set_flag.
-
-2015-05-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid cluttering stdout with trustdb info in verbose mode.
-	+ commit b03a2647299a6c8764a2574590cbaccdff9e497d
-	* g10/trustdb.c (validate_keys): Call dump_key_array only in debug
-	mode.
-
-	gpg: Fix wrong output in list mode.
-	+ commit 7039f87375b3c89d6e63837b811ed2be71c8d9db
-	* g10/parse-packet.c (parse_gpg_control): Replace puts by es_fputs to
-	LISTFP.
-
-	gpg: New command --quick-adduid.
-	+ commit 64e809b791645f343feb69112baba8e2700e454b
-	* g10/keygen.c (ask_user_id): Factor some code out to ...
-	(uid_already_in_keyblock): new.
-	(generate_user_id): Add arg UIDSTR. Fix leaked P.
-	* g10/keyedit.c (menu_adduid): Add new arg uidstring. Adjust caller.
-	(keyedit_quick_adduid): New.
-	* g10/gpg.c (aQuickAddUid): New.
-	(opts): Add command --quick-adduid.
-	(main): Implement that.
-
-	gpg: Add push/pop found state feature to keydb.
-	+ commit 3c439c0447f8a7468a61bbdc4c9a101ef2451dcb
-	* g10/keydb.c (keydb_handle): Add field saved_found.
-	(keydb_new): Init new field.
-	(keydb_push_found_state, keydb_pop_found_state): New.
-	* g10/keyring.c (kyring_handle): Add field saved_found.
-	(keyring_push_found_state, keyring_pop_found_state): New.
-
-	gpg: Minor code merging in keyedit.
-	+ commit b772e459fa91cdc7facd95227ebc0faba20a7003
-	* g10/keyedit.c (fix_keyblock): Rename to fix_key_signature_order.
-	(fix_keyblock): New. Call fix_key_signature_order and other fix
-	functions.
-	(keyedit_menu): Factor code out to new fix_keyblock.
-	(keyedit_quick_sign): Ditto. Check for primary fpr before calling
-	fix_keyblock.
-
-2015-05-07 Werner Koch <wk@gnupg.org>
-
-	agent: Minor change for 56b5c9f.
-	+ commit 436f2060721e997479a9dd5be8dfc73627dd49c9
-	* agent/call-pinentry.c (agent_askpin): Move option setting to ...
-	(start_pinentry): here. Fix error code check.
-
-2015-05-07 Kristian Fiskerstrand <kf@sumptuouscapital.com>
-
-	dirmngr: Fix segfault in ldap engine.
-	+ commit d0d4984cfec54dee727b9e9d33d09e33c6f2e182
-	(ks-engine-ldap.c) Fix segfault caused by missing check whether uri is
-	initialized
-
-2015-05-07 Neal H. Walfield <neal@g10code.com>
-
-	agent: Improve support for externally cached passwords.
-	+ commit 56b5c9f94f2e55d096be585ed061ccf1c9ec0de6
-	* agent/call-pinentry.c (PINENTRY_STATUS_PASSWORD_FROM_CACHE): New
-	constant.
-	(pinentry_status_cb): Add it to *FLAGS if PASSWORD_FROM_CACHE was
-	provided.
-	(agent_askpin): Pass "OPTION allow-external-password-cache" to the
-	pinentry. Always pass SETKEYINFO to the pinentry. If there is no
-	stable identifier, then use "--clear". If the password is incorrect
-	and PINENTRY_STATUS_PASSWORD_FROM_CACHE is set in *PINENTRY_STATUS,
-	then decrement PININFO->FAILED_TRIES.
-
-	agent: Or in the value; don't overwrite the variable.
-	+ commit 74944330ba7229ed0cbe23cc0f573962a444bd07
-	* agent/call-pinentry.c (pinentry_status_cb): Or in
-	PINENTRY_STATUS_CLOSE_BUTTON; don't overwrite *FLAG.
-
-	agent: Avoid magic numbers. Use more accurate names.
-	+ commit d3b5cad2346bd5747789dc62d7804fa5c15f4f3b
-	* agent/call-pinentry.c (PINENTRY_STATUS_CLOSE_BUTTON): New constant.
-	(PINENTRY_STATUS_PIN_REPEATED): Likewise.
-	(close_button_status_cb): Rename from this...
-	(pinentry_status_cb): ... to this. Use the constants.
-	(agent_askpin): Rename local variable from close_button to
-	pinentry_status. Use symbolic constants rather than magic numbers.
-
-2015-05-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve 'General key info' line of --card-status.
-	+ commit 874ef16e70ab750db7b153f17a7e859a0db6a2f1
-	* g10/keylist.c (print_pubkey_info): Print either "pub" or "sub".
-
-	* g10/getkey.c (get_pubkey_byfprint): Add optional arg R_KEYBLOCK.
-	* g10/keyid.c (keyid_from_fingerprint): Adjust for change.
-	* g10/revoke.c (gen_desig_revoke): Adjust for change.
-	* g10/card-util.c (card_status): Simplify by using new arg. Align
-	card-no string.
-
-	* g10/card-util.c (card_status): Remove not used GnuPG-1 code.
-
-	gpg: Fix regression not displaying the card serial number.
-	+ commit 173b26c8f83a3c623165a96c315bf9ed4b90edcc
-	* g10/call-agent.c (keyinfo_status_cb): Detect KEYINFO.
-
-2015-05-06 Werner Koch <wk@gnupg.org>
-
-	speedo,w32: Install a native pinentry.
-	+ commit 154abaf3c97dae43ba972e4482680a287f3e5c39
-	* build-aux/speedo.mk: Always build pinentry for w32.
-	(speedo_pkg_pinentry_configure): Adjust to modern pinentry.
-	* build-aux/speedo/w32/inst.nsi: Install native pinentry under the
-	name pinentry-basic.exe.
-
-2015-05-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: fix cmp_public_key.
-	+ commit f77fd572db658959fa40aa8c181be919e688b707
-	* g10/free-packet.c (cmp_public_keys): Compare opaque
-	data at the first entry of the array when it's unknown algo.
-
-2015-04-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: PC/SC reader selection by partial string match.
-	+ commit 01a2a61bc4b34817c4216888265f65d59a33dad3
-	* scd/apdu.c (open_pcsc_reader_direct): Partial string match.
-
-2015-04-24 Werner Koch <wk@gnupg.org>
-
-	common: Remove JNLIB from boiler plate (jnlib merge).
-	+ commit 172b6193488f433a206fd88f85d8c4a5d1eb7fdf
-	* common/README.jnlib: Remove.
-
-	common: Rename log and gcc attribute macros (jnlib merge).
-	+ commit 26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3
-	* common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
-	* common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
-
-	common: Remove two JNLIB_ macros (jnlib merge).
-	+ commit 575230d91bba95697518da418ea0e8712f889a0f
-	* configure.ac: Merge seperate jnlib checks.
-	(HAVE_JNLIB_LOGGING): Remove.
-	* common/logging.c, common/simple-pwquery.c (JNLIB_NEED_AFLOCAL):
-	Rename to GNUPG_COMMON_NEED_AFLOCAL. Change all tests.
-
-	common: Remove libjnlib-config.h (jnlib merge).
-	+ commit 17bcd087082d01c48c60ff20d7f9a40f34c6969f
-	* common/libjnlib-config.h: Remove.
-	* common/common-defs.h (getenv) HAVE_GETENV: New. From removed
-	header.
-	(getpid) HAVE_W32CE_SYSTEM: New. From removed header.
-	* common/argparse.c: Include util.h and common-defs.h. Replace
-	jnlib_ macro names for non-GNUPG builds by x* names.
-	* common/dotlock.c: Ditto.
-	* common/logging.c: Include util.h and common-defs.h. Replace jnlib_
-	symbol names by x* names.
-	* common/strlist.c: Ditto.
-	* common/utf8conv.c: Ditto.
-	* common/w32-reg.c: Ditto.
-	* common/mischelp.c: Ditto. Also remove _jnlib_free.
-	* common/stringhelp.c: Ditto.
-	(JNLIB_LOG_WITH_PREFIX): Do not depend on this macro.
-	* common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this
-	macro.
-
-2015-04-23 Werner Koch <wk@gnupg.org>
-
-	gpg: Move all DNS access to Dirmngr.
-	+ commit 154f3ed2bf64de801ae0f9796338a2767ec6357b
-	* common/dns-cert.h: Move to ../dirmngr/.
-	* common/dns-cert.c: Move to ../dirmngr/. Change args to return the
-	key as a buffer.
-	* common/t-dns-cert.c: Move to ../dirmngr/.
-	* common/pka.c, common/pka.h, common/t-pka.c: Remove.
-
-	* dirmngr/server.c (data_line_cookie_write): Factor code out to
-	data_line_write and make it a wrapper for that.
-	(data_line_write): New.
-	(cmd_dns_cert): New.
-	(register_commands): Register new command.
-
-	* g10/Makefile.am (LDADD): Remove DNSLIBS.
-	* g10/call-dirmngr.c (dns_cert_parm_s): New.
-	(dns_cert_data_cb, dns_cert_status_cb): New.
-	(gpg_dirmngr_dns_cert): New.
-	(gpg_dirmngr_get_pka): New.
-	* g10/gpgv.c (gpg_dirmngr_get_pka): New dummy function.
-	* g10/keyserver.c (keyserver_import_cert): Replace get_dns_cert by
-	gpg_dirmngr_dns_cert.
-	(keyserver_import_pka): Replace get_pka_info by gpg_dirmngr_get_pka.
-	* g10/mainproc.c: Include call-dirmngr.h.
-	(pka_uri_from_sig): Add CTX arg. Replace get_pka_info by
-	gpg_dirmngr_get_pka.
-
-	common: Minor change of hex2str to allow for embedded nul.
-	+ commit ce11cc39ea7e011040debc9339a2310a714efe7e
-	* common/convert.c (hex2str): Set ERRNO. Return adjusted COUNT.
-
-2015-04-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	common: removal of t-support.c from t_jnlib_src.
-	+ commit a7264e3a6a83189a9e43edf5e99f5ac7ee42a2ab
-	* common/Makefile.am (t_jnlib_src): Remove t-support.c.
-
-2015-04-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Make keyserver-option http_proxy work.
-	+ commit c4d98734c5df39f57a71f0ec1c0c80e82ff08508
-	* g10/options.h (opt): Add field keyserver_options.http_proxy.
-	* g10/keyserver.c (warn_kshelper_option): Add arg noisy.
-	(parse_keyserver_options): Parse into new http_proxy field.
-	* g10/call-dirmngr.c (create_context): Send the http-proxy option.
-
-	common: Make proper use of http proxy parameter.
-	+ commit 54e55149f2af96eff08bfd6f70ef13d007fb58c7
-	* common/http.c (is_hostname_port): New.
-	(send_request): Fix proxy name parsing.
-
-	dirmngr: Add http proxy support for keyservers.
-	+ commit a0dead5edce07838cf5ff3ec7205a3bff2a6ef70
-	* dirmngr/dirmngr.h (server_control_s): Add field http_proxy.
-	* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Copy http_proxy value
-	from OPT.
-	(dirmngr_deinit_default_ctrl): New.
-	(main): Call dirmngr_deinit_default_ctrl.
-	* dirmngr/server.c (start_command_handler): Ditto.
-	(option_handler): Add option "http-proxy".
-	* dirmngr/crlfetch.c (crl_fetch): Take http_proxy from CTRL.
-	* dirmngr/ocsp.c (do_ocsp_request): Ditto.
-	* dirmngr/ks-engine-hkp.c (send_request): Add proxy support.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-
-	gpg: Do not use honor-keyserver-url sub-option by default.
-	+ commit 727fe4f8d7d5fc3eac0b0aa6fafa4a314686d7dc
-
-
-	gpg: Make preferred keyservers work.
-	+ commit ae0d65f86413a82a40cf68e08aaeca405eee8c78
-	* g10/call-dirmngr.c (dirmngr_local_s): Add field set_keyservers_done.
-	(create_context): Move keyserver setting to ...
-	(open_context): here.
-	(clear_context_flags): New.
-	(gpg_dirmngr_ks_get): Add arg override_keyserver.
-	* g10/keyserver.c (keyserver_refresh): Improve diagnostics.
-	(keyserver_get_chunk): Ditto. Pass OVERRIDE_KEYSERVER to ks_get.
-
-	gpg: Update sub-options of --keyserver-options.
-	+ commit da1990bac71f6447d8ebd169c3b3b186e9f287d9
-	* g10/options.h (KEYSERVER_HTTP_PROXY): New.
-	(KEYSERVER_USE_TEMP_FILES, KEYSERVER_KEEP_TEMP_FILES): Remove.
-	(KEYSERVER_TIMEOUT): New.
-	* common/keyserver.h (KEYSERVER_TIMEOUT): Remove.
-	* g10/keyserver.c (keyserver_opts): Remove obsolete "use-temp-files"
-	and "keep-temp-files". Add "http-proxy" and "timeout".
-	(parse_keyserver_options): Remove 1.2 compatibility option
-	"honor-http_proxy". Remove "use-temp-files" and "keep-temp-files"
-	code.
-
-2015-04-14 Werner Koch <wk@gnupg.org>
-
-	agent: Send the new SETKEYINFO command to the Pinentry.
-	+ commit 2180845959839705200e3172dbafc94b70b9007f
-	* agent/call-pinentry.c (agent_askpin): Add args keyinfo and
-	cache_mode. Change all callers to pass (NULL,0) for them. Send
-	SETKEYINFO command.
-	* agent/findkey.c (unprotect): Pass the keygrip and the cache_mode for
-	the new args.
-
-2015-04-14 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: better handling of extended APDU.
-	+ commit 971d558e862db878a7310e06ed7116dbe36886ab
-	* scd/apdu.c (send_le): Bug fix for not append Z when lc<0&&le<0.
-	* scd/app-common.h (struct app_ctx_s): Use bit fields for flags.
-	* scd/ccid-driver.c (CCID_MAX_BUF): New. Only for OpenPGPcard.
-	(struct ccid_driver_s): New field of max_ccid_msglen.
-	 Remove ifsd field.
-	(parse_ccid_descriptor): Initialize max_ccid_msglen.
-	(ccid_transceive_apdu_level): Implement sending extended APDU in
-	chain of CCID message.
-
-2015-04-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix NULL-segv due to invalid imported data.
-	+ commit 25fce93ba19d997e234a674d5cc98df82c5b5496
-	* g10/free-packet.c (my_mpi_copy): New.
-	(copy_public_key, copy_signature): Use instead of mpi_copy.
-
-2015-04-13 Neal H. Walfield <neal@g10code.com>
-
-	dirmngr: If LDAP is not enable, don't build the LDAP bits.
-	+ commit 5cde5bf37339cdeb0bd0a33d39477382eafebede
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Only include
-	ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
-	is TRUE.
-	(module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
-	* dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
-	TRUE.
-	(ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
-	TRUE.
-	(ks_action_search): Likewise.
-	(ks_action_get): Likewise.
-	(ks_action_put): Likewise.
-	* dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
-	TRUE.
-	(cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
-	TRUE.
-
-2015-04-13 Werner Koch <wk@gnupg.org>
-
-	common: Do without nested fucntions to support non-gcc.
-	+ commit 454f60399c7318fffd3de2afadd58c7a490178bd
-	* common/t-stringhelp.c (test_strsplit): Remove nested function.
-
-2015-04-11 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.3.
-	+ commit b1e1959d59a12b53c016ca9c95aee3a62c0bfc00
-
-
-2015-04-11 Yuri Chornoivan <yurchor@ukr.net>
-
-	po: Update Ukrainian translation.
-	+ commit 896f438967b66b4836419aa737c706ced6b6454a
-
-
-2015-04-11 Ineiev <ineiev@gnu.org>
-
-	po: Update and review Russian translation.
-	+ commit b69d7064f30c38ffe18e71de6a0fc14b5da0452f
-
-
-2015-04-10 Werner Koch <wk@gnupg.org>
-
-	dirmngr,w32: Make it build for Windows.
-	+ commit c8bb5000d4c86a055348dc08352f573c599743a7
-	* dirmngr/Makefile.am (t_common_ldadd): Add missing libs.
-
-	Remove obsolete directories from AM_CPPFLAGS.
-	+ commit 67158ff155ef52fd54a6bbe680551c0e12b31e69
-
-
-	dirmngr,w32: Replace functions not available under Windows.
-	+ commit 0fb224c2c5e0c6770d4a6044d62d84f6bbc1b26b
-	* dirmngr/ks-engine-ldap.c (extract_attributes): Replace isoptime and
-	gmtime_r.
-
-	common: Add new function gnupg_gmtime.
-	+ commit 5d60c7f7e05a06e46e23bafe61cef09ad32aa998
-	* common/gettime.c (gnupg_gmtime): New.
-	(gnupg_get_isotime): Use it. Also take care of an gmtime_t returning
-	an error.
-
-	common: Add new function isodate_human_to_tm.
-	+ commit f6670100b7a15b2071c2e4062f5c5a678f2a30f6
-	* common/gettime.c (isotime_human_p): Add arg date_only.
-	(isodate_human_to_tm): New.
-	* common/t-gettime.c (test_isodate_human_to_tm): New.
-	(main): Call new test.
-
-	dirmngr,w32: Avoid name clash with existing function.
-	+ commit 6ad95fe6f1f130c8f6d139a9bd57fc4a0d38292b
-	* dirmngr/ks-engine-ldap.c (ldap_connect): Rename to my_ldap_connect.
-
-	gpgparsemail: Fix last commit (3f2bdac)
-	+ commit 9433661419043431a6cfc7d84c8450e0b2f6c353
-	* tools/rfc822parse.c (parse_field): Replace break by goto.
-
-2015-04-09 Werner Koch <wk@gnupg.org>
-
-	gpgparsemail: Fix case of zero length continuation lines.
-	+ commit 3fbeba64a8bfb2b673230c124a3d616b6568fd2f
-	* tools/rfc822parse.c (parse_field): Loop after continuation line.
-
-2015-04-08 Werner Koch <wk@gnupg.org>
-
-	sm: Fix certificate lookup in dirmngr cache.
-	+ commit 6619ead2cfd2abcb95b66dc70622fdeef624fb8a
-	* sm/call-dirmngr.c (get_cached_cert): Fix typo in LOOKUP command.
-
-2015-04-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Print the user id in --fast-list-mode.
-	+ commit c2383407bba5eefea486464a31e02846124c9da5
-	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Change.
-
-	gpg: Prepare to pass additional context to the list functions.
-	+ commit 67a58118ab6171c0cf28b65a39973062690d1313
-	* g10/keylist.c (struct sig_stats): Rename to keylist_context and add
-	field check_sigs.
-	(keylist_context_release): New.
-	(list_all): Set listctx.check_sigs and call release func.
-	(list_one): Ditto.
-	(locate_one): Ditto.
-	(list_keyblock_print): Use .check_sigs field. Repalce arg opaque by
-	listctx.
-	(list_keyblock): Ditto. Make static.
-	(list_keyblock_direct): New.
-	* g10/keygen.c (do_generate_keypair): Replace list_keyblock by
-	list_keyblock_direct.
-
-	gpg: Merge duplicated code for get_user_id et al.
-	+ commit f577d5c1a747d673fa1d5c012ce3e3b78b699c6a
-	* g10/getkey.c (get_user_id_string): Add args mode and r_LEN.
-	(get_user_id_string_native): Add new args.
-	(get_long_user_id_string, get_user_id): Rewrite using
-	get_user_id_string.
-
-	gpg: Add new option --debug-iolbf.
-	+ commit c581ed717ad2cc4be90c46253baa44a0d3ba5b80
-	* g10/gpg.c (oDebugIOLBF): new.
-	(opts): Add --debug-iolbf.
-	(main): Set option.
-
-	Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
-	+ commit 24a75201da6be72edf85b96dbc0c01c747d02c6a
-	* g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
-
-	Fix use of DBG_CACHE and DBG_LOOKUP.
-	+ commit 2f099eb62ac6491675bbcccaca4e076b2d8e7ea0
-	* dirmngr/dirmngr.h (DBG_LOOKUP_VALUE): Change to 8192.
-	* g10/options.h (DBG_LOOKUP_VALUE, DBG_LOOKUP): New.
-	* g10/getkey.c: Use DBG_LOOKUP instead of DBG_CACHE at most places.
-
-	gpg: Rename a debug macro.
-	+ commit 4de8a58e44262a25564e2acef8c8865d1755982e
-	* g10/options.h (DBG_CIPHER_VALUE): Rename to DBG_CRYPTO_VALUE.
-	(DBG_CIPHER): Rename to DBG_CRYPTO.
-
-2015-04-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix DoS while parsing mangled secret key packets.
-	+ commit d901efcebaefaf6eae4a9b9aa8f0c2c055d3518a
-	* g10/parse-packet.c (parse_key): Check PKTLEN before calling mpi_read
-	et al.
-
-2015-04-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	g10: Fix keytocard.
-	+ commit f82c4a6d0d76e716b6a7b22ca964fa2da1f962a0
-	g10/call-agent.h (agent_scd_learn): Add FORCE option.
-	g10/call-agent.c (agent_scd_learn): Implement FORCE option.
-	g10/keygen.c (gen_card_key): Follow the change of option.
-	g10/card-util.c (change_pin, card_status, factory_reset): Likewise.
-	g10/keyedit.c (keyedit_menu): Update private key storage by
-	agent_scd_learn.
-
-	agent: Add --force option for LEARN.
-	+ commit 4ffadb74b3ada8a5d69ef8d87f4326df9bd97e97
-	* agent/command.c (cmd_learn): Handle --force option.
-	(cmd_keytocard): Don't update key storage file.
-	* agent/agent.h (agent_handle_learn): Add FORCE.
-	* agent/learncard.c (agent_handle_learn): Implement FORCE to update
-	key stroage file.
-
-2015-03-31 Neal H. Walfield <neal@g10code.com>
-
-	dirmngr: Don't use alloca.
-	+ commit d0ff2ee04187fbedacbe4d3884ee75d957a0b8c6
-	* dirmngr/ks-engine-ldap.c (ks_ldap_put): Replace use of alloca with
-	xmalloc and xfree.
-
-	dirmngr: Simplify truncation of long strings in debug code.
-	+ commit 802eec0ca49b92104c92f18c9a6a04c34de74168
-	* dirmngr/ks-engine-ldap.c (modlist_dump): Simplify truncation of long
-	strings.
-
-	dirmngr: Use a better error code.
-	+ commit 7f6d7948c1e56e09c1bdaa5143e1b5558c4376dd
-	* dirmngr/ldap-parse-uri.c (ldap_parse_uri): On error, return
-	GPG_ERR_GENERAL, not GPG_ERR_ASS_GENERAL.
-
-	dirmngr: Better encapsulate the keyservers variable.
-	+ commit 348c520040a31f5c322183c0654a34978e2baf6f
-	* dirmngr/dirmngr.h (struct server_control_s): Move field keyservers
-	from here...
-	* dirmngr/server.c (struct server_local_s): ... to here. Update
-	users.
-	* dirmngr/ks-action.h (ks_action_resolve): Add argument keyservers.
-	(ks_action_search): Likewise.
-	(ks_action_get): Likewise.
-	(ks_action_put): Likewise.
-	* dirmngr/ks-action.c (ks_action_resolve): Add argument keyservers.
-	Use it instead of ctrl->keyservers.
-	(ks_action_search): Likewise.
-	(ks_action_get): Likewise.
-	(ks_action_put): Likewise.
-
-2015-03-28 Neal H. Walfield <neal@g10code.de>
-
-	gpg: Only use the last specified keyserver.
-	+ commit f26ba14028d34845ae10aae552b90681907e377d
-	* g10/gpg.c (main): Only use the last specified keyserver.
-
-2015-03-25 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix resource leaks and check rare errors.
-	+ commit bec10ae4b5a870303c800cdf3cd906044613fc2d
-	* dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Fix resource
-	leak.
-	(ks_ldap_search): Check error from es_fopenmem. Use LDAP_ERR where
-	required.
-	(modlist_dump): Check error from es_fopenmem.
-	(uncescape): s/int/size_t/. Use existing macros.
-	(extract_attributes): Use existing trim function.
-	(ks_ldap_put): Do not segv on error from modlist_dump.
-
-	dirmngr: Minor cleanups.
-	+ commit 6c701af121782c2feb4ee51e559a7420df00471f
-	* dirmngr/ks-engine-ldap.c __riscos__: Remove doubled util.h.
-	(ldap_to_gpg_err): s/GPG_ERR_GENERAL/GPG_ERR_INTERNAL/.
-	(tm2ldaptime): Use snprintf.
-	(ldap_connect): Get error code prior to log_error and and use modern
-	function. Use xfree, xtrustrdup etc.
-	(modlist_lookup): Use GNUPG_GCC_A_USED.
-	(modlist_free): Use xfree.
-
-	common: Add macro GNUPG_GCC_A_USED.
-	+ commit 99ef9cd7f589b51921bfbe8d52735c104ef260e3
-	* common/util.h (GNUPG_GCC_A_USED): New.
-
-	sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).
-	+ commit 1e4d8ddbe3ad7ee8f1c1d1798694d91f792776c0
-	* sm/certreqgen.c (create_request): Change default hash algo.
-	* sm/gpgsm.c (DEFAULT_CIPHER_ALGO): Change default bulk cipher algo.
-
-2015-03-24 Werner Koch <wk@gnupg.org>
-
-	gpg,w32: Handle forward slash in --keyring option.
-	+ commit bdd22e3a0846d38a0b6cdb822476ad2f15d03455
-	* g10/keydb.c (keydb_add_resource): Allow forward slash under Windows.
-
-2015-03-23 Neal H. Walfield <neal@g10code.de>
-
-	Improve documentation for ks_hkp_get.
-	+ commit 7a56b6b3aa8b7a07bd80a3fcd5114bd1af359fa3
-	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Improvement documentation.
-
-	Improve documenation of http_parse_uri.
-	+ commit 00a16cf49336ee0b4ce21eb05a79db955af053e0
-	* common/http.c (http_parse_uri): Improve documentation.
-
-	Add support to talking to LDAP key servers.
-	+ commit 51341badb623927f2a358588c725a356fc77dbe7
-	* g10/call-dirmngr.c (record_output): New function.
-	(ks_put_inq_cb): Use it here to generate a --with-colons like output
-	instead of a custom format.
-	* dirmngr/ks-action.c: Include "ldap-parse-uri.h".
-	(ks_action_help): If the provided URI is an LDAP URI, then use
-	ldap_parse_uri to parse. Call ks_ldap_help.
-	(ks_action_search): If passed an LDAP URI, then call ks_ldap_search.
-	(ks_action_get): Likewise.
-	(ks_action_put): Likewise. Also, change data from a 'const void *' to
-	a 'void *' and add info and infolen parameters. Add note that
-	function may modify DATA.
-	* dirmngr/ks-action.h (ks_action_put): Update declaration accordingly.
-	* dirmngr/server.c: Include "ldap-parse-uri.h".
-	(cmd_keyserver): If ITEM->URI is an LDAP URI, parse it using
-	ldap_parse_uri.
-	(hlp_ks_put): Improve documentation.
-	(cmd_ks_put): Also pass info and infolen to ks_action_put. Improve
-	documentation.
-	* dirmngr/ks-engine.h (ks_ldap_help): New declaration.
-	(ks_ldap_search): Likewise.
-	(ks_ldap_get): Likewise.
-	(ks_ldap_put): Likewise.
-	* dirmngr/ks-engine-ldap.c: New file.
-	* dirmngr/Makefile.am (dirmngr_SOURCES): Add ks-engine-ldap.c,
-	ldap-parse-uri.c and ldap-parse-uri.h.
-	(dirmngr_LDADD) USE_LDAP: Add $(ldaplibs).
-
-	Import _gpgme_parse_timestamp from gpgme as parse_timestamp.
-	+ commit 81e83060856f02f6cfc7b48f8032e0cf14fc6c68
-	* common/gettime.h (parse_timestamp): New declaration.
-	* common/gettime.c (_win32_timegm): New function imported from
-	gpgme/src/conversion.c:_gpgme_timegm.
-	(parse_timestamp): New function imported from
-	gpgme/src/conversion.c:_gpgme_parse_timestamp.
-
-	Move copy_stream function to misc.c.
-	+ commit 9e79a15f74c428624b0049a3f6a077c1bc7c731d
-	* dirmngr/ks-action.c (copy_stream): Move function from here...
-	* dirmngr/misc.c (copy_stream): ... to here and drop the static
-	qualifier.
-	* dirmngr/misc.h (copy_stream): Add declaration.
-
-	Move armor_data to misc.c.
-	+ commit 63552852bf191985b4b55aa524bc397c5b1d1515
-	* dirmngr/ks-engine-hkp.c (armor_data): Move function from here...
-	* dirmngr/misc.c (armor_data): ... to here and drop static qualifier.
-	* dirmngr/misc.h: New declaration.
-
-	Add new LDAP utility functions.
-	+ commit 1a75b7c39f0a84f518711438565645a34fb2673f
-	* dirmngr/Makefile.am (module_tests): New variable.
-	(noinst_PROGRAMS): New primary. Set it to $(module_tests).
-	(TESTS): New variable. Set it to $(module_tests).
-	(t_common_src): New variable.
-	(t_common_ldadd): Likewise.
-	(t_ldap_parse_uri_SOURCES): New primary.
-	(t_ldap_parse_uri_LDADD): Likewise.
-	* dirmngr/ldap-parse-uri.c: New file.
-	* dirmngr/ldap-parse-uri.h: Likewise.
-	* dirmngr/t-ldap-parse-uri.c: Likewise.
-	* dirmngr/t-support.h: Likewise.
-
-	Add new function uri_query_lookup.
-	+ commit e23b3ba5ffd3134a72da176a039e4d6c4f3ff595
-	* common/http.h (uri_query_lookup): New declaration.
-	* common/http.c (uri_query_lookup): The corresponding implementation.
-
-	Add new function strlist_find.
-	+ commit 79907ad256f5b84f36cbebdc92e5a05d9e266557
-	* common/strlist.h (strlist_find): New declaration.
-	* common/strlist.c (strlist_find): New function.
-
-	common: Add new helper function, strsplit.
-	+ commit b18ffcb81a3839dbf09603d70ebb8b80f65892d3
-	* common/stringhelp.h (strsplit): New declaration.
-	* common/stringhelp.c (strsplit): New function.
-	* common/t-stringhelp.c (test_strsplit): New function.
-	(main): Call it here.
-
-2015-03-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Consider a mailbox only userid in mail search mode.
-	+ commit bebab54027d8c63574a2680c60481cfe9b88c240
-	* kbx/keybox-search.c: Include mbox-util.h.
-	(blob_cmp_mail): Improve OpenPGP uid parsing.
-
-	common: Add function is_valid_mailbox_mem.
-	+ commit a0eb2e4e8cef9ca6a5dfbae6440fa6cd583d0805
-	* common/mbox-util.c (mem_count_chr): New.
-	(my_memstr): New.
-	(has_invalid_email_chars): Change args to work on a buffer.
-	(is_valid_mailbox_mem): New.
-	(is_valid_mailbox): Rewrite to use is_valid_mailbox_mem.
-
-	gpg: Find keys using mail addresses with garbage after the '>'
-	+ commit 783a4a98378fa1aa222d5cb7427dd37151feb08b
-	* kbx/keybox-search.c (blob_cmp_mail): Stop comparing at the '>'.
-
-	common: Fix syntax error when building with gnutls.
-	+ commit 5136e39c6466de90697153ea253c4b540c1f7d1a
-	* common/http.c (send_request): Add missing comma.
-
-2015-03-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Emit status line NEWSIG before signature verification starts.
-	+ commit e7ddaad0fd2c8774a1d3367adfaa68014eaf65de
-	* g10/mainproc.c (check_sig_and_print): Emit STATUS_NEWSIG.
-
-	agent: Compute correct MPI length header for protected ECC keys.
-	+ commit cf83ff01fce3ddcbde6d97dffa0db6f277588e25
-	* agent/cvt-openpgp.c (apply_protection): Strip leading zeroes from
-	opaque MPIs to comply with the OpenPGP spec.
-
-	hkps: Fix host name verification when using pools.
-	+ commit dc10d466bff53821f23d2cb4814c259d40c5d9c5
-	* common/http.c (send_request): Set the requested for SNI.
-	* dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
-	the selecting a host.
-
-	Define replacement error codes from libgpg-error 1.19.
-	+ commit 28bb3ab686c1c994f67a92b6846b3726c58a0bc3
-	* common/util.h: Add GPG_ERR_LDAP codes for libgpg-error < 1.19.
-
-2015-03-17 Andre Heinecke <aheinecke@intevation.de>
-
-	gpgtar: Fix extracting files with !(size % 512)
-	+ commit 6cbbb0bec98e1acefc4c7163cc41a507469db920
-	* tools/gpgtar-extract.c (extract_regular): Handle size multiples
-	 of RECORDSIZE.
-
-2015-03-17 Werner Koch <wk@gnupg.org>
-
-	common: Add feature to ease using argparse's usage().
-	+ commit 9078b75a73600fc6b7b5502ceee8de032bb9c446
-	* common/argparse.c (show_help): Take care of flag value
-	(usage): Ditto.
-
-	common: Allow standalone build of argparse.c.
-	+ commit eb5f2c0af6691229300ac120ee44815cb27ed38e
-	* common/argparse.h: Remove types.h - not required.
-	* common/argparse.c: Change to allow standalone use.
-
-2015-03-16 Werner Koch <wk@gnupg.org>
-
-	gpg: Create all MPIs with RFC-4880 correct length headers.
-	+ commit ab17f7b6c392782718f57eaea94fc18a0ff49389
-	* g10/build-packet.c (gpg_mpi_write): Strip leading zeroes.
-
-	gpg: Allow printing of MPI values in --list-mode.
-	+ commit bcc8250bc5b9a357c6d1444f03e334edec573ede
-	* g10/parse-packet.c (set_packet_list_mode): Set mpi_print_mode.
-	* g10/misc.c (mpi_print): Do not print an extra leading zero.
-
-	gpg: Fix broken write of opaque MPI length header.
-	+ commit 8bc1debfefb7cd4b0be724317793d59dea37d677
-	* g10/build-packet.c (gpg_mpi_write): Use a char array for the length.
-
-2015-03-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix possible dead code elimination.
-	+ commit 1a9f13bc663daa75c5009f6a0bf7d7483f12cce0
-	* g10/encrypt.c: Change condition for detecting a real file.
-
-	g13: Fix pointer wrap check.
-	+ commit 4bc3a2e954afc2ba7dbe79ba5f740184b7d4cd73
-	* g13/utils.c (find_tuple, next_tuple): Cast pointer to size_t before
-	doing an overflow check.
-
-	agent: Remove useless conditions in command.c.
-	+ commit 3a35c9740ab792068ec4b3732ecfaa17bf4fc7f0
-	* agent/command.c (cmd_setkeydesc): Remove NULL check.
-	(cmd_get_passphrase): Ditto.
-	(cmd_clear_passphrase): Ditto.
-	(cmd_get_confirmation): Ditto.
-	(cmd_getval): Ditto.
-	(cmd_putval): Ditto.
-
-	agent: Fix length test in sshcontrol parser.
-	+ commit 3529dd8bb5bafc4e02915648d5f409bd27a9cc37
-	* agent/command-ssh.c (ssh_search_control_file): Check S before
-	upcasing it.
-
-	agent: Remove useless conditions.
-	+ commit 95415bdec77a608e6052ba3e2a5d857a8e8f7689
-	* agent/genkey.c (agent_ask_new_passphrase): Remove useless condition.
-	* agent/command-ssh.c (ssh_identity_register): Ditto.
-
-	gpg: Remove useless condition.
-	+ commit c59b410cf1d5676de7061e5a183c01227aa8e760
-	* g10/keylist.c (list_keyblock_colon): Remove useless condition (PK).
-	(list_keyblock_print): Likewise.
-
-	scd: Fix possible NULL deref in apdu.c.
-	+ commit ef0a3abf7305133d071bf1a94a7f461082f9a9aa
-	* scd/apdu.c (control_pcsc_direct): Take care of BUFLEN being NULL.
-	(control_pcsc_wrapped): Ditto.
-
-	common: Make openpgp_oid_to_str more robust.
-	+ commit 35db798c2df7f31b52a9dd9d55ea60ae1f325be9
-	* common/openpgp-oid.c (openpgp_oid_to_str): Take care of
-	gcry_mpi_get_opaque returning NULL. Remove useless condition !BUF.
-
-2015-03-11 Werner Koch <wk@gnupg.org>
-
-	agent: Improve error reporting from Pinentry.
-	+ commit efde50f92af241d8357db83e280a6ece62f6397f
-	* agent/call-pinentry.c (unlock_pinentry): Add error logging. Map
-	error source of uncommon errors to Pinentry.
-
-2015-03-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Change --print-pka-records into an option.
-	+ commit 7b5b52f3268b093eebbac3f199fb69bf246d9cd1
-	* g10/gpg.c (aPrintPKARecords): Rename to oPrintPKARecords and do not
-	use it as a command.
-	* g10/keylist.c (list_keyblock): List PKA rceords also for secret
-	keys.
-
-	gpg: Add --list-gcrypt-config and "curve" item for --list-config.
-	+ commit 14af2be022ccaf826db048fc16959d0222ff1134
-	* common/openpgp-oid.c (curve_supported_p): New.
-	(openpgp_enum_curves): New.
-	* common/t-openpgp-oid.c (test_openpgp_enum_curves): New.
-	(main): Add option --verbose.
-	* g10/gpg.c (opts): Add --list-gcrypt-config.
-	(list_config): Add items "curve" and "curveoid". Remove unused code.
-
-2015-03-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: fix for 64-bit arch.
-	+ commit bb5a1b7c738d74d5b46340ec7b50000a2d343ca9
-	* agent/pksign.c (agent_pksign_do): Use int.
-	* scd/app-openpgp.c (get_public_key): Likewise.
-
-2015-03-04 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: avoid chatter about trustdb when --quiet.
-	+ commit 82146af85b65498a69b28913593dc1ffeb6b6fed
-	* g10/trustdb.c (tdb_check_trustdb_stale): avoid log_info() when
-	 opt.quiet
-
-2015-02-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Lowercase mailbox for PKA lookups.
-	+ commit c071be698efadef1ad01fd3d329d1b486a372927
-	* common/stringhelp.c (ascii_strlwr): New.
-	* common/mbox-util.c (mailbox_from_userid): Downcase result.
-
-	gpg: Fix memory leak due to PKA lookup.
-	+ commit 91baea2dcde6c1e5ca9e8fa7020d9ab4551d1bca
-	* g10/keyserver.c (keyserver_import_pka): Move the xfree.
-
-2015-02-25 Werner Koch <wk@gnupg.org>
-
-	gpg: Switch to a hash and CERT record based PKA system.
-	+ commit 2fc27c8696f5cf2ddf3212397ea49bff115d617b
-	* common/dns-cert.c (get_dns_cert): Make r_key optional.
-	* common/pka.c: Rewrite for the new hash based lookup.
-	* common/t-pka.c: New.
-	* configure.ac: Remove option --disable-dns-pka.
-	(USE_DNS_PKA): Remove ac_define.
-	* g10/getkey.c (parse_auto_key_locate): Always include PKA.
-
-	common: Allow requesting a specific certtype with get_dns_cert()
-	+ commit af60152a4632ef26ca950a424429b15b6c69038d
-	* common/dns-cert.c (get_dns_cert): Add arg want_certtype. Change all
-	callers.
-	(CERTTYPE_): Move constants to ...
-	* common/dns-cert.h: here as DNS_CERTTYPE_.
-
-	Move new mailbox.c source file to common/.
-	+ commit 9913253610bac69e9503800e85696491e018e327
-	* g10/mailbox.c: Move to ...
-	* common/mbox-util.c: new file.
-	* common/mbox-util.h: New. Include where needed.
-	* g10/t-mailbox.c: Move to ...
-	* common/t-mbox-util.c: new file.
-
-2015-02-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Add command --print-pka-records.
-	+ commit e2d93402801a2cb822c723e891fd98233fdb3fd5
-	* g10/gpg.c (main): Add command --print-pka-records.
-	* g10/options.h (struct opt): Add field "print_pka_records".
-	* g10/keylist.c (list_keyblock_pka): New.
-	(list_keyblock): Call it if new option is set.
-	(print_fingerprint): Add mode 10.
-
-	gpg: Add function to extract the mailbox.
-	+ commit 93fa3d5c1760f3fee5412fb29d58fbd60db16ea9
-	* g10/misc.c (has_invalid_email_chars, is_valid_mailbox)
-	(is_valid_user_id): Move to ...
-	* g10/mailbox.c: new file.
-	(string_has_ctrl_or_space, has_dotdot_after_at): New.
-	(has_invalid_email_chars): New.
-
-	* g10/t-mailbox.c: New.
-	* g10/Makefile.am (module_tests): Add t-mailbox.
-	(t_mailbox_SOURCES, t_mailbox_LDADD): New.
-
-2015-02-23 Werner Koch <wk@gnupg.org>
-
-	gpg: Add option to print fingerprints in ICAO spelling.
-	+ commit ae09515b9d3aae653b62a32ea5b4a9b9e557fc52
-	* g10/gpg.c: Add option --with-icao-spelling.
-	* g10/options.h (struct opt): Add with_icao_spelling.
-	* g10/keylist.c (print_icao_hexdigit): New.
-	(print_fingerprint): Print ICAO spelling.
-
-	gpg: Skip legacy keys while searching keyrings.
-	+ commit a8116aacd91b7e775762a62c268fab6cc3c77438
-	* g10/getkey.c (search_modes_are_fingerprint): New.
-	(lookup): Skip over legacy keys.
-
-	common: Fix regression due to commit 2183683b.
-	+ commit d9f6eea6115df7959564123eb99d633ce5bba42e
-	* common/dns-cert.c (get_dns_cert): Remove cruft.
-
-2015-02-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Replace remaining uses of stdio by estream.
-	+ commit d2a70fd8348d6c11d1960caf2afe0701833dad6a
-	* g10/sign.c (sign_file): Use log_printf instead of stderr.
-	* g10/tdbdump.c (export_ownertrust): Use estream fucntions.
-	(import_ownertrust): Ditto.
-	* g10/tdbio.c (tdbio_dump_record): Ditto. Change arg to estream_t.
-
-	gpg: Fix segv due to NULL value stored as opaque MPI.
-	+ commit 76c8122adfed0f0f443cce7bda702ba2b39661b3
-	* g10/build-packet.c (gpg_mpi_write): Check for NULL return from
-	gcry_mpi_get_opaque.
-	(gpg_mpi_write_nohdr, do_key): Ditto.
-	* g10/keyid.c (hash_public_key): Ditto.
-
-2015-02-12 Werner Koch <wk@gnupg.org>
-
-	scd: Fix regression in 2.1.2 (due to commit 2183683)
-	+ commit 07a71da479daaac43b8c5b1034a1e66f96bdbc48
-	* scd/apdu.c (pcsc_vendor_specific_init): Replace use of
-	bufNN_to_uint by direct code.
-
-2015-02-12 Andre Heinecke <aheinecke@intevation.de>
-
-	dirmngr: Initialize cache from sysconfig dir.
-	+ commit 070d7bf940efa60db2b0734273b9b3736d18338a
-	* dirmngr/certcache.c (cert_cache_init): Load certificates
-	from sysconfig dir instead of the homeidr.
-	* dirmngr/dirmngr.c (main): Removed parsing of obsolete
-	homedir_data option.
-	* dirmngr/dirmngr.h (opt): Removed homedir_data.
-	* doc/dirmngr.texi: Update and clarify certs directory doc.
-
-2015-02-11 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.2.
-	+ commit fc17562cc4f8d531ae7f0887cf2a96dcc224b021
-
-
-	dirmngr: Avoid warning about unused function.
-	+ commit 8219c87c301ec669f07528e8d8108655f7b705be
-	* dirmngr/dirmngr.c (my_gnutls_log): Build only if gnutls is used.
-
-	build: Update standard build-aux files.
-	+ commit 81e93e251e52e427a29556de75640c7933bb5aad
-
-
-	Use inline functions to convert buffer data to scalars.
-	+ commit 2183683bd633818dd031b090b5530951de76f392
-	* common/host2net.h (buf16_to_ulong, buf16_to_uint): New.
-	(buf16_to_ushort, buf16_to_u16): New.
-	(buf32_to_size_t, buf32_to_ulong, buf32_to_uint, buf32_to_u32): New.
-
-2015-02-09 Werner Koch <wk@gnupg.org>
-
-	gpg: Prevent an invalid memory read using a garbled keyring.
-	+ commit f0f71a721ccd7ab9e40b8b6b028b59632c0cc648
-	* g10/keyring.c (keyring_get_keyblock): Whitelist allowed packet
-	types.
-	* g10/keydb.c (parse_keyblock_image): Ditto.
-
-	gpg: Fix a NULL-deref in export due to invalid packet lengths.
-	+ commit 0835d2f44ef62eab51fce6a927908f544e01cf8f
-	* g10/build-packet.c (write_fake_data): Take care of a NULL stored as
-	opaque MPI.
-
-	gpg: Fix a NULL-deref due to empty ring trust packets.
-	+ commit 39978487863066e59bb657f5fe4e8baab510da7e
-	* g10/parse-packet.c (parse_trust): Always allocate a packet.
-
-2015-02-04 Werner Koch <wk@gnupg.org>
-
-	gpg-agent: Use "pinentry-basic" as fallback.
-	+ commit 0de5c6a9a783ed9dc69cecbf34eadcaace4be243
-	* common/homedir.c (get_default_pinentry_name): New.
-	(gnupg_module_name): Use that for the default pinentry.
-	(gnupg_module_name_flush_some): New.
-	* agent/gpg-agent.c (agent_sighup_action): Flush some module names.
-	* agent/call-pinentry.c (start_pinentry): Do not modify
-	opt.pinentry_program.
-
-	w32: Add manifest to gpg.
-	+ commit 05428d12561bc7eb872a81444918dfe706477a41
-	* g10/gpg.w32-manifest.in: New.
-	* g10/gpg-w32info.rc: Add manifest.
-	* g10/Makefile.am (EXTRA_DIST): Add manifest.
-	(gpg-w32info.o): Depend on manifest.
-	* configure.ac (BUILD_VERSION): New.
-	(AC_CONFIG_FILES): Add manifest.
-
-2015-02-03 Werner Koch <wk@gnupg.org>
-
-	Update copyright years.
-	+ commit 3f67426a89bf4b37e1d2662fddc3eb4fa474c4ad
-	* common/w32info-rc.h.in (W32INFO_COMPANYNAME): Change to "The GnuPG
-	Project".
-
-2015-02-02 Werner Koch <wk@gnupg.org>
-
-	w32: Change default Windows install dir and add bin to PATH.
-	+ commit 8872657b2a52dd9698224b80e5672e23c5405eda
-	* build-aux/speedo.mk (WITH_GUI): New macro. The Windows installer is
-	now build by default without any GUI stuff.
-	* build-aux/speedo/w32/inst.nsi: Change standard installation
-	directory.
-	(AddToPath, un.RemoveFromPath): New.
-	(gnupginst): Add bin directory to the PATH.
-
-2015-02-01 Werner Koch <wk@gnupg.org>
-
-	w32: Allow for Unicocde installation directory.
-	+ commit 616633b7713081ecc39419494879947cc7f163d0
-	* common/homedir.c (w32_rootdir): Use Unicode fucntion not only for
-	WinCE.
-
-2015-01-30 Joshua Rogers <git@internot.info>
-
-	kbx: Fix resource leak.
-	+ commit 7db6c82cec49b7c56c403a8ea98364086baf75f3
-	* kbx/keybox-update.c (blob_filecopy): Fix resource leak. On error
-	return, 'fp' and 'newfp' was never closed.
-
-2015-01-29 Werner Koch <wk@gnupg.org>
-
-	agent: Fix use of imported but unprotected openpgp keys.
-	+ commit 6ab0fac575a8b04152a199cb300a08436b096753
-	* agent/agent.h (PRIVATE_KEY_OPENPGP_NONE): New.
-	* agent/command.c (do_one_keyinfo): Implement it.
-	* agent/findkey.c (agent_key_from_file): Ditto.
-	(agent_key_info_from_file): Ditto.
-	(agent_delete_key): Ditto.
-	* agent/protect.c (agent_private_key_type): Add detection for openpgp
-	"none" method.
-
-2015-01-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese Translation.
-	+ commit 6c368533f5211bed62e8638f522cef65c7ba4b87
-
-
-2015-01-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Limit the size of key packets to a sensible value.
-	+ commit 382ba4b137b42d5f25a7e256bb7c053ee5ac7b64
-	* g10/parse-packet.c (MAX_KEY_PACKET_LENGTH): New.
-	(MAX_UID_PACKET_LENGTH): New.
-	(MAX_COMMENT_PACKET_LENGTH): New.
-	(MAX_ATTR_PACKET_LENGTH): New.
-	(parse_key): Limit the size of a key packet to 256k.
-	(parse_user_id): Use macro for the packet size limit.
-	(parse_attribute): Ditto.
-	(parse_comment): Ditto.
-
-	gpg: Fix buffering problem in --list-config.
-	+ commit d8eea25b8b7becbfa3f059be6f5966a2f1aa7112
-	* g10/gpg.c (list_config): Replace print_sanitized_string2 by
-	es_write_sanitized.
-
-	* common/stringhelp.c (print_sanitized_buffer2): Remove.
-	(print_sanitized_buffer, print_sanitized_utf8_buffer): Remove.
-	(print_sanitized_utf8_buffer, print_sanitized_utf8_string): Remove.
-	(print_sanitized_string): Remove.
-
-	* sm/certdump.c (print_dn_part, print_dn_parts): Remove arg FP.
-	(pretty_print_sexp, gpgsm_print_name2, gpgsm_print_name): Remove.
-
-	Add a hook to be called right after main.
-	+ commit 0c2bfd9d5a49a6134188f8f7820f6ccdebd9f181
-	* common/init.c (early_system_init): New stub function.
-
-	gpg: Allow predefined names as answer to the keygen.algo prompt.
-	+ commit b1d5ed6ac842469afcb84868d0f6641dc286a6c7
-	* g10/keygen.c (ask_algo): Add list of strings.
-
-	agent: Add some extra robustness to extract_private_key.
-	+ commit 795965437732e50f6216d7f5db0e6174e90548a9
-	* agent/cvt-openpgp.c (extract_private_key): Add arg "arraysize".
-	Make sure that R_FLAGS and R_CURVE are set to NULL.
-
-2015-01-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix varargs call for 64-bit arch on ECC keys.
-	+ commit f6d3c6e5263d84b94ebe13df9ff39b02109a2acb
-	* scd/app-openpgp.c (store_fpr): Remove CARD_VERSION from the
-	arguments.
-	(rsa_writekey): Follow the change.
-	(do_genkey): Likewise.
-	(ecc_writekey): Likewise. Cast to size_t.
-
-2015-01-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix segv introduced to commit 4d7c9b0.
-	+ commit 6eebc56687935f3e993eac374b9f4cc5ad3bcf2b
-	* g10/keygen.c (get_parameter_passphrase): Take care of R == NULL.
-
-2015-01-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix agent_public_key_from_file for ECC.
-	+ commit 9453d645d4a489f038829c80343c124fff62d635
-	* agent/cvt-openpgp.c (extract_private_key): New.
-	(convert_to_openpgp): Use extract_private_key.
-	* agent/findkey.c (agent_public_key_from_file): Use
-	extract_private_key.
-
-2015-01-26 Werner Koch <wk@gnupg.org>
-
-	sm: Simplify fix ed8383c6.
-	+ commit 6c87d1ce66d8e93e6c0f16c06116e9179f6158ba
-	* sm/minip12.c (p12_build): Release PWBUF only at the end.
-
-2015-01-25 Joshua Rogers <git@internot.info>
-
-	ccid: Remove incorrect expression leading to errors.
-	+ commit 274d7b17a90908a90ba6ad295c08a79b287fc231
-	* scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
-
-2015-01-23 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Fix validity check for UINT32 values.
-	+ commit 3f6abb57a7b5e54b593c5775c8f7a07d61119705
-	* tools/gpgconf-comp.c (option_check_validity): Enable check for
-	UINT32.
-
-2015-01-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve skipping of PGP-2 keys.
-	+ commit 09e8f35d3808d6e49f891360c341aae3869e8650
-	* g10/keydb.c (keydb_search_first, keydb_search_next): Skip legacy
-	keys.
-	* g10/keyring.c (keyring_get_keyblock): Handle GPG_ERR_LEGACY_KEY.
-	(prepare_search): Ditto.
-	(keyring_rebuild_cache): Skip legacy keys.
-	* g10/keyserver.c (keyidlist): Ditto.
-	* g10/trustdb.c (validate_key_list): Ditto.
-
-	gpg: Add dedicated error code for PGP-2 keys.
-	+ commit 6f3d11d8837b00e3a1c4fa881066855c0321d6b2
-	* g10/parse-packet.c (parse_key): Return GPG_ERR_LEGACY_KEY for PGP2
-	keys.
-	* g10/import.c (read_block): Simplify by checking GPG_ERR_LEGACY_KEY.
-	* g10/getkey.c (lookup): Silence error message for PGP-2 keys.
-
-	* common/util.h (GPG_ERR_LEGACY_KEY): Add replacement for older
-	libgpg-error.
-
-	gpg: Replace remaining old error code macros by GPG_ERR_.
-	+ commit 11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993
-	* g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
-	gpg_strerror.
-	(G10ERR_): Remove all macros and change all occurrences by their
-	GPG_ERR_ counterparts.
-
-	gpg: Remove an unused variable.
-	+ commit a23c30fb59c0a216763a7972028995d3be42a844
-	* g10/getkey.c (getkey_ctx_s): Remove last_rc.
-
-2015-01-21 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix TLS build problems.
-	+ commit 091c35ec726a4fa4691c2665b13adee6a34b5b66
-	* dirmngr/Makefile.am (AM_CFLAGS): Add flags for TLS libs.
-
-	gpg: Support --passphrase with --quick-gen-key.
-	+ commit 4d7c9b0e9aceedd924d600978bc1b6cae7d5c456
-	* g10/keygen.c: Include shareddefs.h.
-	(quick_generate_keypair): Support static passphrase.
-	(get_parameter_passphrase): New.
-	(do_generate_keypair): Use it.
-
-	gpg: Re-enable the "Passphrase" parameter for batch key generation.
-	+ commit aa99ebde778b7b563f35025f1b48954757f840be
-	* agent/command.c (cmd_genkey): Add option --inq-passwd.
-	* agent/genkey.c (agent_genkey): Add new arg override_passphrase.
-	* g10/call-agent.c (inq_genkey_parms): Handle NEWPASSWD keyword.
-	(agent_genkey): Add arg optional arg "passphrase".
-	* g10/keygen.c (common_gen, gen_elg, gen_dsa, gen_ecc)
-	(gen_rsa, do_create): Add arg "passphrase" and pass it through.
-	(do_generate_keypair): Make use of pPASSPHRASE.
-	(release_parameter_list): Wipe out a passphrase parameter.
-
-2015-01-19 Werner Koch <wk@gnupg.org>
-
-	kbx: Minor cleanup for the previous fix.
-	+ commit 7be1b7d8017cb7ebf1a3855edec0ef5e342cc9c5
-	* kbx/keybox-search.c (blob_get_keyid): Rename to
-	blob_get_first_keyid. Check number of keys and remove blob type check.
-
-2015-01-19 Damien Goutte-Gattat <dgouttegattat@incenp.org>
-
-	kbx: Call skipfnc callback to filter out keys.
-	+ commit c5956592c171e6fe988e74161aa99636b7f12e4b
-	* kbx/keybox-search.c (blob_get_keyid): New.
-	(keybox-search): Call skipfnc callback function.
-
-2015-01-13 Andreas Schwier <andreas.schwier@cardcontact.de>
-
-	scd: Allow for certificates > 1024 with PC/SC.
-	+ commit 16a1330fa16f6b23e2661c0175c431ab40da45ff
-	* scd/pcsc-wrapper.c (handle_transmit): Enlarge buffer to 4096 too
-	allow for larger certificates.
-
-2015-01-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: Fix error code path of map_host.
-	+ commit 657a26f3af1b3f817d6cde2d091273d332571247
-	* dirmngr/ks-engine-hkp.c (map_host): Fix error return.
-
-2015-01-08 Joshua Rogers <git@internot.info>
-
-	scd: fix get_public_key for OpenPGPcard v1.0.
-	+ commit 100b322f5da3066bab5a2b0eb234c631c581c0e4
-	* scd/app-openpgp.c (get_public_key): correctly close 'fp' upon use.
-
-2015-01-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	dirmngr: fix LDAP query PATTERNS limit check.
-	+ commit 22b15fccffe613f455f9748c048c8e451724a842
-	* dirmngr/ldap.c (start_cert_fetch_ldap): fix ARGC limitation.
-
-	scd: fix merge failure.
-	+ commit 602f17b5a775f02e0e33a54d3155929dc00e4f53
-	* scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
-	merge.
-
-2015-01-05 Werner Koch <wk@gnupg.org>
-
-	sm,g13: Init local vars to avoid compiler warnings.
-	+ commit 9bf40849a9f86204e113712c4cc285f1ac16127a
-	* sm/misc.c (transform_sigval): Init RSA_S_LEN.
-	* g13/mount.c (read_keyblob): Init HEADERLEN.
-
-	gpg: Remove unused args from a function.
-	+ commit 616e511f278bf9af04dc66bbb8b05b37bf541f37
-	* g10/keyserver.c (parse_keyserver_uri): Remove args configname and
-	configlineno. Change all callers.
-
-	gpg: Clear a possible rest of the KDF secret buffer.
-	+ commit 56e688823345bbcfef220b13eb418854f8798b16
-	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Fix order of args.
-
-	build: Require automake 1.14.
-	+ commit 445bb17d5fe6b53db078082fb033dbc67eea8307
-	* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
-
-2015-01-04 Werner Koch <wk@gnupg.org>
-
-	agent: Make --allow-loopback-pinentry gpgconf changeable.
-	+ commit ac2cb47fc5c0be539aaa07fd141acdbc0934800f
-
-
-2014-12-22 Joshua Rogers <git@internot.info>
-
-	tools: Free variable before return.
-	+ commit cf88337f8a4f8c98aca4b1da5921d18567b4f474
-	* tools/gpgconf-comp.c: Free 'dest_filename' before it is returned
-	upon error.
-
-2014-12-22 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	sm: Avoid double-free on iconv failure.
-	+ commit ed8383c618e124cfa708c9ee87563fcdf2f4649c
-	* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
-	double-free of pwbuf.
-
-	scd: Avoid double-free on error condition in scd.
-	+ commit b0b3803e8c2959dd67ca96debc54b5c6464f0d41
-	* scd/command.c (cmd_readkey): avoid double-free of cert
-
-	avoid future chance of using uninitialized memory.
-	+ commit 367b073ab5f439ccf0750461d10c69f36998bd62
-	* common/iobuf.c: (iobuf_open): initialize len
-
-	avoid double-close in unusual dotlock situations.
-	+ commit 628b111fa679612e23c0d46505b1ecbbf091897d
-	* common/dotlock.c: (dotlock_create_unix) avoid double-close()
-	 in unusual situations.
-
-	gpgkey2ssh: clean up varargs.
-	+ commit 351bca9047d748c3c4f7e9a3cdc476af127b1da3
-	* tools/gpgkey2ssh.c (key_to_blob) : ensure that va_end is called.
-
-2014-12-22 Werner Koch <wk@gnupg.org>
-
-	doc: Fix memory leak in yat2m.
-	+ commit 6056d2467310260ddc0db2fe65b737ace6febcaa
-	* doc/yat2m.c (write_th): Free NAME.
-
-	dirmngr: Fix memory leak.
-	+ commit 5a556e4e88bcbc926c0922070acaf5f7b25d18fb
-	* dirmngr/server.c (cmd_ks_search, cmd_ks_get): Fix memory leak.
-
-	* dirmngr/ks-engine-hkp.c (ks_hkp_mark_host): Remove double check.
-
-	dirmngr: Remove un-needed check.
-	+ commit 0d5cb55402c44fb5f731ecf85705f845f3091aa7
-	* dirmngr/crlfetch.c (crl_fetch): Check that URL is not NULL.
-
-	dirmngr,gpgsm: Return NULL on fail.
-	+ commit abd5f6752d693b7f313c19604f0723ecec4d39a6
-	* dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
-	* sm/gpgsm.c (parse_keyserver_line): Ditto.
-
-2014-12-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: ECDH Support.
-	+ commit bdc8efbdd124d836c36cf482216e375421f72891
-	* agent/divert-scd.c (divert_pkdecrypt): Support ECDH.
-	* scd/app-openpgp.c (get_algo_byte, store_fpr): Support ECDH.
-	(send_key_attr): Support ECDH. Fix EdDSA algorithm value.
-	(retrieve_key_material): Initialize fields.
-	(get_public_key, ecc_writekey, do_writekey): Support ECDH.
-	(ecdh_writekey): Remove.
-	(do_decipher): Support ECDH.
-	(parse_algorithm_attribute): Support ECDH. Fix EdDSA.
-
-2014-12-19 Werner Koch <wk@gnupg.org>
-
-	agent: Make sure --max-cache-ttl is >= --default-cache-ttl.
-	+ commit 76140141699b545f7a988bf5fc101063917e8ce3
-	* agent/gpg-agent.c (finalize_rereadable_options): New.
-	(main, reread_configuration): Call it.
-
-	agent: Keep the session environment for restricted connections.
-	+ commit 14601eacb51f6c8a60d3d57aee1be11debd94c68
-	* agent/command-ssh.c (setup_ssh_env): Move code to ...
-	* agent/gpg-agent.c (agent_copy_startup_env): .. new function. Change
-	calllers.
-	* agent/command.c (start_command_handler): Call that fucntion for
-	restricted connections.
-
-	agent: Fix string prepended to remotely initiated prompts.
-	+ commit aad8963f7b9d13b319abd413db8f42ec467db913
-	* agent/command.c (cmd_setkeydesc): Use %0A and not \n. Make
-	translatable.
-
-2014-12-18 Werner Koch <wk@gnupg.org>
-
-	build: Remove option to build without agent.
-	+ commit abec64f3cb04e49ca48cc476a5830a920e2ebf8f
-	* configure.ac (build-agent): Set to yes.
-
-2014-12-17 Werner Koch <wk@gnupg.org>
-
-	gpgconf: Exit with failure if --launch fails.
-	+ commit 5cb6df8996623c00eaa2a39e3037101585442f7e
-	* tools/gpgconf-comp.c (gc_component_launch): Return an error code.
-	* tools/gpgconf.c (main): Exit if launch failed.
-
-2014-12-16 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.1.
-	+ commit 08c00cd4fe432d6852ad1d5c34a234c56aa3617c
-
-
-	po: Update the German translation.
-	+ commit 4ba740bd4734c43e7876f6f6380cc5963789d510
-
-
-2014-12-16 Petr Pisar <petr.pisar@atlas.cz>
-
-	po: Update Czech translation.
-	+ commit 30560491fe42562f4bbdb17d3213f7210f549a0f
-
-
-2014-12-16 Werner Koch <wk@gnupg.org>
-
-	gpg: Show private DO information in the card status.
-	+ commit ce9212924039fba4e479760bba86c61b0d91c469
-	* g10/call-agent.c (agent_release_card_info): Free private_do.
-	(learn_status_cb): Parse PRIVATE-DO-n stati.
-
-2014-12-16 Ineiev <ineiev@gnu.org>
-
-	po: Update Russian translation.
-	+ commit 5ab5b3fa6921f08dd0a498fe0381735e803d01e3
-
-
-2014-12-16 Jedi <jedi@jedi.org>
-
-	po: Update zh_TW translation.
-	+ commit 668dc6b32cb97608ef65b85d917c86f5aec896ce
-
-
-2014-12-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Add sub-command "factory-reset" to --card-edit.
-	+ commit dd65e21cb4934b40e6f2f7a8095f39fd6d9971bc
-	* common/util.h (GPG_ERR_OBJ_TERM_STATE): New.
-	* scd/iso7816.c (map_sw): Add this error code.
-	* scd/app-openpgp.c (do_getattr): Return the life cycle indicator.
-	* scd/app.c (select_application): Allow a return value of
-	GPG_ERR_OBJ_TERM_STATE.
-	* scd/scdaemon.c (set_debug): Print the DBG_READER value.
-	* g10/call-agent.c (start_agent): Print a status line for the
-	termination state.
-	(agent_scd_learn): Make arg "info" optional.
-	(agent_scd_apdu): New.
-	* g10/card-util.c (send_apdu): New.
-	(factory_reset): New.
-	(card_edit): Add command factory-reset.
-
-	gpg: Fix regression in notation data regression.
-	+ commit fc9a35d2dec2f838abac831fd88dca494773e082
-	* g10/misc.c (pct_expando): Reorder conditions for clarity.
-	* g10/sign.c (write_signature_packets): Fix notation data creation.
-
-	gpg: Avoid extra LF in notaion data listing.
-	+ commit b4e402cb5c6d7fc507e8d5131969145b49640e50
-	* g10/keylist.c (show_notation): Use log_printf.
-
-2014-12-12 Werner Koch <wk@gnupg.org>
-
-	scd: Fix possibly inhibited checkpin of the admin pin.
-	+ commit 68b4e7c9e4de0dc3580ca5af3cfd0f20a2691b5e
-	* scd/app-openpgp.c (do_check_pin): Do not check a byte of a released
-	buffer.
-
-	gpg: Let --card--status create a shadow key (card key stub).
-	+ commit f3f9f9b2844c35f7942ee904d5222523615cdad4
-	* agent/command.c (cmd_learn): Add option --sendinfo.
-	* agent/learncard.c (agent_handle_learn): Add arg "send" andsend
-	certifciate only if that is set.
-	* g10/call-agent.c (agent_scd_learn): Use --sendinfo. Make INFO
-	optional.
-	(agent_learn): Remove.
-	* g10/keygen.c (gen_card_key): Replace agent_learn by agent_scd_learn.
-
-	gpg: Fix possible read of unallocated memory.
-	+ commit 193815030d20716d9a97850013ac3cc8749022c9
-	* g10/parse-packet.c (can_handle_critical): Check content length
-	before calling can_handle_critical_notation.
-
-2014-12-11 Werner Koch <wk@gnupg.org>
-
-	build: Replace deprecated autconf macro.
-	+ commit 1d8ebe4d54eef37da65e7bd5d7386bc04f344447
-	* m4/intl.m4: s/AM_PROG_MKDIR_P/AC_PROG_MKDIR_P/
-	* m4/po.m4: Ditto.
-
-2014-12-08 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Improve dead host detection.
-	+ commit e8c0ed779579293b3f4592d9337bc15ee0fc3fdd
-	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Mark host dead
-	also for 2 other error messages.
-
-	http: Improve diagnostic messages.
-	+ commit 6d5f12834124ba5ee0e54261531abf95c36c116c
-	* common/http.c (send_request): Print TLS alert info
-	(connect_server): Detect bogus DNS entry.
-
-	gpg: Obsolete some keyserver helper options.
-	+ commit 5bf93f4ea7a11381dd256b5fd4e5913366828265
-	* g10/options.h (opt): Remove keyserver_options.other.
-	* g10/gpg.c (main): Obsolete option --honor-http-proxt.
-	* g10/keyserver.c (add_canonical_option): Replace by ...
-	(warn_kshelper_option): New.
-	(parse_keyserver_uri): Obsolete "x-broken-http".
-
-	dirmngr: Return a proper error for all dead hosts.
-	+ commit b72ece6d74d3e385e818ead748eba0cb111b95b3
-	* dirmngr/ks-engine-hkp.c (map_host): Change to return an gpg_error_t.
-	Return an error code for all dead hosts.
-	(make_host_part): Change to return an gpg_error_t. Change all
-	callers.
-
-	gpg: Write a status line for a failed --send-keys.
-	+ commit 66ab8f807c96b778f2a2c82b58d3e15ac295e1b2
-	* g10/keyserver.c (keyserver_put): Write an status error.
-
-2014-12-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for EdDSA.
-	+ commit c50c11d5751f46ddb38244a5a07d8274e1e10922
-	* scd/app-openpgp.c (get_algo_byte): It catches 22.
-	(store_fpr): It's MPI usually, but it's opaque bytes for EdDSA.
-
-2014-12-05 Andre Heinecke <aheinecke@intevation.de>
-
-	Document no-allow-mark-trusted option.
-	+ commit f4ed04fca8885301b567ec004ffff0d6e24f4611
-	 doc: Document no-allow-mark-trusted for gpg-agent
-
-	 * doc/gpg-agent.texi: Change allow-mark-trusted doc to
-	 no-allow-mark-trusted.
-
-	 --
-	 Since rev. 78a56b14 allow-mark-trusted is the default option
-	 and was replaced by no-allow-mark-trusted to disable the
-	 interactive prompt.
-
-2014-12-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix for NIST P-256.
-	+ commit 8720125f5a283ede34e52c2493b8a9b0226ae62c
-	* g10/card-util.c (card_store_subkey): Error check.
-	* scd/app-opengpg.c (ecc_writekey): Support NIST P-256.
-	(do_writekey): Error check.
-
-2014-12-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Allow import of large keys.
-	+ commit 63e7891f0f9f0228d93c6cd979fbf2797da2b67d
-	* g10/import.c (import): Skip too large keys.
-	* kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 2MB to 5MB.
-
-2014-12-03 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove option aliases --no-throw-keyid and --notation-data.
-	+ commit 17b4662984b4669d8dcbbd6705ccfbe6c263319c
-	* g10/gpg.c (opts): Remove them.
-	* g10/options.h (opt): s/throw_keyid/throw_keyids/ and change users.
-
-2014-12-02 Werner Koch <wk@gnupg.org>
-
-	agent: Replace some sprintf.
-	+ commit fabcf1440a6900b9471f11e4f2a015e9f2d1a74c
-	* agent/call-scd.c (agent_card_pksign): Replace sprintf by bin2hex.
-	* agent/command-ssh.c (ssh_identity_register): Ditto.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Replace sprintf by
-	put_membuf_printf.
-
-2014-12-01 Werner Koch <wk@gnupg.org>
-
-	tools: Improve watchgnupg portability.
-	+ commit 0367a4b8cfbf1f197e093ca2b83b27e0a409c3c7
-	* configure.ac (AC_CHECK_HEADERS): Check for sys.select.h
-	* tools/watchgnupg.c: Include it.
-
-	gpg: Fix export bug using exact search with only one key in the keybox.
-	+ commit f1c3eb4b16ca43b5d3712a3b54c22d17ce85af47
-	* g10/export.c (do_export_stream): Disable caching.
-	* g10/keyserver.c (keyidlist): Ditto.
-
-	scd: Implement socket redirection.
-	+ commit 2f90b7c21b2f84ca2bf5f4555da9233e84606b4e
-	* scd/scdaemon.c (ENAMETOOLONG): New.
-	(redir_socket_name): New.
-	(cleanup): Take care of a redirected socket.
-	(main): Pass redir_socket_name to create_server_socket.
-	(create_socket_name): Remove superfluous length check.
-	(create_server_socket): Add arg r_redir_name and implement
-	redirection. Replace assert for older Assuan by an error message.
-
-	dirmngr: Implement socket redirection.
-	+ commit eede0e59bf6281777da7391752ae4191f3e51204
-	* dirmngr/dirmngr.c (ENAMETOOLONG): new.
-	(redir_socket_name): New.
-	(main): Add Assuan socket redirection.
-	(cleanup): Adjust cleanup for redirection.
-
-2014-11-28 Werner Koch <wk@gnupg.org>
-
-	agent: Implement socket redirection.
-	+ commit e1f515b19c7f63b6d0b0253319b9fc41dabed657
-	* agent/gpg-agent.c (ENAMETOOLONG): New.
-	(redir_socket_name, redir_socket_name_extra)
-	(redir_socket_name_ssh): New.
-	(remove_socket): Take care of the redir names.
-	(main): Pass the redir names to create_server_socket.
-	(create_socket_name): Remove length check - that is anyway done later.
-	(create_server_socket): Add arg r_redir_name and implement redirection
-	if Libassuan is at least 2.14.
-
-	gpg: Change another BUG() call to a regular error message.
-	+ commit e59b1cc7471dd161a627b290c645ef7bd0d9d42c
-	* g10/mainproc.c (proc_tree): Replace BUG by a proper error messages.
-
-	Add option --no-autostart.
-	+ commit 7aee3579be6e24a1aa280e75615fc3a11ceef960
-	* g10/gpg.c: Add option --no-autostart.
-	* sm/gpgsm.c: Ditto.
-	* g10/options.h (opt): Add field autostart.
-	* sm/gpgsm.h (opt): Ditto.
-	* g10/call-agent.c (start_agent): Print note if agent was not
-	autostarted.
-	* sm/call-agent.c (start_agent): Ditto.
-	* g10/call-dirmngr.c (create_context): Likewise.
-	* sm/call-dirmngr.c (start_dirmngr_ext): Ditto.
-
-2014-11-27 Мирослав Николић <wk@gnupg.org>
-
-	gpg-agent: Add restricted connection feature.
-	+ commit f173cdcdfbfd083b035516a406c2c754f38a0ace
-	* agent/agent.h (opt): Add field extra_socket.
-	(server_control_s): Add field restricted.
-	* agent/command.c: Check restricted flag on many commands.
-	* agent/gpg-agent.c (oExtraSocket): New.
-	(opts): Add option --extra-socket.
-	(socket_name_extra): New.
-	(cleanup): Cleanup that socket name.
-	(main): Implement oExtraSocket.
-	(create_socket_name): Add arg homedir and change all callers.
-	(create_server_socket): Rename arg is_ssh to primary and change
-	callers.
-	(start_connection_thread): Take ctrl as arg.
-	(start_connection_thread_std): New.
-	(start_connection_thread_extra): New.
-	(handle_connections): Add arg listen_fd_extra and replace the
-	connection starting code by parameterized loop.
-	* common/asshelp.c (start_new_gpg_agent): Detect the use of the
-	restricted mode and don't fail on sending the pinentry environment.
-
-	* common/util.h (GPG_ERR_FORBIDDEN): New.
-
-	agent: Make auditing of the option list easier.
-	+ commit ccee34736b57a42ec4bdcb0d3181bdc6a08b0fff
-	* agent/gpg-agent.c (opts): Use ARGPARSE_ macros.
-
-2014-11-26 Kristian Fiskerstrand <kf@sumptuouscapital.com>
-
-	dirmngr: Only report hkps scheme when available.
-	+ commit 68a7ccc0c870cce6ab9fefb1aa6fd100e1de129b
-	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Make use of TLS macros.
-
-2014-11-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Change a bug() call to a regular error message.
-	+ commit 1c2140346d6ef9c35e303099d2d15be57869b4d5
-	* g10/decrypt-data.c (decrypt_data): Return an error code instead of
-	calling BUG().
-
-2014-11-25 Werner Koch <wk@gnupg.org>
-
-	Fix buffer overflow in openpgp_oid_to_str.
-	+ commit 8445ef24fc31e1fe0291e17f90f9f06b536e34da
-	* common/openpgp-oid.c (openpgp_oid_to_str): Fix unsigned underflow.
-
-	* common/t-openpgp-oid.c (BADOID): New.
-	(test_openpgp_oid_to_str): Add test cases.
-
-2014-11-24 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix use of uninit.value in listing sig subpkts.
-	+ commit 596ae9f5433ca3b0e01f7acbe06fd2e424c42ae8
-	* g10/parse-packet.c (dump_sig_subpkt): Print regex subpacket
-	sanitized.
-
-	gpg: Fix off-by-one read in the attribute subpacket parser.
-	+ commit 0988764397f99db4efef1eabcdb8072d6159af76
-	* g10/parse-packet.c (parse_attribute_subpkts): Check that the
-	attribute packet is large enough for the subpacket type.
-
-	gpg: Fix batch generation of ECC keys.
-	+ commit b716e6a69919b89c7887d6c7c9b97e58d18fdf95
-	* g10/keygen.c (get_parameter_algo): Map ECC algorithm strings
-	directly.
-
-2014-11-24 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	Distinguish between ARGPARSE_AMBIGUOUS_{OPTION,COMMAND}
-	+ commit eed16ccebf8fd1fdf9709affbd5c831f6957b8ae
-	* common/argparse.c (initialize): Use correct value.
-
-	gpg: Refer to --throw-keyids instead of --throw-keyid.
-	+ commit a3cf781e3bc144aff60e007b9ba59bff7b1b2c9e
-	* g10/encrypt.c: adjust error message
-
-2014-11-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Track number of skipped v3 keys on import.
-	+ commit 44c9cc18968b3e1d7568ec41ebf28a07285c61bb
-	* g10/import.c (stats_s): Add field v3keys.
-	(import): Update this field.
-	(import_print_stats): Print v3 key count.
-	(read_block): Skip v3 keys and return a count for them.
-
-	gpg: Fix regression in parse_key.
-	+ commit 94a54425144e412bc83e44b7c6323282f49f650f
-	* g10/parse-packet.c (parse): Better return just the gpg_err_code.
-	(parse_key): Return the error code.
-
-	speedo: Add simple logos to the installer.
-	+ commit 9a85b91e925ac0798d56820353bf5858b212277f
-	* build-aux/speedo/w32/README.txt: Include GnuPG Readme.
-	* build-aux/speedo/w32/gnupg-logo-150x57.bmp: New.
-	* build-aux/speedo/w32/gnupg-logo-164x314.bmp: New.
-	* build-aux/speedo/w32/inst.nsi: Add logos.
-	* build-aux/speedo.mk ($(bdir)/NEWS.tmp): Extract news items.
-
-2014-11-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix hash detection for ECDSA.
-	+ commit f80c2dd78d522f12b2c7afbd5c0763a97d87d2bd
-	* g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
-
-	Fix linker problem on OS X.
-	+ commit cd2c6f36fe5d1d1d45546f5168aead5cbe6487e0
-	* common/init.c (default_errsource): Move to the .data segmemt.
-
-2014-11-19 Werner Koch <wk@gnupg.org>
-
-	gpg-connect-agent: Add convenience option --uiserver.
-	+ commit 164a6a9dd4af26668dd0d01061688bf1ceff44bf
-
-
-	Add "gpgconf --kill dirmngr" and avoid useless launch before a kill.
-	+ commit 0e7dd40342bd56810c27db1c38c1928f56f43bfd
-	* common/asshelp.c (start_new_gpg_agent): Add arg autostart. Change
-	all callers to use 1 for it.
-	(start_new_dirmngr): Ditto.
-	* tools/gpg-connect-agent.c: Add option --no-autostart.
-	(main): Default autostart to 1.
-	(start_agent): Implement no-autostart.
-	* tools/gpgconf-comp.c (gpg_agent_runtime_change): Use --no-autostart.
-	(scdaemon_runtime_change): Ditto.
-	(dirmngr_runtime_change): New.
-
-	po: Copied missing translations from the 2.0 branch.
-	+ commit 329ece46bf83871f01eb833d5ebec6da36bfcce0
-	* po/LINGUAS: Add new translations.
-
-2014-11-17 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix a NULL-deref for invalid input data.
-	+ commit 32e85668b82f6fbcb824eea9548970804fb41d9e
-	* g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
-	entry.
-
-2014-11-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Make the use of "--verify FILE" for detached sigs harder.
-	+ commit 69384568f66a48eff3968bb1714aa13925580e9f
-	* g10/openfile.c (open_sigfile): Factor some code out to ...
-	(get_matching_datafile): new function.
-	* g10/plaintext.c (hash_datafiles): Do not try to find matching file
-	in batch mode.
-	* g10/mainproc.c (check_sig_and_print): Print a warning if a possibly
-	matching data file is not used by a standard signatures.
-
-	gpg: Fix a missing LF in debug output.
-	+ commit 22748338da9a78d20aefe3656ba40b0f9d34a681
-	* g10/kbnode.c (dump_kbnode): Print a LF.
-
-	gpg: Remove PGP-2 related cruft.
-	+ commit e30cb8f61792e3808f7c8f343fc8545e6c81fe74
-	* g10/armor.c (parse_hash_header,carmor_filter): Ignore MD5 in hash
-	header.
-	(fake_packet): Remove pgp-2 workaround for white space stripping.
-	* g10/filter.h (armor_filter_context_t): Remove field pgp2mode.
-	* g10/options.h (opt): Remove field pgp2_workarounds.
-	* g10/gpg.c (main): Do not set this field.
-	* g10/gpgv.c (main): Ditto.
-	* g10/mainproc.c (proc_encrypted): Use SHA-1 as fallback s2k hash
-	 algo. Using MD5 here is useless.
-	(proc_plaintext): Remove PGP-2 related woraround
-	(proc_tree): Remove another workaround but keep the one for PGP-5.
-
-2014-11-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve perceived speed of secret key listings.
-	+ commit 81e177be10273885573f5d1fd88a1ee23479f4ab
-	* g10/keylist.c (list_keyblock): Flush stdout for secret keys.
-
-	gpg: Fix regression in --refresh-keys.
-	+ commit eecbed004ca1e9ca23c3892c3a5e6dd174ddf93b
-	* g10/keyserver.c (keyserver_get): Factor all code out to ...
-	(keyserver_get_chunk): new. Extimate line length.
-	(keyserver_get): Split up requests into chunks.
-
-	gpg: Add import options "keep-ownertrust".
-	+ commit ffc2307843ce6c4ac3c8d99ba8c70ffa1ae28e39
-	* g10/options.h (IMPORT_KEEP_OWNERTTRUST): New.
-	* g10/import.c (parse_import_options): Add "keep-ownertrust".
-	(import_one): Act upon new option.
-
-2014-11-11 Werner Koch <wk@gnupg.org>
-
-	Remove use of gnulib (part 2)
-	+ commit b8cdfac353ad96d4ef025c066c16dbde34805661
-	* configure.ac (strpbrk): Add to AC_CHECK_FUNCS.
-	(gl_EARLY): Remove.
-	* common/stringhelp.c (strpbrk) !HAVE_STRPBRK: New.
-	* common/sysutils.c (gnupg_mkdtemp): New. Based on code from
-	glibc-2.6.
-	(gnupg_setenv): Rewrite.
-	(gnupg_unsetenv): Rewrite.
-	* g10/exec.c: Include sysutils.h and replace mkdtemp by gnupg_mkdtemp.
-	* g13/be-encfs.c: Ditto.
-	* g13/mount.c: Ditto.
-	* tools/symcryptrun.c (confucius_mktmpdir): Ditto.
-
-	Remove use of gnulib (part 1)
-	+ commit 1adf719b2d8e2d5b912bf6655731e7e586402654
-	* gl/: Remove entire tree.
-	* configure.ac: Remove gnulib tests and the gl/ Makefile.
-	(setenv): Add to AC_CHECK_FUNCS.
-	* autogen.rc (extra_aclocal_flags): Set to empty.
-	* Makefile.am (ACLOCAL_AMFLAGS): Remove -I gl/m4
-	(SUBDIRS): Remove gl/.
-	* agent/Makefile.am (common_libs): Remove ../gl/gnulib.a
-	* common/Makefile.am (t_common_ldadd): Ditto.
-	* dirmngr/Makefile.am (dirmngr_LDADD): Ditto.
-	(dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto.
-	* g10/Makefile.am (needed_libs): Ditto.
-	* g13/Makefile.am (g13_LDADD): Ditto.
-	* kbx/Makefile.am (kbxutil_LDADD): Ditto.
-	($(PROGRAMS)): Ditto.
-	* scd/Makefile.am (scdaemon_LDADD): Ditto.
-	* sm/Makefile.am (common_libs): Ditto.
-	* tools/Makefile.am (common_libs, commonpth_libs): Ditto.
-
-	* agent/gpg-agent.c: Remove "mkdtemp.h"
-	* g10/exec.c: Ditto.
-	* scd/scdaemon.c: Ditto.
-	* tools/symcryptrun.c: Ditto.
-	* common/sysutils.c: Remove "setenv.h"
-
-	* common/t-timestuff.c: Use putenv if setenv is not available.
-
-2014-11-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove warning message for non-implemented search modes.
-	+ commit 7362c8c6e60939588e817384ae2e29195cb3f518
-	* kbx/keybox-search.c (keybox_search): Silently ignore.
-	* doc/specify-user-id.texi: Docuement '@", '+', and '.' search
-	prefixes.
-
-	w32: Fix http access module.
-	+ commit f0f5cb6b3e525f696b8820c517190e1d84f3b885
-	* common/http.c (write_server) W32: Rework to use send() instead of
-	write even when build with npth.
-	(cookie_read) W32: Rework to use recv() instead of read even when
-	build with npth.
-
-	build: Add method to use a custom swdb.lst and use adns with Windows.
-	+ commit c7c79e31937e2d2fdb4042641786c229e31fbfae
-	* build-aux/getswdb.sh: Add option --skip-verify.
-	* build-aux/speedo.mk: Add config var CUSTOM_SWDB. Tage adns version
-	from swdb and build for Windows with adns.
-
-	build: Improve test for ADNS.
-	+ commit f7e1be24c8fcf588d4e48aa53a85b22bd035e3b0
-	* configure.ac <adns>: Use adns_free as probe function for libadns.
-	(HAVE_ADNS_FREE): Remove bogus tests to set this and remove the macro.
-	(ADNSLIBS): Do not ac_subst - it is only used within configure.
-
-2014-11-05 Werner Koch <wk@gnupg.org>
-
-	speedo: Append the date to the Windows installer.
-	+ commit 8ec0b384a86bd7f67a60ab43ff1540e80c3f729d
-	* build-aux/speedo.mk (BUILD_DATESTR): New.
-	(dist-source, installer): Use it.
-
-	Release 2.1.0.
-	+ commit e22b459b910762f77245283746de34c67ebc72da
-
-
-	Avoid sign extension when shifting the MSB.
-	+ commit 91b826a38880fd8a989318585eb502582636ddd8
-	* sm/fingerprint.c (gpgsm_get_short_fingerprint): Cast MSB before
-	shifting.
-	* g10/build-packet.c (delete_sig_subpkt): Ditto.
-
-2014-11-04 Werner Koch <wk@gnupg.org>
-
-	Remove all expired common CA certificates.
-	+ commit 46fa1e0fe9f7407f12aa854e5cdb54624af3e89b
-	* doc/com-certs.pem: Remove certifciates.
-
-2014-11-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid extra pinentries for each subkey in --export-secret-keys.
-	+ commit f8c993fbe28bf02f1d7aadec823a9dfc935398fa
-	* agent/command.c (cmd_export_key): Actually implement the cache_nonce
-	feature.
-	* g10/export.c (do_export_stream): Make use of a cache_nonce.
-
-	gpg: Fix endless loop in keylisting with fingerprint.
-	+ commit d95f05c314adfecbe0af9073f964030010442f9b
-	* g10/getkey.c (getkey_next): Disable cache.
-
-	gpg: Minor cleanup for key listing related code.
-	+ commit 440e8f517008107a9fe1b72cb659b97b7d840de6
-	* g10/getkey.c (get_pubkey_next): Divert to getkey_next.
-	(get_pubkey_end): Move code to getkey_end.
-	* g10/keydb.c (keydb_search_reset): Add a debug statement.
-	(dump_search_desc): Add arg HD and print the handle.
-
-	gpg: Do not show an useless passphrase prompt in batch mode.
-	+ commit a929f36693567e57eca89fb48f23cada8ce7291a
-	* g10/keygen.c: Remove unused PASSPHRASE related code.
-	(proc_parameter_file): Remove useless asking for a passphrase in batch
-	mode.
-
-2014-10-31 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove superfluous check for Libgcrypt >= 1.4.0.
-	+ commit f4df71aa2d544ec46a2ded3055ffb21b9842129e
-	* g10/gpg.c (main): Remove check.
-
-	kbx: Let keydb_search skip unwanted blobs.
-	+ commit 935edf88ab29b2f63afc2a0e3af1b33c92033ab7
-	* kbx/keybox.h (keybox_blobtype_t): New.
-	* kbx/keybox-defs.h (BLOBTYPE_*): Replace by KEYBOX_BLOBTYPE_*.
-	* kbx/keybox-search.c (keybox_search): Add arg want_blobtype and skip
-	non-matching blobs.
-	* sm/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_X509 to keybox_search.
-	* g10/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_PGP to keybox_search.
-
-	gpg: Fix --rebuild-keydb-caches.
-	+ commit 28ae8ad70b3b802e67344468a4765eee6e291c68
-	* g10/parse-packet.c (parse_key): Store even unsupported packet
-	versions.
-	* g10/keyring.c (keyring_rebuild_cache): Do not copy keys with
-	versions less than 4.
-
-	gpg: Fix testing for secret key availability.
-	+ commit 433208a5536608c2b40525eebadbbdeb7780d7f2
-	* g10/getkey.c (have_secret_key_with_kid): Do not change the search
-	mode.
-
-	build: Avoid distributing backup files etc.
-	+ commit b47fe2b14e2a610706bdeff9dbd9a5f7bd6f6b3a
-	* Makefile.am (EXTRA_DIST): Do not include directories.
-
-2014-10-30 Werner Koch <wk@gnupg.org>
-
-	tests: Speed up the genkey1024.test by using not so strong random.
-	+ commit 9546aa3cc87fc83a40768a12fbbceb19496ce129
-	* agent/gpg-agent.c (oDebugQuickRandom): New.
-	(opts): New option --debug-quick-random.
-	(main): Use new option.
-	* common/asshelp.c (start_new_gpg_agent): Add hack to pass an
-	additional argument for the agent name.
-	* tests/openpgp/defs.inc: Pass --debug-quick-random to the gpg-agent
-	starting parameters.
-	* tests/openpgp/version.test: Ditto.
-
-2014-10-29 Werner Koch <wk@gnupg.org>
-
-	common: Check option arguments for a valid range.
-	+ commit 0d73a242cb53522669cf712b5ece7d1ed05d003a
-	* common/argparse.h (ARGPARSE_INVALID_ARG): New.
-	* common/argparse.c: Include limits h and errno.h.
-	(initialize): Add error strings for new error constant.
-	(set_opt_arg): Add range checking.
-
-	Fix stdint.h problem for Apple.
-	+ commit f5592fcff308007322a201c970a6d5e8763c9fe3
-	* gl/stdint_.h __APPLE__: Include hack.
-
-2014-10-27 Werner Koch <wk@gnupg.org>
-
-	speedo: Fixes for native build.
-	+ commit 158fe900183daf745821dea7a70cf1c673cd8de0
-	* build-aux/speedo.mk (TARGETOS): Init with empty string.
-	(speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
-	(INST_VERSION, INST_PROD_VERSION): Create only for w32.
-
-2014-10-24 Werner Koch <wk@gnupg.org>
-
-	agent: Support pinentries with integrated repeat passphrase feature.
-	+ commit c9aadcb3a248632c07391ff3d829bece9320a901
-	* agent/agent.h (struct pin_entry_info_s): Add fields repeat_okay and
-	with_repeat.
-	* agent/call-pinentry.c (close_button_status_cb): Rewrite and check
-	for PIN_REPEAT. Change users to check only the relevant bit.
-	(agent_askpin): Support repeat logic of new Pinentries.
-
-	* agent/command-ssh.c (ssh_identity_register): Use the new repeat
-	feature.
-	* agent/genkey.c (agent_ask_new_passphrase): Ditto.
-
-2014-10-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Silence "packet with obsolete versoin" warnings.
-	+ commit 472a4a0d82add2d17154fa38e0074eaea56c28c1
-	* g10/parse-packet.c (parse_key): Print warning only in very verbose
-	mode.
-
-	gpg: Make card key generation work again.
-	+ commit 1b8decc4767f0c55867327bdf3113204efcd19a7
-	* g10/call-agent.c (agent_scd_learn): Rename from agent_learn.
-	(agent_learn): New.
-	* g10/keygen.c (gen_card_key): Call new agent-learn.
-
-2014-10-17 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Allow building without LDAP support.
-	+ commit 6d9491842d5da597980eaa59e1e3e2137965fe09
-	* configure.ac: Add option --disable-ldap.
-	(USE_LDAP): New ac_define and am_conditional.
-	* dirmngr/Makefile.am: Take care of USE_LDAP.
-	* dirmngr/dirmngr.c (!USE_LDAP): Make all ldap options dummy options
-	and do not call any ldap function.
-	* dirmngr/server.c (!USE_LDAP): Do not call any ldap function.
-	* dirmngr/crlfetch.c (!USE_LDAP): Ditto.
-
-	w32: Set SYSROOT to help finding config scripts.
-	+ commit a13705f4c18db56765f4af31376e81241dbabebe
-	* autogen.sh <build-w32>: Set SYSROOT.
-
-	gpg: Remove all support for v3 keys and always create v4-signatures.
-	+ commit 8fd150b05b744fe9465057c12529d5e6b6b02785
-	* g10/build-packet.c (do_key): Remove support for building v3 keys.
-	* g10/parse-packet.c (read_protected_v3_mpi): Remove.
-	(parse_key): Remove support for v3-keys. Add dedicated warnings for
-	v3-key packets.
-	* g10/keyid.c (hash_public_key): Remove v3-key support.
-	(keyid_from_pk): Ditto.
-	(fingerprint_from_pk): Ditto.
-
-	* g10/options.h (opt): Remove fields force_v3_sigs and force_v4_certs.
-	* g10/gpg.c (cmd_and_opt_values): Remove oForceV3Sigs, oNoForceV3Sigs,
-	oForceV4Certs, oNoForceV4Certs.
-	(opts): Turn --force-v3-sigs, --no-force-v3-sigs, --force-v4-certs,
-	--no-force-v4-certs int dummy options.
-	(main): Remove setting of the force_v3_sigs force_v4_certs flags.
-	* g10/revoke.c (gen_revoke, create_revocation): Always create v4 certs.
-	* g10/sign.c (hash_uid): Remove support for v3-signatures
-	(hash_sigversion_to_magic): Ditto.
-	(only_old_style): Remove this v3-key function.
-	(write_signature_packets): Remove support for creating v3-signatures.
-	(sign_file): Ditto.
-	(sign_symencrypt_file): Ditto.
-	(clearsign_file): Ditto. Remove code to emit no Hash armor line if
-	only v3-keys are used.
-	(make_keysig_packet): Remove arg SIGVERSION and force using
-	v4-signatures. Change all callers to not pass a value for this arg.
-	Remove all v3-key related code.
-	(update_keysig_packet): Remove v3-signature support.
-	* g10/keyedit.c (sign_uids): Always create v4-signatures.
-
-	* g10/textfilter.c (copy_clearsig_text): Remove arg pgp2mode and
-	change caller.
-
-2014-10-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove extra RSA import status line.
-	+ commit fab89f159bcb36ea7285af661d5756eefa981822
-	* g10/import.c (stats_s): Remove field "imported_rsa".
-	(import_print_stats): Do not print separate value for RSA.
-	(import_one): Remove the RSA counter.
-
-	gpg: Fix informative printing of user ids.
-	+ commit 21c0ea6bafafbcc4a2e07f0ac76275cc0229e9a0
-	* g10/getkey.c (keyid_list): Add field "fpr".
-	(cache_user_id): Store fpr and check for dups only by fpr.
-	(get_pubkey_byfpr): New.
-	(get_user_id_string): Make static and use xasprintf.
-	(get_long_user_id_string): Use xasprintf.
-	(get_user_id_byfpr): New.
-	(get_user_id_byfpr_native): New.
-	* g10/keyid.c (fingerprint_from_pk): Make arg RET_LEN optional.
-	* g10/import.c (import_one): Use get_user_id_byfpr_native.
-
-	gpg: Allow importing keys with duplicated long key ids.
-	+ commit c60814a5ce13932d933b363abc0c60c12783ae2f
-	* g10/keydb.c (keydb_handle): Add field no_caching.
-	(keyblock_cache): Repalce field kid by fpr.
-	(keydb_disable_caching): New.
-	(keydb_search): Use the fingerprint as cache index.
-
-	* g10/import.c (import_one): Use the fingerprint and not the kid to
-	lookup the key. Call keydb_disable_caching beofre re-searching for
-	update.
-
-	* tests/openpgp/import.test: Add a test case.
-
-	tests: Speed up conventional encryption tests for gpg.
-	+ commit 2543f0ab9c7b4247347688863f898667bae31984
-	* tests/openpgp/conventional-mdc.test: Add an s2k-count option.
-	* tests/openpgp/conventional.test: Ditto.
-
-2014-10-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Minor change for better readability.
-	+ commit 2d68dc437e7de92619abe3a019b0a7606487b6bf
-	* g10/build-packet.c (write_version): Remove.
-	(do_pubkey_enc, do_onepass_sig): Write version directly.
-
-2014-10-10 Werner Koch <wk@gnupg.org>
-
-	doc: Fix a man page rendering problem.
-	+ commit 5b5e5a6027ae1743719e112aa4e9055f1b8133a7
-	* doc/gpg-agent.texi (Agent Configuration): Fix rendering of the
-	sshcontrol example.
-
-2014-10-10 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: Add build and runtime support for larger RSA keys.
-	+ commit 6cabb7a2a18f871b8c3d5de58bcdc5aaa5b201af
-	* configure.ac: Added --enable-large-secmem option.
-	* g10/options.h: Add opt.flags.large_rsa.
-	* g10/gpg.c: Contingent on configure option: adjust secmem size,
-	add gpg --enable-large-rsa, bound to opt.flags.large_rsa.
-	* g10/keygen.c: Adjust max RSA size based on opt.flags.large_rsa
-	* doc/gpg.texi: Document --enable-large-rsa.
-
-2014-10-09 Werner Koch <wk@gnupg.org>
-
-	gpg: Skip overlong keys and a print a warning.
-	+ commit 2ca90f78cee91c43b8d538d1cb92728f8e1452d5
-	* kbx/keybox-search.c (keybox_search): Add arg r_skipped and skip too
-	long blobs.
-	* sm/keydb.c (keydb_search): Call keybox_search with a dummy param.
-	* g10/keydb.c (struct keydb_handle): Add field skipped_long_blobs.
-	(keydb_search_reset): Reset that field.
-	(keydb_search): Update that field.
-	(keydb_get_skipped_counter): New.
-	* g10/keylist.c (list_all): Print count of skipped keys.
-
-	gpg: Sync keylist output and warning messages.
-	+ commit 60e21d8b85888b8c9ea15c70268f98d780fdf5fb
-	* g10/keylist.c (list_all): Flush stdout before logging.
-	* g10/misc.c (print_pubkey_algo_note): Ditto.
-	(print_cipher_algo_note): Ditto.
-	(print_digest_algo_note): Ditto.
-	(print_md5_rejected_note): Ditto.
-
-	kbx: Fix handling of overlong keys.
-	+ commit b6507bb80e4e4aa5c85a918fdcf5c28cccb75081
-	* kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 10^6 to 2MiB.
-	(_keybox_read_blob2): Skip too long record records.
-	(_keybox_write_blob): Do not accept too long record.
-	* kbx/keybox-dump.c (file_stats_s): Add field skipped_long_blobs.
-	(_keybox_dump_file): Print new counter.
-	(_keybox_dump_file): Skip too long records.
-	----
-
-	To test this feature you may set the limit back to 1MiB and use key
-	F7F0E70F307D56ED which is in my local copy close to 2MiB. Without
-	this patch it was possible to import the key but access to that key
-	and all keys stored after it was not possible.
-
-	gpg: Take care to use pubring.kbx if it has ever been used.
-	+ commit ec332d58efc50f6508b87fc9f51db68c39cee044
-	* kbx/keybox-defs.h (struct keybox_handle): Add field for_openpgp.
-	* kbx/keybox-file.c (_keybox_write_header_blob): Set openpgp header
-	flag.
-	* kbx/keybox-blob.c (_keybox_update_header_blob): Add arg for_openpgp
-	and set header flag.
-	* kbx/keybox-init.c (keybox_new): Rename to do_keybox_new, make static
-	and add arg for_openpgp.
-	(keybox_new_openpgp, keybox_new_x509): New. Use them instead of the
-	former keybox_new.
-	* kbx/keybox-update.c (blob_filecopy): Add arg for_openpgp and set the
-	openpgp header flags.
-
-	* g10/keydb.c (rt_from_file): New. Factored out and extended from
-	keydb_add_resource.
-	(keydb_add_resource): Switch to the kbx file if it has the openpgp
-	flag set.
-
-	* kbx/keybox-dump.c (dump_header_blob): Print header flags.
-
-2014-10-09 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	Avoid unnecessary library linkage.
-	+ commit 27fe067efea883629354450a042ad09e47d90ff8
-	* dirmngr/Makefile.am: Avoid $(DNSLIBS) for dirmngr_ldap
-	* g10/Makefile.am: $(LIBREADLINE) is only for gpg2; gpgv2 does not
-	need $(LIBASSUAN_LIBS)
-	* sm/Makefile.am: gpgsm does not need $(ZLIBS)
-	* tools/Makefile.am: gpgconf does not need $(NPTH_LIBS)
-
-2014-10-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid error exit if keygrip computations fails in a key listing.
-	+ commit 3ae6afc1336d42bd95fa0b7f5f83bd299ae26b97
-	* g10/keyid.c (keygrip_from_pk): Use log_info and clear array on error.
-
-2014-10-03 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.0-beta864.
-	+ commit 0943c7cc23371943e9670a2f35c318d847cbac6a
-
-
-	gpg: Allow creating a cert-only primary key.
-	+ commit bc8583f247898a1fa45f6de834d34b335ab1952c
-	* g10/keygen.c (ask_key_flags): Allow a 'c' in direct entry.
-
-	build: Add configure options --disable-{ntb,gnu}tls.
-	+ commit 6522a68d8d11e15ee77102e6830f251c2d9f440d
-	* configure.ac: Add --disable-ntbtls and --disable-gnutls.
-
-2014-10-03 Andre Heinecke <aheinecke@intevation.de>
-
-	gpg: Check gpg-agent version before 2.1 migration.
-	+ commit a6fcdbc9e0fc0e45a3badc23813e689e83059b61
-	* g10/call-agent.c, g10/call-agent.h (agent_get_version): New.
-	* g10/migrate.c (migrate_secring): Abort migration if
-	agent_get_version returns not at least 2.1.0
-
-2014-10-03 Werner Koch <wk@gnupg.org>
-
-	po: Update German translation.
-	+ commit b15d5d42adf31c0797797ebe19c471ab6f52c668
-
-
-	Remove support for the GPG_AGENT_INFO envvar.
-	+ commit 9c380384dafb213334f8834178c5ceb0bf33db6e
-	* agent/agent.h (opt): Remove field use_standard_socket.
-	* agent/command.c (cmd_killagent): Always allow killing.
-	* agent/gpg-agent.c (main): Turn --{no,}use-standard-socket and
-	--write-env-file into dummy options. Always return true for
-	--use-standard-socket-p. Do not print the GPG_AGENT_INFO envvar
-	setting or set that envvar.
-	(create_socket_name): Simplify by removing non standard socket
-	support.
-	(check_for_running_agent): Ditto.
-	* common/asshelp.c (start_new_gpg_agent): Remove GPG_AGENT_INFO use.
-	* common/simple-pwquery.c (agent_open): Ditto.
-	* configure.ac (GPG_AGENT_INFO_NAME): Remove.
-	* g10/server.c (gpg_server): Do not print the AgentInfo comment.
-	* g13/server.c (g13_server): Ditto.
-	* sm/server.c (gpgsm_server): Ditto.
-	* tools/gpgconf.c (main): Simplify by removing non standard socket
-	support.
-
-2014-10-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix regression removing SHA256.
-	+ commit 688a903b4b3ad348c0d09e9d3fab8a12f4f94311
-	* g10/misc.c (map_md_openpgp_to_gcry): Always use SHA256.
-
-	First changes for future use of NTBTLS.
-	+ commit f2361e6d582d4343d71d294ed1da654afe7750ee
-	* configure.ac (NEED_NTBTLS_ABI, NEED_NTBTLS_VERSION): New.
-	(HTTP_USE_NTBTLS): New. Prefer over GNUTLS.
-	* m4/ntbtls.m4: New.
-	* m4/Makefile.am (EXTRA_DIST): Add new file.
-	* common/http.c: Add conditionals to eventually use NTBTLS.
-
-	build: Update m4 scripts.
-	+ commit 6bc0cd6202033be113999dbf27be4014bdf2c784
-	* m4/gpg-error.m4: Update from Libgpg-error git master.
-	* m4/libgcrypt.m4: Update from Libgcrypt git master.
-	* configure.ac: Declare SYSROOT a precious variable. Add extra error
-	message for library configuration mismatches.
-
-2014-09-29 Werner Koch <wk@gnupg.org>
-
-	doc: Remove GnuPG-1 related parts from gpg.texi.
-	+ commit edd191e5b006dc6ace1d41672e7201cbe58c41c9
-	* doc/Makefile.am (YAT2M_OPTIONS): Add 2.1 to the source info.
-	* doc/gpg.texi: Remove gpg1 related texts.
-
-2014-09-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Default to SHA-256 for all signature types on RSA keys.
-	+ commit d33246700578cddd1cb8ed8164cfbba50aba4ef3
-	* g10/main.h (DEFAULT_DIGEST_ALGO): Use SHA256 in --gnupg and SHA1 in
-	strict RFC or PGP modes.
-	* g10/sign.c (make_keysig_packet): Use DEFAULT_DIGEST_ALGO also for
-	RSA key signatures.
-	* configure.ac: Do not allow to disable sha256.
-
-	gpg: Simplify command --gen-key and add --full-gen-key.
-	+ commit f3625bb018fa8d5bc754f982996f8788386f0a9d
-	* g10/gpg.c (aFullKeygen): New.
-	(opts): Add command --full-key-gen.
-	(main): Implement it.
-	* g10/keygen.c (DEFAULT_STD_ALGO): Replace wrong GCRY_PK_RSA although
-	the value is identical.
-	(DEFAULT_STD_CURVE): New.
-	(DEFAULT_STD_SUBALGO): New.
-	(DEFAULT_STD_SUBKEYSIZE): New.
-	(DEFAULT_STD_SUBCURVE): New.
-	(quick_generate_keypair): Use new macros here.
-	(generate_keypair): Add arg "full" and fix call callers. Do not ask
-	for keysize in non-full node.
-	(ask_user_id): Add arg "full" and simplify for non-full mode.
-
-2014-09-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Add shortcut for setting key capabilities.
-	+ commit 7ff4ea2160e87a16bf701552d3b9c7ab1c42f9ec
-	* g10/keygen.c (ask_key_flags): Add shortcut '='.
-	* doc/help.txt (gpg.keygen.flags): New.
-
-2014-09-25 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not always print dashes in obsolete_option.
-	+ commit 20c6da50d4f6264d26d113d7de606971f719a0ca
-	* g10/gpg.c (main): Pass option names to obsolete_option without
-	double dash.
-	* g10/misc.c (obsolete_option, obsolete_scdaemon_option): Print double
-	dash only for command line options.
-
-2014-09-25 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.
-	+ commit 371c2b14b0347209efd23b4e54e1981a12d7aeab
-	* g10/gpg.c: Add config options that should belong in scdaemon.conf
-	* g10/main.h, g10/misc.c (obsolete_scdaemon_option): New.
-
-2014-09-22 Werner Koch <wk@gnupg.org>
-
-	speedo: Check that wget and gpgv are installed.
-	+ commit 59b6f6f16e095162358ac2001aeb2c058de2fd1e
-	* build-aux/getswdb.sh: Check for required tools.
-
-	speedo: Autodetect sha1sum tools.
-	+ commit 2427bc5bc76b00cfe790e1f370113f5b4199e8fa
-	* build-aux/getswdb.sh: Add option --find-sha1sum.
-	* build-aux/speedo.mk (check-tools): New phony target. Not yet used.
-	(SHA1SUM): New var. Use it instead of sha1sum.
-
-	gpg: Create default keyring with .kbx suffix.
-	+ commit bc2f5c1d1afbe8ba413e594639fd05f19df32f75
-	* g10/keydb.c (maybe_create_keyring_or_box): Rename arg for clarity.
-	(keydb_add_resource): Fix order of args to maybe_create_keyring_or_box
-	and check and create .kbx.
-
-2014-09-20 Werner Koch <wk@gnupg.org>
-
-	gpg: --delete-secret-key - check that a secret key exists.
-	+ commit 1d33d03f0bb576601f5eef1a548cbc519f251b17
-	* g10/delkey.c (do_delete_key): Check availibility of a secret key.
-
-	gpg: Make algorithm selection prompt for ECC more clear.
-	+ commit cf648fc5c8cb20bfea4fd303631ba311bbaf3659
-	* g10/keygen.c (ask_algo): Change 9 to "ECC and ECC".
-
-2014-09-18 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.0-beta834.
-	+ commit 93f158df381af86036332c4314c2d4a64eab3e62
-
-
-	speedo: Distribute needed files.
-	+ commit 72a16d80d4505aa0ff509aae41f848bbe42ed129
-	* Makefile.am (EXTRA_DIST): Add speedo stuff.
-
-	build: Enable gpgtar by default.
-	+ commit 345a8374f31e637a99e6438e527670cf6845ca05
-
-
-	common: Do not build maintainer modules in non-maintainer mode.
-	+ commit 927db789c19cbe5656ff980841ee37dd3a8989e7
-	* common/Makefile.am (module_maint_tests): Use only in maintainer
-	mode.
-	(t_common_cflags): New.
-
-	common: Remove superfluous statements.
-	+ commit cad181b5ece3ab6910575c82c731ce2b47271a09
-	* common/exechelp-posix.c: Remove weak pragmas.
-	* common/sexputil.c (make_canon_sexp_from_rsa_pk): Remove double
-	const.
-
-	g13: Avoid segv after pipe creation failure.
-	+ commit 6e7bcabd781a3ca9ad7dd90d962fb2a239feab4a
-	* g13/call-gpg.c (gpg_encrypt_blob): Init some vars in case of an
-	early error.
-	(gpg_decrypt_blob): Ditto.
-
-	scd: Fix int/short mismatch in format string of app-p15.c.
-	+ commit b17e8bbf20239e840763f98d3e62f16efdc82ba3
-	* scd/app-p15.c (parse_certid): Use snprintf and cast value.
-	(send_certinfo): Ditto.
-	(send_keypairinfo): Ditto.
-	(do_getattr): Ditto.
-
-	agent: Init a local variable in the error case.
-	+ commit f82a6e0f08725008c5bbf702a5f4c175ea09f01c
-	* agent/pksign.c (do_encode_md): Init HASH on error.
-
-	agent: Remove left over debug output.
-	+ commit 4f35ef499ac913036b7b69296a62afe8159b90b8
-	* agent/command-ssh.c (ssh_signature_encoder_eddsa): Remove debug
-	output.
-
-	agent: Silence compiler warning for a debug message.
-	+ commit ba6f8b3d9ec83b35c4f3839853567491fee2f99c
-	* agent/call-pinentry.c (agent_query_dump_state): Use %p for
-	POPUP_TID.
-
-	sm: Silence compiler warnings.
-	+ commit 34b2e8c7dcb0edb28f99edbd788d73491334e3c0
-	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Remove unused var I.
-	* sm/certreqgen.c (proc_parameters): Init PUBLIC to avoid compiler
-	warning.
-
-	gpg: Silence a compiler warning.
-	+ commit 6a0c3fa19cfcdd590b96691e8a8ffb48fb5e0ec4
-	* g10/parse-packet.c (enum_sig_subpkt): Replace hack.
-
-	gpg: Replace a hash algo test function.
-	+ commit 327134934d79d141d92170ad3b4a6ef3cb718ee0
-	* g10/gpg.c (print_mds): Replace openpgp_md_test_algo.
-
-	speedo: Various fixes.
-	+ commit 2f065d7ab6c514013eb8504281f50284764c26ec
-	* build-aux/speedo.mk: Take zlib and bzip2 from ftp.gnupg.org. Minor
-	other fixes.
-
-2014-09-17 Werner Koch <wk@gnupg.org>
-
-	gpg: Print a warning if the subkey expiration may not be what you want.
-	+ commit ae3d1bbb65b65cf3c57bb14886be120f5e31635d
-	* g10/keyedit.c (subkey_expire_warning): New.
-	(keyedit_menu): Call it when needed.
-
-	gpg: Improve passphrase caching.
-	+ commit 457bce5cd39146df047e4740162125c32c738789
-	* agent/cache.c (last_stored_cache_key): New.
-	(agent_get_cache): Allow NULL for KEY.
-	(agent_store_cache_hit): New.
-	* agent/findkey.c (unprotect): Call new function and try to use the
-	last stored key.
-
-	* g10/revoke.c (create_revocation): Add arg CACHE_NONCE and pass to
-	make_keysig_packet.
-	(gen_standard_revoke): Add arg CACHE_NONCE and pass to
-	create_revocation.
-	* g10/keygen.c (do_generate_keypair): Call gen_standard_revoke with
-	cache nonce.
-
-2014-09-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Use algorithm id 22 for EdDSA.
-	+ commit 83c2d2396cc9fa6bdd887a560830fc0f48b01b08
-	* common/openpgpdefs.h (PUBKEY_ALGO_EDDSA): Change to 22.
-	* g10/keygen.c (ask_curve): Reword the Curve25519 warning note.
-
-2014-09-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Stop early on bogus old style comment packets.
-	+ commit 3d250d21d36e8a0935b645f1ed5134ef9083530e
-	* g10/parse-packet.c (parse_key): Take care of too short packets for
-	old style commet packets.
-
-2014-09-10 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Support https for KS_FETCH.
-	+ commit 84419f42da0fd436a9e0e669730157e74ce38b77
-	* dirmngr/ks-engine-hkp.c (cert_log_cb): Move to ...
-	* dirmngr/misc.c (cert_log_cb): here.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Support 307-redirection
-	and https.
-
-	dirmngr: Fix the ks_fetch command for the http scheme.
-	+ commit 3b20cc21de86ac8a475bdefd3aebb02a12fb8d0b
-	* common/http.c (http_session_ref): Allow for NULL arg.
-
-2014-09-08 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix memory leak in ECC encryption.
-	+ commit 98f65291d7abecc1e4d618125f33b6ce759e0892
-	* g10/pkglue.c (pk_encrypt): Fix memory leak and streamline error
-	handling.
-
-2014-09-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix export of NIST ECC keys.
-	+ commit bf2fc12b83b45953f7afa403b8d91c36d0b50ec9
-	* common/openpgp-oid.c (struct oidtable): New.
-	(openpgp_curve_to_oid): Rewrite and allow OID as input.
-	(openpgp_oid_to_curve): Make use of the new table.
-
-	agent: Fix import of OpenPGP EdDSA keys.
-	+ commit afe85582ddc2ebc285728bf6417f8929fd0b3281
-	* agent/cvt-openpgp.c (get_keygrip): Special case EdDSA.
-	(convert_secret_key): Ditto.
-	(convert_transfer_key): Ditto.
-	(apply_protection): Handle opaque MPIs.
-
-	(do_unprotect): Check FLAG_OPAQUE instead of FLAG_USER1 before
-	unpacking an opaque mpi.
-
-2014-09-01 Kyle Butt <kylebutt@gmail.com>
-
-	gpg: Fix export of ecc secret keys by adjusting check ordering.
-	+ commit 4054d86abcb7ad953ed9e988b1765cb9266faefd
-	* g10/export.c (transfer_format_to_openpgp): Move the check against
-	PUBKEY_MAX_NSKEY to after the ECC code adjusts the number of
-	parameters.
-
-2014-09-01 Werner Koch <wk@gnupg.org>
-
-	agent: Allow key unprotection using AES-256.
-	+ commit c913e09ebdbb1a1e9838a0a5897448841f5e9bc3
-	* agent/protect.c (PROT_CIPHER): Rename to GCRY_CIPHER_AES128 for
-	clarity.
-	(do_decryption): Add args prot_cipher and prot_cipher_keylen. USe
-	them instead of the hardwired values.
-	(agent_unprotect): Change to use a table of protection algorithms.
-	Add AES-256 variant.
-
-2014-08-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Do not show "MD5" and triplicated "RSA" in --version.
-	+ commit be98b5960ebd48929c399b0b91c95bfc0cb9749b
-	* g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
-	(build_list_md_test_algo): Ignore MD5.
-
-	gpg: Do not show "MD5" and triplicated "RSA" in --version.
-	+ commit 40ad42dbe3c67d8103aedb6b584f4bedc5f93307
-	* g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
-	(build_list_md_test_algo): Ignore MD5.
-
-2014-08-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove CAST5 from the default prefs and order SHA-1 last.
-	+ commit 15cfd9a3bcdd561091a28c8f989c616b87348463
-	* g10/keygen.c (keygen_set_std_prefs): Update prefs.
-
-	Switch to the libgpg-error provided estream.
-	+ commit 519305feb888b529c005b40445d041a088a2f8fc
-	* configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14.
-	(GPGRT_ENABLE_ES_MACROS): Define.
-	(estream_INIT): Remove.
-	* m4/estream.m4: Remove.
-	* common/estream-printf.c, common/estream-printf.h: Remove.
-	* common/estream.c, common/estream.h: Remove.
-	* common/init.c (_init_common_subsystems): Call gpgrt initialization.
-
-	gpg: Allow for positional parameters in the passphrase prompt.
-	+ commit a731c22952278c12c601b73d7581fda3a15a4b5b
-	* g10/passphrase.c (passphrase_get): Replace sprintf by xasprintf.
-
-2014-08-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix "can't handle public key algorithm" warning.
-	+ commit cb680c5ea540738692a5c74951802b0fdc658e85
-	* g10/parse-packet.c (unknown_pubkey_warning): Check for encr/sign
-	capabilities.
-
-2014-08-19 Werner Koch <wk@gnupg.org>
-
-	speedo: Get version numbers from online database.
-	+ commit 31649e72fd106a990614ce3cf720640a841ba722
-	* build-aux/getswdb.sh: New.
-	* build-aux/speedo.mk: Get release version numbers from swdb.lst.
-
-	build: Create VERSION file via autoconf.
-	+ commit 4fc1c712e986f280057b1bce7ca4696ba6d95dfc
-	* Makefile.am (dist-hook): Remove creation of VERSION.
-	(EXTRA_DIST): Add VERSION.
-	* configure.ac: Let autoconf create VERSION.
-
-2014-08-18 Werner Koch <wk@gnupg.org>
-
-	gpg: Install the current release signing pubkey.
-	+ commit e5da80bc1888bf8801e69c9ff99f7f47550f7a09
-	* g10/distsigkey.gpg: New.
-
-	agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.
-	+ commit 3981ff15f3c0829ba22cd37794353502d996683c
-	* agent/pksign.c (agent_pksign_do): Replace ENONET by NO_SECKEY.
-	* agent/findkey.c (agent_key_from_file): No diagnostic for NO_SECKEY.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Replace checking for ENOENT.
-
-	kbx: Make user id and signature data optional for OpenPGP.
-	+ commit e4aa006e4807285ffdd881e4e05af3bc47c5c964
-	* kbx/keybox-blob.c (_keybox_create_openpgp_blob): Remove restriction.
-
-	gpg: Change default cipher for --symmetric from CAST5 to AES-128.
-	+ commit 57df1121c18b004dd763b35eabf7b51fc9e8ec38
-	* g10/main.h (DEFAULT_CIPHER_ALGO): Chhange to AES or CAST5 or 3DES
-	depending on configure option.
-	* g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
-
-	yat2m: Support @set and @value.
-	+ commit 425d0750168f6b66a5d78a857cf21375a8f129eb
-	* doc/yat2m.c (variablelist): New.
-	(set_variable): New.
-	(macro_set_p): Also check the variables.
-	(proc_texi_cmd): Support the @value command.
-	(parse_file): Support the @set command.
-	(top_parse_file): Release variablelist.
-
-	yat2m: Support the $* command for man page rendering.
-	+ commit 7e51ef0f77962f5fb215da53817caf28899ca190
-
-
-2014-08-17 Werner Koch <wk@gnupg.org>
-
-	estream: Change license from GPL to LPGL.
-	+ commit af1196512f505e8a3a338f9b72394fa3585a5234
-	* common/estream-printf.c, common/estream-printf.h: Change license.
-	* common/estream.c, common/estream.h: Ditto.
-
-2014-08-14 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.0-beta783.
-	+ commit a13198d9bcee368a8de7a401feb017efc83ff795
-
-
-	po: Update the German (de) translation.
-	+ commit fe9ff33b9dc8793957998341cf4bcf5e50827b41
-
-
-	sm: Create homedir and lock empty keybox creation.
-	+ commit c4b60cdae8dbf68206fd105fd09adeb61a9dafe4
-	* sm/gpgsm.h (opt): Add field "no_homedir_creation".
-	* sm/gpgsm.c (main): Set it if --no-options is used.
-	* sm/keydb.c (try_make_homedir): New. Similar to the one from
-	g10/openfile.c.
-	(maybe_create_keybox): New. Similar to the one from g10/keydb.c.
-	(keydb_add_resource): Replace some code by maybe_create_keybox.
-
-	gpg: Screen keyserver responses.
-	+ commit c23c18c1543d1ff58f0f78baaa6a8e319c659ecb
-	* g10/main.h (import_screener_t): New.
-	* g10/import.c (import): Add screener callbacks to param list.
-	(import_one): Ditto.
-	(import_secret_one): Ditto.
-	(import_keys_internal): Ditto.
-	(import_keys_stream): Ditto.
-	* g10/keyserver.c (struct ks_retrieval_screener_arg_s): New.
-	(keyserver_retrieval_screener): New.
-	(keyserver_get): Pass screener to import_keys_es_stream().
-
-	scd: Minor changes to app-sc-hsm.
-	+ commit a61b28df1f29b1e306115282ec1ce580fa54945a
-	* scd/app-sc-hsm.c: Re-indendet some parts and set some vars to NULL
-	after xfree for improbed robustness.
-	(read_ef_prkd): Replace serial operator by blocks for better
-	readability.
-	(apply_PKCS_padding): Rewrite for easier auditing.
-	(strip_PKCS15_padding): Ditto. Add stricter check on SRCLEN.
-
-	gpg: Disable an MD5 workaround for pgp2 by default.
-	+ commit ae29b52119aa419989b773b2d6abb6e287dfc81b
-	* g10/sig-check.c (do_check): Move some code to ...
-	* g10/misc.c (print_md5_rejected_note): new function.
-	* g10/mainproc.c (proc_tree, proc_plaintext): Enable MD5 workaround
-	only if option --allow-weak-digest-algos is used.
-
-	gpg: Remove options --pgp2 and --rfc1991.
-	+ commit 2b8d8369d59249b89526c18c5ac276e6445dc35e
-	* g10/gpg.c (oRFC1991, oPGP2): Remove
-	(opts): Remove --pgp2 and --rfc1991.
-	* g10/options.h (CO_PGP2, CO_RFC1991): Remove. Remove all users.
-	(RFC2440, PGP2): Remove. Remove all code only enabled by these
-	conditions.
-	* tests/openpgp/clearsig.test: Remove --rfc1991 test.
-
-	build: Fix autogen.sh base version hack.
-	+ commit 49c9a958e0b786850309bca555d4465c97d337e1
-	* autogen.sh <find-version>: Fix.
-
-	gpg: Remove --compress-keys and --compress-sigs feature.
-	+ commit 71b55e91f02cdb65a8884892f71c4c7bf8a75247
-	* g10/gpg.c (oCompressKeys, oCompressSigs): Remove.
-	(opts): Turn --compress-keys and --compress-signs in NOPs.
-	* g10/options.h (opt): Remove fields compress_keys and compress_sigs.
-	* g10/export.c (do_export): Remove compress_keys feature.
-	* g10/sign.c (sign_file): Remove compress_sigs feature.
-
-2014-08-13 Werner Koch <wk@gnupg.org>
-
-	gpg: Add list-option "show-usage".
-	+ commit 7d0492075ea638607309b3ea6a792b0e95ea7d98
-	* g10/gpg.c (parse_list_options): Add "show-usage".
-	* g10/options.h (LIST_SHOW_USAGE): New.
-	* g10/keyid.c (usagestr_from_pk): Add arg FILL. Change caller.
-	* g10/keylist.c (list_keyblock_print): Print usage info.
-
-2014-08-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Make --with-colons work again for --search-keys.
-	+ commit a57c33c855c6757c8770529ee71f0f90744cd7a6
-	* g10/keyserver.c (search_line_handler): Replace log_debug by
-	es_printf.
-
-2014-08-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit 2d9f76e07082fc231303ac2c6ae1aea3c98fa2e4
-
-
-2014-07-25 Werner Koch <wk@gnupg.org>
-
-	scd: Minor and editorial changes to app-sc-hsm.c.
-	+ commit 2e936915cf2f830e60d974d607b08822645f5753
-	* scd/app-sc-hsm.c (select_and_read_binary): Use SW_ macro.
-	(parse_certid): Remove useless test.
-	(send_certinfo, send_keypairinfo): Shrink malloc to the needed size.
-	(do_getattr): Ditto.
-	(verify_pin): Use SW_ macro.
-	(do_decipher): Replace OFS variable and extend comment.
-
-	scd: Add a new status word code.
-	+ commit e49c851ff54d5ecf856411bf6cdee721695ea172
-	* scd/apdu.h (SW_REF_DATA_INV): New.
-	* scd/apdu.c (apdu_strerror): Add string.
-
-2014-07-25 Andreas Schwier <andreas.schwier@cardcontact.de>
-
-	scd: Support for SmartCard-HSM.
-	+ commit 8eb9224f32ddf1c9e1490c4d9688a177f8b6ae64
-	* scd/app-sc-hsm.c: New.
-	* scd/app.c (select_application, get_supported_applications): Register
-	new app.
-
-2014-07-25 Werner Koch <wk@gnupg.org>
-
-	gpg: Switch to an EdDSA format with prefix byte.
-	+ commit 557cc11a605dd280d03c52d8b546deed8c4c714d
-	* g10/keygen.c (gen_ecc): USe "comp" for EdDSA.
-
-2014-07-23 Werner Koch <wk@gnupg.org>
-
-	agent: Show just one warning with all failed passphrase constraints.
-	+ commit b3378b3a56fc90ba8ae38e6298b23a378305af32
-	* agent/genkey.c (check_passphrase_constraints): Build a final warning
-	after all checks.
-
-	agent: Only one confirmation prompt for an empty passphrase.
-	+ commit a24510d53bb23e3a680ed2c306e576268c07060d
-	* agent/genkey.c (check_passphrase_constraints): Moev empty passphrase
-	check to the front.
-
-	gpg: Add command --quick-gen-key.
-	+ commit ea186540db5b418bc6f6e5ca90337672c9981c88
-	* g10/gpg.c (aQuickKeygen): New.
-	* g10/misc.c (is_valid_user_id): New stub.
-	* g10/keygen.c (quickgen_set_para): New.
-	(quick_generate_keypair): New.
-
-	common: Add cpr_get_answer_is_yes_def()
-	+ commit 75127bc4561787aa9bc1cf976658e20192446d7f
-	* g10/cpr.c (cpr_get_answer_is_yes): Factor code out to ....
-	(cpr_get_answer_is_yes_def): ...new.
-
-	gpg: Make --quick-sign-key promote local key signatures.
-	+ commit 17404b2fccbc74c4f0b2364cc08e9dcc64175cf8
-	* g10/keyedit.c (sign_uids): Promote local sigs in quick mode.
-
-2014-07-22 Werner Koch <wk@gnupg.org>
-
-	scd: Do not use the pcsc-wrapper.
-	+ commit bc6b452129178658da7241903ca2174c79281752
-	* scd/apdu.c (NEED_PCSC_WRAPPER): Do not define.
-	* scd/Makefile.am (libexec_PROGRAMS): Remove gnupg-pcsc-wrapper
-	(gnupg_pcsc_wrapper_SOURCES): Remove.
-	(gnupg_pcsc_wrapper_LDADD): Remove.
-	(gnupg_pcsc_wrapper_CFLAGS): Remove.
-
-2014-07-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve --list-packets output for faulty packets.
-	+ commit 5b34e347b612765f31061d077b7c343e08662ba9
-	* g10/parse-packet.c: Add list_mode output for certain failures.
-
-	gpg: Cap size of attribute packets at 16MB.
-	+ commit bab9cdd971f35ff47e153c00034c95e7ffeaa09a
-	* g10/parse-packet.c (parse_attribute): Avoid xmalloc failure and cap
-	size of packet.
-
-2014-07-03 Werner Koch <wk@gnupg.org>
-
-	Release 2.1.0-beta751.
-	+ commit 5ae34f574baca2b98a09fd982c941855558408e1
-
-
-	gpg: Make show-uid-validity the default.
-	+ commit 5214d8f02bf65fb0a4af15ff80cf1369ccd4c167
-
-
-	tests: Fix end-of-all-ticks test for Western locales.
-	+ commit 3533860ee316918dd47501c53e910bfd0032b39d
-	* common/t-timestuff.c (test_timegm): Use timegm if available.
-	(main): Set TX to UTC if timegm is not available.
-
-2014-07-03 Kristian Fiskerstrand <kf@sumptuouscapital.com>
-
-	gpg: Spelling error.
-	+ commit b51af333bdf77c042c9fe748616e80d1f5e4d3f9
-
-
-2014-06-30 Werner Koch <wk@gnupg.org>
-
-	gpg: Auto-create revocation certificates.
-	+ commit 03018ef9eec75e4d91ea53c95547a77dedef8f80
-	* configure.ac (GNUPG_OPENPGP_REVOC_DIR): New config define.
-	* g10/revoke.c (create_revocation): Add arg "leadin".
-	(gen_standard_revoke): New.
-	* g10/openfile.c (get_openpgp_revocdir): New.
-	(open_outfile): Add MODE value 3.
-	* g10/keyid.c (hexfingerprint): New.
-	* g10/keygen.c (do_generate_keypair): Call gen_standard_revoke.
-
-	estream: Fix minor glitch in "%.*s" format.
-	+ commit aa5b4392aac99382d96be94782ae745e0a42484a
-	* common/estream-printf.c (pr_string): Take care of non-nul terminated
-	strings.
-
-	gpg: Rearrange code in gen_revoke.
-	+ commit 3a01b220715b3d1a90d94353e4980ab5a1ea8f26
-	* g10/revoke.c (gen_revoke): Factor some code out to ...
-	(create_revocation): new.
-
-	gpg: Create exported secret files and revocs with mode 700.
-	+ commit c434de4d83ccfaca8bde51de5c2ac8d9656e4e18
-	* common/iobuf.c (direct_open): Add arg MODE700.
-	(iobuf_create): Ditto.
-	* g10/openfile.c (open_outfile): Add arg RESTRICTEDPERM. Change call
-	callers to pass 0 for it.
-	* g10/revoke.c (gen_desig_revoke, gen_revoke): Here pass true for new
-	arg.
-	* g10/export.c (do_export): Pass true for new arg if SECRET is true.
-
-	common: Minor code cleanup for a legacy OS.
-	+ commit 35fdfaa0b94342c53eb82eea155a37ad4009fa9f
-	* common/iobuf.c (direct_open) __riscos__: Simply cpp conditionals.
-
-2014-06-27 Werner Koch <wk@gnupg.org>
-
-	speedo: Fix the w32 installer name.
-	+ commit adad1872b448593275d8cae06dffe376bee067b5
-
-
-	po: Update some strings of the French (fr) translation.
-	+ commit 1ef7870fc96f6dd8137e9bfabf9b06787f75dffd
-
-
-	po: Update the German (de) translation.
-	+ commit c2e3eb98884785e6794dc79c1a53d75945f4c1ab
-
-
-	agent: Adjust for changed npth_eselect under W32.
-	+ commit a1dff86da8ebaab6e154360f538ca9d43a6c4934
-	* agent/gpg-agent.c (handle_connections) W32: Make events_set an
-	unsigned int to match the changed prototype.
-
-	dirmngr: Use the homedir based socket also under W32.
-	+ commit 5e1f9b5e1427688ac340f0829e02bece7f0caf9c
-	* common/homedir.c (dirmngr_user_socket_name): Use same code for all
-	platforms.
-
-2014-06-27 Yuri Chornoivan <yurchor@ukr.net>
-
-	po: Update and enable Ukrainian (uk) translation.
-	+ commit 2c4025576105a9deb78e1cfb22c11af4af09c4fa
-
-
-	Fix typos in messages.
-	+ commit e56a2d6a56d95c0f169506a8dc74a845c22b699d
-
-
-2014-06-27 Werner Koch <wk@gnupg.org>
-
-	build: Remove unused options.
-	+ commit 2540a4b674a17b45ec33f43f26e830e74ff0afed
-	* configure.ac: Remove option --build-agent-only.
-	(FAKE_CURL, GPGKEYS_CURL): Remove check for cURL
-	(GPGKEYS_MAILTO): Remove ac_subst but keep the currently unused
-	SENDMAIL check.
-	(GPGKEYS_KDNS): Remove ac_subst.
-	* autogen.rc (final_info): Remove suggestion to use the removed option
-	--enable-mailto.
-
-2014-06-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Add pinpad support for REINER SCT cyberJack go.
-	+ commit 73ba75ad8b933beddd2c3f4b66937b56faa0a2d8
-	* scd/ccid-driver.h (VENDOR_REINER, CYBERJACK_GO): New.
-	* scd/ccid-driver.c (ccid_transceive_secure): Handle the case for
-	VENDOR_REINER. Original work was by Alina Friedrichsen (tiny change).
-
-2014-06-27 Werner Koch <wk@gnupg.org>
-
-	scd: Support reader Gemalto IDBridge CT30.
-	+ commit 24be0f24d3a9325a04de10ae0e5e277bf28a74fe
-	* scd/ccid-driver.h (GEMPC_CT30): New product id.
-	* scd/ccid-driver.c (parse_ccid_descriptor): Add quirk for that
-	reader.
-
-2014-06-26 Werner Koch <wk@gnupg.org>
-
-	gpg: Limit keysize for unattended key generation to useful values.
-	+ commit 03f0b51fe454f8dbe77c302897f7a5899c4c5380
-	* g10/keygen.c (gen_elg): Enforce keysize 1024 to 4096.
-	(gen_rsa): Enforce keysize 1024 to 4096.
-	(gen_dsa): Enforce keysize 768 to 3072.
-
-	Enable DNS SRV records again.
-	+ commit c0d1e7fca95629e1cddd7d129fa51b9a6556cb70
-	* configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst.
-	(use_dns_srv): Make test work.
-
-	agent: Fix export of RSA keys to OpenPGP.
-	+ commit 9a034acf8ab6f85c65ccc75a4fd7b8dd47b73e3a
-	* agent/cvt-openpgp.c (convert_transfer_key): Fix sexp build format
-	string.
-
-	gpg,gpgsm: Simplify wrong_args function.
-	+ commit 572502bd2c0637429bca547ba882629640477495
-
-
-	speedo: "make clean-gnupg" may not remove the source.
-	+ commit c029a184d6a1a96c6de234835fff97d4e946b19c
-	* build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
-
-	gpgsm: Fix default config name.
-	+ commit 2480b0253166712a2f20b92f34c8e4c2db0fc26f
-
-
-2014-06-25 Werner Koch <wk@gnupg.org>
-
-	doc: Improve the rendering of the manual.
-	+ commit b5f95c1b566f9530127f3f34e10d120a951cf428
-
-
-	doc: Update for modern makeinfo.
-	+ commit f149e05427a370f5985bc3fb142370b043f19924
-	* doc/texi.css: Remove.
-	* doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
-
-	gpg: Allow key-to-card upload for cert-only keys.
-	+ commit f171fd226e84311f92545ca0494771db07ba777d
-	* g10/card-util.c (card_store_subkey): Allo CERT usage for key 0.
-
-2014-06-24 Werner Koch <wk@gnupg.org>
-
-	doc: Add conditionals for GnuPG-1.
-	+ commit 2c8e00137a340d04f0836f75e138dd85f8c9eff7
-
-
-2014-06-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Make export of ECC keys work again.
-	+ commit f4fcaa29367daacfe0ca209fa83dfa8640ace276
-	* agent/cvt-openpgp.c (convert_to_openpgp): Use the curve name instead
-	of the curve parameters.
-	* g10/export.c (canon_pubkey_algo): Rename to ...
-	(canon_pk_algo): this. Support ECC.
-	(transfer_format_to_openpgp): Expect curve name.
-
-	gpg: Avoid infinite loop in uncompressing garbled packets.
-	+ commit d6ca407a27877174c10adfae9dc601bea996cf27
-	* g10/compress.c (do_uncompress): Limit the number of extra FF bytes.
-
-2014-06-17 Kristian Fiskerstrand <kf@sumptuouscapital.com>
-
-	gpg: Fix a couple of spelling errors.
-	+ commit 3f17b74aa57ac1ea2f3aa93dec4889778a21afeb
-
-
-2014-06-17 Werner Koch <wk@gnupg.org>
-
-	speedo: Support building from dist-source generated tarball.
-	+ commit 47e63dc00169030b6ff01ab67e73e52aec1395db
-
-
-2014-06-13 Werner Koch <wk@gnupg.org>
-
-	http: Print human readable GNUTLS status.
-	+ commit 5bf04522e353675e4c3eda118fee2580756704a2
-	* common/http.c (send_gnutls_bye): Take care of EAGAIN et al.
-	(http_verify_server_credentials): Print a human readable status.
-
-2014-06-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Improve the output of --list-packets.
-	+ commit d8314e31c58ea0827d0e2361dabcdf869ab08fce
-	* g10/parse-packet.c (parse): Print packet meta info in list mode.
-
-2014-06-11 Werner Koch <wk@gnupg.org>
-
-	speedo: Improve building of the w32 installer.
-	+ commit 6eeb31abee82cb2016bf054cd302af64f6dfdc2e
-	* build-aux/speedo.mk: Change name of build directory to PLAY.
-	Improve the dist-source target.
-	* build-aux/speedo/w32/gdk-pixbuf-loaders.cache: Add a blank
-	line (plus comment).
-	* build-aux/speedo/w32/inst.nsi: Change name of file to gnupg-w32-*.
-	Install more tools.
-
-2014-06-10 Werner Koch <wk@gnupg.org>
-
-	speedo: Revamped speedo and include a w32 installer.
-	+ commit e06d5d1a3b4a5c446a27d64cd2da0e48ccec5601
-	* build-aux/speedo/: New.
-	* build-aux/speedo/w32/: New.
-
-	build: Add more options to autogen.sh.
-	+ commit 0399d87f7aaf2f2126a63899004c5c7bffd4346b
-	* autogen.sh: Add options --print-host and --print-build.
-
-	w32: Fix build problem with dirmngr.
-	+ commit 141d69cb2a94a752244e89f49611923a2f184dfd
-	* dirmngr/ks-engine-hkp.c (EAI_SYSTEM) W32: Add replacement
-	constant.
-
-	gpg: Use more specific reason codes for INV_RECP.
-	+ commit 45ed901c466bd72118c2844069f566e190d847d6
-	* g10/pkclist.c (find_and_check_key, build_pk_list): Use more specific
-	reasons codes for INV_RECP.
-
-2014-06-06 Werner Koch <wk@gnupg.org>
-
-	Improve the beta number generation.
-	+ commit b67e4e523e6d19d384e23c5bb03010caebd150e7
-	* autogen.sh: Add option --find-version
-	* configure.ac: Rework the setting of the mym4_ variables.
-
-2014-06-05 Werner Koch <wk@gnupg.org>
-
-	Remove keyserver helper code.
-	+ commit 23712e69d3f97df9d789325f1a2f2f61e7d5bbb4
-	* configure.ac: Remove keyserver helper related stuff.
-	* Makefile.am (SUBDIRS): Remove keyserver.
-	* keyserver/Makefile.am: Remove.
-
-	gpg: Require confirmation for --gen-key with experimental curves.
-	+ commit 9c9e26d41e7d65711da8dbf1afa452254749621c
-	* g10/keygen.c (ask_curve): Add arg both. Require confirmation for
-	Curve25519.
-
-	gpg: Auto-migrate existing secring.gpg.
-	+ commit 4f0625889b768eabdec52696bf15059a9e8d9c02
-	* g10/migrate.c: New.
-	* g10/import.c (import_old_secring): New.
-	(import_one): Add arg silent.
-	(transfer_secret_keys): Add arg batch.
-	(import_secret_one): Add args batch and for_migration.
-	* g10/gpg.c (main): Call migration function.
-
-2014-06-04 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Fix commit be07ed65.
-	+ commit 09a2d4ec74d352dcb4f006aab60b07bc4f5f1a37
-	* sm/server.c (option_handler): Use "with-secret".
-
-2014-06-03 Werner Koch <wk@gnupg.org>
-
-	Add new option --with-secret.
-	+ commit be07ed65e169a7ec3fbecdb1abf988fc0245d9ff
-	* g10/gpg.c: Add option --with-secret.
-	* g10/options.h (struct opt): Add field with_secret.
-	* g10/keylist.c (public_key_list): Pass opt.with_secret to list_all
-	and list_one.
-	(list_all, list_one): Add arg mark_secret.
-	(list_keyblock_colon): Add arg has_secret.
-	* sm/gpgsm.c: Add option --with-secret.
-	* sm/server.c (option_handler): Add option "with-secret".
-	* sm/gpgsm.h (server_control_s): Add field with_secret.
-	* sm/keylist.c (list_cert_colon): Take care of with_secret. Also move
-	the token string from the wrong field 14 to 15.
-
-	gpgsm: New commands --export-secret-key-{p8,raw}
-	+ commit 0beec2f0f255a71f9d5a4a0729d0259f673e8838
-	* sm/gpgsm.c: Add new commands.
-	* sm/minip12.c (build_key_sequence): Add arg mode.
-	(p12_raw_build): New.
-	* sm/export.c (export_p12): Add arg rawmode. Call p12_raw_build.
-	(gpgsm_p12_export): Ditto.
-	(print_short_info): Print the keygrip.
-
-2014-06-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Avoid NULL-deref in default key listing.
-	+ commit 958e5f292fa3f8e127f54bc088c56780c564dcae
-	* g10/keyid.c (hash_public_key): Take care of NULL keys.
-	* g10/misc.c (pubkey_nbits): Ditto.
-
-	gpg: Simplify default key listing.
-	+ commit f3249b1c4d0f2e9e0e8956042677e47fc9c6f6c0
-	* g10/mainproc.c (list_node): Rework.
-
-	gpg: Graceful skip reading of corrupt MPIs.
-	+ commit d9cde7ba7d4556b216f062d0cf92d60cbb204b00
-	* g10/parse-packet.c (mpi_read): Change error message on overflow.
-
-	gpgsm: Handle re-issued CA certificates in a better way.
-	+ commit 715285bcbc12c024dbd9b633805189c09173e317
-	* sm/certchain.c (find_up_search_by_keyid): Consider all matching
-	certificates.
-	(find_up): Add some debug messages.
-
-	gpgsm: Add a way to save a found state.
-	+ commit 42c043a8ad542c131917879c9b458f234b4bb645
-	* kbx/keybox-defs.h (keybox_found_s): New.
-	(keybox_handle): Factor FOUND out to above. Add saved_found.
-	* kbx/keybox-init.c (keybox_release): Release saved_found.
-	(keybox_push_found_state, keybox_pop_found_state): New.
-
-	* sm/keydb.c (keydb_handle): Add field saved_found.
-	(keydb_new): Init it.
-	(keydb_push_found_state, keydb_pop_found_state): New.
-
-	gpg: Fix bug parsing a zero length user id.
-	+ commit 99972bd6e9abea71f270284f49997de5f00208af
-	* g10/getkey.c (get_user_id): Do not call xmalloc with 0.
-
-	* common/xmalloc.c (xmalloc, xcalloc): Take extra precaution not to
-	pass 0 to the arguments.
-
-2014-05-19 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Print certificates on failed TLS verification.
-	+ commit 9e1c99f8009f056c39a7465b91912c136b248e8f
-	* dirmngr/ks-engine-hkp.c (cert_log_cb): New.
-	(send_request): Set callback.
-
-	http: Add callback to help logging of server certificates.
-	+ commit 45f15b2d767d4068f79fd5b123e9eeae08a0616d
-	* common/http.c (http_session_s): Add field cert_log_cb.
-	(http_session_set_log_cb): New.
-	(http_verify_server_credentials): Call callback.
-
-2014-05-16 Werner Koch <wk@gnupg.org>
-
-	keyserver: Improve support for hkps pools.
-	+ commit d2d9d4fb60e3f2160af6252335364d3aac4b7d17
-	* dirmngr/ks-engine-hkp.c (hostinfo_s): Add fields cname, v4addr, and
-	v6addr.
-	(create_new_hostinfo): Clear them.
-	(my_getnameinfo): Add args numeric and r_isnumeric.
-	(is_ip_address): New.
-	(map_host): Add arg r_host. Rewrite the code to handle pools in a
-	special way.
-	(ks_hkp_print_hosttable): Change format of help info output.
-	(make_host_part): Add arg optional r_httphost.
-	(send_request): Add arg httphost.
-	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Get httphost and pass it to
-	send_request.
-
-	http: Allow overriding of the Host header.
-	+ commit 8b90d79818355b81ce223e1cb96cd0c939096fe2
-	* common/http.c (http_open): Add arg httphost.
-	(http_open_document): Pass NULL for httphost.
-	(send_request): Add arg httphost. If given, use HTTPHOST instead of
-	SERVER. Use https with a proxy if requested.
-	(http_verify_server_credentials): Do not stop at the first error
-	message.
-	* dirmngr/ocsp.c (do_ocsp_request): Adjust call to http_open.
-	* keyserver/curl-shim.c (curl_easy_perform): Ditto.
-	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
-	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Ditto.
-
-2014-05-14 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix uninitialized access to search descindex with gpg keyboxes.
-	+ commit 25036ec6abbc0c9d0003dcfe227724038c35a304
-	* kbx/keybox-search.c (keybox_search): Add arg R_DESCINDEX. Chnage
-	both callers.
-	* g10/keydb.c (keydb_search): Always set DESCINDEX.
-
-	w32: Make make_absfilename work with drive letters.
-	+ commit 71fa6a35107d4d4547eb9155d7c2612b6a6a16fb
-	* common/stringhelp.c (do_make_filename) HAVE_DRIVE_LETTERS: Fix.
-
-	gpg: Remove useless diagnostic in MDC verification.
-	+ commit 455a4a2212302c05095e736b127f647e95714fe7
-	* g10/decrypt-data.c (decrypt_data): Do not distinguish between a bad
-	MDC packer header and a bad MDC.
-
-	gpg: Fix glitch entering a full expiration time.
-	+ commit b2945c451d3d3f25ba11a9fe88c6cbf3f88c2fb5
-	* g10/keygen.c (ask_expire_interval): Get the current time after the
-	prompt.
-
-2014-05-08 Werner Koch <wk@gnupg.org>
-
-	agent: Fix import of non-protected gpg keys.
-	+ commit 4aeb02562c9db4b96366220b781e2b4fa2d6fd3b
-	* agent/cvt-openpgp.c (do_unprotect): Return an s-exp also for
-	non-protected keys.
-	(convert_from_openpgp_main): Do not call agent_askpin for a
-	non-protected key.
-
-	Make more use of *_NAME macros.
-	+ commit cb2aeb4e1157fc0d7dc25d94115973422dc1a800
-	* configure.ac (GPG_DISP_NAME, GPGSM_DISP_NAME): New.
-	(GPG_AGENT_DISP_NAME, SCDAEMON_DISP_NAME): New.
-	(DIRMNGR_DISP_NAME, G13_DISP_NAME): New.
-	(GPGCONF_DISP_NAME): New.
-	(SCDAEMON_SOCK_NAME): New.
-	* common/argparse.c (show_help): Map description string.
-
-2014-05-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix auth key comment handling.
-	+ commit fb24808db9af9dfe36f9f6d7fc24e0b903ecc12c
-	* agent/command-ssh.c (ssh_send_key_public): Handle the case with no
-	comment.
-
-2014-05-07 Werner Koch <wk@gnupg.org>
-
-	Make -jN work again.
-	+ commit 57011da53e43f9c8a6c7e7314166c3e17ff8627a
-	* common/Makefile.am ($(PROGRAMS)): New rule
-	(t_http_LDADD): Use libcommontls.a without directory prefix.
-	* dirmngr/Makefile.am ($(PROGRAMS)): New rule.
-
-	gpg: Print the key algorithm/curve with signature info.
-	+ commit 359c643d747c890f73f68b42e0aeb896016f05fd
-	* g10/mainproc.c (check_sig_and_print): Print the name and curve.
-
-	gpg: Fix memleak in signature verification of bogus keys.
-	+ commit e73edfb1759d05121ea66f67c775e763bf47d737
-	* g10/mainproc.c (check_sig_and_print): Factor common code out to ...
-	(print_good_bad_signature): here.
-
-	gpg: Mark experimental algorithms in the key listing.
-	+ commit 09055aa0f7993aaf4dcffdd80d8192945ae6080a
-	* g10/keylist.c (list_keyblock_print): Remove duplicate curve name.
-	Print a note for experimental algorithms.
-	* g10/misc.c (print_pubkey_algo_note): Fix warning message.
-
-	gpg: Finish experimental support for Ed25519.
-	+ commit 8fee6c1ce6d116fe7909dbe1184d95bc91305484
-	* agent/cvt-openpgp.c (try_do_unprotect_arg_s): Add field "curve".
-	(get_keygrip): Add and use arg CURVE.
-	(convert_secret_key): Ditto.
-	(convert_transfer_key): Ditto.
-	(get_npkey_nskey): New.
-	(prepare_unprotect): Replace gcrypt functions by
-	get_npkey_nskey. Allow opaque MPIs.
-	(do_unprotect): Use CURVE instead of parameters.
-	(convert_from_openpgp_main): Ditto.
-	(convert_to_openpgp): Simplify.
-	* g10/import.c (one_mpi_from_pkey): Remove.
-	(transfer_secret_keys): Rewrite to use the curve instead of the
-	parameters.
-	* g10/parse-packet.c (parse_key): Mark protected MPIs with USER1 flag.
-
-	* common/openpgp-oid.c (openpgp_curve_to_oid): Allow the use of
-	 "NIST P-256" et al.
-	* g10/keygen.c (ask_curve): Add arg ALGO.
-	(generate_keypair): Rewrite the ECC key logic.
-
-	* tests/openpgp/ecc.test: Provide the "ecc" passphrase.
-
-	kbx: Add experimental support for EDDSA.
-	+ commit bdb9c2b314400da9155b8a924e22e486793dda89
-	* kbx/keybox-openpgp.c (parse_key): Use algo constants and add
-	experimental support for EdDSA.
-
-	agent: Remove greeting message.
-	+ commit a63ed9875830e5b3b4d48b7d97d24c18de36b326
-	* agent/gpg-agent.c (main): Remove greeting. Make --no-greeting a
-	dummy.
-
-2014-05-06 Werner Koch <wk@gnupg.org>
-
-	Use "samethread" mode keyword for some es_fopenmem.
-	+ commit 6477e51919ef97f0f9cc05d10cdc7aa2b89faafe
-	* dirmngr/ks-engine-hkp.c (armor_data): Add mode keyword.
-	* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
-	* scd/atr.c (atr_dump): Ditto.
-
-2014-05-05 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Add support for hkps keyservers.
-	+ commit 60e2fc7d38d8b37d1de944cf230e410c2ce37d5e
-	* dirmngr/dirmngr.c: Include gnutls.h.
-	(opts): Add --gnutls-debug and --hkp-cacert.
-	(opt_gnutls_debug, my_gnutls_log): New.
-	(set_debug): Set gnutls log level.
-	(parse_rereadable_options): Register a CA file.
-	(main): Init GNUTLS.
-	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Support hkps.
-	(send_request): Ditto.
-
-	http: Add reference counting to the session object.
-	+ commit ea0f5481f01eacedff264bf08144164aa989ec4d
-	* common/http.c (http_session_t): Add field "refcount".
-	(_my_socket_new, _my_socket_ref, _my_socket_unref): Add debug code.
-	(send_request, my_npth_read, my_npth_write): Use SOCK object for the
-	transport ptr.
-	(http_session_release): Factor all code out to ...
-	(session_unref): here. Deref SOCK.
-	(http_session_new): Init refcount and transport ptr.
-	(http_session_ref): New. Ref and unref all assignments.
-
-2014-05-02 Werner Koch <wk@gnupg.org>
-
-	http: Add HTTP_FLAG_FORCE_TLS and http_get_tls_info.
-	+ commit 0e59195642eb26263b8e0b9200290538631d35cd
-	* common/http.c (http_parse_uri): Factor code out to ...
-	(parse_uri): here. Add arg FORCE_TLS.
-	(do_parse_uri): Ditto. Implement flag.
-	(http_get_tls_info): New.
-	(http_register_tls_ca): Allow clearing of the list.
-	(send_request): Use a default verification function.
-	* common/http.h (HTTP_FLAG_FORCE_TLS): New.
-	* common/t-http.c (main): Add several command line options.
-
-	common: Fix test for openpgp_oid_is_ed25519.
-	+ commit 2def230231abd34f6012df284ab468321ffedc10
-	* common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): Add correct
-	value.
-
-	http: Revamp TLS API.
-	+ commit 8412a5825c225c8ff14de3ffaad2e55e040b2eca
-	* configure.ac (NEED_GNUTLS_VERSION): New.
-	(HTTP_USE_GNUTLS, LIBGNUTLS_CFLAGS, LIBGNUTLS_LIBS): New ac_subst.
-
-	* common/http.h (http_session_t): New.
-	* common/http.c: Remove compatibility for gnutls < 3.0.
-	(http_session_s): New.
-	(cookie_s): Replace gnutls_session_t by http_session_t.
-	(tls_callback, tls_ca_certlist): New variables.
-	(my_socket_unref): Add preclose args.
-	(my_npth_read, my_npth_write): New.
-	(make_header_line): Fix bug using int* instead of char*.
-	(http_register_tls_callback): New.
-	(http_register_tls_ca): New.
-	(http_session_new): New.
-	(http_session_release): New.
-	(http_get_header_names): New.
-	(escape_data): Add hack to escape in forms mode.
-	(send_request) HTTP_USE_GNUTLS: Support SNI.
-	(send_request) HTTP_USE_GNUTLS: Fix use of make_header_line.
-	(send_gnutls_bye): New.
-	(cookie_close): Make use of preclose feature.
-	(http_verify_server_credentials): New.
-	(main) TEST: Remove test code.
-	* common/t-http.c: New.
-	* common/tls-ca.pem: New.
-	* common/Makefile.am (tls_sources): New. Move http code to here.
-	(libcommontls_a_SOURCES): New.
-	(libcommontlsnpth_a_SOURCES): New.
-	(EXTRA_DIST): Add tls-ca.pem
-	(module_maint_tests): Add t-http.
-	(t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
-
-	* dirmngr/Makefile.am (dirmngr_LDADD): Add libcommontlsnpth.
-
-	common: Cleanup the use of USE_NPTH and HAVE_NPTH macros.
-	+ commit 84289e85c72ae58c321dfdb96816700a6b7f7122
-	* configure.ac (HAVE_NPTH): New ac_define.
-	* common/estream.c: Use USE_NPTH instead of HAVE_NPTH.
-	* common/http.c: Ditto. Replace remaining calls to pth by npth calls.
-	(connect_server): Remove useless _().
-	* common/exechelp-posix.c, common/exechelp-w32.c
-	* common/exechelp-w32ce.c: Use HAVE_PTH to include npth.h.
-	* common/init.c (_init_common_subsystems): Remove call to pth_init.
-	* common/sysutils.c (gnupg_sleep): Use npth_sleep.
-	* scd/ccid-driver.c (my_sleep): Ditto.
-
-2014-04-30 Werner Koch <wk@gnupg.org>
-
-	estream: Implement "samethread" mode keyword.
-	+ commit 8416c875a729426eae05ed1ca9f1ebcb933c246a
-	* src/estream.c (estream_internal): Add field SAMETHREAD.
-	(init_stream_lock, lock_stream, trylock_stream, unlock_stream): Use it.
-	(parse_mode): Add arg SAMETHREAD and parse that keyword.
-	(es_initialize): Rename to ...
-	(init_stream_obj): this. Add arg SAMETHREAD.
-	(es_create): Add arg SAMETHREAD. Call init_stream_lock after
-	init_stream_obj.
-	(doreadline): Call es_create with samethread flag.
-	(es_fopen, es_mopen, es_fopenmem, es_fopencookie, do_fdopen)
-	(do_fpopen, do_w32open): Implement "samethread" keyword.
-	(es_freopen): Take samthread flag from old stream.
-	(es_tmpfile): Call es)_create w/o samethread.
-
-	estream: Fix deadlock in es_fileno.
-	+ commit ecea94461ed40f3f6ef662c2501e1d56ec284022
-	* src/estream.c (es_fileno_unlocked): Call the unlocked functions.
-
-	estream: Add debug code to the lock functions.
-	+ commit aeb81727c77dfea3bf5d2d689ffbdc897f2938a7
-	* common/estream.c (dbg_lock_0, dbg_lock_1, dbg_lock_1): New.
-
-	estream: Replace locking macros by functions.
-	+ commit 39e91a5f0a666aad2fef7a840b2cd03949bb1be4
-	* common/estream.c: Replace most macros.
-
-2014-04-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	ECC Fixes.
-	+ commit 21dab64030c95a909767bf6d8f99e8476f9df8a2
-	* agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
-	(convert_transfer_key): Follow newer (>= 1.6) libgcrypt API, which
-	does not distinguish the detail.
-	(do_unprotect, convert_from_openpgp_main): Don't call
-	map_pk_openpgp_to_gcry, as it's the value of libgcrypt API already and
-	not the value defined by OpenPGP.
-	(convert_to_openpgp): It's "ecc".
-	* agent/gpg-agent.c (map_pk_openpgp_to_gcry): Remove.
-	* g10/call-agent.c (agent_pkdecrypt): Fix off-by-one error.
-	* g10/pubkey-enc.c (get_it): Fix swapping the fields error.
-
-2014-04-22 Werner Koch <wk@gnupg.org>
-
-	gpg: Pass --homedir to gpg-agent.
-	+ commit fdd938a5bbecb5b70f564ae3afb4e17905404bb2
-	* agent/gpg-agent.c (main): Make sure homedir is absolute.
-	* common/asshelp.c (lock_spawning): Create lock file with an absolute
-	name.
-	(start_new_gpg_agent): Use an absolute name for the socket and pass
-	option --homedir to the agent.
-	(start_new_dirmngr): Use an absolute name for the --homedir.
-
-	common: Add functions make_absfilename and make_absfilename_try.
-	+ commit 71a54313adf7b57b7b27bb9ad07b142a34306260
-	* common/stringhelp.c (do_make_filename): Add modes 2 and 3.
-	(make_absfilename): New.
-	(make_absfilename_try): New.
-
-	common: Add function gnupg_getcwd.
-	+ commit 1a87edab6657a257876ab2f8790f2937feba7066
-	* tools/gpg-connect-agent.c (gnu_getcwd): Move to ...
-	* common/sysutils.c (gnupg_getcwd): .. here.
-	* tools/gpg-connect-agent.c (get_var_ext): Use gnupg_getcwd.
-
-	gpg: Print a warning if GKR has hijacked gpg-agent.
-	+ commit ffa39be5ebfc1059a737905ee317c9b6f3d2a77e
-	* g10/call-agent.c (check_hijacking): New.
-	(start_agent): Call it.
-	(membuf_data_cb, default_inq_cb): Move more to the top.
-
-2014-04-17 Werner Koch <wk@gnupg.org>
-
-	gpg: New %U expando for the photo viewer.
-	+ commit e184a11f94e2d41cd9266484542631bec23628b5
-	* g10/photoid.c (show_photos): Set namehash.
-	* g10/misc.c (pct_expando): Add "%U" expando.
-
-	common: Add z-base-32 encoder.
-	+ commit b8a91ebf46a927801866e99bb5a66ab00651424e
-	* common/zb32.c: New.
-	* common/t-zb32.c: New.
-	* common/Makefile.am (common_sources): Add zb82.c
-	(module_tests): Add t-zb32.
-
-2014-04-16 Werner Koch <wk@gnupg.org>
-
-	Two minor code cleanups and one NULL deref on error fix.
-	+ commit a34afa8f2053d75f276d6d28dbf1a43db0fd9768
-	* common/estream.c (es_freopen): Remove useless check for STREAM.
-	* kbx/keybox-blob.c (_keybox_create_x509_blob): Remove useless check
-	for BLOB.
-	* tools/sockprox.c (run_proxy): Do not fclose(NULL).
-
-2014-04-15 Werner Koch <wk@gnupg.org>
-
-	gpg: Re-enable secret key deletion.
-	+ commit db3b528239c9d56bc71fd2283e07a3f1d91e4fd0
-	* g10/call-agent.c (agent_delete_key): New.
-	* g10/keydb.h (FORMAT_KEYDESC_DELKEY): New.
-	* g10/passphrase.c (gpg_format_keydesc): Support new format.
-	* g10/delkey.c (do_delete_key): Add secret key deletion.
-
-	gpg: Re-indent a file.
-	+ commit d25d00b89efed461d344028d0e2e2be38cc77628
-	* g10/delkey.c: Re-indent.
-	(do_delete_key, delete_keys): Change return type top gpg_error_t.
-
-	gpg: Fix regression in secret key export.
-	+ commit c4d983239a3f0a18c77f0a5aeba520a81a1b86e8
-	* agent/cvt-openpgp.c (convert_to_openpgp): Fix use
-	gcry_sexp_extract_param.
-	* g10/export.c (do_export_stream): Provide a proper prompt to the
-	agent.
-
-	gpg: Change pinentry prompt to talk about "secret key".
-	+ commit e549799db66be30cdd68a3e6cdca9c6a050466d1
-	* g10/passphrase.c (gpg_format_keydesc): Add mode 2. Change strings.
-	* g10/keydb.h (FORMAT_KEYDESC_NORMAL, FORMAT_KEYDESC_IMPORT)
-	(FORMAT_KEYDESC_EXPORT): New. Use them for clarity.
-
-	agent: Add command DELETE_KEY.
-	+ commit e3a4ff89a0b106e678bf9d0a4d47917123071140
-	* agent/command.c (cmd_delete_key): New.
-	* agent/findkey.c (modify_description): Add '%C' feature.
-	(remove_key_file): New.
-	(agent_delete_key): New.
-	* agent/command-ssh.c (search_control_file): Make arg R_DISABLE
-	optional.
-
-	* configure.ac: Require libgpg-error 1.13.
-
-2014-04-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: EdDSA support.
-	+ commit 3132bd90dc8db9c7fd19ba201918e95891306dc5
-	* scd/app-openpgp.c (KEY_TYPE_EDDSA, CURVE_ED25519): New.
-	(struct app_local_s): Add eddsa.
-	(get_algo_byte, store_fpr): Support KEY_TYPE_EDDSA.
-	(get_ecc_key_parameters, get_curve_name): Support CURVE_ED25519.
-	(send_key_attr, get_public_key): Support KEY_TYPE_EDDSA.
-	(build_ecc_privkey_template): Rename as it supports both of
-	ECDSA and EdDSA.
-	(ecc_writekey): Rename. Support CURVE_ED25519, too.
-	(do_writekey): Follow the change of ecc_writekey.
-	(do_auth): Support KEY_TYPE_EDDSA.
-	(parse_ecc_curve): Support CURVE_ED25519. Bug fix for other curves.
-	(parse_algorithm_attribute): Bug fix for ECDH. Support EdDSA.
-
-2014-04-08 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Fix compiler warning.
-	+ commit db85feceaf43ebd6d44421bb14fcb60495804ae0
-	* common/mischelp.h (JNLIB_GCC_HAVE_PUSH_PRAGMA): New.
-	* dirmngr/dirmngr.c (handle_tick): Factor time check out to ...
-	(time_for_housekeeping_p): new.
-
-	gpgconf: Add command --launch.
-	+ commit b4cf4686f7349be9558217f20e51157398cd88a0
-	* tools/gpgconf.c: Add command --launch.
-	* tools/gpgconf-comp.c (gc_component_launch): New.
-
-	scd: Silent compiler warnings about unused variables.
-	+ commit 36dfc37e438660632d3a2bf5d5526be9005fa8c5
-	* scd/app-openpgp.c (build_ecdsa_privkey_template): Mark unused arg.
-	(ecdh_writekey): Mark unused args.
-
-2014-04-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Support EdDSA.
-	+ commit 5ff6d0c25e6d0f422b17809b954e9e87cb137347
-	* agent/pksign.c (agent_pksign_do): Handle EdDSA signature.
-
-	g10: EdDSA support.
-	+ commit 40c3b0741e593d0658dda0c707c4f32e80648dd1
-	* g10/keyid.c (keygrip_from_pk): Compute keygrip of EdDSA key.
-	* g10/keygen.c (generate_subkeypair): Ed25519 is for EdDSA.
-	* common/openpgp-oid.c (oid_ed25519): Update.
-
-2014-04-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: EdDSA support for SSH.
-	+ commit 513c67b7461a2451247ef2b2fc64e0470a16edf1
-	* agent/command-ssh.c (ssh_signature_encoder_eddsa): Signature is
-	two 32-byte opaque data which should not be interpreted as number.
-
-2014-03-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Add commands --quick-sign-key and --quick-lsign-key.
-	+ commit b6786cc3ec0bb582323adf94c2ee624bcfbeb466
-	* g10/gpg.c (main): Add commands --quick-sign-key and
-	--quick-lsign-key.
-	* g10/keyedit.c (sign_uids): Add args FP and QUICK.
-	(keyedit_quick_sign): New.
-	(show_key_with_all_names): Add arg NOWARN.
-
-	Change some keyedit functions to allow printing to arbitrary streams.
-	+ commit 4f50ec98ddd57253cae66e2321f0cc98ee189a09
-	* common/ttyio.c (tty_print_string): Add optional arg FP. Change all
-	callers.
-	(tty_print_utf8_string2): Ditto.
-	* g10/keyedit.c (show_prefs): Ditto.
-	(show_key_with_all_names_colon): Ditto.
-	(show_names): Ditto.
-	* g10/keylist.c (print_revokers): Ditto.
-	(print_fingerprint): Ditto.
-
-2014-03-23 Werner Koch <wk@gnupg.org>
-
-	agent: Replace es_mopen by es_fopenmem for ssh.
-	+ commit 5c2a50cdc90e85b1fc380851ccfbe9186969b658
-	* agent/command-ssh.c (ssh_read_key_public_from_blob): Use
-	es_fopenmem.
-	(ssh_handler_request_identities): Ditto.
-	(ssh_request_process): Ditto.
-
-2014-03-22 Werner Koch <wk@gnupg.org>
-
-	agent: Put ssh key type as comment into sshcontrol.
-	+ commit fc3e70c11342267c1062e4244955d19ecd72e0f6
-	* agent/command-ssh.c (ssh_key_type_spec): Add field name.
-	(ssh_key_types): Add human readable names.
-	(add_control_entry): Add arg SPEC and print key type as comment.
-	(ssh_identity_register): Add arg SPEC.
-	(ssh_handler_add_identity): Add var SPEC and pass ssh_receive_key.
-
-	agent: Support the Ed25519 signature algorithm for ssh.
-	+ commit 072432883ededa15bf35f80102e0572746ba4af1
-	* agent/command-ssh.c (SPEC_FLAG_IS_EdDSA): New.
-	(ssh_key_types): Add entry for ssh-ed25519.
-	(ssh_identifier_from_curve_name): Move to the top.
-	(stream_read_skip): New.
-	(stream_read_blob): New.
-	(ssh_signature_encoder_rsa): Replace MPIS array by an s-exp and move
-	the s-exp parsing to here.
-	(ssh_signature_encoder_dsa): Ditto.
-	(ssh_signature_encoder_ecdsa): Ditto.
-	(ssh_signature_encoder_eddsa): New.
-	(sexp_key_construct): Rewrite.
-	(ssh_key_extract): Rename to ...
-	(ssh_key_to_blob): .. this and rewrite most of it.
-	(ssh_receive_key): Add case for EdDSA.
-	(ssh_convert_key_to_blob, key_secret_to_public): Remove.
-	(ssh_send_key_public): Rewrite.
-	(ssh_handler_request_identities): Simplify.
-	(data_sign): Add rename args. Add new args HASH and HASHLEN. Make
-	use of es_fopenmen and es_fclose_snatch. Remove parsing into MPIs
-	which is now doe in the sgnature encoder functions.
-	(ssh_handler_sign_request): Take care of Ed25519.
-	(ssh_key_extract_comment): Rewrite using gcry_sexp_nth_string.
-
-	agent: Cleanups to prepare implementation of Ed25519.
-	+ commit a77ed0f266d03e234027dda4de5a7f3dd6787b1e
-	* agent/cvt-openpgp.c: Remove.
-	(convert_to_openpgp): Use gcry_sexp_extract_param.
-	* agent/findkey.c (is_eddsa): New.
-	(agent_is_dsa_key, agent_is_eddsa_key): Check whether ecc means EdDSA.
-	* agent/pksign.c (agent_pksign_do): Add args OVERRIDEDATA and
-	OVERRIDEDATALEN.
-
-	* common/ssh-utils.c (is_eddsa): New.
-	(get_fingerprint): Take care or EdDSA.
-
-2014-03-18 Werner Koch <wk@gnupg.org>
-
-	tools: Fix NULL deref in gpg-connect-agent.
-	+ commit 6376227a31b3076321ce16ad626b333057bda53d
-	* tools/gpg-connect-agent.c (handle_inquire): Do not pass NULL to
-	strlen.
-
-	dirmngr: Resurrect hosts in the HKP hosttable.
-	+ commit 6c058fac65c7e9d1ffb72686f0f02644f172da22
-	* dirmngr/dirmngr.c (HOUSEKEEPING_INTERVAL): New.
-	(housekeeping_thread): New.
-	(handle_tick): Call new function.
-	* dirmngr/ks-engine-hkp.c (RESURRECT_INTERVAL): New.
-	(struct hostinfo_s): Add field died_at and set it along with the dead
-	flag.
-	(ks_hkp_print_hosttable): Print that info.
-	(ks_hkp_housekeeping): New.
-
-	common: New function elapsed_time_string.
-	+ commit 04e304278c9302831bc81e7fe9049c588ead029a
-	* common/gettime.c (elapsed_time_string): New.
-
-2014-03-17 Werner Koch <wk@gnupg.org>
-
-	gpg: Reject signatures made with MD5.
-	+ commit f90cfe6b66269de0154d810c5cee1fe9a5af475c
-	* g10/gpg.c: Add option --allow-weak-digest-algos.
-	(main): Set option also in PGP2 mode.
-	* g10/options.h (struct opt): Add flags.allow_weak_digest_algos.
-	* g10/sig-check.c (do_check): Reject MD5 signatures.
-	* tests/openpgp/defs.inc: Add allow_weak_digest_algos to gpg.conf.
-
-	gpg: Make --auto-key-locate work again with keyservers.
-	+ commit 1e2e39c5758ffaf62f8bb85b4a86dc49c41f3a68
-	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Allow exact search mode.
-	* g10/keyserver.c (keyserver_import_name): Implement.
-	(keyserver_get): Use exact mode for name based import.
-	(keyserver_get): Add args R_FPR and R_FPRLEN. Change all callers.
-
-	gpg: New mechanism "clear" for --auto-key-locate.
-	+ commit 1d642d3ca890daa65ee5dd949a00747da6b49015
-	* g10/getkey.c (parse_auto_key_locate): Implement "clear".
-
-2014-03-14 Werner Koch <wk@gnupg.org>
-
-	gpg-connect-agent: Make it easier to connect to the dirmngr.
-	+ commit 2223eaefaf53aa7217ac593b83e4294148a4db5d
-	* tools/gpg-connect-agent.c: Add options --dirmngr and
-	--dirmngr-program.
-
-	dirmngr: Make use of IPv4 and IPV6 more explicit.
-	+ commit 59b4fb5f4927908af06bb80ecd86adbf6e54ba14
-	* common/http.c (connect_server): Handle the new flags.
-	* common/http.h (HTTP_FLAG_IGNORE_IPv4, HTTP_FLAG_IGNORE_IPv4): New.
-	* dirmngr/ks-engine-hkp.c (map_host): Add arg r_httpflags.
-	(make_host_part): Ditto.
-	(send_request): Add arg httpflags.
-	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Handle httpflags.
-
-	dirmngr: Do not use brackets around legacy IP addresses.
-	+ commit d7fbefeb82833db9eea8b15dc7889ecf0b7ffab4
-	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Change args to take a
-	complete addrinfo. Bracket only v6 addresses. Change caller.
-
-	gpg: Print the actual used keyserver address.
-	+ commit a401f768ca8e218eef7a5c87a8f99cb1d6b4aaeb
-	* dirmngr/ks-engine-hkp.c (ks_hkp_search, ks_hkp_get): Print SOURCE
-	status lines.
-	* g10/call-dirmngr.c (ks_status_parm_s): New.
-	(ks_search_parm_s): Add field stparm.
-	(ks_status_cb): New.
-	(ks_search_data_cb): Send source to the data callback.
-	(gpg_dirmngr_ks_search): Change callback prototope to include the
-	SPECIAL arg. Adjust all users. Use ks_status_cb.
-	(gpg_dirmngr_ks_get): Add arg r_source and use ks_status_cb.
-	* g10/keyserver.c (search_line_handler): Adjust callback and print
-	"data source" disgnostic.
-	(keyserver_get): Print data source diagnostic.
-
-	dirmngr: Default to a user socket name and enable autostart.
-	+ commit 5d321eb00be0774418de1a05678ac0ec44d7193b
-	* common/homedir.c (dirmngr_socket_name): Rename to
-	dirmngr_sys_socket_name.
-	(dirmngr_user_socket_name): New.
-	* common/asshelp.c (start_new_dirmngr): Handle sys and user dirmngr
-	socket.
-	* dirmngr/dirmngr.c (main): Ditto.
-	* dirmngr/server.c (cmd_getinfo): Ditto.
-	* sm/server.c (gpgsm_server): Ditto.
-	* dirmngr/dirmngr-client.c (start_dirmngr): Likewise.
-	* tools/gpgconf.c (main): Print "dirmngr-sys-socket" with --list-dirs.
-
-	* configure.ac (USE_DIRMNGR_AUTO_START): Set by default.
-
-2014-03-12 Werner Koch <wk@gnupg.org>
-
-	gpg: Add option --dirmngr-program.
-	+ commit 6dd5d99a61f24aff862ccba9f7410d7f1af87c05
-	* g10/gpg.c: Add option --dirmngr-program.
-	* g10/options.h (struct opt): Add field dirmngr_program.
-	* g10/call-dirmngr.c (create_context): Use new var.
-
-	* dirmngr/dirmngr.c: Include gc-opt-flags.h.
-	(main): Remove GC_OPT_FLAG_*.
-	* tools/gpgconf-comp.c (GC_OPT_FLAG_NO_CHANGE): Move macro to ...
-	* common/gc-opt-flags.h: here.
-
-	dirmngr: Detect dead keyservers and try another one.
-	+ commit fb56a273b1f2b3a99dc1d1a0850378ab7625e6b9
-	* dirmngr/ks-action.c (ks_action_resolve): Rename var for clarity.
-	(ks_action_search, ks_action_put): Ditto.
-	(ks_action_get): Consult only the first server which retruned some
-	data.
-
-	* dirmngr/ks-engine-hkp.c (SEND_REQUEST_RETRIES): New.
-	(map_host): Add arg CTRL and call dirmngr_tick.
-	(make_host_part): Add arg CTRL.
-	(mark_host_dead): Allow the use of an URL.
-	(handle_send_request_error): New.
-	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Mark host dead and retry on
-	error.
-
-	http: Add a flag to the URL parser indicating a literal v6 address.
-	+ commit 3d9e0eb02ce2b2e153e25deb0fc4b27b45f5026a
-	* common/http.h (struct parsed_uri_t): Add field v6lit.
-	* common/http.c (do_parse_uri): Set v6lit.
-
-2014-03-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: writekey support of ECC.
-	+ commit 781b94174310dceffa075719420b74b29fe41764
-	* scd/app-openpgp.c (CURVE_SEC_P256K1, get_algo_byte): New.
-	(store_fpr): Support ECC keys with varargs.
-	(get_ecc_key_parameters, get_curve_name): Support secp256k1.
-	(parse_ecc_curve): Likewise.
-	(build_ecdsa_privkey_template, rsa_writekey, ecdsa_writekey): New.
-	(ecdh_writekey): New. Not implemented yet.
-	(do_writekey): Call rsa_writekey, ecdsa_writekey, or ecdh_writekey.
-	(do_genkey): Follow the change of store_fpr.
-
-2014-03-11 Werner Koch <wk@gnupg.org>
-
-	dirmngr: Put brackets around IP addresses in the hosttable.
-	+ commit 0b2cca807d5a4a3664145032271141da853e7bac
-	* dirmngr/ks-engine-hkp.c (EAI_OVERFLOW): Provide a substitute.
-	(my_getnameinfo): New.
-	(map_host): Use it.
-
-	dirmngr: Add command option to mark hosts as dead or alive.
-	+ commit a3dee2889106fcab112c1c96b32e04d8154875e7
-	* dirmngr/server.c (cmd_killdirmngr): Factor some code out to ...
-	(check_owner_permission): here.
-	(cmd_keyserver): Add options --dead and --alive.
-	* dirmngr/ks-engine-hkp.c (host_in_pool_p): New.
-	(ks_hkp_mark_host): New.
-
-	dirmngr: Make Assuan output of keyblocks easier readable.
-	+ commit 71b55c945542e695161ddbd783f87c5f534012a5
-	* dirmngr/server.c (data_line_cookie_write): Print shorter data lines
-	in verbose mode.
-
-	dirmngr: Fix HKP host selection code.
-	+ commit 3c35b46a32ac7584f3807b611cde78b199c527d6
-	* dirmngr/server.c (cmd_keyserver): Add option --resolve and change
-	--print-hosttable to --hosttable.
-	* dirmngr/ks-action.c (ks_printf_help): New.
-	(ks_action_resolve): New.
-	* dirmngr/ks-engine-hkp.c (select_random_host): Fix selection.
-	(ks_hkp_print_hosttable): Print to assuan stream.
-	(map_host): Remove debug code. Add arg FORCE_SELECT. Return numeric
-	IP addr if it can't be resolved.
-	(make_host_part): Add arg FORCE_SELECT; change callers to pass false.
-	(ks_hkp_resolve): New.
-
-	List readline support in configure summary.
-	+ commit f30d8b018871495327cbf711b73b04278a34f3e1
-	* m4/readline.m4: Set gnupg_cv_have_readline.
-	* configure.ac: Add readline support to summary output.
-
-2014-03-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: API change of agent_key_from_file.
-	+ commit ac5a1a3ccb7c3e6393bc83d73b545dec9b70e7d1
-	* agent/findkey.c (agent_key_from_file): Always return S-expression.
-	* agent/command.c (cmd_passwd): Distinguish by SHADOW_INFO.
-	(cmd_export_key): Likewise. Free SHADOW_INFO.
-	(cmd_keytocard): Likewise. Release S_SKEY.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Likewise.
-	* agent/pksign.c (agent_pksign_do): Likewise. Use the S-expression to
-	know the key type.
-
-2014-03-10 Werner Koch <wk@gnupg.org>
-
-	Backport useful code from fixes for bug 1447.
-	+ commit 57d26f39afb3c75e24a8d240d7af32b9d2b9775a
-	* configure.ac: Cehck for inet_ntop.
-	* m4/libcurl.m4: Provide a #define for the version of the curl
-	library.
-
-	scd: acquire lock in new_reader_slot.
-	+ commit 9ab9f414fb919f0bc87c301c3e36180715d0aa4e
-	* scd/apdu.c (new_reader_slot): Acquire lock.
-	(open_ct_reader, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
-	(open_ccid_reader, open_rapdu_reader): Release lock.
-	(lock_slot, trylock_slot, unlock_slot): Move more to the top.
-
-	Do not require libiconv for Android.
-	+ commit b278043a8f38e2706ccf617d2ac5661b33791d6b
-	* configure.ac (require_iconv): New. Set to false for android.
-	(AM_ICONV): Run only if required.
-
-2014-03-07 Werner Koch <wk@gnupg.org>
-
-	dirmmgr: Use a portability wrapper for struct timeval.
-	+ commit feda379595e06583bc5b3610dec74890de29cb8e
-	* dirmngr/dirmngr_ldap.c W32: Include winber.h.
-	(my_ldap_timeval_t): New.
-
-	Silence more warnings about unused vars and args.
-	+ commit 4387ecb11cdb2addf738eb922c1b9f14c6c76efc
-	* dirmngr/cdblib.c (cdb_init) W32: Remove unused var.
-	* dirmngr/dirmngr-client.c (start_dirmngr): s/int/assuan_fd_t/.
-	* dirmngr/dirmngr.c (w32_service_control): Mark unused args.
-	(call_real_main): New.
-	(main) W32: Use new function to match prototype.
-	(real_main) W32: Mark unused vars.
-	(handle_signal) W32: Do not build the function at all.
-	(handle_connections) W32: Do not define signo.
-	* dirmngr/ldap-wrapper-ce.c (outstream_reader_cb): Remove used vars.
-	* g10/tdbio.c (ftruncate) DOSISH: Define only if not yet defined.
-
-	dirmngr: Simplify strtok macro.
-	+ commit 35266076e3452590931e58f188815859dff6de3c
-	* dirmngr/ldap-url.c (ldap_utf8_strtok): Remove unused r3d arg.
-	(ldap_str2charray): Remove lasts.
-
-	Use attribute __gnu_printf__ also in estream header files.
-	+ commit 72133b54de89e593d8193b106e9369cf90d2e1c0
-	* common/estream-printf.h: Use attribute gnu_printf.
-	* common/estream.h: Ditto.
-
-	Use attribute __gnu_printf__ with our estream-printf functions.
-	+ commit 36372dcb2f75a659b7ace0e9c46f07bb431d009c
-	* common/mischelp.h (JNLIB_GCC_A_PRINTF): Use __gnu_printf__
-	(JNLIB_GCC_A_NR_PRINTF): Ditto.
-
-	w32: Silence warnings about unused vars.
-	+ commit 094aa2589e3920d400be93ae2823a6c4b23db623
-	* agent/gpg-agent.c (main) W32: Mark unused vars.
-	* sm/gpgsm.c (run_protect_tool) W32: Ditto.
-	* g10/trustdb.c (check_regexp) DISABLE_REGEX: Ditto.
-	* scd/scdaemon.c (main) W32: Ditto.
-	(handle_connections) W32: Ditto.
-	(handle_signal) W32: Do not build the function at all.
-	* scd/apdu.c (pcsc_send_apdu_direct): Ditto.
-	(connect_pcsc_card): s/long/pcsc_dword_t/.
-	(open_pcsc_reader_direct): Remove var listlen.
-
-	w32: Fix a potential problem in gpgconf's gettext.
-	+ commit a0fc42598f51ef4a958fc3c2fed7f4b8df2da3fd
-	* tools/gpgconf-comp.c (my_dgettext) USE_SIMPLE_GETTEXT: Make sure
-	to return something even DOMAIN is not given.
-
-	Silence several warnings when building under Windows.
-	+ commit 3032fc3ad78ac9ed857570844547afed520d635a
-	* agent/call-scd.c (start_scd): Replace int by assuan_fd_t.
-	(start_pinentry): Ditto.
-	* common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t.
-	* common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for
-	prototypes on Windows and some other platforms.
-	* common/logging.c (fun_writer): Declare addrbuf only if needed.
-	* g10/decrypt.c (decrypt_message_fd) W32: Return not_implemented.
-	* g10/encrypt.c (encrypt_crypt) W32: Return error if used in server
-	mode.
-	* g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD
-	by -1 as temporary hack for Windows.
-	* g10/export.c (do_export): Ditto.
-	* g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto.
-	* g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto.
-	* g10/server.c (cmd_verify, gpg_server) W32: Return an error.
-
-	w32: Include winsock2.h to silence warnings.
-	+ commit cb0dcc340836a64e2d33b27f1be7bc888c084f12
-
-
-	gl: Avoid warning about shadowing an arg.
-	+ commit 84fd36f8baa2b800ea47ff74935f5aaf0e55c299
-	* gl/setenv.c (KNOWN_VALUE): s/value/_v/.
-
-	common: Fix build problem with Sun Studio compiler.
-	+ commit 0fc71f7277c6f833f838bbd384f1a22d0c333e8e
-	* common/estream.c (ESTREAM_MUTEX_UNLOCK): Use int dummy dummy
-	functions.
-	(ESTREAM_MUTEX_INITIALIZE): Ditto.
-
-	gpg: Do not require a trustdb with --always-trust.
-	+ commit d8f0b83e4f04641e5e9adbdd8abada15380f981c
-	* g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
-	* g10/trustdb.c (trustdb_args): Add field no_trustdb.
-	(init_trustdb): Set that field.
-	(revalidation_mark): Take care of a nonexistent trustdb file.
-	(read_trust_options): Ditto.
-	(tdb_get_ownertrust): Ditto.
-	(tdb_get_min_ownertrust): Ditto.
-	(tdb_update_ownertrust): Ditto.
-	(update_min_ownertrust): Ditto.
-	(tdb_clear_ownertrusts): Ditto.
-	(tdb_cache_disabled_value): Ditto.
-	(tdb_check_trustdb_stale): Ditto.
-	(tdb_get_validity_core): Ditto.
-	* g10/gpg.c (main): Do not create a trustdb with most commands for
-	trust-model always.
-
-	gpg: Print a "not found" message for an unknown key in --key-edit.
-	+ commit dfb25d47a9fcfd7c7c084ea58744724cd5315086
-	* g10/keyedit.c (keyedit_menu): Print message.
-
-	gpg: Protect against rogue keyservers sending secret keys.
-	+ commit db1f74ba5338f624f146a3cb41a346e46b15c8f9
-	* g10/options.h (IMPORT_NO_SECKEY): New.
-	* g10/keyserver.c (keyserver_spawn, keyserver_import_cert): Set new
-	flag.
-	* g10/import.c (import_secret_one): Deny import if flag is set.
-
-	agent: Fix UPDATESTARTUPTTY for ssh.
-	+ commit 90688b29f3701f4d3e2a5a49c5544fe8d2a84b2d
-	* agent/command-ssh.c (setup_ssh_env): Fix env setting.
-
-	gpgv: Init Libgcrypt to avoid syslog warning.
-	+ commit 7c4bfa599fa69c3a942c8deea83737a4c5a0806e
-	* g10/gpgv.c (main): Check libgcrypt version and disable secure
-	memory.
-
-	Improve libcurl detection.
-	+ commit 5ca482d5f949444ffd453de158ee186ab07fc9b6
-	* m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
-	given. Suggested by John Marshall.
-
-	gpg: Remove legacy keyserver examples from the template conf file.
-	+ commit 0ab752cc2d46bbd0077bed889676169b7aeb1eb6
-	* g10/options.skel: Update.
-
-	(cherry picked from commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c)
-
-	w32: Define WINVER only if needed.
-	+ commit 76b1940ad6f5f058c4a6bec35902da9f6d4e27b0
-	* common/sysutils.c (WINVER): Define only if less that 5.0.
-
-	w32: Remove unused code.
-	+ commit 63b7658a29809249d7aeb0423bf8c5a693eee0c7
-	* jnlib/w32-reg.c (write_w32_registry_string): Remove.
-
-	agent: Make --allow-mark-trusted the default.
-	+ commit 9942a149ff2ab919c1b2916c7bc347e578a56b14
-	* agent/gpg-agent.c (opts, main): Add option --no-allow-mark-trusted.
-	Put this option into the gpgconf-list.
-	(main): Enable opt.allow_mark_trusted by default.
-	* tools/gpgconf-comp.c (gc_options_gpg_agent): Replace
-	allow-mark-trusted by no-allow-mark-trusted.
-
-	* agent/trustlist.c (agent_marktrusted): Always set the "relax" flag.
-
-	ssh: Add support for Putty.
-	+ commit 5105c8d2d344fd7301d456d8c13c7e90a54f7e98
-	* agent/gpg-agent.c W32: Include Several Windows header.
-	(opts): Change help text for enable-ssh-support.
-	(opts, main): Add option --enable-putty-support
-	(putty_support, PUTTY_IPC_MAGIC, PUTTY_IPC_MAXLEN): New for W32.
-	(agent_init_default_ctrl): Add and asssert call.
-	(putty_message_proc, putty_message_thread): New.
-	(handle_connections) W32: Start putty message thread.
-	* common/sysutils.c (w32_get_user_sid): New for W32 only
-	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add
-	--enable-ssh-support and --enable-putty-support. Make the
-	configuration group visible at basic level.
-	* agent/command-ssh.c (serve_mmapped_ssh_request): New for W32 only.
-
-	agent: Fix binary vs. text mode problem in ssh.
-	+ commit 179012ddd48e63ca83e8f5c24537a2db45c3e122
-	* agent/command-ssh.c (file_to_buffer)
-	(ssh_handler_request_identities): Open streams in binary mode.
-	(start_command_handler_ssh): Factor some code out to ..
-	(setup_ssh_env): new function.
-
-	Fix syntax error for building on APPLE.
-	+ commit 4ad123d6fe341da7768e43360375e17fa89e8e0d
-	* scd/pcsc-wrapper.c __APPLE__: Fix syntax error.
-
-	Ignore obsolete option --disable-keypad.
-	+ commit d2a6be24af0bf220bb448fdd50c0196faddee0f4
-	* scd/scdaemon.c (opts): Ignore --disable-keypad.
-
-	Allow marking options as ignored.
-	+ commit 8fc9de8d6bf663f7c8419b42dab01f590a694d59
-	* jnlib/argparse.h (ARGPARSE_OPT_IGNORE): New.
-	(ARGPARSE_TYPE_MASK): New, for internal use.
-	(ARGPARSE_ignore): New.
-	* jnlib/argparse.c (optfile_parse, arg_parse): Replace remaining
-	constants by macros.
-	(optfile_parse): Implement ARGPARSE_OPT_IGNORE.
-	(arg_parse): Exclide ignore options from --dump-options.
-
-2014-03-06 Werner Koch <wk@gnupg.org>
-
-	common: Fix recent commit 55656208.
-	+ commit 191e32026f02054b1edb4f02536875462fd0b6b3
-	* common/membuf.c (get_membuf_shrink): Fix use of LEN.
-
-2014-03-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	Fix g10/trust.c.
-	+ commit 5ed8e9335fb886d7ddc86728d8481e5e47485531
-	* g10/trust.c (register_trusted_keyid, register_trusted_key)
-	(update_ownertrust): Call functions with tdb_.
-
-2014-02-26 Werner Koch <wk@gnupg.org>
-
-	common: Replace all macros in strusage() returned strings.
-	+ commit 0f38c87f427a155ab5684e18e3b73956f81edfab
-	* common/argparse.c (writechar): Remove.
-	(writestrings): Simplify.
-	(strusage): Use map_static_macro_string.
-
-	common: New function map_static_macro_string.
-	+ commit c72762f9acf3eef5c466ba76e895d7654df12ff7
-	* common/mapstrings.c: New.
-	* common/t-mapstrings.c: New.
-	* common/t-support.h (DIM, DIMof): Define if not defined.
-	* common/Makefile.am: Add new files.
-
-	common: New function get_membuf_shrink.
-	+ commit 556562086acd2bc2f8e3aa3126ebf155715e042b
-	* common/membuf.c (get_membuf_shrink): New.
-
-	agent: Fixed unresolved symbol under Windows.
-	+ commit 55c3e5f448c26360eda31e05b1f62249119f73d9
-	* agent/gpg-agent.c (main): s/ttyname/gnupg_ttyname/.
-
-	common: Require an installed libiconv.
-	+ commit 380a2aa18e0c048cfefa1cb4102dfbf902a1962b
-	* common/utf8conv.c: Remove dynload.h.
-	(load_libiconv): Remove. Remove all calls to it.
-
-2014-02-10 Werner Koch <wk@gnupg.org>
-
-	gpg: Silent more compiler warnings due to some configure options.
-	+ commit 47e6b6bad1dff493f4102a5549a7bb54466684c2
-	* g10/keygen.c (generate_keypair, gen_card_key)
-	(gen_card_key_with_backup) !ENABLE_CARD_SUPPORT: Mark unused args.
-
-	tests: Avoid segv if dns cert lookup is not configured.
-	+ commit 672f4aeba8bf55839911e1fe805af6b2873853f7
-	* common/dns-cert.c (get_dns_cert) !USE_DNS_CERT: Reset return args.
-
-	gpg: Cleanup compiler warnings due to some configure options.
-	+ commit 7901c5c2a3b7b24e9a4eaab590b0a54e9695c3e4
-	* g10/photoid.c (show_photos) DISABLE_PHOTO_VIEWER: Mark args as
-	unused.
-	* tools/gpgconf-comp.c (my_dgettext): Mark DOMAIN as unused if NLS is
-	not configured.
-
-	gpg: Allow building without any trust model support.
-	+ commit 62fb86c6589f7f74dad4741db31b3aefa0848420
-	* configure.ac: Add option --disable-trust-models
-	(NO_TRUST_MODELS): New ac_define and am_conditional.
-	* g10/Makefile.am (trust_source): New.
-	(gpg2_SOURCES): Factor some files out to above. Add trust.c.
-	* g10/gpg.c NO_TRUST_MODELS: Disable options --export-ownertrust,
-	--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
-	--list-trustdb, --trustdb-name, --auto-check-trustdb,
-	--no-auto-check-trustdb, and --force-ownertrust.
-	(parse_trust_model) NO_TRUST_MODELS: Do not build.
-	(main) NO_TRUST_MODELS: Set trust_model to always and exclude all
-	trustdb related option code.
-	* g10/keyedit.c (cmds) NO_TRUST_MODELS: Remove menu items "trust",
-	"enable", and "disable".
-	* g10/keylist.c (public_key_list) NO_TRUST_MODELS: Do not print
-	"tru" record.
-
-	* g10/trust.c: New.
-	* g10/trustdb.c (struct key_item): Move to trustdb.h.
-	(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
-	(register_trusted_key): Rename to tdb_register_trusted_key.
-	(trust_letter, uid_trust_string_fixed, trust_value_to_string)
-	(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
-	(get_ownertrust_string, get_validity_info, get_validity_string)
-	(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
-	(mark_usable_uid_certs): Move to trust.c and make global.
-	(is_in_klist): Move as inline to trustdb.h.
-	(trustdb_check_or_update): Rename to tdb_check_or_update
-	(revalidation_mark): Rename to tdb_revalidation_mark.
-	(get_ownertrust): Rename to tdb_get_ownertrust.
-	(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
-	(update_ownertrust): Rename to tdb_update_ownertrust.
-	(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
-	(cache_disabled_value): Rename to tdb_cache_disabled_value.
-	(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
-	(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
-	factor some code out to ...
-	* trust.c (get_validity): ...new.
-	(check_or_update_trustdb): New wrapper.
-	(revalidation_mark): New wrapper.
-	(get_ownertrust): New wrapper.
-	(get_ownertrust_with_min): New wrapper.
-	(update_ownertrust): New wrapper.
-	(clear_ownertrusts): New wrapper.
-	(cache_disabled_value): New wrapper.
-	(check_trustdb_stale): New wrapper.
-
-	* tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
-	of --always-trust.
-
-	tests: Handle disabled algorithms.
-	+ commit ea7f895319e89150e5613b6d20f21410f99d6f22
-	* tests/openpgp/mds.test: Skip disabled algorithms.
-	* tests/openpgp/signencrypt-dsa.test: Ditto.
-	* tests/openpgp/sigs-dsa.test: Ditto.
-
-2014-02-07 Werner Koch <wk@gnupg.org>
-
-	Silence annoying ABI change warning.
-	+ commit 111f082487dc7a2a50375e24203de31b000e0dea
-	* configure.ac GCC: Pass -Wno-psabi for gcc >= 4.6. Avoid some gcc
-	option tests for gcc >= 4.6
-
-	Allow disabling of card support.
-	+ commit 8e0ba4ecd3897c748ac2f06028406604ae7baced
-	* configure.ac: Add option --disable-card-support. Also add
-	am_conditional and do not build scd if card support is enabled.
-
-	gpg: List only available algos in --gen-key.
-	+ commit 357b142e7225e5c7f1e0f9768f48e833d5804b6a
-	* g10/keygen.c (ask_algo, ask_curve): Take care of GPG_USE_<algo>.
-
-	gpg: Change --print-mds to output enabled OpenPGP algos.
-	+ commit 54a11729fb71ba06e318fe229d0a230686ed4dc8
-	* g10/gpg.c (print_mds): Use opengpg_md_test_algo. Test also for MD5
-	availibility.
-
-	gpg: Avoid compiler warnings for disabled algos.
-	+ commit aa76a1660613ece3fc0d774856abcbe0bb158300
-	* g10/misc.c (map_cipher_openpgp_to_gcry): Add case for disabled algo.
-	(openpgp_pk_test_algo2): Ditto.
-	(map_md_openpgp_to_gcry): Ditto.
-
-2014-02-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Change format for the key size in --list-key and --edit-key.
-	+ commit 2c814806d759e5cf611200e8210137cf8502a672
-	* g10/gpg.c (oLegacyListMode, opts, main): Add --legacy-list-mode.
-	* g10/options.h (struct opt): Add field legacy_list_mode.
-	* g10/keydb.h (PUBKEY_STRING_SIZE): New.
-	* g10/keyid.c (pubkey_string): New.
-	* g10/import.c (import_one, import_secret_one): Use pubkey_string.
-	* g10/keylist.c (print_seckey_info): Ditto.
-	(print_pubkey_info, print_card_key_info): Ditto.
-	(list_keyblock_print): Ditto.
-	* g10/mainproc.c (list_node): Ditto.
-	* g10/pkclist.c (do_edit_ownertrust, build_pk_list): Ditto.
-	* g10/keyedit.c (show_key_with_all_names): Ditto. Also change the
-	format.
-	(show_basic_key_info): Ditto.
-	* common/openpgp-oid.c (openpgp_curve_to_oid): Also allow "ed25519".
-	(openpgp_oid_to_curve): Downcase "ed25519"
-
-2014-01-31 Werner Koch <wk@gnupg.org>
-
-	gpg: Add configure options to disable algorithms.
-	+ commit 2ba818de1aa311ba8eb27012d69e93dd16e7d4ed
-	* acinclude.m4 (GNUPG_GPG_DISABLE_ALGO): New.
-	* configure.ac: Add --enable-gpg-* options to disable non MUS
-	algorithms.
-	* g10/misc.c (map_cipher_openpgp_to_gcry): Implement these options.
-	(openpgp_pk_test_algo2): Ditto.
-	(map_md_openpgp_to_gcry): Ditto.
-	(openpgp_cipher_test_algo, openpgp_md_test_algo): Simplify.
-
-	gpg: Improve --version algo info output.
-	+ commit 71540d40414dc8b304b45dc476e5e5650a2db20a
-	* g10/misc.c (openpgp_pk_algo_name): Return a different string for
-	each ECC algorithm.
-	* g10/gpg.c (build_list_pk_test_algo): New wrapper to cope with the
-	different algo type enums.
-	(build_list_pk_algo_name): Ditto.
-	(build_list_cipher_test_algo): Ditto.
-	(build_list_cipher_algo_name): Ditto.
-	(build_list_md_test_algo): Ditto.
-	(build_list_md_algo_name): Ditto.
-	(my_strusage): Use them.
-	(list_config): Ditto. Add "pubkeyname".
-	(build_list): Add letter==1 hack.
-
-	gpg: Start using OpenPGP digest algo ids.
-	+ commit bf50604a0d50b974c1d4b8ccf5d774489f996cae
-	* g10/misc.c (print_pubkey_algo_note): Use enum typedef for the arg.
-	(print_cipher_algo_note): Ditto.
-	(print_digest_algo_note): Ditto.
-	(map_md_openpgp_to_gcry): New.
-	(openpgp_md_test_algo): Rewrite.
-	(openpgp_md_algo_name): Rewrite to do without Libgcrypt.
-	* g10/cpr.c (write_status_begin_signing): Remove hardwired list of
-	algo ranges.
-
-	gpg: Use only OpenPGP cipher algo ids.
-	+ commit 16a6311adefff0139056714521214f845315b7f8
-	* g10/misc.c (map_cipher_openpgp_to_gcry): Use explicit mapping and
-	use enums for the arg and return value.
-	(map_cipher_gcry_to_openpgp): Ditto.
-	(openpgp_cipher_blocklen): Use constant macros.
-	(openpgp_cipher_test_algo): Use mapping function and prepare to
-	disable algorithms.
-	(openpgp_cipher_algo_name): Do not use Libgcrypt.
-
-	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Replace
-	CGRY_CIPHER_* by CIPHER_ALGO_*.
-
-	* common/openpgpdefs.h (cipher_algo_t): Remove unused
-	CIPHER_ALGO_DUMMY.
-
-2014-01-30 Werner Koch <wk@gnupg.org>
-
-	gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.
-	+ commit b7f8dec6325f1c80640f878ed3080bbc194fbc78
-	* common/sexputil.c (get_pk_algo_from_canon_sexp): Change to return a
-	string.
-	* g10/keygen.c (check_keygrip): Adjust for change.
-	* sm/certreqgen-ui.c (check_keygrip): Likewise.
-
-	* agent/pksign.c (do_encode_dsa): Remove bogus map_pk_openpgp_to_gcry.
-
-	* g10/misc.c (map_pk_openpgp_to_gcry): Remove.
-	(openpgp_pk_test_algo): Change to a wrapper for openpgp_pk_test_algo2.
-	(openpgp_pk_test_algo2): Rewrite.
-	(openpgp_pk_algo_usage, pubkey_nbits): Add support for EdDSA.
-	(openpgp_pk_algo_name): Rewrite to remove need for gcry calls.
-	(pubkey_get_npkey, pubkey_get_nskey): Ditto.
-	(pubkey_get_nsig, pubkey_get_nenc): Ditto.
-	* g10/keygen.c(do_create_from_keygrip): Support EdDSA.
-	(common_gen, gen_ecc, ask_keysize, generate_keypair): Ditto.
-	* g10/build-packet.c (do_key): Ditto.
-	* g10/export.c (transfer_format_to_openpgp): Ditto.
-	* g10/getkey.c (cache_public_key): Ditto.
-	* g10/import.c (transfer_secret_keys): Ditto.
-	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
-	* g10/mainproc.c (proc_pubkey_enc): Ditto.
-	* g10/parse-packet.c (parse_key): Ditto,
-	* g10/sign.c (hash_for, sign_file, make_keysig_packet): Ditto.
-	* g10/keyserver.c (print_keyrec): Use openpgp_pk_algo_name.
-	* g10/pkglue.c (pk_verify, pk_encrypt, pk_check_secret_key): Use only
-	OpenPGP algo ids and support EdDSA.
-	* g10/pubkey-enc.c (get_it): Use only OpenPGP algo ids.
-	* g10/seskey.c (encode_md_value): Ditto.
-
-2014-01-29 Werner Koch <wk@gnupg.org>
-
-	gpg: Remove cipher.h and put algo ids into a common file.
-	+ commit ea8a1685f75d27f5277d42ea7390ad5aeaf51b1f
-	* common/openpgpdefs.h (cipher_algo_t, pubkey_algo_t, digest_algo_t)
-	(compress_algo_t): New.
-	* agent/gpg-agent.c: Remove ../g10/cipher.h. Add openpgpdefs.h.
-	* g10/cipher.h (DEK): Move to ...
-	* g10/dek.h: new file.
-	* g10/cipher.h (is_RSA, is_ELGAMAL, is_DSA)
-	(PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY, PUBKEY_MAX_NSIG, PUBKEY_MAX_NENC)
-	(PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC, PUBKEY_USAGE_CERT)
-	(PUBKEY_USAGE_AUTH, PUBKEY_USAGE_NONE): Move to
-	* g10/packet.h: here.
-	* g10/cipher.h: Remove. Remove from all files.
-	* g10/filter.h, g10/packet.h: Include dek.h.
-	* g10/Makefile.am (common_source): Remove cipher.h. Add dek.h.
-
-	include: Remove this directory.
-	+ commit 25b4c2acbd01f9b4c2c364f44c53b73498ed8469
-	* include/cipher.h: Move to ...
-	* g10/cipher.h: here.
-	* agent/gpg-agent.c: Adjust header file name.
-
-	* include/host2net.h: Move to ...
-	* common/host2net.h: here. Change license to LGPLv3/GPLv2. Adjust
-	notices to reflect that only me worked on that file.
-
-	* include/types.h: Remove.
-	* common/types.h: Include inttypes.h. Add byte typedef and comments
-	for __riscos__.
-	* common/iobuf.h: Adjust header file name.
-
-	* include/_regex.h: Remove this unused file.
-
-	* include/Makefile.am: Remove.
-	* Makefile.am (SUBDIRS): Remove "include".
-	* configure.ac (AC_CONFIG_FILES): Remove include/Makefile.
-	* include/ChangeLog-2011: Move to ...
-	* common/ChangeLog-2011.include: here.
-	* common/Makefile.am (EXTRA_DIST): Add file.
-
-	* include/zlib-riscos.h: Move this repo only file to ...
-	* g10/zlib-riscos.h: here.
-
-	* include/: Remove.
-
-2014-01-17 Werner Koch <wk@gnupg.org>
-
-	Remove unused u64 type definitions.
-	+ commit 362a30d8c2f529cd44687066f9c33cab7b43bedc
-	* configure.ac: Remove check for uint64 and UINT64_C.
-	* include/types.h: Remove u64 stuff.
-	* common/types.h: Ditto.
-
-2014-01-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Not remove SSH socket when already running.
-	+ commit 0ee66a6f66d7389e381fffa5f9eedbc8de9add10
-	* agent/gpg-agent.c (main): Defer setting of socket_name_ssh to avoid
-	removal of the socket when it will die in create_server_socket for
-	socket_name.
-
-	agent: Fix agent_is_eddsa_key.
-	+ commit 9c731bbedfd8bded5efd886304c5ca6655768c45
-	* agent/findkey.c (agent_is_eddsa_key): Implemented.
-
-2014-01-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	Add secp256k1.
-	+ commit c5e41f539b9a21cbad10c7dae95572a4445d31c3
-	* common/openpgp-oid.c (openpgp_curve_to_oid): Add secp256k1.
-	(openpgp_oid_to_curve): Likewise.
-
-	* g10/keygen.c (ask_curve): Add secp256k1.
-
-2014-01-10 Werner Koch <wk@gnupg.org>
-
-	autogen.sh: Add rule for 64 bit windows.
-	+ commit aedfa95bcc49156f2bc6ae5d0f385705d4fbdd32
-
-
-	Turn autogen.sh into a generic script.
-	+ commit e7973d36d88178b4b0a977e3fcc0d62600777618
-	* autogen.sh: Revamp.
-	* autogen.rc: New.
-	* Makefile.am (EXTRA_DIST): Add autogen.rc.
-
-	Rename scripts/ to build-aux/
-	+ commit 99a48b2fcdf7c33fe553511c12f2ebb8eea5c634
-	* scripts/: Rename to build-aux/
-	* Makefile.am: Adjust accordingly.
-	* configure.ac (AC_CONFIG_AUX_DIR): Change to build-aux.
-
-2014-01-09 Werner Koch <wk@gnupg.org>
-
-	Improve the speedo make script.
-	+ commit a55ffb9da9a844bd2bd73a4a2ea65bf18b21c57f
-	* scripts/gpg-w32-dev/README: Remove
-	* scripts/gpg-w32-dev/GNUmakefile, scripts/gpg-w32-dev/speedo.mk:
-	Merge into ..
-	* scripts/speedo.mk: this.
-
-	gpgsplit: Allow building without zlib support.
-	+ commit 00d5d2204cefb0f4b953e0c00448f16aab2d39c7
-	* tools/gpgsplit.c !HAVE_ZLIB: Do not include zlib.h.
-	(handle_zlib): Build only if HAVE_ZLIB is defined.
-	(write_part): Support zlib and zip only if HAVE_ZLIB is defined.
-
-	w32: Fix backslash quoting in registry name.
-	+ commit fa318406c9bdb60aee1e1b410e4c9e0b3eb1392e
-	* configure.ac (GNUPG_REGISTRY_DIR): Double backslashes.
-
-	Fix test for zlib.
-	+ commit 477aabaf753f987987f7a2e1f999a499ea3bd103
-	* configure.ac (HAVE_ZLIB): Define only if found.
-
-	Add --enable-silent-rules stuff.
-	+ commit aba53e9f96d0c9b270edef0806976a56326249c4
-	* configure.ac: Add AM_SILENT_RULES.
-
-2014-01-08 Werner Koch <wk@gnupg.org>
-
-	w32: Add macro for the registry key.
-	+ commit 75ba215ebd8be7e14b26bb53ef3c7d41e4ce1e02
-	* configure.ac (GNUPG_REGISTRY_DIR) W32: New ac-define.
-	* common/homedir.c (default_homedir): Use it.
-	* common/logging.c (do_logv): Use it.
-
-2013-12-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Change --show-session-key to print the session key earlier.
-	+ commit 101a54add351ff62793cbfbf3877787c4791f833
-	* g10/cpr.c (write_status_strings): New.
-	(write_status_text): Replace code by a call to write_status_strings.
-	* g10/mainproc.c (proc_encrypted): Remove show_session_key code.
-	* g10/decrypt-data.c (decrypt_data): Add new show_session_key code.
-
-2013-12-05 Werner Koch <wk@gnupg.org>
-
-	gpg: Change OID of Ed25519 and add Brainpool oids.
-	+ commit 59207a86e5f40c77fed296b642bf76692e8eef65
-	* common/openpgp-oid.c (openpgp_curve_to_oid): Change OID for
-	Ed25519. Add brainpool OIDs.
-	(openpgp_oid_to_curve): Ditto.
-
-2013-11-29 Werner Koch <wk@gnupg.org>
-
-	common: Add put_membuf_printf.
-	+ commit 159d42ee6ab21d97f40ee129445f37209b875739
-	* common/membuf.c (put_membuf_printf): New.
-
-2013-11-27 Werner Koch <wk@gnupg.org>
-
-	gpg: Change armor Version header to emit only the major version.
-	+ commit e951782e937ce290be0d89d83e84b3daea997587
-	* g10/options.h (opt): Rename field no_version to emit_version.
-	* g10/gpg.c (main): Init opt.emit_vesion to 1. Change --emit-version
-	to bump up opt.emit_version.
-	* g10/armor.c (armor_filter): Implement different --emit-version
-	values.
-
-2013-11-18 Werner Koch <wk@gnupg.org>
-
-	Make use of the *_NAME etc macros.
-	+ commit cc9a0b69b698ba436eaf777e5020532845b56236
-	Replace hardwired strings at many places with new macros from config.h
-	and use the new strusage macro replacement feature.
-
-	* common/asshelp.c (lock_spawning) W32: Change the names of the spawn
-	sentinels.
-	* agent/command.c (cmd_import_key): Use asprintf to create the prompt.
-
-	Add strusage macro replacement feature.
-	+ commit 798daaa1ddf73f64cf840fbdc1f4c5b9c4b4ec13
-	* common/argparse.c (writechar): New.
-	(writestrings): Add macro replacement feature.
-	(show_help): Remove specialized @EMAIL@ replacement.
-	* configure.ac (GNUPG_NAME, GPG_NAME, GPGSM_NAME): Define.
-	(GPG_AGENT_NAME, DIRMNGR_NAME, G13_NAME, GPGCONF_NAME): Define.
-	(GPGTAR_NAME, GPG_AGENT_INFO_NAME, GPG_AGENT_SOCK_NAME): Define.
-	(GPG_AGENT_SSH_SOCK_NAME, DIRMNGR_INFO_NAME): Define.
-	(DIRMNGR_SOCK_NAME): Define.
-
-2013-11-15 Werner Koch <wk@gnupg.org>
-
-	kbx: Implement update operation for OpenPGP keyblocks.
-	+ commit 5499942571a88a1223a7318992605c6d29858866
-	* kbx/keybox-update.c (keybox_update_keyblock): Implement.
-	* kbx/keybox-search.c (get_blob_flags): Move to ...
-	* kbx/keybox-defs.h (blob_get_type): here.
-	* kbx/keybox-file.c (_keybox_read_blob2): Fix calling without R_BLOB.
-	* g10/keydb.c (build_keyblock_image): Allow calling without
-	R_SIGSTATUS.
-	(keydb_update_keyblock): Implement for keybox.
-
-	* kbx/keybox-dump.c (_keybox_dump_blob): Fix printing of the unhashed
-	size. Print "does not expire" also on 64 bit platforms.
-
-	gpg: Rework ECC support and add experimental support for Ed25519.
-	+ commit 402aa0f94854bb00475c934be5ca6043a4632126
-	* agent/findkey.c (key_parms_from_sexp): Add algo name "ecc".
-	(agent_is_dsa_key): Ditto.
-	(agent_is_eddsa_key): New. Not finished, though.
-	* agent/pksign.c (do_encode_eddsa): New.
-	(agent_pksign_do): Use gcry_log_debug functions.
-	* agent/protect.c (agent_protect): Parse a flags parameter.
-	* g10/keygen.c (gpg_curve_to_oid): Move to ...
-	* common/openpgp-oid.c (openpgp_curve_to_oid): here and rename.
-	(oid_ed25519): New.
-	(openpgp_oid_is_ed25519): New.
-	(openpgp_oid_to_curve): New.
-	* common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): New.
-	* g10/build-packet.c (gpg_mpi_write): Write the length header also for
-	opaque MPIs.
-	(gpg_mpi_write_nohdr): New.
-	(do_key): Use gpg_mpi_write_nohdr depending on algorithm.
-	(do_pubkey_enc): Ditto.
-	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Use
-	gpg_mpi_write_nohdr.
-	* g10/export.c (transfer_format_to_openpgp):
-	* g10/keygen.c (ecckey_from_sexp): Return the error.
-	(gen_ecc): Repalce arg NBITS by CURVE.
-	(read_parameter_file): Add keywords "Key-Curve" and "Subkey-Curve".
-	(ask_curve): New.
-	(generate_keypair, generate_subkeypair): Use ask_curve.
-	(do_generate_keypair): Also pass curve name.
-	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Print
-	curve name.
-	* g10/parse-packet.c (mpi_read): Remove workaround for
-	Libcgrypt < 1.5.
-	(parse_key): Fix ECC case. Print the curve name.
-	* g10/pkglue.c (mpi_from_sexp): Rename to get_mpi_from_sexp.
-	(pk_verify, pk_check_secret_key): Add special case for Ed25519.
-	* g10/seskey.c (encode_md_value): Ditto.
-	* g10/sign.c (do_sign, hash_for, sign_file): Ditto.
-
-	kbx: Fix possible segv in kbxdump.
-	+ commit 9ae48b173c93f4747a9826beb1fbd023c4362c22
-	* kbx/keybox-dump.c (_keybox_dump_blob): Check length before get32.
-
-	Require Libgcrypt 1.6.
-	+ commit b27161cd0c76ae6e2381f60c3a502cde3a2aaa21
-	* agent/pksign.c (do_encode_dsa): Remove Libgcrypt version check
-
-2013-11-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: more pinpad input fix for PC/SC.
-	+ commit abd922e79b2ff63a5a763a30d4a06a91f93d0b12
-	* scd/apdu.c (check_pcsc_pinpad): Set default values here.
-	(pcsc_pinpad_verify, pcsc_pinpad_modify): Remove setting default
-	values, as it's too late.
-
-2013-11-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: more pinpad fix.
-	+ commit 037dea9dd5eac7a74df0e12cb437e71fb0732afa
-	* scd/apdu.c (check_pcsc_pinpad): Set ->minlen and ->maxlen only when
-	those are specified.
-	(pcsc_pinpad_modify): Remove old check code.
-
-2013-10-29 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: pinpad fix for PC/SC on Windows.
-	+ commit 32989ad2b152d18198d718bc2c7232ce3e79c72f
-	* scd/apdu.c (SCARD_CTL_CODE): Fix for Windows.
-
-2013-10-28 Werner Koch <wk@gnupg.org>
-
-	doc: Change yat2m to allow arbitrary condition names.
-	+ commit a15c35f37ed2b58805adc213029998aa3e52f038
-	* doc/yat2m.c (MAX_CONDITION_NESTING): New.
-	(gpgone_defined): Remove.
-	(condition_s, condition_stack, condition_stack_idx): New.
-	(cond_is_active, cond_in_verbatim): New.
-	(add_predefined_macro, set_macro, macro_set_p): New.
-	(evaluate_conditions, push_condition, pop_condition): New.
-	(parse_file): Rewrite to use the condition stack.
-	(top_parse_file): Set prefined macros.
-	(main): Change -D to define arbitrary macros.
-
-2013-10-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: fix pinpad input on Windows.
-	+ commit de7e15c6b80164a351586e9087aad86420c8b89e
-	* scd/apdu.c (open_pcsc_reader_direct): Don't call
-	pcsc_vendor_specific_init here, but...
-	(connect_pcsc_card): Call it here.
-
-2013-10-23 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Update Japanese translation.
-	+ commit b66158cac7347e4c56c79ab7b5416ae5b3f4a0a2
-
-
-2013-10-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: add pinpad readers information for PC/SC service.
-	+ commit 5efcc2b8fee8de31d255d09037f0a1e6209eab32
-	* scd/apdu.c (pcsc_vendor_specific_init): Add information for Cherry
-	ST-2xxx, Reiner cyberJack, Vasco DIGIPASS, FSIJ Gnuk Token, and KAAN
-	Advance.
-
-2013-10-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: remove pin length check.
-	+ commit e0ab665a792ada6470cb8885b8427acc3c960998
-	* scd/apdu.c (pcsc_pinpad_verify): Remove old check code for pin
-	length.
-
-2013-10-04 Werner Koch <wk@gnupg.org>
-
-	gpg: Limit the nesting level of I/O filters.
-	+ commit e6175055fbca958b7fa43aaf84359574ca7f3ebb
-	* common/iobuf.c (MAX_NESTING_FILTER): New.
-	(iobuf_push_filter2): Limit the nesting level.
-
-	* g10/mainproc.c (mainproc_context): New field ANY. Change HAVE_DATA
-	and ANY_SIG_SIGN to bit fields of ANY. Add bit field
-	UNCOMPRESS_FAILED.
-	(proc_compressed): Avoid printing multiple Bad Data messages.
-	(check_nesting): Return GPG_ERR_BAD_DATA instead of UNEXPECTED_DATA.
-
-2013-10-02 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix bug with deeply nested compressed packets.
-	+ commit 0899f6d4be0406c9efbf9c3f342825804f359b5a
-	* g10/mainproc.c (MAX_NESTING_DEPTH): New.
-	(proc_compressed): Return an error code.
-	(check_nesting): New.
-	(do_proc_packets): Check packet nesting depth. Handle errors from
-	check_compressed.
-
-2013-09-08 Werner Koch <wk@gnupg.org>
-
-	Switch to deterministic DSA.
-	+ commit 6466db10fb22a4f24df4edad9c5cb33ec67321bd
-	* agent/pksign.c (rfc6979_hash_algo_string): New.
-	(do_encode_dsa) Libgcrypt >= 1.6: Make use of RFC-6979.
-
-2013-08-30 Werner Koch <wk@gnupg.org>
-
-	scd: Suppress gcc warning about possible uninitialized use.
-	+ commit 244587ea41d4c75cb5570356f09a6705864a7e8d
-	* scd/app-nks.c (parse_pwidstr): Always init r_pwid.
-
-	gpg: Use 2048 as the default keysize in batch mode.
-	+ commit 4c3b35b067a4e7002bb6473b879b551014bb7857
-	* g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
-	2048.
-
-	gpgtar: Fix building for systems with a separate libintl.
-	+ commit 12990efb45ee7c425167aad19fe759d5609c5182
-	* tools/Makefile.am (gpgtar_LDADD): Add LIBINTL and LIBICONV.
-
-	scd: Use vendor and product id macros also in apdu.c.
-	+ commit fc31d730d8506b069de1d3529ed26660856bf07f
-	* scd/ccid-driver.c: Move vendor and product ids to ...
-	* scd/ccid-driver.h: here.
-	* scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
-	(pcsc_vendor_specific_init): Use vendor and product id macros.
-
-2013-08-30 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: PC/SC pinpad input improvement.
-	+ commit 95a3bffeaf07e8bf9487d4b165c336d166236fc1
-	* scd/apdu.c (struct reader_table_s): Add members: PINMIN, PINMAX, and
-	PINPAD_VERLEN_SUPPORTED.
-	(CM_IOCTL_VENDOR_IFD_EXCHANGE, FEATURE_GET_TLV_PROPERTIES,
-	PCSCv2_PART10_PROPERTY_*): New.
-	(new_reader_slot): Initialize pinpad_varlen_supported, pinmin, pinmax.
-	(pcsc_vendor_specific_init): New.
-	(open_pcsc_reader_direct, open_pcsc_reader_wrapped): Call
-	pcsc_vendor_specific_init.
-	(check_pcsc_pinpad): Not detect here but use the result of
-	pcsc_vendor_specific_init.
-	(pcsc_pinpad_verify, pcsc_pinpad_modify): Specify bNumberMessage.
-
-2013-08-29 Jonas Borgström <jonas@borgstrom.se>
-
-	scd: add support for RSA_CRT and RSA_CRT_N key import.
-	+ commit cc67918c088e90c1d9a507af5f6288e8faa93d87
-	* scd/app-openpgp.c (do_writekey): Added RSA_CRT and RSA_CRT_N support.
-
-2013-08-29 Werner Koch <wk@gnupg.org>
-
-	kbx: Add a few macros for easier readability.
-	+ commit 3adfaa9beee4502479b5673c7dfd386680a920c5
-	* kbx/keybox-update.c (FILECOPY_INSERT)
-	(FILECOPY_DELETE, FILECOPY_UPDATE): New macros. Replace numbers by
-	them.
-
-2013-08-28 Werner Koch <wk@gnupg.org>
-
-	Fix commit 04e2c83f.
-	+ commit fdbf76eee6a4e81b040d423926b71af7b491fb4a
-	* agent/command-ssh.c (stream_read_string): Do not assign to a NULL
-	ptr.
-
-	gpg: Make decryption with the OpenPGP card work.
-	+ commit 780ba3233618393835970bac4cf8aab713f4d7fa
-	* scd/app-common.h (APP_DECIPHER_INFO_NOPAD): New.
-	* scd/app-openpgp.c (do_decipher): Add arg R_INFO.
-	* scd/app-nks.c (do_decipher): Add arg R_INFO as a dummy.
-	* scd/app.c (app_decipher): Add arg R_INFO.
-	* scd/command.c (cmd_pkdecrypt): Print status line "PADDING".
-	* agent/call-scd.c (padding_info_cb): New.
-	(agent_card_pkdecrypt): Add arg R_PADDING.
-	* agent/divert-scd.c (divert_pkdecrypt): Ditto.
-	* agent/pkdecrypt.c (agent_pkdecrypt): Ditto.
-	* agent/command.c (cmd_pkdecrypt): Print status line "PADDING".
-	* g10/call-agent.c (padding_info_cb): New.
-	(agent_pkdecrypt): Add arg R_PADDING.
-	* g10/pubkey-enc.c (get_it): Use padding info.
-
-	agent: Fix two compiler warnings.
-	+ commit 04e2c83f189cc56342e1be784bdc63761ccdb5bb
-	* agent/command.c (cmd_preset_passphrase, pinentry_loopback): Use %zu
-	in format string.
-	* scd/ccid-driver.c (ccid_get_atr): Ditto.
-	* agent/command-ssh.c (stream_read_string): Init arg STRING_SIZE to
-	avoid maybe_unitialized warning.
-
-2013-08-27 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: fix parsing login-data DO.
-	+ commit b6d54f1196d5f110fd94dfd661e74dbc60ca9811
-	* scd/app-openpgp.c (parse_login_data): Release RELPTR. Fix parsing.
-
-	scd: fix Vega for Alpha reader.
-	+ commit 54cbab29c700db2df74e808f16db49170e6c42f1
-	* scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
-	and size of command.
-
-2013-08-21 Werner Koch <wk@gnupg.org>
-
-	scd: Make SPRx32 pinpad work with PC/SC on Windows.
-	+ commit 5c5e52df4b92e23045ac87abac09357de58920d4
-	* scd/apdu.c (CM_IOCTL_GET_FEATURE_REQUEST): Use SCARD_CTL_CODE.
-	(SCARD_CTL_CODE): Define if not defined.
-	(reader_table_s): Add is_spr532.
-	(new_reader_slot): Clear it.
-	(check_pcsc_pinpad): Set it.
-	(pcsc_pinpad_verify, pcsc_pinpad_modify): Add fix for SPR532.
-
-	scd: Improve --enable-pinpad-varlen.
-	+ commit 7bde2bf3b0ddb5d3515a44879e1a7ddb581a5c0b
-	* tools/gpgconf-comp.c (gc_options_scdaemon): Add
-	enable-pinpad-varlen.
-	* scd/apdu.c (check_pcsc_pinpad): Detect SPRx32 reader.
-
-2013-08-08 Werner Koch <wk@gnupg.org>
-
-	agent: Extend cmd KEYINFO to return data from sshcontrol.
-	+ commit 50c98c7ed6b542857ee2f902eca36cda37407737
-	* agent/command-ssh.c (struct control_file_s): Rename to
-	ssh_control_file_s.
-	(ssh_open_control_file, ssh_close_control_file)
-	(ssh_read_control_file, ssh_search_control_file): New.
-	(control_file_t): Rename and move to ...
-	* agent/agent.h (ssh_control_file_t): here.
-	* agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
-	and confirm. Rename unknown keytype indicator from '-' to 'X'. Extend
-	output.
-	(cmd_keyinfo): Add options --ssh-list and --with-ssh.
-
-2013-08-02 Werner Koch <wk@gnupg.org>
-
-	gpg: No need to create a trustdb when encrypting with --always-trust.
-	+ commit 498b9a95dc65c43240835d64cc92d8fb43014d53
-	* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
-
-2013-08-01 Werner Koch <wk@gnupg.org>
-
-	w32: Fix recent patch 9ff72e4.
-	+ commit ca6fe88c0068f8d45ef39df0fc7b161998a91fe9
-	* common/homedir.c (check_portable_app): Fix the name of the control
-	file.
-
-	agent: Include missing prototype.
-	+ commit ef6a6d973c2bcc54006c04dc41f978ff01005c97
-	* agent/protect.c: Include cvt-openpgp.h.
-
-	w32: Add code to support a portable use of GnuPG.
-	+ commit 9ff72e4e7e4f56c241a525479a94ed4c95efc23f
-	* common/homedir.c (w32_bin_is_bin, w32_portable_app) W32: New.
-	(check_portable_app) W32: New.
-	(standard_homedir, default_homedir) W32: Support the portable flag.
-	(w32_rootdir, w32_commondir) W32: Ditto.
-	(gnupg_bindir, gnupg_cachedir, dirmngr_socket_name) W32: Ditto.
-	* common/logging.h (JNLIB_LOG_NO_REGISTRY): New.
-	* common/logging.c (no_registry): New variable.
-	(log_set_prefix, log_get_prefix): Set/get that variable.
-	(do_logv): Do not check the registry if that variable is set.
-
-	Silence compiler warning about deprecated Libgcrypt symbols.
-	+ commit db4651734fe91935b17876dc9194329b00066eff
-	* configure.ac (AH_BOTTOM): Define GCRYPT_NO_DEPRECATED.
-
-	dirmngr: Define missing LDAP constant.
-	+ commit ef2e2e54020c3475bf2129c3ec8360c7bad3a6c9
-	* dirmngr/ldap-url.c (LDAP_SCOPE_DEFAULT): Define if missing.
-
-	scd: Fix a syntax error for Apple and Windows.
-	+ commit 25b0357bf0a4861a751cfbc3e0335ae05c8b2b1b
-	* scd/apdu.c (pcsc_dword_t) W32: Fix syntax error.
-
-	common: Fix a build error when using adns.
-	+ commit ffa7472db551f12f66b9789c31fabb5fc80cc13a
-	* common/dns-cert.c (get_dns_cert) USE_ADNS: Fix synatx error.
-
-2013-07-31 Werner Koch <wk@gnupg.org>
-
-	common: Comment out unused code.
-	+ commit f101f34fffee4a02e7a5f62b59667e45e50e8325
-	* common/w32-reg.c (write_w32_registry_string): Comment out.
-
-	dirmngr: Remove unused file.
-	+ commit 2830fcb83c99289a49da0e111766daf2d9a1fa3b
-	* dirmngr/get-path.c: Remove.
-
-2013-06-27 Werner Koch <wk@gnupg.org>
-
-	sm: Remove cruft from source files.
-	+ commit f254497e09fa4e0e24e63d14f7316fc31c938844
-	* sm/keydb.c, sm/keydb.h: Remove disabled code parts.
-
-	Prepare for newer automake versions.
-	+ commit 043e2728c813299fafcf62cd125ecf872b26179e
-	* configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
-	option form. Add options from the top Makefile.
-	(AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
-	* Makefile.am (AUTOMAKE_OPTIONS): Remove.
-
-	* kbx/Makefile.am: Remove INCLUDES. Include cmacros.am. FActor some
-	AM_CPPFLAGS options to AM_CFLAGS.
-
-2013-06-26 Werner Koch <wk@gnupg.org>
-
-	Fix Makefile regression.
-	+ commit 136f190a2f20c6ec4d5c3ca3ac7f0440c14e4dc2
-	* agent/Makefile.am (gpg_agent_DEPENDENCIES): Remove cruft from wrong
-	resolve conflict 2013-04-25.
-	(gpg_agent_DEPENDENCIES): Remove obsolete gpg_agent_res_deps
-	(gpg_agent_LDFLAGS): Remove obsolete gpg_agent_res_ldflags.
-
-2013-05-22 Werner Koch <wk@gnupg.org>
-
-	Implement unattended OpenPGP secret key import.
-	+ commit 7777e68d0482c942f527e91c04adbcfb40bc8bef
-	* agent/command.c (cmd_import_key): Add option --unattended.
-	* agent/cvt-openpgp.c (convert_transfer_key): New.
-	(do_unprotect): Factor some code out to ...
-	(prepare_unprotect): new function.
-	(convert_from_openpgp): Factor all code out to ...
-	(convert_from_openpgp_main): this. Add arg 'passphrase'. Implement
-	openpgp-native protection modes.
-	(convert_from_openpgp_native): New.
-	* agent/t-protect.c (convert_from_openpgp_native): New dummy fucntion
-	* agent/protect-tool.c (convert_from_openpgp_native): Ditto.
-	* agent/protect.c (agent_unprotect): Add arg CTRL. Adjust all
-	callers. Support openpgp-native protection.
-	* g10/call-agent.c (agent_import_key): Add arg 'unattended'.
-	* g10/import.c (transfer_secret_keys): Use unattended in batch mode.
-
-	New debug functions log_printcanon and log_printsexp.
-	+ commit cb6a64bb78296c8e9f72df0c482ff847e89a1541
-	* common/sexputil.c (sexp_to_string, canon_sexp_to_string): New.
-	(log_printcanon, log_printsexp): New.
-
-	agent: Fix length detection of canonical formatted openpgp keys.
-	+ commit 0f0e0559f9b160824f10dc17b389268cdb53aea4
-	* agent/command.c (cmd_import_key): Pass 0 instead of KEYLEN to
-	gcry_sexp_canon_len.
-
-	agent: New option --disable-check-own-socket.
-	+ commit f2d8a14e1b12534eba69d595a62c78f92331e11b
-	* agent/gpg-agent.c (oDisableCheckOwnSocket): New.
-	(disable_check_own_socket): New.
-	(parse_rereadable_options): Set new option.
-	(check_own_socket): Implement new option.
-
-2013-05-07 Werner Koch <wk@gnupg.org>
-
-	w32: Add icons and version information.
-	+ commit 88e24341e57c96e31a25e92e09d67989e64cc1c1
-	* common/gnupg.ico: New. Take from artwork/gnupg-favicon-1.ico.
-	* agent/gpg-agent-w32info.rc: New.
-	* g10/gpg-w32info.rc: New.
-	* scd/scdaemon-w32info.rc: New.
-	* sm/gpgsm-w32info.rc: New.
-	* tools/gpg-connect-agent-w32info.rc: New.
-	* common/w32info-rc.h.in: New.
-	* configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP)
-	(BUILD_HOSTNAME): New.
-	(AC_CONFIG_FILES): Add w32info-rc.h.
-	* am/cmacros.am (.rc.o): New rule.
-	* agent/Makefile.am, common/Makefile.am, g10/Makefile.am
-	* scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to
-	build resource files.
-
-2013-05-07 Ian Abbott <abbotti@mev.co.uk>
-
-	doc: fix some Texinfo warnings.
-	+ commit 2c3fc4719b92d9e3ac32efd134a930e1cc126032
-	* doc/gpg.texi: Fix syntax and add missing menu entries.
-	* doc/gpgsm.texi: Fix subsectioning.
-
-2013-04-22 Werner Koch <wk@gnupg.org>
-
-	Fix potential heap corruption in "gpg -v --version".
-	+ commit 151b78cc26d728e9eb42620e0caf8c6f4bd7f839
-	* g10/gpg.c (build_list): Rewrite to cope with buffer overflow in
-	certain locales.
-
-2013-04-19 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Remove non-implemented commands from --help.
-	+ commit d6798d261cbe6519ef5b3ebb474e2ad348442c0c
-	* sm/gpgsm.c (opts): Removed commands --clearsign, --symmetric,
-	--send-keys, and --recv-keys.
-
-2013-04-19 Daiki Ueno <ueno@gnu.org>
-
-	Make sure to call fflush if estream_t is backed with stdio.
-	+ commit e498180d5647d3427a7d7e6c82a9f09cf1ba439d
-	* common/estream.c (es_func_fp_write): Call fflush after fwrite.
-
-2013-04-19 Werner Koch <wk@gnupg.org>
-
-	doc: Formatting fixes.
-	+ commit ff6115227a1ced14e2fb3d160a12181b9dfbc502
-	* doc/Makefile.am (.fig.jpg): Correct to use -L jpeg.
-	* doc/gpg.texi: Fix cross reference for --options.
-	* doc/gpgsm.texi: Likewise.
-	* doc/gpl.texi: Fix enumerate and re-indent examples.
-
-2013-04-01 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: move SCDaemon to libexecdir.
-	+ commit 021767d8aa11aac8ac87dc3a31969ee6cfa65966
-	* common/homedir.c (gnupg_module_name): It's now libexecdir.
-	* scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
-	(bin_PROGRAMS): Remove scdaemon.
-
-2013-03-29 Werner Koch <wk@gnupg.org>
-
-	copyright assignments are not anymore required.
-	+ commit 07227279c44e3af0939f90025a0d22b782d0f185
-
-
-2013-03-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: PC/SC status fix.
-	+ commit 64b1a2cf6f18348544a2d2cd4d49fd27bf01c150
-	* scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when
-	PCSC_STATE_PRESENT.
-
-	* scd/pcsc-wrapper.c (handle_status): Ditto.
-
-	scd: PC/SC cleanup (more).
-	+ commit b9aceaa442914beb4f5359283053b43ba5a46b4c
-	* scd/apdu.c (control_pcsc_direct, control_pcsc_wrapped, control_pcsc)
-	(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify): Use
-	pcsc_dword_t.
-
-	scd: call update_card_removed only when detecting removal.
-	+ commit 1062893832bb15eaac853f52e1cb673e5e03790a
-	* scd/command.c (update_reader_status_file): Add condition
-	vr->status == 0.
-
-2013-03-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: PC/SC cleanup.
-	+ commit ee95c23fcdc6673db0fc7287ab2197915d9b55b3
-	* scd/apdu.c (pcsc_dword_t): New. It was named as DWORD (double-word)
-	when a word was 16-bit.
-	(struct reader_table_s): Fixes for types.
-	(struct pcsc_readerstate_s) __APPLE__: Enable #pragma pack(1).
-	Throughout: Fixes for types.
-
-	* scd/pcsc-wrapper.c: Likewise.
-
-2013-03-21 NIIBE Yutaka <gniibe@fsij.org>
-
-	po: Enable ja.po.
-	+ commit a75a08d6e30e93e1793aa78a15d473a3ea7623cb
-	* po/LINGUAS: Enable ja.po.
-
-	scd: change default value of pinpad maxlen.
-	+ commit ca66f5c779af74d0eb7221afd7a9707201931e50
-	* scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value
-	of maxlen for pinpad input is now 15 (was: 25).
-
-	* scd/ccid-driver.c (ccid_transceive_secure): Likewise.
-
-2013-03-20 Werner Koch <wk@gnupg.org>
-
-	Add code to allow for late memory cleanup.
-	+ commit 2739834206f23833161898a73427b8a9c6d5d26d
-	* common/init.c (mem_cleanup_item_t): New.
-	(run_mem_cleanup): New.
-	(_init_common_subsystems): Add an atexit for it.
-	(register_mem_cleanup_func): New.
-
-	* g10/kbnode.c (cleanup_registered): New.
-	(release_unused_nodes): New.
-	(alloc_node): Call register_mem_cleanup_func.
-
-	kbx: Remove unused macro.
-	+ commit 44159b681f8f09000fabfc3ee294d5821578d3a6
-	* kbx/keybox.h (KEYBOX_WITH_OPENPGP): Remove unused macro.
-
-2013-03-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Print indicator for unknown key capability.
-	+ commit c4dbd1b2de8ae3847a040444e86500848868bcf4
-	* g10/keylist.c (print_capabilities): Print '?' for unknown usage.
-
-2013-03-19 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-	gpg: Allow setting of all zero key flags.
-	+ commit b693ec02c467696bf9d7324dd081e279f9965151
-	* g10/keygen.c (do_add_key_flags): Do not check for empty key flags.
-
-2013-03-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Distinguish between missing and cleared key flags.
-	+ commit 4bde12206c5bf199dc6e12a74af8da4558ba41bf
-	* include/cipher.h (PUBKEY_USAGE_NONE): New.
-	* g10/getkey.c (parse_key_usage): Set new flag.
-
-2013-03-15 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: ccid-driver supporting larger APDU.
-	+ commit 76dc5c08dc2686eef32e1bd221c60fe91201246f
-	* scd/ccid-driver.c (ccid_transceive_apdu_level): Support larger
-	APDU.
-
-	scd: fix missing close paren.
-	+ commit 006782068e4d2a9413770400494421a2e9726ee7
-	* scd/app-openpgp.c (du_auth): Fix.
-
-2013-03-09 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: support ECDSA signing.
-	+ commit 73ad742deacfe2bf7d6efc7cc30f9ced2d83521a
-	* scd/app-openpgp.c (do_sign): Only prepend message digest block
-	for RSA or do_auth.
-	(do_auth): Remove message digest block for ECDSA.
-
-2013-03-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: support ECDSA public key.
-	+ commit 010bc7f4f06d8affb98950e1adc76c68bfcc9abb
-	* scd/app-openpgp.c (key_type_t): New.
-	(CURVE_NIST_P256, CURVE_NIST_P384, CURVE_NIST_P521): New.
-	(struct app_local_s): Change keyattr to have key_type and union.
-	(get_ecc_key_parameters, get_curve_name): New.
-	(send_key_attr, get_public_key): Support ECDSA.
-	(build_privkey_template, do_writekey, do_genkey): Follow the change
-	of the member KEY_ATTR.
-	(parse_historical): New.
-	(parse_algorithm_attribute): Support ECDSA.
-
-2013-03-05 Werner Koch <wk@gnupg.org>
-
-	Require libgpg-error 1.11.
-	+ commit 5bac5040dc93343e1e89916b263390b0e52040bf
-	* configure.ac: Require libgpg-error 1.11.
-	* common/util.h (GPG_ERR_NO_KEYSERVER, GPG_ERR_INV_CURVE)
-	(GPG_ERR_UNKNOWN_CURVE): Remove fallback definitions.
-
-2013-02-28 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: pksign result conversion to sexp to upper layer.
-	+ commit ef1983d58b913306e9bf02a7189e530123839c59
-	* agent/agent.h (divert_pksign): Add R_SIGLEN argument.
-	* agent/divert-scd.c (divert_pksign): Return length at R_SIGLEN.
-	* agent/call-scd.c (agent_card_pksign): Move composition of
-	S-expression to...
-	* agent/pksign.c (agent_pksign_do): ... here.
-
-2013-02-22 Werner Koch <wk@gnupg.org>
-
-	Use has_leading_keyword in the assuan callbacks.
-	+ commit 585d5c62eece23911a768d97d11f159be138b13d
-	* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
-	* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
-	* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
-	(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
-	* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
-	* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
-	(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
-	(keyinfo_status_cb, inq_import_key_parms): Ditto.
-	* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
-	(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
-
-	Remove some unused variables.
-	+ commit c6b8f05517228c6aeab28d2bf5da7724c059bb1a
-	* tools/gpgconf-comp.c (gc_process_gpgconf_conf): Remove unused
-	used_components.
-	* agent/command-ssh.c (ssh_signature_encoder_ecdsa): Mark unused arg.
-	* g13/g13.c (main): Comment variable of yet unimplemented options.
-
-	gpg: Fix a memory leak in batch key generation.
-	+ commit 161674118d568025896026ede5e03d26bdfdfa68
-	* g10/keygen.c (append_to_parameter): New.
-	(proc_parameter_file): Use new func to extend the parameter list.
-
-	* g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
-	gcry_kdf_derive failed.
-	* g10/keygen.c (proc_parameter_file): Print a diagnostic if
-	passphrase_to_dek failed.
-
-	gpg: Handle the agent's NEW_PASSPHRASE inquiry.
-	+ commit baee681d2406530c45fd6d4bde77193ba23ac263
-	* g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
-
-	common: Add func has_leading_keyword.
-	+ commit 2838385e76c8c7108bc949d5a1d1c947051bd5be
-	* common/stringhelp.c (has_leading_keyword): New.
-
-	Remove build hacks for FreeBSD.
-	+ commit 21f5a9ec27c0794141a835a5bb3c69495ee554a6
-	* configure.ac freebsd: Do not add /usr/local to CPPFLAGS and
-	LDFLAGS.
-
-2013-02-22 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: fix two bugs.
-	+ commit 3c3648e720b8014828573bd708c88ba4775014e3
-	* agent/command.c (cmd_keytocard): Decrement KEYDATALEN.
-	* agent/findkey.c (agent_public_key_from_file): Increment for ELEMS.
-
-	gpg: fix keytocard and support ECC card for key attribute.
-	+ commit 7d376ffa321d4af6e62a2bc64ef2b8574b122b1a
-	* g10/call-agent.c (agent_keytocard): Supply PARM arg.
-	* g10/card-util.c (card_status): Support ECC.
-	(card_store_subkey): Don't assume RSA.
-
-2013-02-21 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix a memory leak in batch key generation.
-	+ commit 273bb38cd7b517460cb3de67662e96e910104675
-	* g10/keygen.c (append_to_parameter): New.
-	(proc_parameter_file): Use new func to extend the parameter list.
-
-	* g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
-	gcry_kdf_derive failed.
-	* g10/keygen.c (proc_parameter_file): Print a diagnostic if
-	passphrase_to_dek failed.
-
-	gpg: Handle the agent's NEW_PASSPHRASE inquiry.
-	+ commit 18a261b65fd77a9e434b13483ceaaaf2176f1197
-	* g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
-
-	common: Add func has_leading_keyword.
-	+ commit 4af0c62b15c51056dc293c8e3b907e7c41fbf08c
-	* common/stringhelp.c (has_leading_keyword): New.
-
-2013-02-20 Werner Koch <wk@gnupg.org>
-
-	Remove build hacks for FreeBSD.
-	+ commit 8e5766c38f3ac376fb8e7c7f2b0f65de23d84cbe
-	* configure.ac freebsd: Do not add /usr/local to CPPFLAGS and
-	LDFLAGS.
-
-2013-02-12 NIIBE Yutaka <gniibe@fsij.org>
-
-	gpg: Implement card_store_subkey again.
-	+ commit b90506ea220860c89128f002bd593d0462a08d73
-	* g10/call-agent.h (agent_keytocard): New.
-	* g10/call-agent.c (agent_keytocard): New.
-	* g10/card-util.c (replace_existing_key_p): Returns 1 when replace.
-	(card_generate_subkey): Check return value of replace_existing_key_p.
-	(card_store_subkey): Implement again using agent_keytocard.
-
-	agent: Add KEYTOCARD command.
-	+ commit 30f8a3c8736451d8c06ef72521a8da5eabf23016
-	* agent/agent.h (divert_writekey, agent_card_writekey): New.
-	* agent/call-scd.c (inq_writekey_parms, agent_card_writekey): New.
-	* agent/command.c (cmd_keytocard, hlp_keytocard): New.
-	(register_commands): Add cmd_keytocard.
-	* agent/divert-scd.c (divert_writekey): New.
-
-	Japanese: update po and doc.
-	+ commit 595ab0da666c43a1315a72a1346ee149998d8771
-	* doc/help.ja.txt, po/ja.po: Updated.
-
-2013-02-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Rename 'keypad' to 'pinpad'.
-	+ commit 7253093addfd82a8dd25cd80e3ba820a85e3c9a7
-	* NEWS: Mention scd changes.
-
-	* agent/divert-scd.c (getpin_cb): Change message.
-
-	* agent/call-scd.c (inq_needpin): Change the protocol to
-	POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
-	* scd/command.c (pin_cb): Likewise.
-
-	* scd/apdu.c (struct reader_table_s): Rename member functions.
-	(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
-	check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
-	apdu_pinpad_verify, apdu_pinpad_modify): Rename.
-
-	* scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
-	(apdu_pinpad_verify, apdu_pinpad_modify): Rename.
-
-	* scd/iso7816.h (iso7816_check_pinpad): Rename.
-
-	* scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
-	(iso7816_check_pinpad): Rename.
-	(iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
-	the change.
-
-	* scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
-	* scd/ccid-driver.c (ccid_transceive_secure): Use it.
-
-	* scd/app-dinsig.c (verify_pin): Follow the change.
-	* scd/app-nks.c (verify_pin): Follow the change.
-
-	* scd/app-openpgp.c (check_pinpad_request): Rename.
-	(parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
-	the change.
-
-	* scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
-
-	* scd/scdaemon.h (opt): Rename to disable_pinpad,
-	enable_pinpad_varlen.
-
-	* tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
-	disable-pinpad.
-
-2013-02-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Add pinentry-mode feature.
-	+ commit 21feecd48f990b2569cb4b385dea3e57b9501525
-	* g10/gpg.c: Include shareddefs.h.
-	(main): Add option --pinentry-mode.
-	* g10/options.h (struct opt): Add field pinentry_mode.
-	* g10/passphrase.c: Include shareddefs.h.
-	(have_static_passphrase): Take care of loopback pinentry_mode.
-	(read_passphrase_from_fd): Ditto.
-	(get_static_passphrase): New.
-	(passphrase_to_dek_ext): Factor some code out to ...
-	(emit_status_need_passphrase): new.
-	* g10/call-agent.c (start_agent): Send the pinentry mode.
-	(default_inq_cb): Take care of the PASSPHRASE inquiry. Return a
-	proper error code.
-	(agent_pksign): Add args keyid, mainkeyid and pubkey_algo.
-	(agent_pkdecrypt): Ditto.
-	* g10/pubkey-enc.c (get_it): Pass new args.
-	* g10/sign.c (do_sign): Pass new args.
-
-	* g10/call-agent.c (struct default_inq_parm_s): New. Change all
-	similar structs to reference this one. Change all users and inquire
-	callback to use this struct, instead of NULL or some undefined but not
-	used structs. This change will help to eventually get rid of global
-	variables.
-
-2013-02-06 Werner Koch <wk@gnupg.org>
-
-	agent: Move a typedef to common and provide parse_pinentry_mode.
-	+ commit 8b2b8dfe5c4cd346bbea2c228e75737bbeeca4c4
-	* common/agent-opt.c: New.
-	* common/shareddefs.h: New.
-	* common/Makefile.am: Add new files.
-	* agent/agent.h: Include shareddefs.h.
-	(pinentry_mode_t): Factor out to shareddefs.h.
-	* agent/command.c (option_handler): Use parse_pinentry_mode.
-
-	agent: Return a better error code if no passphrase was given.
-	+ commit 4483a4f0ea030046137ba04905eb5220c14a2161
-	* agent/protect.c (hash_passphrase): Handle an empty passphrase.
-
-2013-02-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: Fix check_keypad_request.
-	+ commit c27315fc6466cceb862c9e67755a8e044e9b7688
-	* scd/app-openpgp.c (check_keypad_request): 0 means not to use pinpad.
-
-	SCD: Add vendor specific initalization.
-	+ commit e791ac6683bfb90d5e40c0103324784bd58535c9
-	* scd/ccid-driver.c (ccid_vendor_specific_init): New.
-	(ccid_open_reader): Call ccid_vendor_specific_init.
-
-	SCD: Support P=N format for login data.
-	+ commit 0407e642f796fb2780a77b7a1a86731d0de27e5d
-	* scd/app-openpgp.c (parse_login_data): Support P=N format.
-
-	SCD: Better interoperability.
-	+ commit bd5eded73a1268afdf81482f8408e5f640abf9c4
-	* scd/apdu.c: Fill bTeoPrologue2 field.
-
-	SCD: Defaults to use pinpad if the reader has the capability.
-	+ commit a9ff97a10f7ae5a703ed1bccba294473ecc88d5d
-	* scd/app-openpgp.c (struct app_local_s): Remove VARLEN.
-	(parse_login_data): "P=0" means to disable pinpad.
-	(check_keypad_request): Default is to use pinpad if available.
-
-	SCD: handle keypad request on the card.
-	+ commit 334ba6efa5a05d8849fae213128a0505e7615e13
-	* scd/app-openpgp.c: Add 2013.
-	(struct app_local_s): Add keypad structure.
-	(parse_login_data): Add parsing keypad request on the card.
-	(check_keypad_request): New.
-	(verify_a_chv, verify_chv3, do_change_pin): Call check_keypad_request
-	to determine use of keypad.
-
-	SCD: Minor fix of ccid-driver.
-	+ commit d5bf83a24cf3871b7d8cfe61049f70e1e206d09a
-	* scd/ccid-driver.c (VENDOR_VEGA): Fix typo.
-
-	SCD: Add support of Covadis VEGA_ALPHA reader.
-	+ commit 82e1e837c29225cd55642b193cc04ce6191d19bb
-	* scd/ccid-driver.c: Add 2013.
-	(VENDER_VEGA, VEGA_ALPHA):New.
-	(ccid_transceive_secure): VEGA_ALPHA is same firmware as GEMPC_PINPAD.
-	Change bNumberMessage to 0x01, as it works better (was: 0xff).
-
-	SCD: Support fixed length PIN input for keypad (PC/SC).
-	+ commit 3aae780f9debaeb3560ff866b7e09d0923481c57
-	* scd/apdu.c (pcsc_keypad_verify): SUpport fixed length PIN input for
-	keypad.
-	(pcsc_keypad_modify): Likewise.
-	* scd/ccid-driver.c (ccid_transceive_secure): Clean up.
-
-	SCD: Support fixed length PIN input for keypad.
-	+ commit 40a914a2e3052847b49c4b5e8ac8538e97efd18a
-	* scd/iso7816.h (struct pininfo_s): Remove MODE and add FIXEDLEN.
-	* scd/app-dinsig.c (verify_pin): Initialize FIXEDLEN to unknown.
-	* scd/app-nks.c (verify_pin): Likewise.
-	* scd/app-openpgp.c (verify_a_chv, verify_chv3, do_change_pin):
-	Likewise.
-	* scd/apdu.c (check_pcsc_keypad): Add comment.
-	(pcsc_keypad_verify, pcsc_keypad_modify): PC/SC driver only support
-	readers with the feature of variable length input (yet).
-	(apdu_check_keypad): Set FIXEDLEN.
-	* scd/ccid-driver.c (ccid_transceive_secure): Add GEMPC_PINPAD
-	specific settings.
-	Support fixed length PIN input for keypad.
-
-	SCD: API cleanup for keypad handling.
-	+ commit b526f6e223604b7c1852ef2aab9fc1ea691b1181
-	* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
-	Change meaning of MODE.
-	(pininfo_t): Rename from iso7816_pininfo_t.
-	* scd/sc-copykeys.c: Include "iso7816.h".
-	* scd/scdaemon.c, scd/command.c: Likewise.
-	* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
-	(ccid_transceive_secure): Follow the change of PININFO_T.
-	* scd/app.c: Include "apdu.h" after "iso7816.h".
-	* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
-	(iso7816_change_reference_data_kp): Follow the change of API.
-	* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
-	KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
-	(check_pcsc_keypad, check_ccid_keypad): Likewise.
-	(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
-	(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
-	(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
-	(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
-	(send_le): Follow the change of API.
-	* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
-	(apdu_keypad_modify): Change the API.
-	* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
-	change.
-
-	SCD: Clean up. Remove PADLEN for keypad input.
-	+ commit ca89277cb4cb9558da97a71a4cb070cb77c9b536
-	* scd/apdu.c (struct pininfo_s): Use iso7816_pininfo_s.
-	(struct reader_table_s): Remove last arg from check_keypad method.
-	(check_pcsc_keypad, check_pcsc_keypad): Remove PIN_PADLEN.
-	(pcsc_keypad_verify, pcsc_keypad_modify): Don't check PIN_PADLEN.
-	(send_apdu_ccid, ccid_keypad_operation): Remove PIN_PADLEN.
-	(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify):
-	Likewise.
-
-	* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
-	(apdu_keypad_modify): Remove PIN_PADLEN.
-
-	* scd/ccid-driver.c (ccid_transceive_secure): Remove PIN_PADLEN.
-
-	* scd/ccid-driver.h (ccid_transceive_secure): Remove PIN_PADLEN.
-
-	* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
-	(iso7816_change_reference_data_kp): Remove PADLEN.
-
-	* scd/iso7816.h (struct iso7816_pininfo_s): Remove PADLEN, PADCHAR.
-
-	SCD: Add option enable-keypad-varlen and support for GEMPC_PINPAD.
-	+ commit d9f6cc7502793ed41928042cc2f968c8c7effc22
-	* scd/scdaemon.h (opt): Add enable_keypad_varlen.
-	* scd/scdaemon.c (cmd_and_opt_values): Add oEnableKeypadVarlen.
-	(opts, main): Add oEnableKeypadVarlen.
-	* scd/ccid-driver.c (GEMPC_PINPAD): New.
-	(ccid_transceive_secure): Add enable_varlen handling.
-	Enable GEMPC_PINPAD.
-
-2013-01-30 Werner Koch <wk@gnupg.org>
-
-	Remove unused status codes.
-	+ commit 50a7badbdacac8ba472b35090c1aab4568434d04
-	* common/status.h (STATUS_BEGIN_STREAM, STATUS_END_STREAM)
-	(STATUS_SIEXPIRED): Remove unused codes.
-
-	gpg: Add status line PINENTRY_LAUNCHED.
-	+ commit 1cd6445eec4c3642ad92afb02f3563a01cc10c10
-	* common/status.h (STATUS_PINENTRY_LAUNCHED): New.
-	* g10/server.c (server_local_s): Add field allow_pinentry_notify.
-	(option_handler): Add option "allow-pinentry-notify".
-	(gpg_proxy_pinentry_notify): New.
-	* g10/call-agent.c (default_inq_cb): Factor code out to the new
-	function.
-
-2013-01-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix a bug of handling return code from npth_join.
-	+ commit 19994466449a93704d38d429ca1ea36f63da0bf0
-	* agent/call-pinentry.c (agent_popup_message_stop): Fix npth_join
-	return code.
-
-2013-01-11 Christian Aistleitner <christian@quelltextlich.at>
-
-	gpg: Fix honoring --cert-digest-algo when recreating a cert.
-	+ commit 60c58766aeb847b769372fa981f79abac6014500
-	* g10/sign.c (update_keysig_packet): Override original signature's
-	digest algo in hashed data and for hash computation.
-
-2013-01-11 Werner Koch <wk@gnupg.org>
-
-	Fix spurious cruft from configure summary output.
-	+ commit 7a638c094fa1aa7ed1d9caf085af9980a2664d64
-	* configure.ac (build_scdaemon_extra): Remove $tmp cruft.
-
-2013-01-11 NIIBE Yutaka <gniibe@fsij.org>
-
-	SCD: Hold lock for pinpad input.
-	+ commit 4dddf32c83f52483d95d7770232e9e808558e702
-	* scd/apdu.c (apdu_check_keypad, apdu_keypad_verify)
-	(apdu_keypad_modify): Hold lock to serialize communication.
-
-2013-01-08 Werner Koch <wk@gnupg.org>
-
-	kbx: Switch from MD5 to SHA-1 for the checksum.
-	+ commit b11f84b858bad867f1062977a7aba30299157e90
-	* kbx/keybox-blob.c (put_membuf): Use a NULL buf to store zero bytes.
-	(create_blob_finish): Write just the needed space.
-	(create_blob_finish): Switch to SHA-1.
-	* kbx/keybox-dump.c (print_checksum): New.
-	(_keybox_dump_blob): Print the checksum and the verification status.
-
-	gpg: Cache keybox searches.
-	+ commit 492792378dc7a79316ef742b2ffaa46c6cda282a
-	* common/iobuf.c (iobuf_seek): Fix for temp streams.
-	* g10/pubkey-enc.c (get_session_key, get_it): Add some log_clock calls.
-	* g10/keydb.c (dump_search_desc): New.
-	(enum_keyblock_states, struct keyblock_cache): New.
-	(keyblock_cache_clear): New.
-	(keydb_get_keyblock, keydb_search): Implement a keyblock cache.
-	(keydb_update_keyblock, keydb_insert_keyblock, keydb_delete_keyblock)
-	(keydb_rebuild_caches, keydb_search_reset): Clear the cache.
-
-	Make log_clock easier to read.
-	+ commit 5c565512b8af73bee2a176530663154b9277ef1c
-	* common/logging.c (log_clock): Print in microseconds.
-
-	gpg: Remove a function wrapper.
-	+ commit f3f5721e6843a08d1011875400f385b8cd5fe226
-	* g10/keydb.h (keydb_search): Remove macro.
-	* g10/keydb.c (keydb_search2): Rename to keydb_search. Change all
-	callers.
-
-2013-01-08 NIIBE Yutaka <gniibe@fsij.org>
-
-	SCD: Support not-so-smart card readers.
-	+ commit a776f660363d20b6cc023609c4547e0aa8825d97
-	* scd/ccid-driver.c (struct ccid_driver_s): Add auto_voltage,
-	auto_param, and auto_pps.
-	(parse_ccid_descriptor): Set auto_voltage, auto_param, and auto_pps.
-	Support non-autoconf readers.
-	(update_param_by_atr): New.
-	(ccid_get_atr): Use 5V for PowerOn when auto_voltage is not supported.
-	Use 0x10 when nonnull_nad for SetParameters.
-	Call update_param_by_atr for parsing ATR, and use param for
-	SetParameters.
-	Send PPS if reader requires it and card is negotiable.
-	When bNadValue in the return values of SetParameters == 0,
-	clear handle->nonnull_nad flag.
-
-2013-01-07 Werner Koch <wk@gnupg.org>
-
-	gpg: Set the node flags while retrieving a keyblock.
-	+ commit f6d7b3f1ee5eed32bc3257c99cb878091d26c482
-	* g10/keydb.c (parse_keyblock_image): Add args PK_NO and UID_NO and
-	set the note flags accordingly.
-	(keydb_get_keyblock): Transfer PK_NO and UID_NO to parse_keyblock_image.
-	* kbx/keybox-search.c (blob_cmp_fpr, blob_cmp_fpr_part)
-	(blob_cmp_name, blob_cmp_mail): Return the key/user number.
-	(keybox_search): Set the key and user number into the found struct.
-	(keybox_get_keyblock): Add args R_PK_NO and R_UID_NO and set them from
-	the found struct.
-
-	New function log_clock.
-	+ commit 0baedfd25a4bdc6c8e7aefbd67006b063e2dc33f
-	* common/logging.c (log_clock): New.
-	* g10/gpg.c (set_debug): Print clock debug flag.
-	* g10/options.h (DBG_CLOCK_VALUE, DBG_CLOCK): New.
-
-	gpg: Allow searching for user ids in a keybox.
-	+ commit fb31462e7e92d4b19256e6fd40b1b6ffcef2676c
-	* kbx/keybox-search.c (blob_cmp_name): Add arg X509 and adjust for PGP
-	use. Change callers.
-	(blob_cmp_mail): Add arg X509 and find the mailbox offset for PGP.
-	Chnage callers.
-	(has_subject_or_alt): Rename to has_username.
-	(has_username): Allow blobtype PGP.
-	(has_mail): Ditto.
-
-	gpg: Allow generation of more than 4096 keys in one run.
-	+ commit 7d00e52bd58d9e40c18dcc0122b2c236ef3318f5
-	* g10/getkey.c (cache_public_key): Make room in the cache if needed.
-
-2013-01-07 NIIBE Yutaka <gniibe@fsij.org>
-
-	Update Japanese Translation.
-	+ commit bb51edc31e6595e38fcbd91d470de57d3a1a7150
-	* po/ja.po: Fix wrong translations for designated revocation.
-	Reported by Hideki Saito.
-
-	Conflicts:
-		po/ja.po
-
-2013-01-05 NIIBE Yutaka <gniibe@fsij.org>
-
-	Update Japanese Translation.
-	+ commit 05a4458e5721a0afd600f0ec908e739fa83d58f2
-	* po/ja.po: Fix fuzzy translations.
-
-2013-01-03 NIIBE Yutaka <gniibe@fsij.org>
-
-	Update Japanese Translation.
-	+ commit 709a8f8125b9ba5e1ad1e6268cca5ac96d478f63
-	* po/ja.po: Update with POT.
-
-	Update Japanese Translation.
-	+ commit 0fae789c4125dd8492ed25bd6728b5ac98f19729
-	* po/ja.po: Start from the new one of 2.0.
-
-2012-12-28 Werner Koch <wk@gnupg.org>
-
-	gpg: Add signature cache support to the keybox.
-	+ commit 79f08fb0699f4a065e3a29bc7676a90534d7ba60
-	* g10/keydb.c (parse_keyblock_image): Add arg SIGSTATUS.
-	(keydb_get_keyblock): Handle it.
-	(build_keyblock_image): Add arg SIGSTATUS.
-	(keydb_insert_keyblock): Handle it.
-	* kbx/keybox-blob.c (pgp_create_sig_part): Add arg SIGSTATUS.
-	(_keybox_create_openpgp_blob): Ditto.
-	* kbx/kbxutil.c (import_openpgp): Adjust for above change.
-	* kbx/keybox.h (KEYBOX_FLAG_SIG_INFO): New.
-	* kbx/keybox-search.c (_keybox_get_flag_location): Handle new flag.
-	(keybox_get_keyblock): Add arg R_SIGSTATUS.
-	* kbx/keybox-update.c (keybox_insert_keyblock): Add arg SIGSTATUS.
-
-	kbxutil: Improve format of the Sig-Expire lines.
-	+ commit 564d10ea5cd29685a00a4096d69ae2476b60506f
-	* kbx/keybox-dump.c (_keybox_dump_blob): Print the expirate timestamp.
-
-	gpg: First working support for keyboxes.
-	+ commit a9863834244fc2a58d8950977243702d12e420a1
-	* g10/getkey.c (get_pubkey_fast): Improve the assertion.
-	* kbx/keybox.h: Include iobuf.h.
-	* kbx/keybox-blob.c (keyboxblob_uid): Add field OFF.
-	(KEYBOX_WITH_OPENPGP): Remove use of this macro.
-	(pgp_create_key_part_single): New.
-	(pgp_temp_store_kid): Change to use the keybox-openpgp parser.
-	(pgp_create_key_part): Ditto.
-	(pgp_create_uid_part): Ditto.
-	(pgp_create_sig_part): Ditto.
-	(pgp_create_blob_keyblock): Ditto.
-	(_keybox_create_openpgp_blob): Ditto.
-	* kbx/keybox-search.c (keybox_get_keyblock): New.
-	* kbx/keybox-update.c (keybox_insert_keyblock): New.
-	* g10/keydb.c (parse_keyblock_image):
-	(keydb_get_keyblock): Support keybox.
-	(build_keyblock_image): New.
-	(keydb_insert_keyblock): Support keybox.
-
-	* kbx/kbxutil.c (import_openpgp, main): Add option --dry-run and print
-	a kbx file to stdout.
-
-	* kbx/keybox-file.c (_keybox_read_blob2): Allow keyblocks up to 10^6
-	bytes.
-
-	kbxutil: Print algo number and fold similar lines.
-	+ commit f7495f1004071a0ceac394007bb37f88d7a3467f
-	* kbx/keybox-defs.h (_keybox_openpgp_key_info): Add field ALGO.
-	* kbx/keybox-openpgp.c (parse_key): Store algo.
-	* kbx/kbxutil.c (dump_openpgp_key): Print algo number.
-	* kbx/keybox-dump.c (_keybox_dump_blob): Print identical Sig-Expire
-	value lines with a range of indices.
-
-2012-12-27 Werner Koch <wk@gnupg.org>
-
-	gpg: First patches to support a keybox storage backend.
-	+ commit 91e61d52539b1808e209c43e51465c76cebb06f9
-	* kbx/keybox-defs.h (_keybox_write_header_blob): Move prototype to ..
-	* kbx/keybox.h: here.
-	* kbx/keybox-init.c (keybox_lock): Add dummy function
-	* g10/keydb.c: Include keybox.h.
-	(KeydbResourceType): Add KEYDB_RESOURCE_TYPE_KEYBOX.
-	(struct resource_item): Add field kb.
-	(maybe_create_keyring_or_box): Add error descriptions to diagnostics.
-	Add arg IS_BOX. Write a header for a new keybox file.
-	(keydb_add_resource): No more need for the force flag. Rename the
-	local variable "force" to "create". Add URL scheme "gnupg-kbx". Add
-	magic test to detect a keybox file. Add basic support for keybox.
-	(keydb_new, keydb_get_resource_name, keydb_delete_keyblock)
-	(keydb_locate_writable, keydb_search_reset, keydb_search2): Add
-	support for keybox.
-	(lock_all, unlock_all): Ditto.
-	* g10/Makefile.am (needed_libs): Add libkeybox.a.
-	(gpg2_LDADD, gpgv2_LDADD): Add KSBA_LIBS as a workaround.
-
-	* g10/keydb.h (KEYDB_RESOURCE_FLAG_PRIMARY)
-	KEYDB_RESOURCE_FLAG_DEFAULT, KEYDB_RESOURCE_FLAG_READONLY): New.
-	* g10/gpg.c, g10/gpgv.c (main): Use new constants.
-
-2012-12-20 Werner Koch <wk@gnupg.org>
-
-	gpg: Import only packets which are allowed in a keyblock.
-	+ commit f0b33b6fb8e0586e9584a7a409dcc31263776a67
-	* g10/import.c (valid_keyblock_packet): New.
-	(read_block): Store only valid packets.
-
-2012-12-19 Werner Koch <wk@gnupg.org>
-
-	gpg: Make commit 2b3cb2ee actually work.
-	+ commit d61f7402f2b0f6dd288e403ed9408fd65e617f85
-	* g10/sign.c (update_keysig_packet): Use digest_algo.
-
-	(cherry-picked from commit d23ec86095714d388acac14b515445fe69f019e9)
-
-	gpg: Suppress "public key already present" in quiet mode.
-	+ commit 8325d616593187ff227853de0295e3269b96edcb
-	* g10/pkclist.c (find_and_check_key, build_pk_list): Print a
-	diagnostic only in non-quiet mode.
-
-2012-12-18 Werner Koch <wk@gnupg.org>
-
-	common: Add meta option ignore-invalid-option.
-	+ commit 41d564333d35c923f473aa90625d91f8fe18cd0b
-	* common/argparse.c (iio_item_def_s, IIO_ITEM_DEF): New.
-	(initialize): Init field IIO_LIST.
-	(ignore_invalid_option_p): New.
-	(ignore_invalid_option_add): New.
-	(ignore_invalid_option_clear): New.
-	(optfile_parse): Implement meta option.
-
-2012-12-13 Werner Koch <wk@gnupg.org>
-	 Hans of Guardian <hans@guardianproject.info>
-
-	utf8conv.c: Add hacks for Android.
-	+ commit 6177fb3c87f485fb654bbba492d04508755718b3
-	* common/utf8conv.c HAVE_ANDROID_SYSTEM: Do not include iconv.h.
-	(iconv_open, iconv_close, load_libiconv) HAVE_ANDROID_SYSTEM: New
-	dummy functions.
-	(set_native_charset) HAVE_ANDROID_SYSTEM: Force use of "utf-8".
-	(jnlib_iconv_open) HAVE_ANDROID_SYSTEM: Act the same as under W32.
-	(jnlib_iconv) HAVE_ANDROID_SYSTEM: Ditto.
-	(jnlib_iconv_close) HAVE_ANDROID_SYSTEM: Ditto.
-
-2012-12-13 NIIBE Yutaka <gniibe@fsij.org>
-
-	SCD: Fix the process of writing key or generating key.
-	+ commit e7dca3e83ebd6df0a7ea55e97c3cd6e91be90af5
-	* scd/app-openpgp.c (store_fpr): Flush KEY-FPR and KEY-TIME.
-
-2012-12-12 Werner Koch <wk@gnupg.org>
-
-	ssh: Support ECDSA keys.
-	+ commit 649b31c663b8674bc874b4ef283d714a13dc8cfe
-	* agent/command-ssh.c (SPEC_FLAG_IS_ECDSA): New.
-	(struct ssh_key_type_spec): Add fields CURVE_NAME and HASH_ALGO.
-	(ssh_key_types): Add types ecdsa-sha2-nistp{256,384,521}.
-	(ssh_signature_encoder_t): Add arg spec and adjust all callers.
-	(ssh_signature_encoder_ecdsa): New.
-	(sexp_key_construct, sexp_key_extract, ssh_receive_key)
-	(ssh_convert_key_to_blob): Support ecdsa.
-	(ssh_identifier_from_curve_name): New.
-	(ssh_send_key_public): Retrieve and pass the curve_name.
-	(key_secret_to_public): Ditto.
-	(data_sign): Add arg SPEC and change callers to pass it.
-	(ssh_handler_sign_request): Get the hash algo from SPEC.
-	* common/ssh-utils.c (get_fingerprint): Support ecdsa.
-
-	* agent/protect.c (protect_info): Add flag ECC_HACK.
-	(agent_protect): Allow the use of the "curve" parameter.
-	* agent/t-protect.c (test_agent_protect): Add a test case for ecdsa.
-
-	* agent/command-ssh.c (ssh_key_grip): Print a better error code.
-
-2012-12-11 Werner Koch <wk@gnupg.org>
-
-	ssh: Rewrite a function for better maintainability.
-	+ commit f76a0312c3794afd81fe1e172df15eb0612deae0
-	* agent/command-ssh.c (ssh_signature_encoder_dsa): Rewrite.
-
-2012-12-10 Werner Koch <wk@gnupg.org>
-
-	ssh: Improve key lookup for many keys.
-	+ commit d2777f84be0ded5906a9bec3bc23cfed0a9be02f
-	* agent/command-ssh.c: Remove dirent.h.
-	(control_file_s): Add struct item.
-	(rewind_control_file): New.
-	(search_control_file): Factor code out to ...
-	(read_control_file_item): New.
-	(ssh_handler_request_identities): Change to iterate over entries in
-	sshcontrol.
-
-	ssh: Cleanup sshcontrol file access code.
-	+ commit 25fb53ab4ae7e1c098500229c776d29b82713a20
-	* agent/command-ssh.c (SSH_CONTROL_FILE_NAME): New macro to replace
-	the direct use of the string.
-	(struct control_file_s, control_file_t): New.
-	(open_control_file, close_control_file): New. Use them instead of
-	using fopen/fclose directly.
-
-	agent: Add envvar "gnupg_SSH_AUTH_SOCK_by"
-	+ commit 36ba7845995dd3caf8faeec3e09b3ffb879fc29b
-	* agent/gpg-agent.c (main): Pass new envar gnupg_SSH_AUTH_SOCK_by to
-	an invoked process.
-
-	config: Update npth.m4.
-	+ commit ceab60b59d907354d323ace09d7b3f2d36d330fb
-	* m4/npth.m4: Take from current npth master.
-
-2012-12-04 NIIBE Yutaka <gniibe@fsij.org>
-
-	Revert SCD changes of 2010-05-03.
-	+ commit 1e1326aeb8923782138e133f091afec41d969c40
-	* scd/apdu.c (pcsc_no_service): Remove.
-	(open_pcsc_reader_direct, open_pcsc_reader_wrapped): Remove
-	pcsc_no_service support.
-	(apdu_open_reader): Remove R_NO_SERVICE.
-	* scd/apdu.h (apdu_open_reader): Remove R_NO_SERVICE.
-	* scd/command.c (reader_disabled): Remove.
-	(get_current_reader): Follow the change of R_NO_SERVICE.
-	(open_card, cmd_serialno, scd_command_handler): Remove reader_disabled
-	support.
-	* scd/sc-copykeys.c (main): Follow the change of R_NO_SERVICE.
-
-	Don't keep opening unavailable card reader.
-	+ commit baf7b09e124f9eb4ca4b8ee02474ee7710a95a40
-	* scd/command.c (update_reader_status_file): Don't call
-	get_current_reader.
-
-2012-11-30 David Shaw <dshaw@jabberwocky.com>
-
-	Refresh sample keys.
-	+ commit b8eb2ab56971a309353ae2682bc6ef1357e9ac53
-
-
-	Adjust awk to not add trailing whitespace.
-	+ commit 3f8ad564674431b4c0c6cff259f02248c80a6ef9
-	* mksamplekeys: Tweak awk script to not add trailing whitespace to
-	 blank lines (makes git pre-commit hook unhappy)
-
-2012-11-29 David Shaw <dshaw@jabberwocky.com>
-
-	The keyserver search menu should honor --keyid-format.
-	+ commit 7602d9e3edda99b0b65ba928eef435dab04ecd09
-	* keyserver.c (print_keyrec): Honor --keyid-format when getting back
-	 full fingerprints from the keyserver (the comment in the code was
-	 correct, the code was not).
-
-2012-11-27 Werner Koch <wk@gnupg.org>
-
-	Fix printing of ECC algo names in hkp keyserver listings.
-	+ commit 3d2da6c82163ffbc2e827abc4144dc3197ed53db
-	* g10/keyserver.c (print_keyrec): Map OpenPGP algorithm ids.
-
-2012-11-26 Ben Kibbey <bjk@luxsci.net>
-
-	Check for inet_addr() in -lnsl.
-	+ commit 66331e138ec17e176cc3f45bb095820866d5358c
-	* configure.ac: Check for inet_addr() in libnsl.
-
-2012-11-20 Werner Koch <wk@gnupg.org>
-
-	Do not use a broken ttyname.
-	+ commit 835698b72bc509565aad52b0753f1c56c1a8f062
-	* configure.ac (HAVE_BROKEN_TTYNAME): New ac_define set for Android
-	systems.
-	* common/util.h (gnupg_ttyname): New macro. Change all callers of
-	ttyname to use this macro instead.
-	(ttyname) W32: Rename to _gnupg_ttyname and use also if
-	HAVE_BROKEN_TTYNAME is defined.
-	* common/simple-pwquery.c (agent_send_all_options): Keep on using
-	ttyname unless HAVE_BROKEN_TTYNAME is set. This is because this file
-	may be used standalone.
-
-2012-11-16 Werner Koch <wk@gnupg.org>
-
-	Fix non-portable use of chmod in autogen.sh.
-	+ commit e7bc5012c568da9ceb0a80a8f3fe3edf3dac9564
-	* autogen.sh: Remove option -c from chmod.
-
-	Improve parsing of the GIT revision number.
-	+ commit 011faa0c68cf0c628ef581193166e9ac9bf22b71
-	* configure.ac (mmm4_revision): Use git rev-parse.
-
-	Add an OpenPGP card vendor.
-	+ commit ac775780fef3ef63f896e822add9ff6ea7e5119c
-	* g10/card-util.c (get_manufacturer): Add Yubico.
-
-2012-11-06 Werner Koch <wk@gnupg.org>
-
-	agent: Use wipememory instead of memset in one place.
-	+ commit 9f0e9ea80ca30269770eb955e33b54401bff917f
-	* agent/command.c (clear_outbuf): Use wipememory. Suggested by Ben
-	Kibbey.
-
-	Allow decryption with card keys > 3072 bits.
-	+ commit 905b6a36d3ca21b2f619721e1de892398e5eb759
-	* scd/command.c (MAXLEN_SETDATA): New.
-	(cmd_setdata): Add option --append.
-	* agent/call-scd.c (agent_card_pkdecrypt): Use new option for long
-	data.
-
-	* scd/app-openpgp.c (struct app_local_s): Add field manufacturer.
-	(app_select_openpgp): Store manufacturer.
-	(do_decipher): Print a note for broken cards.
-
-2012-11-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	agent: Fix wrong use of gcry_sexp_build_array.
-	+ commit 8f8c29d24ca13f987e6c118702b428a2051b7072
-	* findkey.c (agent_public_key_from_file): Fix use of
-	gcry_sexp_build_array.
-
-2012-10-31 NIIBE Yutaka <gniibe@fsij.org>
-
-	SCD: Upon error, open_pcsc_reader_wrapped does same as _direct.
-	+ commit 8df89f3e9cf0255f11011c2f1df0d419a5c23a8c
-	* scd/apdu.c (PCSC_E_NO_SERVICE): New.
-	(open_pcsc_reader_direct): Use PCSC_E_NO_SERVICE.
-	(open_pcsc_reader_wrapped): Set pcsc_no_service.
-
-2012-08-24 Werner Koch <wk@gnupg.org>
-
-	Update and enable French translation.
-	+ commit 76055d49d1c8b8e4f6245e6729cae81b1eaecbf6
-	* po/fr.po: Update.
-	* po/LINGUAS: Enable fr.
-
-2012-08-24 David Prévot <taffit@debian.org>
-
-	Fix typos spotted during translations.
-	+ commit ba591e2f14c0d85ba15346ffd04b9e7d72ec89dc
-	* agent/genkey.c: s/to to/to/
-	* sm/*.c: s/failed to allocated/failed to allocate/
-	* sm/certlist.c, ./dirmngr/validate.c: s/should have not/should not have/
-	* g10/seskey.c: missing closing parenthesis
-	* dirmngr/crlcache.c: s/may has/may have/
-
-	Consistency fix:
-
-	* g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax
-	* dirmngr/dirmngr_ldap: no period in Syntax
-	* dirmngr/dirmngr-client.c: infinitive for option description:
-		s/certificates are expected/expect certificates/
-
-	Keep previous msgids of translated messages.
-	+ commit bf95408fc33709d154cd41566d33af3ec3c48886
-	* po/Makefile.in.in: Use --previous with msgmerge.
-
-2012-08-24 Hans-Christoph Steiner <hans@eds.org>
-
-	Fix build system for Android by disabling tests since its x-compiled.
-	+ commit 1da04bfb3f5714a0fa6d0b779d0d2ae4e9544b8f
-	* configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New.
-	(AH_BOTTOM) __ANDROID__: Do not re-define ttyname.
-	* Makefile.am: Depend tests on new RUN_TESTS conditional.
-
-2012-08-24 Werner Koch <wk@gnupg.org>
-
-	Fix left over use of jnlib on some platforms.
-	+ commit 8156a38674421deef6c2eb3e91e0186fe7fe4b26
-	* tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.
-
-2012-06-25 NIIBE Yutaka <gniibe@fsij.org>
-
-	scd: handle reader/token removal.
-	+ commit ca8eec8e28abb8473d02dbaf8d61cfb1094c5c50
-	* scd/apdu.c (pcsc_error_to_sw): PCSC_E_UNKNOWN_READER means
-	SW_HOST_NO_READER.
-
-2012-06-05 Werner Koch <wk@gnupg.org>
-
-	Change all quotes in strings and comments to the new GNU standard.
-	+ commit 096e7457ec636bcfcf128678660eb2f2e19f113a
-	The asymmetric quotes used by GNU in the past (`...') don't render
-	nicely on modern systems. We now use two \x27 characters ('...').
-
-	The proper solution would be to use the correct Unicode symmetric
-	quotes here. However this has the disadvantage that the system
-	requires Unicode support. We don't want that today. If Unicode is
-	available a generated po file can be used to output proper quotes. A
-	simple sed script like the one used for en@quote is sufficient to
-	change them.
-
-	The changes have been done by applying
-
-	 sed -i "s/\`$^'\`*$'/'\1'/g"
-
-	to most files and fixing obvious problems by hand. The msgid strings in
-	the po files were fixed with a similar command.
-
-2012-05-24 Werner Koch <wk@gnupg.org>
-
-	Print the hash algorithm in colon mode key listing.
-	+ commit fc00d3fcb201476b3495f47138fa35b71c52f403
-	* g10/keylist.c (list_keyblock_colon): Print digest_algo.
-
-	Fix type conflict warning.
-	+ commit f8a8c71c41bc1893df8af6ce522876ccbf6240a9
-	* g10/keylist.c: Change min_cert_level to a byte.
-
-2012-05-11 Werner Koch <wk@gnupg.org>
-
-	Switch to the new automagic beta numbering scheme.
-	+ commit 68777b40dcf215305a325185f6bd9cfd6dcc0542
-	* configure.ac: Add all the require m4 magic.
-
-2012-05-08 Werner Koch <wk@gnupg.org>
-
-	Add tweaks for the not anymore patented IDEA algorithm.
-	+ commit b4d9f8dbc8e074cd91bbd3e2e54e2b77c9268d1a
-	* g10/keygen.c (keygen_set_std_prefs): Include IDEA only in PGP2
-	compatibility mode.
-	* g10/misc.c (idea_cipher_warn): Remove. Also remove all callers.
-	* common/status.h (STATUS_RSA_OR_IDEA): Remove. Do not emit this
-	status anymore.
-
-	po: Update de.po.
-	+ commit 59b77f9ea7dfa4d5c74573d2186c9a3e129ab3bf
-	* po/de.po: Update.
-
-	common: Remove generated files only during maintainer-clean.
-	+ commit d800fa5ce6102e069305f8e1a5d55d18ac3a1993
-	* common/Makefile.am (CLEANFILES): Rename to MAINTAINERCLEANFILES.
-
-2012-04-30 Werner Koch <wk@gnupg.org>
-
-	agent: Fix deadlock in trustlist due to the switch to npth.
-	+ commit 0f02fba19df16c82ca1ad44a8cb09f952d755598
-	* agent/trustlist.c (clear_trusttable): New.
-	(agent_reload_trustlist): Use new function.
-	(read_trustfiles): Require to be called with lock held.
-	(agent_istrusted): Factor all code out to ...
-	(istrusted_internal): new. Add ALREADY_LOCKED arg. Make sure the
-	table islocked. Do not print TRUSTLISTFLAG stati if called internally.
-	(agent_marktrusted): Replace calls to agent_reload_trustlist by
-	explicit code.
-
-2012-04-26 NIIBE Yutaka <gniibe@fsij.org>
-
-	make DNS and URI fields work in gpgsm --gen-key.
-	+ commit 8d7522837c6dba3065d24594bcdbe7b99a702cde
-	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Actually set mb_uri and
-	mb_dns.avoid buffer strncpy-induced buffer overrun
-
-2012-04-26 Jim Meyering <jim@meyering.net>
-
-	avoid buffer strncpy-induced buffer overrun.
-	+ commit 20c9ac4df34e25f7085bb4e4ab5ea7223932f5c4
-	* dirmngr/crlcache.c (open_dir): Ensure that both this_update
-	and next_update member strings are NUL-terminated.
-
-	remove doubled words in a comment.
-	+ commit 6e3882785a629b361c57c8b9d5cad51fb234ac23
-
-
-2012-04-20 Werner Koch <wk@gnupg.org>
-
-	Change license for some files in common to LGPLv3+/GPLv2+.
-	+ commit 37df3d5f593f76ddbf1b9dc6de0173b7bb85c0ad
-	Having the LGPL on the common GnuPG code helps to share code
-	between GnuPG and related projects (like GPGME and Libassuan). This
-	is good for interoperability and to reduces bugs.
-
-	* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
-	* common/b64enc.c, common/convert.c, common/dns-cert.c
-	* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
-	* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
-	* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
-	* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
-	* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
-	* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
-	* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
-	* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
-	* common/session-env.h, common/sexp-parse.h, common/sexputil.c
-	* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
-	* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
-	* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
-	* common/userids.c, common/userids.h, common/xasprintf.c: Change
-	license to LGPLv3+/GPLv2+/
-
-2012-04-10 Ben Kibbey <bjk@luxsci.net>
-
-	Fix killing PID -1.
-	+ commit bee0ac28c9c8027540ae56900b9f85e0bd555f1d
-	When the KILLSCD command had been sent a race condition would occur
-	causing PID -1 getting killed, which on Linux seems to terminate all
-	applications for the current user.
-
-2012-04-05 Werner Koch <wk@gnupg.org>
-
-	Do not mix test result with progress lines.
-	+ commit f1e1387bee286c7434f0462185048872bcdb4484
-	This makes parsing of the results easier. Fixes bug#1400.
-
-	* tests/openpgp/defs.inc (progress_cancel, progress_end)
-	(progress_new): New.
-	* tests/openpgp/conventional-mdc.test: Use progress functions
-	* tests/openpgp/conventional.test: Ditto.
-	* tests/openpgp/encrypt-dsa.test: Ditto.
-	* tests/openpgp/encrypt.test: Ditto.
-	* tests/openpgp/sigs.test: Ditto.
-
-2012-04-04 Ben Kibbey <bjk@luxsci.net>
-
-	Mention status messages in the documentation.
-	+ commit 99fc61f1cf09c7f72a9037d91d3cf0cd2e035ae6
-	Note INQUIRE_MAXLEN.
-
-	Document PASSWD --preset.
-	+ commit a577f06c4aecc0af5b492e15812e9150c747cbe4
-
-
-	Document GENKEY options.
-	+ commit 108e8f622ef9cfa256707debec1d379ce3cf21ca
-
-
-	Document PRESET_PASSPHRASE.
-	+ commit 96e107fc29db625b247022ae1bf2cbe90b939c5d
-
-
-	Document CLEAR_PASSPHRASE.
-	+ commit 26b59d78c43d72fa28609fb2c0d80fb377393127
-	And describe the --mode=normal option.
-
-2012-03-27 Werner Koch <wk@gnupg.org>
-
-	Fix timegm regression test.
-	+ commit 17499e761e8cd0fe867b5b5f3e42a71b6d45f954
-	* common/t-timestuff.c (test_timegm): Change test to use January and
-	not February or December+1. Bug spotted by Daniel Kahn Gillmor.
-
-	Print warning for arguments not considered an option.
-	+ commit de01c51ecb3918f427aa76281351749c8ad07ed6
-	GnuPG requires that options are given before other arguments. This
-	can sometimes be confusing. We now print a warning if we found an
-	argument looking alike a long option without being preceded by the
-	stop option. This is bug#1343.
-
-	* common/argparse.h (ARGPARSE_FLAG_STOP_SEEN): New.
-	* common/argparse.c (arg_parse): Set new flag.
-	* g10/gpg.c (main): Print the warning.
-	* agent/gpg-agent.c (main): Ditto.
-	* dirmngr/dirmngr.c (main): Ditto.
-	* g13/g13.c (main): Ditto.
-	* scd/scdaemon.c (main): Ditto.
-	* sm/gpgsm.c (main): Ditto.
-	* tools/gpg-connect-agent.c (main): Ditto.
-	* tools/gpgconf.c (main): Ditto.
-
-2012-03-26 Werner Koch <wk@gnupg.org>
-
-	Allow compress algorithm 0.
-	+ commit 7ddbcb6b6ab8b26c8e609fcd95c2c8a89bc20a7d
-	* g10/mainproc.c (proc_compressed): Remove superfluous check for
-	compress algorithm 0. Reported by pfandrade. This is bug#1326.
-
-	Add mksamplekeys script.
-	+ commit 7441e622ffb3296686bd0d7f04b4051466aaad38
-	* doc/mksamplekeys: New.
-
-2012-02-28 Marcus Brinkmann <mb@g10code.com>
-
-	Replace npth_yield in busy wait by npth_usleep.
-	+ commit 8f8c6594147608b1021c16fc3561feb96da5d55a
-	* dirmngr/ldap-wrapper.c (ldap_wrapper_wait_connections): Call
-	npth_usleep instead of npth_yield.
-
-2012-02-16 Marcus Brinkmann <mb@g10code.com>
-
-	Check for lber and link dirmngr_ldap to it.
-	+ commit 76ff42ef8d1232dd36bf48c1020b0b9b2afb1c7d
-	* configure.ac (LBER_LIBS, HAVE_LBER): New variables, check for lber.
-	* dirmngr/Makefile.am (dirmngr_lda_LDADD): Add $(LBER_LIBS).
-
-2012-02-07 Werner Koch <wk@gnupg.org>
-
-	agent: Add pin length field to the shadowed private key format.
-	+ commit b817ae7df947093384a25797999a9aa187e20f9c
-	This is not yet fully implemented. It will eventually allow to
-	support pinpad equipped readers which do not support variable length
-	pin lengths.
-	* agent/protect.c (parse_shadow_info): Add optional arg R_PINLEN and
-	parse pinlen info. Change all callers to pass NULL for it.
-
-	Use new status printing functions.
-	+ commit 12ea5c904c0008a2adec2e8bbe45dac629548e7d
-	* agent/command.c (cmd_geteventcounter): Get rid of static buffers.
-	* scd/command.c (cmd_serialno, cmd_learn): Simplify by using
-	print_assuan_status.
-
-	agent: New function agent_print_status.
-	+ commit e78585cd0f553d92f332e33810ab636758bc88a2
-	* common/asshelp2.c (vprint_assuan_status): New.
-	(print_assuan_status): Re-implement using above func.
-	* agent/command.c (agent_print_status): New.
-
-	po: Add Ukrainian translation.
-	+ commit 8d8d740bfd73d8764a03220c0b0c949e03fea351
-	* po/uk.po: New.
-
-	common: Replace macro based function calls by using DEFAULT_ERRSOURCE.
-	+ commit 13ec74481ce0137f7a60b3256cc4840073c77efa
-	* common/dns-cert.h (get_dns_cert): Remove macro.
-	* common/dns-cert.c (_get_dns_cert): Rename to get_dns_cert. Replace
-	arg ERRSOURCE by global DEFAULT_ERRSOURCE.
-	* common/http.h (http_parse_uri, http_raw_connect, http_open)
-	(http_open_document, http_wait_response): Remove macros.
-	* common/http.c (_http_parse_uri, _http_raw_connect, _http_open)
-	(_http_open_document, _http_wait_response): Remove underscore from
-	symbols. Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
-	* common/ssh-utils.h (ssh_get_fingerprint)
-	(ssh_get_fingerprint_string): Remove macros.
-	* common/ssh-utils.h (_ssh_get_fingerprint)
-	(_ssh_get_fingerprint_string): Remove underscore from symbols.
-	Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
-	* common/tlv.h (parse_ber_header, parse_sexp): Remove macros.
-	* common/tlv.c: Include util.h.
-	(_parse_ber_header, _parse_sexp): Remove underscore from symbols.
-	Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
-
-2012-02-06 Werner Koch <wk@gnupg.org>
-
-	Add replacement hack for Android's broken ttyname.
-	+ commit 115a6ed55d1f6be33f66de6734359fa590ca3749
-	* configure.ac (HAVE_TTYNAME) __ANDROID__: Add hack.
-
-	agent: Simplify printing of INQUIRE_MAXLEN.
-	+ commit 7981cdd1345d51fd917b2375691ead60c24db2cd
-	* agent/command.c: Include asshelp.h.
-	(cmd_pkdecrypt, cmd_genkey, cmd_preset_passphrase)
-	(pinentry_loopback): Use print_assuan_status for INQUIRE_MAXLEN.
-
-	common: Add function print_assuan_status.
-	+ commit 1a0df8506050448f16c63666850e3ae6d94a971b
-	* common/asshelp2.c: New.
-	(print_assuan_status): New function.
-	* common/Makefile.am (common_sources): Add asshelp2.c.
-
-	common: Add a global variable to for the default error source.
-	+ commit eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a
-	For the shared code parts it is cumbersome to pass an error sourse
-	variable to each function. Its value is always a constant for a given
-	binary and thus a global variable makes things a lot easier than the
-	former macro stuff.
-	* common/init.c (default_errsource): New global var.
-	(init_common_subsystems): Rename to _init_common_subsystems. Set
-	DEFAULT_ERRSOURCE.
-	* common/init.h: Assert value of GPG_ERR_SOURCE_DEFAULT.
-	(init_common_subsystems): New macro.
-	* common/util.h (default_errsource): Add declaration.
-	* kbx/keybox-defs.h: Add some GPG_ERR_SOURCE_DEFAULT trickery.
-
-2012-02-03 Ben Kibbey <bjk@luxsci.net>
-
-	Also let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message.
-	+ commit ecda65498ac60dfde50fbbc71cd0cc321d7175a9
-	* agent/command.c (cmd_pkdecrypt): Send the INQUIRE_MAXLEN status
-	message before doing the inquire.
-	(cmd_genkey): Ditto.
-
-2012-02-02 Ben Kibbey <bjk@luxsci.net>
-
-	Inform the client of the preset passphrase length.
-	+ commit 3f7788f2e035eb939abb27b3a53854ec0fc6178c
-	* agent/command.c (cmd_preset_passphrase): Send the INQUIRE_MAXLEN
-	status message before inquiring the passphrase.
-
-2012-02-01 David Shaw <dshaw@jabberwocky.com>
-
-	Honor --cert-digest-algo when recreating a cert.
-	+ commit 2b3cb2ee94625498e7a7f939216c9bcddef6ec20
-	* g10/sign.c (update_keysig_packet): Honor --cert-digest-algo when
-	 recreating a cert.
-
-	This is used by various things in --edit-key like setpref, primary,
-	etc. Suggested by Christian Aistleitner.
-
-2012-01-27 Werner Koch <wk@gnupg.org>
-
-	gl: Add support for Android to stdint.h replacement.
-	+ commit bdde44ae8d4709e33c09781c3d37a5da2c7a5e0d
-	* gl/stdint_.h: When included from Bionic <sys/types.h>, just include
-	the system's <stdint.h>.
-
-	gpg-connect-tool: Take the string "true" as a true condition.
-	+ commit 2871422d9a889cb632f59efda4d9cd170fc9fca7
-	* tools/gpg-connect-agent.c (main): Handle strings "true" and "yes" in
-	conditions as expected.
-
-2012-01-26 Ben Kibbey <bjk@luxsci.net>
-
-	Return GPG_ERR_CARD_NOT_PRESENT when pinentry-mode=loopback.
-	+ commit cf748e8736b984194345bfd74887b35d3d23fa37
-	Since there isn't a way to prompt the user to insert the smartcard when
-	pinentry-mode=loopback, return GPG_ERR_CARD_NOT_PRESENT instead of
-	GPG_ERR_NO_PIN_ENTRY.
-
-	* agent/divert-scd.c (ask_for_card): Return GPG_ERR_CARD_NOT_PRESENT
-	when pinentry-mode=loopback.
-
-	Also check for GPG_ERR_ASS_CANCELED during an inquire.
-	+ commit 3da10eefcb09a520f11e4fae7f59a33f80ffba69
-	Fix pinentry-mode=loopback when cancelling an inquire from scdaemon.
-	This is similar to commit 4f21f8d but for both protocol command
-	cancellation and pinentry cancellation.
-
-	* agent/call-scd.c (agent_card_pkdecrypt): Check for
-	GPG_ERR_ASS_CANCELED.
-	(agent_card_pksign): Ditto.
-
-2012-01-25 Werner Koch <wk@gnupg.org>
-
-	nPth is now a hard requirement for GnuPG.
-	+ commit 001352077cdc7e402421c77328bea1a052005673
-	* configure.ac: Remove cruft to allow building without npth.
-
-	Require libassuan 2.1.0.
-	+ commit c254d0f0d13a54777a62dad8f78a8f287d6ae565
-	* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.1.0. This is due to
-	the npth changes.
-
-	Fix strerror vs. gpg_strerror usage.
-	+ commit 2be7818c6d916a69ffdf88cce32960949a56e893
-	This bug was introduced by the migration to npth.
-	* agent/gpg-agent.c (handle_connections): Use strerror.
-
-	Add missing variable.
-	+ commit a55d2e16f1090264338dc3ad0b2afca28db27c09
-	* agent/gpg-agent.c (handle_connections) !W32: Add missing variable.
-
-2012-01-25 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	Port LDAP wrapper to NPTH.
-	+ commit 4074f966276be10a794fd63a7f443b9d974d3982
-	* agent/gpg-agent.c (handle_connections): Handle error.
-	* dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c: Port to NPTH.
-
-	Port Windows code to NPTH.
-	+ commit ccbb4c3652ee72386b8889358b829e256e1ebcda
-	* agent/gpg-agent.c (get_agent_ssh_socket_name): Use
-	INVALID_HANDLE_VALUE instead of 0.
-	(handle_signal) !HAVE_W32_SYSTEM: Don't define.
-	(handle_connections): Port Windows code to NPTH.
-	* dirmngr/dirmngr.c (handle_connections): Port Windows code to NPTH.
-	* g13/g13.c (handle_connections): Port Windows code to NPTH.
-	* scd/scdaemon.c (handle_connections): Port Windows code to NPTH.
-
-	Port to npth.
-	+ commit 7a7a59782766a8bde0c3e7156d14bb2b0e4a3951
-	* configure.ac: Don't check for PTH but for NPTH.
-	(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
-	(have_pth): Rename to ...
-	(have_npth): ... this.
-	(USE_GNU_NPTH): Rename to ...
-	(USE_GNU_PTH): ... this.
-	* m4/npth.m4: New file.
-	* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
-	agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
-	agent/trustlist.c, common/Makefile.am, common/estream.c,
-	common/exechelp-posix.c, common/exechelp-w32.c,
-	common/exechelp-w32ce.c, common/http.c, common/init.c,
-	common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
-	dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
-	dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
-	g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
-	scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
-	scd/scdaemon.c, tools/Makefile.am: Port to npth.
-
-2012-01-25 Werner Koch <wk@gnupg.org>
-
-	Require gitlog-to-changelog to be installed.
-	+ commit 495dc68586356891b82a2d2b6367c4131fd17f08
-	* Makefile.am (GITLOG_TO_CHANGELOG): New.
-	(gen-ChangeLog): Use installed version of gitlog-to-changelog.
-
-2012-01-20 David Shaw <dshaw@jabberwocky.com>
-
-	Changes to --min-cert-level should cause a trustdb rebuild (issue 1366)
-	+ commit deee8147aab086161c91e6aa6fb41d7148a630f6
-	* g10/gpgv.c, g10/trustdb.c (read_trust_options): Add min_cert_level
-
-	* g10/trustdb.c (check_trustdb_stale): Request a rebuild if
-	 pending_check_trustdb is true (set when we detect a trustdb
-	 parameter has changed).
-
-	* g10/keylist.c (public_key_list): Use 'l' in the "tru" with-colons
-	 listing for min_cert_level not matching.
-
-	* g10/tdbio.c (tdbio_update_version_record, create_version_record,
-	 tdbio_db_matches_options, tdbio_dump_record, tdbio_read_record,
-	 tdbio_write_record): Add a byte for min_cert_level in the tdbio
-	 version record.
-
-2012-01-20 Werner Koch <wk@gnupg.org>
-
-	estream: Fix unclean usage of realloc.
-	+ commit e97e2ced6cf3ee295a3cc9f8968969a1910380ea
-	* common/estream-printf.c (_ESTREAM_PRINTF_MALLOC): Remove.
-	(_ESTREAM_PRINTF_FREE): Remove.
-	(_ESTREAM_PRINTF_REALLOC): New.
-	(fixed_realloc) !_ESTREAM_PRINTF_REALLOC): New.
-	(estream_vasprintf): Use my_printf_realloc instead of my_printf_malloc
-	and my_printf_free.
-	(dynamic_buffer_out): Use my_printf_realloc instead of realloc.
-
-	Do not copy default merge commit log entries into the ChangeLog.
-	+ commit 7589e43b21c8d80c5a57ecb6eb78dfcd0b5dac46
-	* scripts/gitlog-to-changelog: Skip merge commits.
-
-2012-01-18 Ben Kibbey <bjk@luxsci.net>
-
-	Add the INQUIRE_MAXLEN status message.
-	+ commit ae981dd8f454e2a8bbc6429bed5abc5e87cc83d5
-	This status message is used to inform the client of the maximum length
-	of an inquired passphrase and is used in pinentry-mode=loopback.
-
-	* agent/command.c (pinentry_loopback): Send the INQUIRE_MAXLEN status
-	message before doing the inquire.
-
-2012-01-16 Jim Meyering <meyering@redhat.com>
-
-	yat2m: don't dereference pointer to freed memory.
-	+ commit 4402dc3f0a5c5d0f26ed2ae97f9cda9cf4e695fa
-	* doc/yat2m.c (top_parse_file): Correct macrolist-freeing loop.
-
-	gpg-agent: fix lc-messages handling not to change Xauthority setting.
-	+ commit 37801918cb916ae8c641e003f204dcc70cccb29c
-	* agent/gpg-agent.c (main): Supply omitted "break" statement for
-	lc-messages option. Otherwise, control would fall through to the
-	following oXauthority case and use the same value there.
-
-2012-01-15 Werner Koch <wk@gnupg.org>
-
-	Fix indentation.
-	+ commit 75a402fc25e4ec9659723dd58306aff3415736f4
-
-
-2012-01-14 Ben Kibbey <bjk@luxsci.net>
-
-	Fix scdaemon pinentry inquire cancelation.
-	+ commit 4f21f8d6e109eae111d2da91f4c946afda4174e4
-	Similar to commit 29af488 but also fixes PKDECRYPT and PKSIGN.
-
-	* agent/call-scd.c (agent_card_pkdecrypt): Check for GPG_ERR_CANCELED
-	when returning from the PKDECRYPT operation of scdaemon and cancel the
-	inquire.
-	(agent_card_pksign): Ditto.
-	(cancel_inquire): New.
-
-2012-01-11 Werner Koch <wk@gnupg.org>
-
-	gpg: Fix segv with RSA_S keys.
-	+ commit 30ec869b8c63f1edcc58110ed20b83b0e77248f8
-	* g10/misc.c (pubkey_get_npkey, pubkey_get_nskey)
-	(pubkey_get_nsig, pubkey_get_nenc): Map all RSA algo ids to
-	GCRY_PK_RSA.
-
-	estream: Avoid printing leading zeroes by %p on 32 bit systems.
-	+ commit b42bc48dfb4b6d4f745eb02d8de4f4dcffdacf48
-	* common/estream-printf.c (pr_pointer): Synchronize definition of
-	AULONG with its use.
-
-2012-01-11 David Shaw <dshaw@jabberwocky.com>
-
-	Refresh sample keys.
-	+ commit 860861279bc17dd80eecc9631c4ae5d161a335fd
-
-
-2012-01-10 David Shaw <dshaw@jabberwocky.com>
-
-	Adapt HKP fix for fingerprint/long keyid retrievals for dirmngr.
-	+ commit 3f59561cee635c6801e0a59d3abff1c064fcbdbe
-	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Use the longest valid keyid form
-
-2012-01-06 Werner Koch <wk@gnupg.org>
-
-	gpg: Make the double space in the middle of a fingerprint optional.
-	+ commit 957fe728466893bc63f5ccad197d3e245dca4bf3
-	This change might help to c+p a fingerprint from an HTML page without
-	being enclosed in a "pre" tag.
-	* common/userids.c (classify_user_id): Skip a second blank in the
-	middle of a fingerprint.
-
-	gpg: Allow use of a standard space separated fingerprint.
-	+ commit 372fb4fc0661014ccd9275c89e6da2208f87155f
-	* common/userids.c (classify_user_id): Check for space separated GPG
-	fingerprint.
-
-2012-01-06 NIIBE Yutaka <gniibe@fsij.org>
-
-	Merge ccid_driver_improvement branch.
-	+ commit 5988c8bfb7eafaca53c8abeb793f189acd3177c6
-	* scd/apdu.c (ccid_keypad_operation): Rename from ccid_keypad_verify.
-	(open_ccid_reader): Use ccid_keypad_operation for verify and modify.
-
-	* scd/ccid-driver.c (VENDOR_VASCO, VASCO_920): New.
-	(ccid_transceive_apdu_level): Permit sending packet where
-	apdulen <= 289. Support receiving packets in a chain.
-	(ccid_transceive_secure): Maximum is 15 for VASCO DIGIPASS 920.
-	Support keypad_modify method such as CHANGE_REFERENCE_DATA: 0x24.
-
-2012-01-03 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	Silence gcc warning.
-	+ commit ed432f030e604f7b2fd4a79c2110d92b9cde7501
-	* sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.
-
-	Revert last change, add comment about link() return values.
-	+ commit ff2095ad7b4be7eaf9468b6ef39fd979527ecc4f
-	* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check
-	return value of link().
-
-	Fix compiler warnings.
-	+ commit 0dce26778ef8abd4fc40de689d7ec9b720d26430
-	* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return
-	value of link().
-	* g13/g13.c: Make sure err is initialized.
-	* scd/scdaemon.c (main) !USE_GCRY_THREAD_CBS: Do not define ERR.
-
-	Fix last change: Only set gcrypt thread callback for older versions.
-	+ commit 61ccd8d92d9d3b8ba0eca3c2969d7f6f37e16405
-	* dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to
-	USE_GCRY_THREAD_CBS.
-
-2012-01-03 Werner Koch <wk@gnupg.org>
-
-	Terminate csh commands with a semicolon also for dirmngr.
-	+ commit 682df45d15661ed3544e2ed34bcb636200cc40f9
-	* dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.
-
-	Terminate csh commands with a semicolon.
-	+ commit d01d9ff11f46cbd61b7b8c0e04431e4f0c4a8580
-	Fixes bug#1386.
-
-	* agent/gpg-agent.c (main): Terminate csh style output with a semicolon.
-	* scd/scdaemon.c: Ditto.
-
-2012-01-02 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
-
-	Only set gcrypt thread callback for older version of gcrypt.
-	+ commit a2d9e48fcca6cfc2dfadef6dbd3579a30314676b
-	* agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c
-	(USE_GCRY_THREAD_CBS): New macro, defined if
-	GCRY_THREAD_OPTION_VERSION is 0.
-	(fixed_gcry_pth_init) !USE_GCRY_THREAD_CBS: Don't define.
-	(main) !USE_GCRY_THREAD_CBS: Do not install thread callbacks.
-
-2011-12-28 David Shaw <dshaw@jabberwocky.com>
-
-	Use the longest key ID available when talking to a HKP server.
-	+ commit c6aaf024651c7d55ac9fb77a53c084efb3adc1a9
-	This is issue 1340. Now that PKSD is dead, and SKS supports long key
-	IDs, this is safe to do. Patch from Daniel Kahn Gillmor
-	<dkg@fifthhorseman.net>.
-
-2011-12-20 Werner Koch <wk@gnupg.org>
-
-	Post-release version number update.
-	+ commit 97d1c884e62bba94e42bb5b2bb13cd3880334c31
-
-
-	Release 2.1.0beta3.
-	+ commit 604c130a85d4203b9d84137a42673aeaff1c0bd1
-
-
-	Prepare for the beta3 release.
-	+ commit 8e47f1e576f70d4dbe966523057fe3078006ae8b
-
-
-	po: Update the German translation.
-	+ commit 6f02c143440865781b4e3c1753e24e55a0de40e4
-
-
-	Add the STEED Self-Signing Nonthority certificate.
-	+ commit fe2f1826991e8130f727ee15df1a4651f679752f
-	* doc/com-certs.pem: Install it when creating a keybox.
-
-	faq: Add section on US export restrictions.
-	+ commit 779611494dbd187d09b05d2eb10faabd31a70156
-
-
-	Require Libassuan 2.0.3.
-	+ commit 366512abe44d9e71bb2c699c29477afa6ac71cdd
-	* configure.ac: Require Libassuan 2.0.3.
-	* agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
-	* agent/command.c (cmd_killagent) ASSUAN_FORCE_CLOSE: Remove
-	dependency.
-	(cmd_killagent) ASSUAN_FORCE_CLOSE: Ditto.
-	* scd/command.c (cmd_killscd) ASSUAN_FORCE_CLOSE: Ditto.
-
-2011-12-20 NIIBE Yutaka <gniibe@fsij.org>
-
-	Add error log and debug log for pcsc_keypad_verify and pcsc_keypad_modify.
-	+ commit 07f20f313a0b13e5c93168a8a62ff1cbb94a4514
-	* scd/apdu.c (pcsc_keypad_verify): Add debug log and error log.
-	(pcsc_keypad_modify): Likewise.
-
-2011-12-19 Werner Koch <wk@gnupg.org>
-	 Ben Kibbey <bjk@luxsci.net>
-
-	scd: Fix for card change returning GPG_ERR_CARD_RESET.
-	+ commit f4b7f7146349c388a2f3ce224ff2006606c66232
-	* scd/apdu.c (apdu_connect): Do not test for zero atrlen.
-
-2011-12-16 NIIBE Yutaka <gniibe@fsij.org>
-
-	Don't kill pinentry by SIGKILL but let it quit by SIGINT.
-	+ commit f6251c0d0af92331388f5e9bcd1750cbadcaca8f
-	* agent/call-pinentry.c (agent_popup_message_stop): To pinentry, send
-	SIGINT (was: SIGKILL).
-
-2011-12-15 David Shaw <dshaw@jabberwocky.com>
-
-	Merge fix for issue 1331 from 1.4.
-	+ commit a98260c39f1c0ccdad004784cbc9440376766082
-	* photoid.c (generate_photo_id): Check for the JPEG magic numbers
-	instead of JFIF since some programs generate an EXIF header first.
-
-2011-12-15 Werner Koch <wk@gnupg.org>
-
-	scd: Prefer application Geldkarte over DINSIG.
-	+ commit 27089564b6453deaf7b4ffe7cc5f5f290b6d892b
-	* scd/app.c (select_application): Reorder application tests.
-
-	scd: Add option --dump-atr to command APDU.
-	+ commit b22d62bd1481dfe13d60a6d16b09b9297944f063
-	* scd/atr.c: Rewrite.
-	* scd/Makefile.am (scdaemon_SOURCES): Add atr.c and atr.h.
-	* scd/command.c (cmd_apdu): Add option --dump-atr.
-
-	estream: New function es_fclose_snatch.
-	+ commit 7737a2c269657189a583cde7f214f20871d264f8
-	* common/estream.c (cookie_ioctl_function_t): New type.
-	(es_fclose_snatch): New function.
-	(COOKIE_IOCTL_SNATCH_BUFFER): New constant.
-	(struct estream_internal): Add field FUNC_IOCTL.
-	(es_initialize): Clear FUNC_IOCTL.
-	(es_func_mem_ioctl): New function.
-	(es_fopenmem, es_fopenmem_init): Init FUNC_IOCTL.
-
-2011-12-14 Werner Koch <wk@gnupg.org>
-
-	scd: Skip S/N reading for the "undefined" application.
-	+ commit 792e137ec7997a0ff5c54ff970611238d28d4ba8
-	* scd/app.c (select_application): Skip serial number reading.
-
-	scd: Add more status word values for documentation.
-	+ commit 0bac31ee9f74a25d76b08c3e0355a338908f083a
-
-
-	scd: Add the "undefined" stub application.
-	+ commit dcd64131c60efd0189aa05d5dbce6b93547b04e3
-	* scd/app.c (select_application): Implement the "undefined"
-	application.
-
-	agent: Pass comment lines from scd verbatim thru gpg-agent.
-	+ commit 45cf9de341405a228e331bd3893cbcd6b72306be
-	* agent/call-scd.c (pass_status_thru): Pass comment lines verbatim.
-	* tools/gpg-connect-agent.c (help_cmd_p): New.
-	(main): Treat an "SCD HELP" the same as "HELP".
-
-	scd: Fix resetting and closing of the reader.
-	+ commit 2d91febbd8d30beb7eb33f7aa80ffd5691d1d3cc
-	* scd/command.c (update_card_removed): Do no act on an invalid VRDR.
-	(do_reset): Ignore apdu_reset error codes for no and inactive card.
-	Close the reader before setting the slot to -1.
-	(update_reader_status_file): Notify the application before closing the
-	reader.
-
-	scd: Add debug option for reader function calls.
-	+ commit 07ea8c56b507b06d4bd70e94fa51914659afac4b
-	* scd/scdaemon.h (DBG_READER_VALUE, DBG_READER): New.
-	* scd/apdu.c (apdu_open_reader, apdu_close_reader)
-	(apdu_shutdown_reader, apdu_connect, apdu_disconnect)
-	(apdu_reset, apdu_get_atr, apdu_get_status): Add debug code.
-	(apdu_activate): Remove this unused function.
-
-2011-12-13 Werner Koch <wk@gnupg.org>
-
-	scd: New option --debug-assuan-log-cats.
-	+ commit 00c760f628f4cf0fc11e79d305c172f98123f815
-	* scd/scdaemon.c (oDebugAssuanLogCats): New.
-	(opts): Add option --debug-assuan-log-cats.
-	(main): Implement option.
-	* common/asshelp.c (set_libassuan_log_cats): New.
-
-	scd: Introduce a virtual reader table.
-	+ commit 24e121ef261731069868ca403b818f1168237f53
-	The vreader table makes the code more clear by explicitly talking
-	about APDU slots and reader indices. It also accommodates for future
-	extensions.
-
-	* scd/scdaemon.h (server_control_s): Remove READER_SLOT.
-	* scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT.
-	* scd/app.c (check_application_conflict): Add arg SLOT.
-	* scd/command.c (slot_status_s): Rename to vreader_s.
-	(server_local_s): Add field VREADER_IDX as replacement for
-	the READER_SLOT in server_control_s. Change all users.
-	(slot_table): Rename to vreader_table. Change all users.
-	(vreader_slot): New.
-	(do_reset, cmd_apdu): Map vreader to apdu slot.
-	(get_reader_slot): Rename to get_current_reader. Return -1 on error.
-	(open_card): Map vreader toapdu slot. Pass slot to
-	check_application_conflict.
-	(scd_command_handler): Init VREADER_IDX.
-	(update_reader_status_file): Reset SLOT field on error.
-
-2011-12-12 Werner Koch <wk@gnupg.org>
-
-	scd: Retry command SERIALNO for an inactive card.
-	+ commit 11164662788036c4b15d30555ea33ec0b6f5a670
-	* scd/command.c (cmd_serialno): Retry once for an inactive card.
-
-	Fix detection of card removal and insertion.
-	+ commit cd29dc0f1cf7f3bd7938ffa65bf13f9a75d8c156
-	* scd/apdu.c (apdu_connect): Return status codes for no card available
-	and inactive card.
-	* scd/command.c (TEST_CARD_REMOVAL): Also test for GPG_ERR_CARD_RESET.
-	(open_card): Map apdu_connect status to GPG_ERR_CARD_RESET.
-
-	gitlog-to-changelog: New option --tear-off.
-	+ commit ea0a21410b8fa460882c0f8de90b9291345fd4fc
-	* scripts/gitlog-to-changelog: Add option --tear-off.
-	* Makefile.am (gen-ChangeLog): Use that option.
-
-2011-12-07 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Add new validation model "steed".
-	+ commit 8a12a2000d82acfa881e8c18d028290100bf5e43
-	* sm/gpgsm.h (VALIDATE_FLAG_STEED): New.
-	* sm/gpgsm.c (gpgsm_parse_validation_model): Add model "steed".
-	* sm/server.c (option_handler): Allow validation model "steed".
-	* sm/certlist.c (gpgsm_cert_has_well_known_private_key): New.
-	* sm/certchain.c (do_validate_chain): Handle the
-	well-known-private-key attribute. Support the "steed" model.
-	(gpgsm_validate_chain): Ditto.
-	* sm/verify.c (gpgsm_verify): Return "steed" in the trust status line.
-	* sm/keylist.c (list_cert_colon): Print the new 'w' flag.
-
-	Correct punctuation in the ChangeLog summary line.
-	+ commit 14e4fdc9f97d6f12bf563adfff1e3157305d7795
-	* Makefile.am (gen-ChangeLog): Supply --append-dot.
-
-	Allow comments which will not show up in the ChangeLog.
-	+ commit cd3732841de32ce5c7841e6e158df3a5f1102f86
-	* scripts/gitlog-to-changelog: Ignore lines after a "--" line.
-
-2011-12-06 Werner Koch <wk@gnupg.org>
-
-	gpgsm: Allow specification of an AuthorityKeyIdentifier.
-	+ commit 596b84a4de58def2155d3fe56462f6607f135b69
-	* sm/certreqgen.c (pAUTHKEYID): New.
-	(read_parameters): Add keyword Authority-Key-Id.
-	(proc_parameters): Check its value.
-	(create_request): Insert an Authority-Key-Id.
-
-	gpgsm: Allow arbitrary extensions for cert creation.
-	+ commit 5cdad8ff000152b4bd01953646bb87fe8703c70d
-	* sm/certreqgen.c (pSUBJKEYID, pEXTENSION): New.
-	(read_parameters): Add new keywords.
-	(proc_parameters): Check values of new keywords.
-	(create_request): Add SubjectKeyId and extensions.
-	(parse_parameter_usage): Support "cert" and the encrypt alias "encr".
-
-	gpgsm: Fix storing of the serial number.
-	+ commit 3f284e40502d8181b0b3ea66c77cd7c1252ea781
-	* sm/certreqgen.c (create_request): Fix hex-bin conversion.
-
-2011-12-05 Werner Koch <wk@gnupg.org>
-
-	Fix last change.
-	+ commit 9274d4d18281b3364fa8abaa821dddf124b105d7
-	* agent/command.c (start_command_handler): Remove use of removed var.
-
-	Amend the agent code with more comments.
-	+ commit 477360e8cdc458b0a36e9c7fb52a35f27766255d
-	* agent/command.c (server_local_s): Remove unused field MESSAGE_FD.
-
-2011-12-02 Werner Koch <wk@gnupg.org>
-
-	Support the Cherry ST-2000 card reader.
-	+ commit 239659d3a0b8c0c378734ca3d1e9210a02e24da7
-	* scd/ccid-driver.c (SCM_SCR331, SCM_SCR331DI, SCM_SCR335)
-	(SCM_SCR3320, SCM_SPR532, CHERRY_ST2000): New constants.
-	(parse_ccid_descriptor): Use them.
-	(scan_or_find_usb_device, ccid_transceive_secure): Handle Cherry
-	ST-2000. Suggested by Matthias-Christian Ott.
-
-	Avoid possible double free in export.c.
-	+ commit 96dc146fa17a7853277dbf3dc771c585a815c247
-	* g10/export.c (transfer_format_to_openpgp): Avoid possible double
-	 free of LIST. Reported by NIIBE Yutaka.
-
-2011-12-02 NIIBE Yutaka <gniibe@fsij.org>
-
-	Fix pinpad input support for passphrase modification.
-	+ commit bf37c32367ba149559385ee90b6435cef8bd6412
-	* apdu.c (pcsc_keypad_verify): Have dummy Lc field with value 0.
-	(pcsc_keypad_modify): Likewise.
-	(pcsc_keypad_modify): It's only for ISO7816_CHANGE_REFERENCE_DATA.
-	bConfirmPIN value is determined by the parameter p0.
-
-	* app-openpgp.c (do_change_pin): The flag use_keypad should be 0 when
-	reset_mode is on, or resetcode is on. use_keypad only makes sense for
-	iso7816_change_reference_data_kp.
-
-	* iso7816.h (iso7816_put_data_kp): Remove.
-	(iso7816_reset_retry_counter_kp): Remove.
-	(iso7816_reset_retry_counter_with_rc_kp): Remove.
-	(iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
-
-	* iso7816.c (iso7816_put_data_kp): Remove.
-	(iso7816_reset_retry_counter_kp): Remove.
-	(iso7816_reset_retry_counter_with_rc_kp): Remove.
-	(iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
-
-2011-12-01 Werner Koch <wk@gnupg.org>
-
-	Add hook to check the commit log syntax.
-	+ commit 29e96e6b9a8e68e6554dd48bc2ce68ae9525d29f
-	* autogen.sh: Install commit-msg hook for git.
-
-	Generate the ChangeLog from commit logs.
-	+ commit 2336b09779d313c1594acf6df3bd8a8486e90458
-	* scripts/gitlog-to-changelog: New script. Taken from gnulib.
-	* scripts/git-log-fix: New file.
-	* scripts/git-log-footer: New file.
-	* doc/HACKING: Describe the ChangeLog policy
-	* ChangeLog: New file.
-	* Makefile.am (EXTRA_DIST): Add new files.
-	(gen-ChangeLog): New.
-	(dist-hook): Run gen-ChangeLog.
-
-	Rename all ChangeLog files to ChangeLog-2011.
 
 2011-12-01 Werner Koch <wk@gnupg.org>

_service:tar_scm:gnupg-2.3.6.tar.bz2/INSTALL -> _service:tar_scm:gnupg-2.4.3.tar.bz2/INSTALL Changed

@@ -42,10 +42,12 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+The suggested way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+  1. `cd' to the directory containing the package's source code and
+     create a new directory named `build'.  Then `cd' to that
+     directory and type `../configure' to configure the package for
+     your system.
 
      Running `configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
@@ -58,14 +60,17 @@
   4. Type `make install' to install the programs and any data files and
      documentation.
 
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
+  5. You can remove the program binaries and object files by deleting
+     all files from the `build' directory.  In case you did not used a
+     dedicated build directory but build the software directly in the
+     source tree, you can remove the program binaries and object files
+     from the source code directory by typing `make clean'.  To also
+     remove the files that `configure' created (so you can compile the
+     package for a different kind of computer), type `make distclean'.
+     There is also a `make maintainer-clean' target, but that is
+     intended mainly for the package's developers.  If you use it, you
+     may have to get all sorts of other programs in order to
+     regenerate files that came with the distribution.
 
 Compilers and Options
 =====================
@@ -231,4 +236,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-

_service:tar_scm:gnupg-2.3.6.tar.bz2/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/Makefile.am Changed

@@ -18,13 +18,13 @@
 
 ## Process this file with automake to produce Makefile.in
 
-# To include the wixlibs for building an MSI installer in a release use
-#   make release WITH_MSI=1
+# We want to also build the wixlib for use by GnuPG Desktop
+WITH_MSI=1
 
 # 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.3
+RELEASE_ARCHIVE_SUFFIX  = gnupg/v2.4
 # The variable RELEASE_SIGNKEY in ~/.gnupg-autogen.rc is used
 # to specify the key for signing.  For example:
 # RELEASE_SIGNKEY=D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
@@ -55,6 +55,7 @@
              build-aux/speedo/w32/pango.modules		    \
              build-aux/speedo/w32/gdk-pixbuf-loaders.cache  \
              build-aux/speedo/w32/exdll.h		    \
+             build-aux/speedo/w32/exdll.c		    \
              build-aux/speedo/w32/README.txt		    \
              build-aux/speedo/w32/gnupg-logo-150x57.bmp	    \
              build-aux/speedo/w32/gnupg-logo-164x314.bmp    \
@@ -131,22 +132,24 @@
 	@cat $(srcdir)/tests/gpgconf.ctl.in > bin/gpgconf.ctl
 	(set -e; cd bin; \
 	 for i in gpg gpgv; \
-	     do ln -sf ../g10/$$i .; done; \
+	     do ln -sf ../g10/$$i$(EXEEXT) .; done; \
 	 for i in gpgsm; \
-	     do ln -sf ../sm/$$i .; done; \
+	     do ln -sf ../sm/$$i$(EXEEXT) .; done; \
 	 for i in gpg-agent; \
-	     do ln -sf ../agent/$$i .; done; \
+	     do ln -sf ../agent/$$i$(EXEEXT) .; done; \
 	 for i in dirmngr; \
-	     do ln -sf ../dirmngr/$$i .; done; \
+	     do ln -sf ../dirmngr/$$i$(EXEEXT) .; done; \
 	 for i in gpgconf gpg-connect-agent gpgtar gpg-card; \
-	     do ln -sf ../tools/$$i .; done; \
+	     do ln -sf ../tools/$$i$(EXEEXT) .; done; \
 	 cd ../libexec ; \
 	 for i in keyboxd; \
-	     do ln -sf ../kbx/$$i .; done; \
+	     do ln -sf ../kbx/$$i$(EXEEXT) .; done; \
 	 for i in scdaemon; \
-	     do ln -sf ../scd/$$i .; done; \
+	     do ln -sf ../scd/$$i$(EXEEXT) .; done; \
 	 for i in gpg-preset-passphrase; \
-	     do ln -sf ../agent/$$i .; done; \
+	     do ln -sf ../agent/$$i$(EXEEXT) .; done; \
+	 for i in tpm2daemon; \
+             do  -f ../tpm2d/$$i$(EXEEXT)  && ln -sf ../tpm2d/$$i$(EXEEXT) .; done; \
 	 echo "created links to binaries" )
 
 
@@ -210,12 +213,14 @@
 	PATH=$(abs_top_builddir)/tests/gpgscm:$(PATH) \
 	abs_top_srcdir=$(abs_top_srcdir) \
 	objdir=$(abs_top_builddir) \
+	GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
+	GNUPG_IN_TEST_SUITE=fact \
 	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
 
 .PHONY: check-all release sign-release
 check-all:
 	$(TESTS_ENVIRONMENT) \
-	  $(abs_top_builddir)/tests/gpgscm/gpgscm \
+	  $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/tests/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 # Names of to help the release target.
@@ -234,11 +239,26 @@
 	 ./autogen.sh --force; \
 	 cd $(abs_top_builddir); \
 	 rm -rf dist; mkdir dist ; cd dist ; \
+         mkopt=""; \
+	 if  -n "$$CUSTOM_SWDB" ; then \
+            mkopt="CUSTOM_SWB=1"; \
+	    x=$$(grep '^OVERRIDE_TARBALLS=' \
+                 $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
+	    if  -f "$$x/swdb.lst" ; then \
+	      echo "/* Copying swdb.lst from the overrides directory */"; \
+              cp "$$x/swdb.lst" . ; \
+              cp "$$x/swdb.lst.sig" . ; \
+	    fi; \
+	 fi; \
+	 echo "/* Running configure */";\
 	 $(abs_top_srcdir)/configure --enable-maintainer-mode; \
+	 echo "/* Running make distcheck */";\
 	 $(MAKE) distcheck TESTFLAGS=--parallel; \
+	 echo "/* Unpacking release */";\
 	 $(AMTAR) xjf $(RELEASE_NAME).tar.bz2 ;\
 	 target=w32-release ;\
 	  -n "$(WITH_MSI)"  && target=w32-msi-release ;\
+	 echo "/* Running $(MAKE) -f  $(RELEASE_NAME)/build-aux/speedo.mk $${target} */";\
 	 $(MAKE) -f  $(RELEASE_NAME)/build-aux/speedo.mk $${target} ;\
 	 echo "/* Build finished at $$(date -uIseconds) */" ;\
 	 echo "/*" ;\

_service:tar_scm:gnupg-2.3.6.tar.bz2/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/Makefile.in Changed

@@ -32,9 +32,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <https://www.gnu.org/licenses/>.
 
-# To include the wixlibs for building an MSI installer in a release use
-# make release WITH_MSI=1
-
 VPATH = @srcdir@
 am__is_gnu_make = { \
 if test -z '$(MAKELEVEL)'; then \
@@ -467,10 +464,13 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
+# We want to also build the wixlib for use by GnuPG Desktop
+WITH_MSI = 1
+
 # 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.3
+RELEASE_ARCHIVE_SUFFIX = gnupg/v2.4
 # The variable RELEASE_SIGNKEY in ~/.gnupg-autogen.rc is used
 # to specify the key for signing. For example:
 # RELEASE_SIGNKEY=D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
@@ -499,6 +499,7 @@
 build-aux/speedo/w32/pango.modules		 \
 build-aux/speedo/w32/gdk-pixbuf-loaders.cache \
 build-aux/speedo/w32/exdll.h		 \
+ build-aux/speedo/w32/exdll.c		 \
 build-aux/speedo/w32/README.txt		 \
 build-aux/speedo/w32/gnupg-logo-150x57.bmp	 \
 build-aux/speedo/w32/gnupg-logo-164x314.bmp \
@@ -539,6 +540,8 @@
 	PATH=$(abs_top_builddir)/tests/gpgscm:$(PATH) \
 	abs_top_srcdir=$(abs_top_srcdir) \
 	objdir=$(abs_top_builddir) \
+	GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
+	GNUPG_IN_TEST_SUITE=fact \
 	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
 
 
@@ -1070,22 +1073,24 @@
 	@cat $(srcdir)/tests/gpgconf.ctl.in > bin/gpgconf.ctl
 	(set -e; cd bin; \
 	 for i in gpg gpgv; \
-	 do ln -sf ../g10/$$i .; done; \
+	 do ln -sf ../g10/$$i$(EXEEXT) .; done; \
 	 for i in gpgsm; \
-	 do ln -sf ../sm/$$i .; done; \
+	 do ln -sf ../sm/$$i$(EXEEXT) .; done; \
 	 for i in gpg-agent; \
-	 do ln -sf ../agent/$$i .; done; \
+	 do ln -sf ../agent/$$i$(EXEEXT) .; done; \
 	 for i in dirmngr; \
-	 do ln -sf ../dirmngr/$$i .; done; \
+	 do ln -sf ../dirmngr/$$i$(EXEEXT) .; done; \
 	 for i in gpgconf gpg-connect-agent gpgtar gpg-card; \
-	 do ln -sf ../tools/$$i .; done; \
+	 do ln -sf ../tools/$$i$(EXEEXT) .; done; \
 	 cd ../libexec ; \
 	 for i in keyboxd; \
-	 do ln -sf ../kbx/$$i .; done; \
+	 do ln -sf ../kbx/$$i$(EXEEXT) .; done; \
 	 for i in scdaemon; \
-	 do ln -sf ../scd/$$i .; done; \
+	 do ln -sf ../scd/$$i$(EXEEXT) .; done; \
 	 for i in gpg-preset-passphrase; \
-	 do ln -sf ../agent/$$i .; done; \
+	 do ln -sf ../agent/$$i$(EXEEXT) .; done; \
+	 for i in tpm2daemon; \
+ do -f ../tpm2d/$$i$(EXEEXT) && ln -sf ../tpm2d/$$i$(EXEEXT) .; done; \
 	 echo "created links to binaries" )
 
 # Clean up our test directories but take care that this is never
@@ -1137,7 +1142,7 @@
 .PHONY: check-all release sign-release
 check-all:
 	$(TESTS_ENVIRONMENT) \
-	 $(abs_top_builddir)/tests/gpgscm/gpgscm \
+	 $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	 $(abs_srcdir)/tests/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 release:
@@ -1152,11 +1157,26 @@
 	 ./autogen.sh --force; \
 	 cd $(abs_top_builddir); \
 	 rm -rf dist; mkdir dist ; cd dist ; \
+ mkopt=""; \
+	 if -n "$$CUSTOM_SWDB" ; then \
+ mkopt="CUSTOM_SWB=1"; \
+	 x=$$(grep '^OVERRIDE_TARBALLS=' \
+ $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
+	 if -f "$$x/swdb.lst" ; then \
+	 echo "/* Copying swdb.lst from the overrides directory */"; \
+ cp "$$x/swdb.lst" . ; \
+ cp "$$x/swdb.lst.sig" . ; \
+	 fi; \
+	 fi; \
+	 echo "/* Running configure */";\
 	 $(abs_top_srcdir)/configure --enable-maintainer-mode; \
+	 echo "/* Running make distcheck */";\
 	 $(MAKE) distcheck TESTFLAGS=--parallel; \
+	 echo "/* Unpacking release */";\
 	 $(AMTAR) xjf $(RELEASE_NAME).tar.bz2 ;\
 	 target=w32-release ;\
 	 -n "$(WITH_MSI)" && target=w32-msi-release ;\
+	 echo "/* Running $(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk $${target} */";\
 	 $(MAKE) -f $(RELEASE_NAME)/build-aux/speedo.mk $${target} ;\
 	 echo "/* Build finished at $$(date -uIseconds) */" ;\
 	 echo "/*" ;\

_service:tar_scm:gnupg-2.3.6.tar.bz2/NEWS -> _service:tar_scm:gnupg-2.4.3.tar.bz2/NEWS Changed

@@ -1,3 +1,345 @@
+Noteworthy changes in version 2.4.3 (2023-07-04)
+------------------------------------------------
+
+  * gpg: Set default expiration date to 3 years.  T2701
+
+  * gpg: Add --list-filter properties "key_expires" and
+     "key_expires_d".  T6529
+
+  * gpg: Emit status line and proper diagnostics for write errors.
+    T6528
+
+  * gpg: Make progress work for large files on Windows.  T6534
+
+  * gpg: New option --no-compress as alias for -z0.
+
+  * gpgsm: Print PROGRESS status lines.  Add new --input-size-hint.
+    T6534
+
+  * gpgsm: Support SENDCERT_SKI for --call-dirmngr.  rG701a8b30f0
+
+  * gpgsm: Major rewrite of the PKCS#12 parser.  T6536
+
+  * gpgtar: New option --no-compress.
+
+  * dirmngr: Extend the AD_QUERY command.  rG207c99567c
+
+  * dirmngr: Disable the HTTP redirect rewriting.  T6477
+
+  * dirmngr: New option --compatibility-flags.  rGbf04b07327
+
+  * dirmngr: New option --ignore-crl-extensions.  T6545
+
+  * wkd: Use export-clean for gpg-wks-client's --mirror and --create
+    commands.  rG2c7f7a5a27
+
+  * wkd: Make --add-revocs the default in gpg-wks-client.  New option
+    --no-add-revocs.  rG10c937ee68
+
+  * scd: Make signing work for Nexus cards.  rGb83d86b988
+
+  * scd: Fix authentication with Administration Key for PIV.
+    rG25b59cf6ce
+
+  See-also: gnupg-announce/2023q3/000480.html
+  Release-info: https://dev.gnupg.org/T6509
+
+
+Noteworthy changes in version 2.4.2 (2023-05-30)
+------------------------------------------------
+
+  * gpg: Print a warning if no more encryption subkeys are left over
+    after changing the expiration date.  rGef2c3d50fa
+
+  * gpg: Fix searching for the ADSK key when adding an ADSK.  T6504
+
+  * gpgsm: Speed up key listings on Windows.  rG08ff55bd44
+
+  * gpgsm: Reduce the number of "failed to open policy file"
+    diagnostics.  rG68613a6a9d
+
+  * agent: Make updating of private key files more robust and track
+    display S/N.  T6135
+
+  * keyboxd: Avoid longish delays on Windows when listing keys.
+    rG6944aefa3c
+
+  * gpgtar: Emit extra status lines to help GPGME.  T6497
+
+  * w32: Avoid using the VirtualStore.  T6403
+
+  See-also: gnupg-announce/2023q2/000479.html
+  Release-info: https://dev.gnupg.org/T6506
+
+
+Noteworthy changes in version 2.4.1 (2023-04-28)
+------------------------------------------------
+
+  * If the ~/.gnupg directory does not exist, the keyboxd is now
+    automagically enabled.  rGd9e7488b17
+
+  * gpg: New option --add-desig-revoker.  rG3d094e2bcf
+
+  * gpg: New option --assert-signer.  rGc9e95b8dee
+
+  * gpg: New command --quick-add-adsk and other ADSK features.
+    T6395, https://gnupg.org/blog/20230321-adsk.html
+
+  * gpg: New list-option "show-unusable-sigs".  Also show
+    "self-signature" instead of the user-id in key signature
+    listings.  rG103acfe9ca
+
+  * gpg: For symmetric encryption the default S2K hash is now SHA256.
+    T6367
+
+  * gpg: Detect already compressed data also when using a pipe.  Also
+    detect JPEG and PNG file formats.  T6332
+
+  * gpg: New subcommand "openpgp" for --card-edit.  T6462
+
+  * gpgsm: Verification of detached signatures does now strip trailing
+    zeroes from the input if --assume-binary is used.  rG2a13f7f9dc
+
+  * gpgsm: Non-armored detached signature are now created without
+    using indefinite form length octets.  This improves compatibility
+    with some PDF signature verification software.  rG8996b0b655
+
+  * gpgtar: Emit progress status lines in create mode.  T6363
+
+  * dirmngr: The LDAP modifyTimestamp is now returned by some
+    keyserver commands.  rG56d309133f
+
+  * ssh: Allow specification of the order keys are presented to ssh.
+    See the man page entry for --enable-ssh-support.  T5996, T6212
+
+  * gpg: Make list-options "show-sig-subpackets" work again.
+    Fixes regression in 2.4.0.  rG5a223303d7
+
+  * gpg: Fix the keytocard command for Yubikeys.  T6378
+
+  * gpg: Do not continue an export after a cancel for the primary key.
+    T6093
+
+  * gpg: Replace the --override-compliance-check hack by a real fix.
+    T5655
+
+  * gpgtar: Fix decryption with input taken from stdin.  T6355
+
+  See-also: gnupg-announce/2023q2/000478.html
+  Release-info: https://dev.gnupg.org/T6454
+
+
+Noteworthy changes in version 2.4.0 (2022-12-16)
+------------------------------------------------
+
+  * gpg: New command --quick-update-pref.  rGd40d23b233
+
+  * gpg: New list-options show-pref and show-pref-verbose.
+    rG811cfa34cb
+
+  * gpg: New option --list-filter to restrict key listings like
+      gpg -k --list-filter 'select=revoked-f && sub/algostr=ed25519'
+    rG1324dc3490
+
+  * gpg: New --export-filter export-revocs.  rGc985b52e71
+
+  * gpg: Also import stray revocation certificates.  rG7aaedfb107
+
+  * gpg: Add a notation to encryption subkeys in de-vs mode.  T6279
+
+  * gpg: Improve signature verification speed by a factor of more than
+    four.  Double detached signing speed.  T5826
+
+  * gpg: Allow only OCB for AEAD encryption.  rG5a2cef801d
+
+  * gpg: Fix trusted introducer for mbox only user-ids.  T6238
+
+  * gpg: Report an error via status-fd for receiving a key from the
+    agent.  T5151
+
+  * gpg: Make --require-compliance work without the --status-fd
+    option.  rG2aacd843ad
+
+  * gpg: Fix verification of cleartext signatures with overlong lines.
+    T6272
+
+  * agent: Fix import of protected OpenPGP v5 keys.  T6294
+
+  * gpgsm: Change the default cipher algorithm from AES128 to AES256.
+    Also announce support for this in signatures.  rG2d8ac55d26
+
+  * gpgsm: Always use the chain validation model if the root-CA
+    requests this.  rG7fa1d3cc82
+
+  * gpgsm: Print OCSP revocation date and reason in cert listings.
+    rGb6abaed2b5
+
+  * agent: Support Win32-OpenSSH emulation by gpg-agent.  T3883
+
+  * scd: Support the Telesec Signature Card v2.0.  T6252
+
+  * scd: Redact --debug cardio output of a VERIFY APDU.  T5085
+
+  * scd: Skip deleted pkcs#15 records in CARDOS 5.  rG061efac03f
+
+  * dirmngr: Fix build with no LDAP support.  T6239
+
+  * dirmngr: Fix verification of ECDSA signed CRLs.  rG868dabb402
+
+  * wkd: New option --add-revocs for gpg-wks-client.  rGc3f9f2d497
+
+  * wkd: Ignore expired user-ids in gpg-wks-client.  T6292
+
+  * card: New commands "gpg" and "gpgsm".  rG9c4691c73e
+
+  See-also: gnupg-announce/2022q4/000477.html
+  Release-info: https://dev.gnupg.org/T6303
+
+
+Noteworthy changes in version 2.3.8 (2022-10-13)
+------------------------------------------------
+
+  * gpg: Do not consider unknown public keys as non-compliant while
+    decrypting.  T6205
+
+  * gpg: Avoid to emit a compliance mode line if Libgcrypt is
+    non-compliant.  T6221
+
+  * gpg: Improve --edit-key setpref command to ease c+p.  rG1908fa8b83
+
+  * gpg: Emit an ERROR status if --quick-set-primary-uid fails and
+    allow to pass the user ID by hash.  T6126
+
+  * gpg: Actually show symmetric+pubkey encrypted data as de-vs
+    compliant.  Add extra compliance checks for symkey_enc packets.
+    T6119
+
+  * gpg: In de-vs mode use SHA-256 instead of SHA-1 as implicit
+    preference.  T6043
+
+  * gpgsm: Fix reporting of bad passphrase error during PKCS#11
+    import.  T5713,T6037
+
+  * agent: Fix a regression in "READKEY --format=ssh".  T6012
+
+  * agent: New option --need-attr for KEYINFO.  rG989eae648c
+
+  * agent: New attribute "Remote-list" for use by KEYINFO.
+    r1383aa4750
+
+  * scd: Fix problem with Yubikey 5.4 firmware.  T6070
+
+  * dirmngr: Fix CRL Distribution Point fallback to other schemes.
+    rG0c8299e2b5
+
+  * dirmngr: New LDAP server flag "areconly" (A-record-only).
+    rGd65a0335e5
+
+  * dirmngr: Fix upload of multiple keys for an LDAP server specified
+    using the colon format.  rG536b5cd663
+
+  * dirmngr: Use LDAP schema v2 when a Base DN is specified.  T6047
+
+  * dirmngr: Avoid caching expired certificates.  T6142
+
+  * wkd: Fix path traversal attack in gpg-wks-server.  Add the mail
+    address to the pending request data.  rG8a63a8c825,T6098
+
+  * wkd: New command --mirror for gpg-wks-client.  T6224
+
+  * gpg-auth: New tool for authentication.  T5862
+
+  * New common.conf option no-autostart.  rG203dcc19eb
+
+  * Silence warnings from AllowSetForegroundWindow unless
+    GNUPG_EXEC_DEBUG_FLAGS is used.  rG4ef8516a79
+
+  Release-info: https://dev.gnupg.org/T6106
+  See-also: gnupg-announce/2022q4/000476.html
+
+
+Noteworthy changes in version 2.3.7 (2022-07-11)
+------------------------------------------------
+
+  * gpg: Fix possibly garbled status messages in NOTATION_DATA.  This
+    bug could trick GPGME and other parsers to accept faked status
+    lines.  T6027, CVE-2022-34903
+
+  * gpg: Look up user ID to revoke by UID hash.  T5936
+
+  * gpg: Setup the 'usage' filter property for export.  rG7aabd94b81
+
+  * gpg,w32: Allow Unicode filenames for iobuf_cancel.  rG4ee2009083
+
+  * gpg: Fix reading AEAD preference.  T6019
+
+  * gpgsm: New option --compatibility-flags.  rGf0b373cec9
+
+  * gpgsm: Rework the PKCS#12 parser to support DFN issued keys.
+    T6037
+
+  * agent: New option --no-user-trustlist and --sys-trustlist-name.
+    T5990
+
+  * agent: Pop up dialog window for confirmation, when specified so.
+    T5099
+
+  * agent: Show "Label:" field of private key when prompt the
+    insertion.  T5986
+
+  * agent: Handle USAGE information in KEYINFO.  rG295a6a7591
+
+  * agent,ssh: Make not-inserted OpenPGP.3 keys available for SSH.
+    T5996
+
+  * agent,ssh: Support "Use-for-ssh" flag in private key.  T5985
+
+  * agent: New field "Prompt" to prevent asking card key insertion.
+    T5987
+
+  * agent: Support --format=ssh option for READKEY.  T6012
+
+  * agent: Add KEYATTR command.  T5988
+
+  * agent: Flush before calling ftruncate.  T6035
+
+  * agent: Do not consider --min-passphrase-len for the magic wand.
+    rGae2f1f0785
+
+  * kbx: Fix a race condition which results no status report.  T5948
+
+  * scd:openpgp: Fix a segv for cards supporting unknown curves.
+    T5963
+
+  * scd:p15: Fix reading certificates without length info.
+
+  * scd:p15: Improve the displayed S/N for Technology Nexus cards.
+
+  * scd:openpgp: Add workaround for ECC attribute on Yubikey.  T5963
+
+  * scd,piv: Fix status report of KEYPAIRINFO.  rG64c8786105
+
+  * scd:nks: Support the Telesec ESIGN application.  T5219, T4938
+
+  * scd: Fix use of SCardListReaders for PC/SC.  T5979
+
+  * scd: Support automatic card selection for READCERT with keygrip.
+    T6003
+
+  * scd: Support specifying keygrip for learn command.  T6002
+
+  * dirmngr: Fix for Windows when build against GNUTLS.  T5899
+
+  * gpg-connect-agent: Add --unbuffered option.
+
+  * gpg-connect-agent: Add a way to cancel an INQUIRE.  T6010
+
+  * gpgconf: New short options -V and -X
+
+  Release-info: https://dev.gnupg.org/T5947
+  See-also: gnupg-announce/2022q3/000474.html
+
+
 Noteworthy changes in version 2.3.6 (2022-04-25)
 ------------------------------------------------
 
@@ -1323,6 +1665,12 @@
 Release dates of 2.2 versions
 -----------------------------
 
+Version 2.2.40 (2022-10-10) https://dev.gnupg.org/T6181
+Version 2.2.39 (2022-09-02) https://dev.gnupg.org/T6175
+Version 2.2.38 (2022-09-01) https://dev.gnupg.org/T6159
+Version 2.2.37 (2022-08-24) https://dev.gnupg.org/T6105
+Version 2.2.36 (2022-07-06) https://dev.gnupg.org/T5949
+Version 2.2.35 (2022-04-25) https://dev.gnupg.org/T5928
 Version 2.2.34 (2022-02-07) https://dev.gnupg.org/T5703
 Version 2.2.33 (2021-11-23) https://dev.gnupg.org/T5641
 Version 2.2.32 (2021-10-06) https://dev.gnupg.org/T5601

_service:tar_scm:gnupg-2.3.6.tar.bz2/README -> _service:tar_scm:gnupg-2.4.3.tar.bz2/README Changed

@@ -1,10 +1,10 @@
- The GNU Privacy Guard 2
- =========================
- Version 2.3
+ The GNU Privacy Guard
+ =======================
+ Version 2.4
 
 Copyright 1997-2019 Werner Koch
 Copyright 1998-2021 Free Software Foundation, Inc.
- Copyright 2003-2021 g10 Code GmbH
+ Copyright 2003-2023 g10 Code GmbH
 
 
 * INTRODUCTION
@@ -27,7 +27,7 @@
 
 * BUILD INSTRUCTIONS
 
- GnuPG 2.3 depends on the following GnuPG related packages:
+ GnuPG 2.4 depends on the following GnuPG related packages:
 
 npth (https://gnupg.org/ftp/gcrypt/npth/)
 libgpg-error (https://gnupg.org/ftp/gcrypt/libgpg-error/)
@@ -53,7 +53,9 @@
 
 As with all packages, you just have to do
 
- ./configure
+ mkdir build
+ cd build
+ ../configure
 make
 make check
 make install
@@ -74,14 +76,15 @@
 
 You may run
 
- gpgconf --list-dirs
+ gpgconf -L
 
 to view the directories used by GnuPG.
 
 To quickly build all required software without installing it, the
 Speedo method may be used:
 
- make -f build-aux/speedo.mk native
+ cd build
+ make -f ../build-aux/speedo.mk native
 
 This method downloads all required libraries and does a native build
 of GnuPG to PLAY/inst/. GNU make is required and you need to set
@@ -113,6 +116,34 @@
 
 * RECOMMENDATIONS
 
+** Key database daemon
+
+ Since version 2.3.0 it is possible to store the keys in an SQLite
+ database instead of the keyring.kbx file. This is in particular
+ useful for large keyrings or if many instances of gpg and gpgsm may
+ run concurrently. This is implemented using another daemon process,
+ the "keyboxd". To enable the use of the keyboxd put the option
+ "use-keyboxd" into the configuration file ~/.gnupg/common.conf or the
+ global /etc/gnupg/common.conf. See also doc/examples/common.conf.
+ Only public keys and X.509 certificates are managed by the keyboxd;
+ private keys are still stored as separate files.
+
+ Since version 2.4.1 the keyboxd will be used by default for a fresh
+ install; i.e. if a ~/.gnupg directory did not yet exist.
+
+ Note that there is no automatic migration; if the use-keyboxd option
+ is enabled keys are not taken from pubring.kbx. To migrate existing
+ keys to the keyboxd do this:
+
+ 1. Disable the keyboxd (remove use-keyboxd from common.conf)
+ 2. Export all public keys
+ gpg --export --export-options backup > allkeys.gpg
+ gpgsm --export --armor > allcerts.gpg
+ 3. Enable the keyboxd (add use-keyboxd to common.conf)
+ 4. Import all public keys
+ gpg --import --import-options restore < allkeys.gpg
+ gpgsm --import < allcerts.crt
+
 ** Socket directory
 
 GnuPG uses Unix domain sockets to connect its components (on Windows
@@ -139,7 +170,7 @@
 * DOCUMENTATION
 
 The complete documentation is in the texinfo manual named
- `gnupg.info'. Run "info gnupg" to read it. If you want a a
+ `gnupg.info'. Run "info gnupg" to read it. If you want a
 printable copy of the manual, change to the "doc" directory and
 enter "make pdf" For a HTML version enter "make html" and point your
 browser to gnupg.html/index.html. Standard man pages for all
@@ -196,18 +227,14 @@
 Please direct questions about GnuPG to the users mailing list or one
 of the PGP newsgroups; please do not direct questions to one of the
 authors directly as we are busy working on improvements and bug
- fixes. The English and German mailing lists are watched by the
- authors and we try to answer questions when time allows us.
+ fixes. The mailing lists are watched by the authors and we try to
+ answer questions as time allows us.
 
 Commercial grade support for GnuPG is available; for a listing of
 offers see https://gnupg.org/service.html . Maintaining and
 improving GnuPG requires a lot of time. Since 2001, g10 Code GmbH,
 a German company owned and headed by GnuPG's principal author Werner
- Koch, is bearing the majority of these costs. To keep GnuPG in a
- healthy state, they need your support.
-
- Please consider to donate at https://gnupg.org/donate/ .
-
+ Koch, is bearing the majority of these costs.
 
 # This file is Free Software; as a special exception the authors gives
 # unlimited permission to copy and/or distribute it, with or without

_service:tar_scm:gnupg-2.3.6.tar.bz2/VERSION -> _service:tar_scm:gnupg-2.4.3.tar.bz2/VERSION Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/aclocal.m4 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/aclocal.m4 Changed

@@ -20,18 +20,18 @@
 If you have problems, you may need to regenerate the build system entirely.
 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, 2016 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 8 (gettext-0.20.2)
+dnl Copyright (C) 2004-2014, 2016, 2019-2020 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 be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
+dnl the GNU General Public License or the GNU Lesser 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 by the GNU Lesser General Public License, and the rest of the GNU
 dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
@@ -39,7 +39,7 @@
 dnl Defines INTL_MACOSX_LIBS.
 AC_DEFUN(gt_INTL_MACOSX,
 
- dnl Check for API introduced in Mac OS X 10.2.
+ dnl Check for API introduced in Mac OS X 10.4.
 AC_CACHE_CHECK(for CFPreferencesCopyAppValue,
 gt_cv_func_CFPreferencesCopyAppValue,
 gt_save_LIBS="$LIBS"
@@ -55,23 +55,32 @@
 AC_DEFINE(HAVE_CFPREFERENCESCOPYAPPVALUE, 1,
 Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.)
 fi
- dnl Check for API introduced in Mac OS X 10.3.
- AC_CACHE_CHECK(for CFLocaleCopyCurrent, gt_cv_func_CFLocaleCopyCurrent,
+ dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent,
+ dnl because in macOS 10.13.4 it has the following behaviour:
+ dnl When two or more languages are specified in the
+ dnl "System Preferences > Language & Region > Preferred Languages" panel,
+ dnl it returns en_CC where CC is the territory (even when English is not among
+ dnl the preferred languages!). What we want instead is what
+ dnl CFLocaleCopyCurrent returned in earlier macOS releases and what
+ dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
+ dnl first among the preferred languages and CC is the territory.
+ AC_CACHE_CHECK(for CFLocaleCopyPreferredLanguages, gt_cv_func_CFLocaleCopyPreferredLanguages,
 gt_save_LIBS="$LIBS"
 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
 AC_LINK_IFELSE(
 AC_LANG_PROGRAM(
 #include <CoreFoundation/CFLocale.h>,
- CFLocaleCopyCurrent();),
- gt_cv_func_CFLocaleCopyCurrent=yes,
- gt_cv_func_CFLocaleCopyCurrent=no)
+ CFLocaleCopyPreferredLanguages();),
+ gt_cv_func_CFLocaleCopyPreferredLanguages=yes,
+ gt_cv_func_CFLocaleCopyPreferredLanguages=no)
 LIBS="$gt_save_LIBS")
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- AC_DEFINE(HAVE_CFLOCALECOPYCURRENT, 1,
- Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.)
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+ AC_DEFINE(HAVE_CFLOCALECOPYPREFERREDLANGUAGES, 1,
+ Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.)
 fi
 INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
 fi
 AC_SUBST(INTL_MACOSX_LIBS)

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/Makefile.am Changed

@@ -1,3 +1,4 @@
+# Makefile.am - agent
 # Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -19,14 +20,12 @@
 
 bin_PROGRAMS = gpg-agent
 libexec_PROGRAMS = gpg-protect-tool
-if !HAVE_W32CE_SYSTEM
 # fixme: Do no use simple-pwquery for preset-passphrase.
 libexec_PROGRAMS += gpg-preset-passphrase
-endif
 noinst_PROGRAMS = $(TESTS)
 
-EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc all-tests.scm
-
+EXTRA_DIST = ChangeLog-2011 all-tests.scm \
+             gpg-agent-w32info.rc gpg-agent.w32-manifest.in
 
 AM_CPPFLAGS =
 
@@ -34,6 +33,8 @@
 
 if HAVE_W32_SYSTEM
 resource_objs += gpg-agent-w32info.o
+
+gpg-agent-w32info.o : gpg-agent.w32-manifest ../common/w32info-rc.h
 endif
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
@@ -66,11 +67,7 @@
 
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
-if HAVE_W32CE_SYSTEM
-pwquery_libs =
-else
 pwquery_libs = ../common/libsimple-pwquery.a
-endif
 
 
 gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) \
@@ -79,7 +76,7 @@
                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
 		$(resource_objs)
-gpg_agent_LDFLAGS = $(extra_bin_ldflags)
+gpg_agent_LDFLAGS =
 gpg_agent_DEPENDENCIES = $(resource_objs)
 
 gpg_protect_tool_SOURCES = \
@@ -111,10 +108,12 @@
 #
 # Module tests
 #
+module_tests = t-protect
+
 if DISABLE_TESTS
 TESTS =
 else
-TESTS = t-protect
+TESTS = $(module_tests)
 endif
 
 t_common_ldadd = $(common_libs)  $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/Makefile.in Changed

@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+# Makefile.am - agent
 # Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -124,11 +125,10 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = gpg-agent$(EXEEXT)
-libexec_PROGRAMS = gpg-protect-tool$(EXEEXT) $(am__EXEEXT_1)
-# fixme: Do no use simple-pwquery for preset-passphrase.
-@HAVE_W32CE_SYSTEM_FALSE@am__append_1 = gpg-preset-passphrase
+libexec_PROGRAMS = gpg-protect-tool$(EXEEXT) \
+	gpg-preset-passphrase$(EXEEXT)
 noinst_PROGRAMS = $(am__EXEEXT_2)
-@HAVE_DOSISH_SYSTEM_FALSE@am__append_2 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+@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@\"" \
 @HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
@@ -139,15 +139,15 @@
 # If a specific protect tool program has been defined, pass its name
 # to cc. Note that these macros should not be used directly but via
 # the gnupg_module_name function.
-@GNUPG_AGENT_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
-@GNUPG_PINENTRY_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
-@GNUPG_SCDAEMON_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
-@GNUPG_TPM2DAEMON_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_TPM2DAEMON="\"@GNUPG_TPM2DAEMON_PGM@\""
-@GNUPG_DIRMNGR_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
-@GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_8 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
-@GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_9 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
-@HAVE_W32_SYSTEM_TRUE@am__append_10 = gpg-agent-w32info.o
-@DISABLE_TESTS_FALSE@TESTS = t-protect$(EXEEXT)
+@GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+@GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+@GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+@GNUPG_TPM2DAEMON_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_TPM2DAEMON="\"@GNUPG_TPM2DAEMON_PGM@\""
+@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
+@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_1)
 subdir = agent
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -167,12 +167,11 @@
 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)
-@DISABLE_TESTS_FALSE@am__EXEEXT_2 = t-protect$(EXEEXT)
+am__EXEEXT_1 = t-protect$(EXEEXT)
+@DISABLE_TESTS_FALSE@am__EXEEXT_2 = $(am__EXEEXT_1)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am__gpg_agent_SOURCES_DIST = gpg-agent.c agent.h command.c \
 	command-ssh.c call-pinentry.c cache.c trans.c findkey.c \
@@ -199,10 +198,8 @@
 am_gpg_preset_passphrase_OBJECTS = \
 	gpg_preset_passphrase-preset-passphrase.$(OBJEXT)
 gpg_preset_passphrase_OBJECTS = $(am_gpg_preset_passphrase_OBJECTS)
-@HAVE_W32CE_SYSTEM_FALSE@am__DEPENDENCIES_2 = \
-@HAVE_W32CE_SYSTEM_FALSE@	../common/libsimple-pwquery.a
-gpg_preset_passphrase_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(common_libs) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+gpg_preset_passphrase_DEPENDENCIES = $(pwquery_libs) $(common_libs) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 gpg_preset_passphrase_LINK = $(CCLD) $(gpg_preset_passphrase_CFLAGS) \
@@ -221,10 +218,10 @@
 am_t_protect_OBJECTS = t_protect-t-protect.$(OBJEXT) \
 	t_protect-protect.$(OBJEXT)
 t_protect_OBJECTS = $(am_t_protect_OBJECTS)
-am__DEPENDENCIES_3 = $(common_libs) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_2 = $(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_2)
 t_protect_LINK = $(CCLD) $(t_protect_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
@@ -337,8 +334,9 @@
 std='&#x1b;m'; \
 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@
@@ -532,25 +530,17 @@
 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 all-tests.scm \
+ gpg-agent-w32info.rc gpg-agent.w32-manifest.in
+
 
 # NB: AM_CFLAGS may also be used by tools running on the build
 # platform to create source files.
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(am__append_2) \
-	$(am__append_3) $(am__append_4) $(am__append_5) \
-	$(am__append_6) $(am__append_7) $(am__append_8) \
-	$(am__append_9)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx. WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library. We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc. 256k is the largest stack
-# we use with pth.
-@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)
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(am__append_1) \
+	$(am__append_2) $(am__append_3) $(am__append_4) \
+	$(am__append_5) $(am__append_6) $(am__append_7) \
+	$(am__append_8)
+resource_objs = $(am__append_9)
 
 # Convenience macros
 libcommon = ../common/libcommon.a
@@ -582,8 +572,7 @@
 
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
-@HAVE_W32CE_SYSTEM_FALSE@pwquery_libs = ../common/libsimple-pwquery.a
-@HAVE_W32CE_SYSTEM_TRUE@pwquery_libs = 
+pwquery_libs = ../common/libsimple-pwquery.a
 gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) \
 		$(INCICONV)
 
@@ -592,7 +581,7 @@
 	 $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
 		$(resource_objs)
 
-gpg_agent_LDFLAGS = $(extra_bin_ldflags)
+gpg_agent_LDFLAGS = 
 gpg_agent_DEPENDENCIES = $(resource_objs)
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \
@@ -615,6 +604,11 @@
 $(pwquery_libs) $(common_libs) $(LIBASSUAN_LIBS) \
 	 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
+
+#
+# Module tests
+#
+module_tests = t-protect
 t_common_ldadd = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 	 $(LIBINTL) $(LIBICONV) $(NETLIBS)
 
@@ -655,6 +649,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=; \
@@ -1553,6 +1549,8 @@
 @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 ../common/w32info-rc.h
+
 # Make sure that all libs are build before we use them. This is
 # important for things like make -j2.
 $(PROGRAMS): $(common_libs) $(commonpth_libs) $(pwquery_libs)

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/agent.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/agent.h Changed

@@ -37,6 +37,7 @@
 #include "../common/sysutils.h" /* (gnupg_fd_t) */
 #include "../common/session-env.h"
 #include "../common/shareddefs.h"
+#include "../common/name-value.h"
 
 /* To convey some special hash algorithms we use algorithm numbers
    reserved for application use. */
@@ -140,13 +141,6 @@
      passphrase change.  */
   int enable_passphrase_history;
 
-  /* 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. */
 
   /* If this global option is true, the passphrase cache is ignored
@@ -157,6 +151,13 @@
      interactively mark certificate in trustlist.txt as trusted. */
   int allow_mark_trusted;
 
+  /* Only use the system trustlist.  */
+  int no_user_trustlist;
+
+  /* The standard system trustlist is SYSCONFDIR/trustlist.txt.  This
+   * option can be used to change the name.  */
+  const char *sys_trustlist_name;
+
   /* If this global option is true, the Assuan command
      PRESET_PASSPHRASE is allowed.  */
   int allow_preset_passphrase;
@@ -392,6 +393,7 @@
   char keygrip41;
   char *serialno;
   char *idstr;
+  char *usage;
 };
 
 /*-- gpg-agent.c --*/
@@ -444,15 +446,18 @@
                                      int *r_disabled,
                                      int *r_ttl, int *r_confirm);
 
+void start_command_handler_ssh_stream (ctrl_t ctrl, estream_t stream);
 void start_command_handler_ssh (ctrl_t, gnupg_fd_t);
 
 /*-- findkey.c --*/
 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 char *serialno, const char *keyref,
-                             time_t timestamp);
+gpg_error_t agent_write_private_key (const unsigned char *grip,
+                                     const void *buffer, size_t length,
+                                     int force,
+                                     const char *serialno, const char *keyref,
+                                     const char *dispserialno,
+                                     time_t timestamp);
 gpg_error_t agent_key_from_file (ctrl_t ctrl,
                                  const char *cache_nonce,
                                  const char *desc_text,
@@ -463,10 +468,13 @@
                                  gcry_sexp_t *result,
                                  char **r_passphrase, time_t *r_timestamp);
 gpg_error_t agent_raw_key_from_file (ctrl_t ctrl, const unsigned char *grip,
-                                     gcry_sexp_t *result);
+                                     gcry_sexp_t *result, nvc_t *r_keymeta);
 gpg_error_t agent_public_key_from_file (ctrl_t ctrl,
                                         const unsigned char *grip,
                                         gcry_sexp_t *result);
+gpg_error_t agent_ssh_key_from_file (ctrl_t ctrl,
+                                     const unsigned char *grip,
+                                     gcry_sexp_t *result, int *r_order);
 int agent_pk_get_algo (gcry_sexp_t s_key);
 int agent_is_tpm2_key(gcry_sexp_t s_key);
 int agent_key_available (const unsigned char *grip);
@@ -477,6 +485,7 @@
 gpg_error_t agent_delete_key (ctrl_t ctrl, const char *desc_text,
                               const unsigned char *grip,
                               int force, int only_stubs);
+gpg_error_t agent_update_private_key (const unsigned char *grip, nvc_t pk);
 
 /*-- call-pinentry.c --*/
 void initialize_module_call_pinentry (void);
@@ -552,7 +561,7 @@
 unsigned long get_standard_s2k_time (void);
 int agent_protect (const unsigned char *plainkey, const char *passphrase,
                    unsigned char **result, size_t *resultlen,
-		   unsigned long s2k_count, int use_ocb);
+		   unsigned long s2k_count);
 gpg_error_t agent_unprotect (ctrl_t ctrl,
                      const unsigned char *protectedkey, const char *passphrase,
                      gnupg_isotime_t protected_at,
@@ -580,7 +589,8 @@
                                  unsigned char *key, size_t keylen);
 gpg_error_t agent_write_shadow_key (const unsigned char *grip,
                                     const char *serialno, const char *keyid,
-                                    const unsigned char *pkbuf, int force);
+                                    const unsigned char *pkbuf, int force,
+                                    const char *dispserialno);
 
 
 /*-- trustlist.c --*/
@@ -593,11 +603,11 @@
 
 /*-- divert-tpm2.c --*/
 #ifdef HAVE_LIBTSS
-int divert_tpm2_pksign (ctrl_t ctrl, const char *desc_text,
+int divert_tpm2_pksign (ctrl_t ctrl,
                         const unsigned char *digest, size_t digestlen, int algo,
                         const unsigned char *shadow_info, unsigned char **r_sig,
                         size_t *r_siglen);
-int divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+int divert_tpm2_pkdecrypt (ctrl_t ctrl,
                            const unsigned char *cipher,
                            const unsigned char *shadow_info,
                            char **r_buf, size_t *r_len, int *r_padding);
@@ -605,25 +615,25 @@
                           gcry_sexp_t s_skey);
 #else /*!HAVE_LIBTSS*/
 static inline int
-divert_tpm2_pksign (ctrl_t ctrl, const char *desc_text,
+divert_tpm2_pksign (ctrl_t ctrl,
                     const unsigned char *digest,
                     size_t digestlen, int algo,
                     const unsigned char *shadow_info,
                     unsigned char **r_sig,
                     size_t *r_siglen)
 {
-  (void)ctrl; (void)desc_text; (void)digest; (void)digestlen;
+  (void)ctrl; (void)digest; (void)digestlen;
   (void)algo; (void)shadow_info; (void)r_sig; (void)r_siglen;
   return gpg_error (GPG_ERR_NOT_SUPPORTED);
 }
 static inline int
-divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+divert_tpm2_pkdecrypt (ctrl_t ctrl,
                        const unsigned char *cipher,
                        const unsigned char *shadow_info,
                        char **r_buf, size_t *r_len,
                        int *r_padding)
 {
-  (void)ctrl; (void)desc_text; (void)cipher; (void)shadow_info;
+  (void)ctrl; (void)cipher; (void)shadow_info;
   (void)r_buf; (void)r_len; (void)r_padding;
   return gpg_error (GPG_ERR_NOT_SUPPORTED);
 }
@@ -639,15 +649,14 @@
 
 
 /*-- divert-scd.c --*/
-int divert_pksign (ctrl_t ctrl, const char *desc_text,
+int divert_pksign (ctrl_t ctrl,
                    const unsigned char *grip,
                    const unsigned char *digest, size_t digestlen, int algo,
-                   const unsigned char *shadow_info, unsigned char **r_sig,
+                   unsigned char **r_sig,
                    size_t *r_siglen);
-int divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+int divert_pkdecrypt (ctrl_t ctrl,
                       const unsigned char *grip,
                       const unsigned char *cipher,
-                      const unsigned char *shadow_info,
                       char **r_buf, size_t *r_len, int *r_padding);
 int divert_generic_cmd (ctrl_t ctrl,
                         const char *cmdline, void *assuan_context);

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/all-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/all-tests.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/call-daemon.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/call-daemon.c Changed

@@ -153,6 +153,8 @@
                       name, WSTOPSIG (wstatus));
           goto again;
         }
+
+      assuan_set_flag (g->primary_ctx, ASSUAN_NO_WAITPID, 1);
     }
 #endif /*!HAVE_W32_SYSTEM*/
 
@@ -166,8 +168,6 @@
     }
   else
     {
-      assuan_set_flag (g->primary_ctx, ASSUAN_NO_WAITPID, 1);
-
       for (sl = g->local_list; sl; sl = sl->next_local)
         {
           sl->invalid = 1;
@@ -414,11 +414,7 @@
 
   i=0;
   if (!opt.running_detached)
-    {
-      if (log_get_fd () != -1)
-        no_close_listi++ = assuan_fd_from_posix_fd (log_get_fd ());
-      no_close_listi++ = assuan_fd_from_posix_fd (fileno (stderr));
-    }
+    no_close_listi++ = assuan_fd_from_posix_fd (fileno (stderr));
   no_close_listi = ASSUAN_INVALID_FD;
 
   /* Connect to the daemon and perform initial handshaking.  Use
@@ -469,9 +465,7 @@
     xfree (databuf);
   }
 
-  /* Tell the daemon we want him to send us an event signal.  We
-     don't support this for W32CE.  */
-#ifndef HAVE_W32CE_SYSTEM
+  /* Tell the daemon we want him to send us an event signal.  */
   if (opt.sigusr2_enabled)
     {
       char buf100;
@@ -484,7 +478,6 @@
 #endif
       assuan_transact (ctx, buf, NULL, NULL, NULL, NULL, NULL, NULL);
     }
-#endif /*HAVE_W32CE_SYSTEM*/
 
   g->primary_ctx = ctx;
   g->primary_ctx_reusable = 0;

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/call-pinentry.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/call-pinentry.c Changed

@@ -57,7 +57,9 @@
 * passphrase will be rendered as zbase32 which results for 150 bits
 * in a string of 30 characters. That fits nicely into the 5
 * character blocking which pinentry can do. 128 bits would actually
- * be sufficient but can't be formatted nicely. */
+ * be sufficient but can't be formatted nicely. Please do not change
+ * this value because pattern check files may let such passwords
+ * always pass. */
 #define DEFAULT_GENPIN_BITS 150
 
 /* The assuan context of the current pinentry. */
@@ -394,11 +396,7 @@
 
 i=0;
 if (!opt.running_detached)
- {
- if (log_get_fd () != -1)
- no_close_listi++ = assuan_fd_from_posix_fd (log_get_fd ());
- no_close_listi++ = assuan_fd_from_posix_fd (fileno (stderr));
- }
+ no_close_listi++ = assuan_fd_from_posix_fd (fileno (stderr));
 no_close_listi = ASSUAN_INVALID_FD;
 
 rc = assuan_new (&ctx);
@@ -848,21 +846,20 @@
 
 
 /* Generate a random passphrase in zBase32 encoding (RFC-6189) to be
- * used by Pinentry to suggest a passphrase. */
+ * used by Pinentry to suggest a passphrase. Note that we have the
+ * same algorithm in gpg.c for --gen-random at level 30. It is
+ * important that we always output exactly 30 characters to match the
+ * special exception we have in the pattern file for symmetric
+ * encryption. */
 static char *
 generate_pin (void)
 {
- unsigned int nbits = opt.min_passphrase_len * 8;
- size_t nbytes;
+ unsigned int nbits = DEFAULT_GENPIN_BITS;
+ size_t nbytes = nbytes = (nbits + 7) / 8;
 void *rand;
 char *generated;
 
- if (nbits < 128)
- nbits = DEFAULT_GENPIN_BITS;
-
- nbytes = (nbits + 7) / 8;
-
- rand = gcry_random_bytes_secure (nbytes, GCRY_STRONG_RANDOM);
+ rand = gcry_random_bytes_secure (nbytes, GCRY_STRONG_RANDOM);
 if (!rand)
 {
 log_error ("failed to generate random pin\n");
@@ -1546,6 +1543,17 @@
 NULL, NULL, NULL, NULL, NULL, NULL);
 if (rc)
 pininfo->with_repeat = 0; /* Pinentry does not support it. */
+
+ if (pininfo->with_repeat)
+ {
+ snprintf (line, DIM(line), "SETREPEATOK %s",
+ L_("Passphrases match."));
+ rc = assuan_transact (entry_ctx, line,
+ NULL, NULL, NULL, NULL, NULL, NULL);
+ if (rc)
+ rc = 0; /* Pinentry does not support it. */
+ }
+
 }
 pininfo->repeat_okay = 0;
 pininfo->status = 0;
@@ -1805,6 +1813,16 @@
 if (rc)
 pininfo->with_repeat = 0; /* Pinentry does not support it. */
 
+ if (pininfo->with_repeat)
+ {
+ snprintf (line, DIM(line), "SETREPEATOK %s",
+ L_("Passphrases match."));
+ rc = assuan_transact (entry_ctx, line,
+ NULL, NULL, NULL, NULL, NULL, NULL);
+ if (rc)
+ rc = 0; /* Pinentry does not support it. */
+ }
+
 (void)setup_genpin (ctrl);
 
 rc = setup_enforced_constraints (ctrl);

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/call-scd.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/call-scd.c Changed

@@ -384,7 +384,12 @@
       rc = parm->getpin_cb (parm->getpin_cb_arg, parm->getpin_cb_desc,
                             line, pin, pinlen);
       if (!rc)
-        rc = assuan_send_data (parm->ctx, pin, pinlen);
+        {
+          assuan_begin_confidential (parm->ctx);
+          rc = assuan_send_data (parm->ctx, pin, pinlen);
+          assuan_end_confidential (parm->ctx);
+        }
+      wipememory (pin, pinlen);
       xfree (pin);
     }
   else if ((s = has_leading_keyword (line, "POPUPPINPADPROMPT")))
@@ -934,6 +939,7 @@
       int n;
       struct card_key_info_s **l_p = &parm->list;
 
+      /* It's going to append the information at the end.  */
       while ((*l_p))
         l_p = &(*l_p)->next;
 
@@ -971,7 +977,7 @@
         ;
 
       if (!n)
-        goto parm_error;
+        goto skip;
 
       keyinfo->serialno = xtrymalloc (n+1);
       if (!keyinfo->serialno)
@@ -983,18 +989,34 @@
       line = s;
 
       if (!*line)
-        goto parm_error;
+        goto skip;
 
       while (spacep (line))
         line++;
 
       if (!*line)
-        goto parm_error;
+        goto skip;
 
-      keyinfo->idstr = xtrystrdup (line);
+      for (s = line; *s && !spacep (s); s++)
+        ;
+
+      keyinfo->idstr = xtrymalloc (s - line + 1);
       if (!keyinfo->idstr)
         goto alloc_error;
+      memcpy (keyinfo->idstr, line, s - line);
+      keyinfo->idstrs - line = 0;
+
+      while (spacep (s))
+        s++;
+
+      if (!*s)
+        goto skip;
+
+      keyinfo->usage = xtrystrdup (s);
+      if (!keyinfo->usage)
+        goto alloc_error;
 
+    skip:
       *l_p = keyinfo;
     }
   else if (keywordlen == 12 && !memcmp (keyword, "PINCACHE_PUT", keywordlen))
@@ -1003,6 +1025,8 @@
   return err;
 
  alloc_error:
+  xfree (keyinfo->serialno);
+  xfree (keyinfo->idstr);
   xfree (keyinfo);
   if (!parm->error)
     parm->error = gpg_error_from_syserror ();
@@ -1026,6 +1050,7 @@
       l_next = l->next;
       xfree (l->serialno);
       xfree (l->idstr);
+      xfree (l->usage);
       xfree (l);
     }
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/command-ssh.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/command-ssh.c Changed

@@ -231,6 +231,22 @@
 };
 
 
+/* Two objects definition to hold keys for later sorting. */
+struct key_collection_item_s
+{
+ gcry_sexp_t key; /* Public key. (owned by us) */
+ char *cardsn; /* Serial number of a card or NULL. (owned by us) */
+ int order; /* Computed ordinal */
+};
+
+struct key_collection_s
+{
+ struct key_collection_item_s *items;
+ size_t allocated;
+ size_t nitems;
+};
+
+
 /* Prototypes. */
 static gpg_error_t ssh_handler_request_identities (ctrl_t ctrl,
 						 estream_t request,
@@ -1030,10 +1046,11 @@
 HEXGRIP is found; return success in this case and store true at
 DISABLED if the found key has been disabled. If R_TTL is not NULL
 a specified TTL for that key is stored there. If R_CONFIRM is not
- NULL it is set to 1 if the key has the confirm flag set. */
+ NULL it is set to 1 if the key has the confirm flag set. The line
+ number where the item was found is stored at R_LNR. */
 static gpg_error_t
 search_control_file (ssh_control_file_t cf, const char *hexgrip,
- int *r_disabled, int *r_ttl, int *r_confirm)
+ int *r_disabled, int *r_ttl, int *r_confirm, int *r_lnr)
 {
 gpg_error_t err;
 
@@ -1045,6 +1062,8 @@
 *r_ttl = 0;
 if (r_confirm)
 *r_confirm = 0;
+ if (r_lnr)
+ *r_lnr = -1;
 
 rewind_control_file (cf);
 while (!(err=read_control_file_item (cf)))
@@ -1062,6 +1081,8 @@
 *r_ttl = cf->item.ttl;
 if (r_confirm)
 *r_confirm = cf->item.confirm;
+ if (r_lnr)
+ *r_lnr = cf->lnr;
 }
 return err;
 }
@@ -1090,7 +1111,7 @@
 if (err)
 return err;
 
- err = search_control_file (cf, hexgrip, &disabled, NULL, NULL);
+ err = search_control_file (cf, hexgrip, &disabled, NULL, NULL, NULL);
 if (err && gpg_err_code(err) == GPG_ERR_EOF)
 {
 struct tm *tp;
@@ -1141,7 +1162,7 @@
 if (open_control_file (&cf, 0))
 return 0; /* Error: Use the global default TTL. */
 
- if (search_control_file (cf, hexgrip, &disabled, &ttl, NULL)
+ if (search_control_file (cf, hexgrip, &disabled, &ttl, NULL, NULL)
 || disabled)
 ttl = 0; /* Use the global default if not found or disabled. */
 
@@ -1164,7 +1185,7 @@
 if (open_control_file (&cf, 0))
 return 1; /* Error: Better ask for confirmation. */
 
- if (search_control_file (cf, hexgrip, &disabled, NULL, &confirm)
+ if (search_control_file (cf, hexgrip, &disabled, NULL, &confirm, NULL)
 || disabled)
 confirm = 0; /* If not found or disabled, there is no reason to
 ask for confirmation. */
@@ -1250,7 +1271,8 @@
 if (i != 40)
 err = gpg_error (GPG_ERR_INV_LENGTH);
 else
- err = search_control_file (cf, uphexgrip, r_disabled, r_ttl, r_confirm);
+ err = search_control_file (cf, uphexgrip, r_disabled, r_ttl, r_confirm,
+ NULL);
 if (gpg_err_code (err) == GPG_ERR_EOF)
 err = gpg_error (GPG_ERR_NOT_FOUND);
 return err;
@@ -2410,9 +2432,14 @@
 hex2bin (keyinfo->keygrip, grip, sizeof (grip));
 if ( agent_key_available (grip) )
 {
+ char *dispserialno;
+
 /* (Shadow)-key is not available in our key storage. */
+ agent_card_getattr (ctrl, "$DISPSERIALNO", &dispserialno,
+ keyinfo->keygrip);
 err = agent_write_shadow_key (grip, keyinfo->serialno,
- keyinfo->idstr, pkbuf, 0);
+ keyinfo->idstr, pkbuf, 0, dispserialno);
+ xfree (dispserialno);
 if (err)
 {
 xfree (pkbuf);
@@ -2424,6 +2451,7 @@
 if (cardsn)
 {
 char *dispsn;
+ char *p;
 
 /* If the card handler is able to return a short serialnumber,
 use that one, else use the complete serialno. */
@@ -2442,6 +2470,10 @@
 gcry_sexp_release (s_pk);
 return err;
 }
+ /* Let's avoid blanks in the comment. */
+ for (p=*cardsn; *p; p++)
+ if (spacep (p))
+ *p = '_';
 }
 
 xfree (pkbuf);
@@ -2449,155 +2481,346 @@
 return 0;
 }
 
+static struct card_key_info_s *
+get_ssh_keyinfo_on_cards (ctrl_t ctrl)
+{
+ struct card_key_info_s *keyinfo_on_cards = NULL;
+ gpg_error_t err;
+ char *serialno;
 
-&#xc;
+ if (opt.disable_daemonDAEMON_SCD)
+ return NULL;
 
-/*
+ /* Scan for new device(s). */
+ err = agent_card_serialno (ctrl, &serialno, NULL);
+ if (err)
+ {
+ if (opt.verbose)
+ log_info (_("error getting list of cards: %s\n"),
+ gpg_strerror (err));
+ return NULL;
+ }
 
- Request handler. Each handler is provided with a CTRL context, a
- REQUEST object and a RESPONSE object. The actual request is to be
- read from REQUEST, the response needs to be written to RESPONSE.
+ xfree (serialno);
 
-*/
+ err = agent_card_keyinfo (ctrl, NULL, GCRY_PK_USAGE_AUTH, &keyinfo_on_cards);
+ if (err)
+ return NULL;
 
+ return keyinfo_on_cards;
+}
 
-/* Handler for the "request_identities" command. */
+
+/* Append (KEY,CARDSN,LNR,ORDER) to ARRAY. The array must initially
+ * be passed as a cleared struct. ARRAY takes ownership of KEY and
+ * CARDSN. */
 static gpg_error_t
-ssh_handler_request_identities (ctrl_t ctrl,
- estream_t request, estream_t response)
+add_to_key_array (struct key_collection_s *array, gcry_sexp_t key,
+ char *cardsn, int order)
+{
+ if (array->nitems == array->allocated)
+ {
+ struct key_collection_item_s *newitems;
+ size_t newsize = ((array->allocated + 63)/64 + 1) * 64;
+
+ newitems = xtryreallocarray (array->items, array->allocated, newsize+1,
+ sizeof *newitems);
+ if (!newitems)
+ return gpg_error_from_syserror ();
+ array->allocated = newsize;
+ array->items = newitems;
+ }
+ array->itemsarray->nitems.key = key;
+ array->itemsarray->nitems.cardsn = cardsn;
+ array->itemsarray->nitems.order = order;
+ array->nitems++;
+ return 0;
+}
+
+/* Release the content of ARRAY. */
+static void
+free_key_array (struct key_collection_s *array)
+{
+ if (array && array->items)
+ {
+ unsigned int n;
+
+ for (n = 0; n < array->nitems; n++)
+ {
+ gcry_sexp_release (array->itemsn.key);
+ xfree (array->itemsn.cardsn);
+ }
+ xfree (array->items);
+ }
+}
+
+
+/* Helper for the qsort in ssh_send_available_keys. */
+static int
+compare_key_collection_items (const void *arg_a, const void *arg_b)
+{
+ const struct key_collection_item_s *a
+ = (const struct key_collection_item_s *)arg_a;
+ const struct key_collection_item_s *b
+ = (const struct key_collection_item_s *)arg_b;
+ int res;
+
+ res = a->order - b->order;
+ /* If we are comparing two cards we sort by serial number. */
+ if (!res && a->order == 1)
+ res = strcmp (a->cardsn?a->cardsn:"", b->cardsn?b->cardsn:"");
+ return res;
+}
+
+
+static gpg_error_t
+ssh_send_available_keys (ctrl_t ctrl, estream_t key_blobs, u32 *r_key_counter)
 {
- u32 key_counter;
- estream_t key_blobs;
- gcry_sexp_t key_public;
 gpg_error_t err;
- int ret;
+ char *dirname;
+ gnupg_dir_t dir = NULL;
+ gnupg_dirent_t dir_entry;
+ char hexgrip41;
 ssh_control_file_t cf = NULL;
- gpg_error_t ret_err;
-
- (void)request;
+ struct card_key_info_s *keyinfo_on_cards, *l;
+ char *cardsn;
+ gcry_sexp_t key_public = NULL;
+ int count;
+ struct key_collection_s keyarray = { NULL };
 
- /* Prepare buffer stream. */
+ err = open_control_file (&cf, 0);
+ if (err)
+ return err;
 
- key_public = NULL;
- key_counter = 0;
+ /* First, get information keys available on cards on-line. */
+ keyinfo_on_cards = get_ssh_keyinfo_on_cards (ctrl);
 
- key_blobs = es_fopenmem (0, "r+b");
- if (! key_blobs)
+ /* Look at all the registered and non-disabled keys, in sshcontrol. */
+ /* And, look at all keys with "Use-for-ssh:" flag. */
+ dirname = make_filename_try (gnupg_homedir (),
+ GNUPG_PRIVATE_KEYS_DIR, NULL);
+ if (!dirname)
 {
 err = gpg_error_from_syserror ();
- goto out;
+ agent_card_free_keyinfo (keyinfo_on_cards);
+ return err;
+ }
+ dir = gnupg_opendir (dirname);
+ if (!dir)
+ {
+ err = gpg_error_from_syserror ();
+ xfree (dirname);
+ agent_card_free_keyinfo (keyinfo_on_cards);
+ return err;
 }
+ xfree (dirname);
+
+ while ( (dir_entry = gnupg_readdir (dir)) )
+ {
+ struct card_key_info_s *l_prev = NULL;
+ int disabled, is_ssh, lnr, order;
+ unsigned char grip20;
+
+ cardsn = NULL;
+ if (strlen (dir_entry->d_name) != 44
+ || strcmp (dir_entry->d_name + 40, ".key"))
+ continue;
+ strncpy (hexgrip, dir_entry->d_name, 40);
+ hexgrip40 = 0;
+
+ if ( hex2bin (hexgrip, grip, 20) < 0 )
+ continue; /* Bad hex string. */
 
- /* First check whether a key is currently available in the card
- reader - this should be allowed even without being listed in
- sshcontrol. */
-
- if (!opt.disable_daemonDAEMON_SCD)
- {
- char *serialno;
- struct card_key_info_s *keyinfo_list;
- struct card_key_info_s *keyinfo;
+ /* Check if it's a key on card. */
+ for (l = keyinfo_on_cards; l; l = l->next)
+ if (!memcmp (l->keygrip, hexgrip, 40))
+ break;
+ else
+ l_prev = l;
 
- /* Scan device(s), and get list of KEYGRIP. */
- err = agent_card_serialno (ctrl, &serialno, NULL);
+ /* Check if it's listed in "ssh_control" file. */
+ disabled = is_ssh = 0;
+ err = search_control_file (cf, hexgrip, &disabled, NULL, NULL, &lnr);
 if (!err)
 {
- xfree (serialno);
- err = agent_card_keyinfo (ctrl, NULL, GCRY_PK_USAGE_AUTH,
- &keyinfo_list);
+ if (!disabled)
+ {
+ is_ssh = 1;
+ }
 }
+ else if (gpg_err_code (err) != GPG_ERR_EOF)
+ break;
 
- if (err)
+ /* Clamp LNR value and set the ordinal.
+ * Current use of ordinals:
+ * 1..999 - low value Use-for-ssh.
+ * 1000..99999 - inserted cards (right now only 1000)
+ * 100000..199999 - listed in sshcontrol
+ * 200000..299999 - order taken from Use-for-ssh
+ */
+ if (is_ssh)
 {
- if (opt.verbose)
- log_info (_("error getting list of cards: %s\n"),
- gpg_strerror (err));
- goto scd_out;
+ if (lnr < 1)
+ lnr = 0;
+ else if (lnr > 99999)
+ lnr = 99999;
+ order = lnr + 100000;
 }
 
- for (keyinfo = keyinfo_list; keyinfo; keyinfo = keyinfo->next)
+ if (l)
 {
- char *cardsn;
-
- if (card_key_available (ctrl, keyinfo, &key_public, &cardsn))
- continue;
-
- err = ssh_send_key_public (key_blobs, key_public, cardsn);
- gcry_sexp_release (key_public);
- key_public = NULL;
- xfree (cardsn);
+ err = card_key_available (ctrl, l, &key_public, &cardsn);
+ /* Remove the entry from the list of KEYINFO_ON_CARD */
+ if (l_prev)
+ l_prev->next = l->next;
+ else
+ keyinfo_on_cards = l->next;
+ xfree (l->serialno);
+ xfree (l->idstr);
+ xfree (l->usage);
+ xfree (l);
+ l = NULL;
+ /* If we want to allow that the user to change the sorting
+ * order of card keys (which are sorted by their s/n), we
+ * would need to get the use-for-ssh: value from the stub
+ * file and set an appropriate ordinal. */
+ order = 1000;
+ }
+ else if (is_ssh)
+ err = agent_public_key_from_file (ctrl, grip, &key_public);
+ else /* Examine the file if it's suitable for SSH. */
+ {
+ err = agent_ssh_key_from_file (ctrl, grip, &key_public, &order);
 if (err)
+ order = 0;
+ else if (order < 0)
 {
- if (opt.verbose)
- gcry_log_debugsxp ("pubkey", key_public);
- if (gpg_err_code (err) == GPG_ERR_UNKNOWN_CURVE
- || gpg_err_code (err) == GPG_ERR_INV_CURVE)
- {
- /* For example a Brainpool curve or a curve we don't
- * support at all but a smartcard lists that curve.
- * We ignore them. */
- }
- else
- {
- agent_card_free_keyinfo (keyinfo_list);
- goto out;
- }
+ order = -order;
+ if (order > 999)
+ order = 999;
 }
+ else if (order > 99999)
+ order = 299999;
 else
- key_counter++;
+ order += 200000;
+ }
+ if (err)
+ {
+ /* Clear ERR, skipping the key in question. */
+ err = 0;
+ continue;
 }
 
- agent_card_free_keyinfo (keyinfo_list);
+ err = add_to_key_array (&keyarray, key_public, cardsn, order);
+ if (err)
+ {
+ gcry_sexp_release (key_public);
+ xfree (cardsn);
+ goto leave;
+ }
 }
 
- scd_out:
- /* Then look at all the registered and non-disabled keys. */
- err = open_control_file (&cf, 0);
- if (err)
- goto out;
-
- while (!read_control_file_item (cf))
- {
- unsigned char grip20;
+ gnupg_closedir (dir);
+ ssh_close_control_file (cf);
 
- if (!cf->item.valid)
- continue; /* Should not happen. */
- if (cf->item.disabled)
- continue;
- log_assert (strlen (cf->item.hexgrip) == 40);
- hex2bin (cf->item.hexgrip, grip, sizeof (grip));
+ /* Lastly, handle remaining keys which don't have the stub files. */
+ for (l = keyinfo_on_cards, count=0; l; l = l->next, count++)
+ {
+ cardsn = NULL;
+ if (card_key_available (ctrl, l, &key_public, &cardsn))
+ continue;
+
+ err = add_to_key_array (&keyarray, key_public, cardsn, 300000+count);
+ if (err)
+ {
+ gcry_sexp_release (key_public);
+ xfree (cardsn);
+ goto leave;
+ }
+ }
+
+ /* Sort the array. */
+ qsort (keyarray.items, keyarray.nitems, sizeof *keyarray.items,
+ compare_key_collection_items);
+ if (opt.debug)
+ for (count=0; count < keyarray.nitems; count++)
+ log_debug ("sshkeys%d: order=%d, pubkey=%p sn=%s\n",
+ count, keyarray.itemscount.order,
+ keyarray.itemscount.key, keyarray.itemscount.cardsn);
 
- err = agent_public_key_from_file (ctrl, grip, &key_public);
+ /* And print the keys. */
+ for (count=0; count < keyarray.nitems; count++)
+ {
+ err = ssh_send_key_public (key_blobs, keyarray.itemscount.key,
+ keyarray.itemscount.cardsn);
 if (err)
 {
- log_error ("%s:%d: key '%s' skipped: %s\n",
- cf->fname, cf->lnr, cf->item.hexgrip,
- gpg_strerror (err));
- continue;
+ if (opt.debug)
+ gcry_log_debugsxp ("pubkey", keyarray.itemscount.key);
+ if (gpg_err_code (err) == GPG_ERR_UNKNOWN_CURVE
+ || gpg_err_code (err) == GPG_ERR_INV_CURVE)
+ {
+ /* For example a Brainpool curve or a curve we don't
+ * support at all but a smartcard lists that curve.
+ * We ignore them. */
+ }
+ else
+ goto leave;
 }
+ }
+ *r_key_counter = count;
 
- err = ssh_send_key_public (key_blobs, key_public, NULL);
- if (err)
- goto out;
- gcry_sexp_release (key_public);
- key_public = NULL;
+ leave:
+ agent_card_free_keyinfo (keyinfo_on_cards);
+ free_key_array (&keyarray);
+ return err;
+}
+&#xc;
 
- key_counter++;
- }
- err = 0;
+/*
 
- ret = es_fseek (key_blobs, 0, SEEK_SET);
- if (ret)
+ Request handler. Each handler is provided with a CTRL context, a
+ REQUEST object and a RESPONSE object. The actual request is to be
+ read from REQUEST, the response needs to be written to RESPONSE.
+
+*/
+
+
+/* Handler for the "request_identities" command. */
+static gpg_error_t
+ssh_handler_request_identities (ctrl_t ctrl,
+ estream_t request, estream_t response)
+{
+ u32 key_counter;
+ estream_t key_blobs;
+ gpg_error_t err;
+ int ret;
+ gpg_error_t ret_err;
+
+ (void)request;
+
+ /* Prepare buffer stream. */
+
+ key_counter = 0;
+
+ key_blobs = es_fopenmem (0, "r+b");
+ if (! key_blobs)
 {
 err = gpg_error_from_syserror ();
 goto out;
 }
 
+ err = ssh_send_available_keys (ctrl, key_blobs, &key_counter);
+ if (!err)
+ {
+ ret = es_fseek (key_blobs, 0, SEEK_SET);
+ if (ret)
+ err = gpg_error_from_syserror ();
+ }
+
 out:
 /* Send response. */
 
- gcry_sexp_release (key_public);
-
 if (!err)
 {
 ret_err = stream_write_byte (response, SSH_RESPONSE_IDENTITIES_ANSWER);
@@ -2614,7 +2837,6 @@
 }
 
 es_fclose (key_blobs);
- close_control_file (cf);
 
 return ret_err;
 }
@@ -2671,7 +2893,7 @@
 char *fpr, *prompt;
 char *comment = NULL;
 
- err = agent_raw_key_from_file (ctrl, ctrl->keygrip, &key);
+ err = agent_raw_key_from_file (ctrl, ctrl->keygrip, &key, NULL);
 if (err)
 goto out;
 err = ssh_get_fingerprint_string (key, opt.ssh_fingerprint_digest, &fpr);
@@ -2933,7 +3155,7 @@
 buffer_new, buffer_new_n);
 
 if (*passphrase)
- err = agent_protect (buffer_new, passphrase, buffer, buffer_n, 0, -1);
+ err = agent_protect (buffer_new, passphrase, buffer, buffer_n, 0);
 else
 {
 /* The key derivation function does not support zero length
@@ -3065,7 +3287,7 @@
 /* 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,
- NULL, NULL, 0);
+ NULL, NULL, NULL, 0);
 if (err)
 goto out;
 
@@ -3679,67 +3901,73 @@
 }
 
 
-/* Start serving client on SOCK_CLIENT. */
+/* Start serving client on STREAM. */
 void
-start_command_handler_ssh (ctrl_t ctrl, gnupg_fd_t sock_client)
+start_command_handler_ssh_stream (ctrl_t ctrl, estream_t stream)
 {
- estream_t stream_sock = NULL;
 gpg_error_t err;
 int ret;
- struct peer_info_s peer_info;
- es_syshd_t syshd;
-
- syshd.type = ES_SYSHD_SOCK;
- syshd.u.sock = sock_client;
 
 err = agent_copy_startup_env (ctrl);
 if (err)
 goto out;
 
- get_client_info (sock_client, &peer_info);
- ctrl->client_pid = peer_info.pid;
- ctrl->client_uid = peer_info.uid;
-
- /* Create stream from socket. */
- stream_sock = es_sysopen (&syshd, "r+");
- if (!stream_sock)
- {
- err = gpg_error_from_syserror ();
- log_error (_("failed to create stream from socket: %s\n"),
-		 gpg_strerror (err));
- goto out;
- }
 /* We have to disable the estream buffering, because the estream
 core doesn't know about secure memory. */
- ret = es_setvbuf (stream_sock, NULL, _IONBF, 0);
+ ret = es_setvbuf (stream, NULL, _IONBF, 0);
 if (ret)
 {
- err = gpg_error_from_syserror ();
- log_error ("failed to disable buffering "
- "on socket stream: %s\n", gpg_strerror (err));
+ log_error ("failed to disable buffering on socket stream: %s\n",
+ strerror (errno));
 goto out;
 }
 
 /* Main processing loop. */
- while ( !ssh_request_process (ctrl, stream_sock) )
+ while ( !ssh_request_process (ctrl, stream) )
 {
 /* Check whether we have reached EOF before trying to read
-	 another request. */
+ another request. */
 int c;
 
- c = es_fgetc (stream_sock);
+ c = es_fgetc (stream);
 if (c == EOF)
 break;
- es_ungetc (c, stream_sock);
+ es_ungetc (c, stream);
 }
 
 /* Reset the daemon in case it has been used. */
 agent_reset_daemon (ctrl);
 
-
 out:
- if (stream_sock)
- es_fclose (stream_sock);
+ es_fclose (stream);
+}
+
+
+/* Start serving client on SOCK_CLIENT. */
+void
+start_command_handler_ssh (ctrl_t ctrl, gnupg_fd_t sock_client)
+{
+ estream_t stream_sock;
+ struct peer_info_s peer_info;
+ es_syshd_t syshd;
+
+ syshd.type = ES_SYSHD_SOCK;
+ syshd.u.sock = sock_client;
+
+ get_client_info (sock_client, &peer_info);
+ ctrl->client_pid = peer_info.pid;
+ ctrl->client_uid = peer_info.uid;
+
+ /* Create stream from socket. */
+ stream_sock = es_sysopen (&syshd, "r+");
+ if (!stream_sock)
+ {
+ log_error (_("failed to create stream from socket: %s\n"),
+ strerror (errno));
+ return;
+ }
+
+ start_command_handler_ssh_stream (ctrl, stream_sock);
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/command.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/command.c Changed

@@ -445,10 +445,13 @@
 /* Take the keyinfo for cards from our local cache. Actually this
 * cache could be a global one but then we would need to employ
 * reference counting. */
-struct card_key_info_s *
+static struct card_key_info_s *
 get_keyinfo_on_cards (ctrl_t ctrl)
 {
- struct card_key_info_s *keyinfo_on_cards;
+ struct card_key_info_s *keyinfo_on_cards = NULL;
+
+ if (opt.disable_daemonDAEMON_SCD)
+ return NULL;
 
 if (ctrl->server_local->last_card_keyinfo.ki
 && ctrl->server_local->last_card_keyinfo.eventno == eventcounter.card
@@ -633,7 +636,7 @@
 "HAVEKEY --list=<limit>\n"
 "\n"
 "Return success if at least one of the secret keys with the given\n"
- "keygrips is available. With --list return all availabale keygrips\n"
+ "keygrips is available. With --list return all available keygrips\n"
 "as binary data; with <limit> bail out at this number of keygrips";
 static gpg_error_t
 cmd_havekey (assuan_context_t ctx, char *line)
@@ -1197,10 +1200,102 @@
 }
 
 
+static const char hlp_keyattr =
+ "KEYATTR --delete <hexstring_with_keygrip> <ATTRNAME> <VALUE>\n"
+ "\n"
+ "For the secret key, show the attribute of ATTRNAME. With VALUE,\n"
+ "put the value to the attribute. Use --delete option to delete.";
+static gpg_error_t
+cmd_keyattr (assuan_context_t ctx, char *line)
+{
+ ctrl_t ctrl = assuan_get_pointer (ctx);
+ gpg_error_t err;
+ const char *argv3;
+ int argc;
+ unsigned char grip20;
+ int opt_delete;
+
+ if (ctrl->restricted)
+ return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
+
+ opt_delete = has_option (line, "--delete");
+
+ line = skip_options (line);
+
+ argc = split_fields (line, argv, DIM (argv));
+ if (argc < 2)
+ {
+ err = gpg_error (GPG_ERR_MISSING_VALUE);
+ goto leave;
+ }
+
+ if (!strcmp (argv1, "Key:") /* It allows only access to attribute */
+ /* Make sure ATTRNAME ends with colon. */
+ || argv1strlen (argv1) - 1 != ':')
+ {
+ err = gpg_error (GPG_ERR_INV_PARAMETER);
+ goto leave;
+ }
+
+ err = parse_keygrip (ctx, argv0, grip);
+ if (err)
+ goto leave;
+
+ if (!err)
+ {
+ gcry_sexp_t s_key = NULL;
+ nvc_t keymeta = NULL;
+ const char *p;
+
+ err = agent_raw_key_from_file (ctrl, grip, &s_key, &keymeta);
+ if (err)
+ goto leave;
+
+ if (argc == 2)
+ {
+ nve_t e = NULL;
 
+ if (keymeta)
+ e = nvc_lookup (keymeta, argv1);
+
+ if (opt_delete)
+ {
+ if (e)
+ {
+ nvc_delete (keymeta, e);
+ goto key_attr_write;
+ }
+ }
+ else if (e)
+ {
+ p = nve_value (e);
+ if (p)
+ err = assuan_send_data (ctx, p, strlen (p));
+ }
+ }
+ else if (argc == 3)
+ {
+ if (!keymeta)
+ keymeta = nvc_new_private_key ();
+
+ err = nvc_set (keymeta, argv1, argv2);
+ key_attr_write:
+ if (!err)
+ err = nvc_set_private_key (keymeta, s_key);
+ if (!err)
+ err = agent_update_private_key (grip, keymeta);
+ }
+
+ nvc_release (keymeta);
+ gcry_sexp_release (s_key);
+ }
+
+ leave:
+ return leave_cmd (ctx, err);
+}
 &#xc;
 static const char hlp_readkey =
- "READKEY --no-data <hexstring_with_keygrip>\n"
+ "READKEY --no-data --format=ssh <hexstring_with_keygrip>\n"
 " --card <keyid>\n"
 "\n"
 "Return the public key for the given keygrip or keyid.\n"
@@ -1213,20 +1308,22 @@
 unsigned char grip20;
 gcry_sexp_t s_pkey = NULL;
 unsigned char *pkbuf = NULL;
- char *serialno = NULL;
- char *keyidbuf = NULL;
 size_t pkbuflen;
- int opt_card, opt_no_data;
+ int opt_card, opt_no_data, opt_format_ssh;
 
 if (ctrl->restricted)
 return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
 
 opt_no_data = has_option (line, "--no-data");
 opt_card = has_option (line, "--card");
+ opt_format_ssh = has_option (line, "--format=ssh");
+
 line = skip_options (line);
 
 if (opt_card)
 {
+ char *serialno = NULL;
+ char *keyidbuf = NULL;
 const char *keyid = line;
 
 rc = agent_card_getattr (ctrl, "SERIALNO", &serialno, NULL);
@@ -1262,12 +1359,20 @@
 if (agent_key_available (grip))
 {
 /* (Shadow)-key is not available in our key storage. */
- rc = agent_write_shadow_key (grip, serialno, keyid, pkbuf, 0);
+ char *dispserialno;
+ char hexgrip40+1;
+
+ bin2hex (grip, 20, hexgrip);
+ agent_card_getattr (ctrl, "$DISPSERIALNO", &dispserialno, hexgrip);
+ rc = agent_write_shadow_key (grip, serialno, keyid, pkbuf, 0,
+ dispserialno);
+ xfree (dispserialno);
 if (rc)
 goto leave;
 }
 
- rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
+ xfree (serialno);
+ xfree (keyidbuf);
 }
 else
 {
@@ -1278,23 +1383,47 @@
 rc = agent_public_key_from_file (ctrl, grip, &s_pkey);
 if (!rc)
 {
- pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
- log_assert (pkbuflen);
- pkbuf = xtrymalloc (pkbuflen);
- if (!pkbuf)
- rc = gpg_error_from_syserror ();
+ if (opt_format_ssh)
+ {
+ estream_t stream = NULL;
+
+ stream = es_fopenmem (0, "r+b");
+ if (!stream)
+ {
+ rc = gpg_error_from_syserror ();
+ goto leave;
+ }
+
+ rc = ssh_public_key_in_base64 (s_pkey, stream, "(none)");
+ if (rc)
+ {
+ es_fclose (stream);
+ goto leave;
+ }
+
+ rc = es_fclose_snatch (stream, (void **)&pkbuf, &pkbuflen);
+ if (rc)
+ goto leave;
+ }
 else
 {
+ pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
+ log_assert (pkbuflen);
+ pkbuf = xtrymalloc (pkbuflen);
+ if (!pkbuf)
+ {
+ rc = gpg_error_from_syserror ();
+ goto leave;
+ }
 pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON,
 pkbuf, pkbuflen);
- rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
 }
 }
 }
 
+ rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
+
 leave:
- xfree (keyidbuf);
- xfree (serialno);
 xfree (pkbuf);
 gcry_sexp_release (s_pkey);
 return leave_cmd (ctx, rc);
@@ -1303,15 +1432,18 @@
 
 &#xc;
 static const char hlp_keyinfo =
- "KEYINFO --ssh-list --data --ssh-fpr=algo --with-ssh <keygrip>\n"
+ "KEYINFO --ssh-list --data --ssh-fpr=algo --with-ssh\n"
+ " --need-attr=ATTRNAME <keygrip>\n"
 "\n"
 "Return information about the key specified by the KEYGRIP. If the\n"
 "key is not available GPG_ERR_NOT_FOUND is returned. If the option\n"
 "--list is given the keygrip is ignored and information about all\n"
 "available keys are returned. If --ssh-list is given information\n"
 "about all keys listed in the sshcontrol are returned. With --with-ssh\n"
- "information from sshcontrol is always added to the info. Unless --data\n"
- "is given, the information is returned as a status line using the format:\n"
+ "information from sshcontrol is always added to the info. If --need-attr\n"
+ "is used the key is only listed if the value of the given attribute name\n"
+ "(e.g. \"Use-for-ssh\") is true. Unless --data is given, the information\n"
+ "is returned as a status line using the format:\n"
 "\n"
 " KEYINFO <keygrip> <type> <serialno> <idstr> <cached> <protection> <fpr>\n"
 "\n"
@@ -1356,7 +1488,8 @@
 static gpg_error_t
 do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
 int data, int with_ssh_fpr, int in_ssh,
- int ttl, int disabled, int confirm, int on_card)
+ int ttl, int disabled, int confirm, int on_card,
+ const char *need_attr, int list_mode)
 {
 gpg_error_t err;
 char hexgrip40+1;
@@ -1384,6 +1517,39 @@
 goto leave;
 }
 
+ if (need_attr || (ctrl->restricted && list_mode))
+ {
+ gcry_sexp_t s_key = NULL;
+ nvc_t keymeta = NULL;
+ int istrue, has_rl;
+
+
+ if (missing_key)
+ goto leave; /* No attribute available. */
+
+ err = agent_raw_key_from_file (ctrl, grip, &s_key, &keymeta);
+ if (!keymeta)
+ istrue = 0;
+ else
+ {
+ has_rl = 0;
+ if (ctrl->restricted && list_mode
+ && !(has_rl = nvc_get_boolean (keymeta, "Remote-list:")))
+ istrue = 0;
+ else if (need_attr)
+ istrue = nvc_get_boolean (keymeta, need_attr);
+ else
+ istrue = has_rl;
+ nvc_release (keymeta);
+ }
+ gcry_sexp_release (s_key);
+ if (!istrue)
+ {
+ err = gpg_error (GPG_ERR_NOT_FOUND);
+ goto leave;
+ }
+ }
+
 /* Reformat the grip so that we use uppercase as good style. */
 bin2hex (grip, 20, hexgrip);
 
@@ -1431,7 +1597,7 @@
 {
 gcry_sexp_t key;
 
- if (!agent_raw_key_from_file (ctrl, grip, &key))
+ if (!agent_raw_key_from_file (ctrl, grip, &key, NULL))
 {
 ssh_get_fingerprint_string (key, with_ssh_fpr, &fpr);
 gcry_sexp_release (key);
@@ -1523,6 +1689,8 @@
 struct card_key_info_s *keyinfo_on_cards;
 struct card_key_info_s *l;
 int on_card;
+ char *need_attr = NULL;
+ size_t n;
 
 if (has_option (line, "--ssh-list"))
 list_mode = 2;
@@ -1545,6 +1713,23 @@
 opt_ssh_fpr = 0;
 
 opt_with_ssh = has_option (line, "--with-ssh");
+
+ err = get_option_value (line, "--need-attr", &need_attr);
+ if (err)
+ goto leave;
+ if (need_attr && (n=strlen (need_attr)) && need_attrn-1 != ':')
+ {
+ /* We need to append a colon. */
+ char *tmp = strconcat (need_attr, ":", NULL);
+ if (!tmp)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ xfree (need_attr);
+ need_attr = tmp;
+ }
+
 line = skip_options (line);
 
 if (opt_with_ssh || list_mode == 2)
@@ -1554,9 +1739,6 @@
 
 if (list_mode == 2)
 {
- if (ctrl->restricted)
- return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
-
 if (cf)
 {
 while (!ssh_read_control_file (cf, hexgrip,
@@ -1571,8 +1753,12 @@
 on_card = 1;
 
 err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, 1,
- ttl, disabled, confirm, on_card);
- if (err)
+ ttl, disabled, confirm, on_card, need_attr,
+ list_mode);
+ if ((need_attr || ctrl->restricted)
+ && gpg_err_code (err) == GPG_ERR_NOT_FOUND)
+ ;
+ else if (err)
 goto leave;
 }
 }
@@ -1583,9 +1769,6 @@
 char *dirname;
 gnupg_dirent_t dir_entry;
 
- if (ctrl->restricted)
- return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
-
 dirname = make_filename_try (gnupg_homedir (),
 GNUPG_PRIVATE_KEYS_DIR, NULL);
 if (!dirname)
@@ -1630,8 +1813,12 @@
 on_card = 1;
 
 err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, is_ssh,
- ttl, disabled, confirm, on_card);
- if (err)
+ ttl, disabled, confirm, on_card, need_attr,
+ list_mode);
+ if ((need_attr || ctrl->restricted)
+ && gpg_err_code (err) == GPG_ERR_NOT_FOUND)
+ ;
+ else if (err)
 goto leave;
 }
 err = 0;
@@ -1658,10 +1845,11 @@
 on_card = 1;
 
 err = do_one_keyinfo (ctrl, grip, ctx, opt_data, opt_ssh_fpr, is_ssh,
- ttl, disabled, confirm, on_card);
+ ttl, disabled, confirm, on_card, need_attr, 0);
 }
 
 leave:
+ xfree (need_attr);
 ssh_close_control_file (cf);
 gnupg_closedir (dir);
 if (err && gpg_err_code (err) != GPG_ERR_NOT_FOUND)
@@ -1694,6 +1882,7 @@
 xfree (p);
 }
 }
+ assuan_end_confidential (ctx);
 return rc;
 }
 
@@ -2309,14 +2498,17 @@
 
 
 static const char hlp_preset_passphrase =
- "PRESET_PASSPHRASE --inquire <string_or_keygrip> <timeout> <hexstring>\n"
+ "PRESET_PASSPHRASE --inquire --restricted \\\n"
+ " <string_or_keygrip> <timeout> <hexstring>\n"
 "\n"
 "Set the cached passphrase/PIN for the key identified by the keygrip\n"
 "to passwd for the given time, where -1 means infinite and 0 means\n"
 "the default (currently only a timeout of -1 is allowed, which means\n"
 "to never expire it). If passwd is not provided, ask for it via the\n"
 "pinentry module unless --inquire is passed in which case the passphrase\n"
- "is retrieved from the client via a server inquire.\n";
+ "is retrieved from the client via a server inquire. The option\n"
+ "--restricted can be used to put the passphrase into the cache used\n"
+ "by restricted connections.";
 static gpg_error_t
 cmd_preset_passphrase (assuan_context_t ctx, char *line)
 {
@@ -2327,6 +2519,7 @@
 int ttl;
 size_t len;
 int opt_inquire;
+ int opt_restricted;
 
 if (ctrl->restricted)
 return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
@@ -2335,6 +2528,7 @@
 return set_error (GPG_ERR_NOT_SUPPORTED, "no --allow-preset-passphrase");
 
 opt_inquire = has_option (line, "--inquire");
+ opt_restricted = has_option (line, "--restricted");
 line = skip_options (line);
 grip_clear = line;
 while (*line && (*line != ' ' && *line != '\t'))
@@ -2386,16 +2580,27 @@
 
 rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%zu", maxlen);
 if (!rc)
-	rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen);
+ {
+ assuan_begin_confidential (ctx);
+ rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen);
+ assuan_end_confidential (ctx);
+ }
 }
 else
 rc = set_error (GPG_ERR_NOT_IMPLEMENTED, "passphrase is required");
 
 if (!rc)
 {
+ int save_restricted = ctrl->restricted;
+ if (opt_restricted)
+ ctrl->restricted = 1;
 rc = agent_put_cache (ctrl, grip_clear, CACHE_MODE_ANY, passphrase, ttl);
+ ctrl->restricted = save_restricted;
 if (opt_inquire)
-	xfree (passphrase);
+ {
+	 wipememory (passphrase, len);
+ xfree (passphrase);
+ }
 }
 
 leave:
@@ -2429,7 +2634,7 @@
 argc = split_fields (l, argv, DIM (argv));
 
 /* These commands are allowed. */
- if ((argc == 1 && !strcmp (argv0, "SERIALNO"))
+ if ((argc >= 1 && !strcmp (argv0, "SERIALNO"))
 || (argc == 2
 && !strcmp (argv0, "GETINFO")
 && !strcmp (argv1, "version"))
@@ -2715,14 +2920,14 @@
 if (passphrase)
 {
 err = agent_protect (key, passphrase, &finalkey, &finalkeylen,
- ctrl->s2k_count, -1);
+ ctrl->s2k_count);
 if (!err)
 err = agent_write_private_key (grip, finalkey, finalkeylen, force,
- NULL, NULL, opt_timestamp);
+ NULL, NULL, NULL, opt_timestamp);
 }
 else
- err = agent_write_private_key (grip, key, realkeylen, force, NULL, NULL,
- opt_timestamp);
+ err = agent_write_private_key (grip, key, realkeylen, force,
+ NULL, NULL, NULL, opt_timestamp);
 
 leave:
 gcry_sexp_release (openpgp_sexp);
@@ -2740,7 +2945,7 @@
 
 &#xc;
 static const char hlp_export_key =
- "EXPORT_KEY --cache-nonce=<nonce> --openpgp <hexstring_with_keygrip>\n"
+ "EXPORT_KEY --cache-nonce=<nonce> --openpgp|--mode1003 <hexkeygrip>\n"
 "\n"
 "Export a secret key from the key store. The key will be encrypted\n"
 "using the current session's key wrapping key (cf. command KEYWRAP_KEY)\n"
@@ -2748,9 +2953,10 @@
 "prior to using this command. The function takes the keygrip as argument.\n"
 "\n"
 "If --openpgp is used, the secret key material will be exported in RFC 4880\n"
- "compatible passphrase-protected form. Without --openpgp, the secret key\n"
- "material will be exported in the clear (after prompting the user to unlock\n"
- "it, if needed).\n";
+ "compatible passphrase-protected form. If --mode1003 is use the secret key\n"
+ "is exported as s-expression as storred locally. Without those options,\n"
+ "the secret key material will be exported in the clear (after prompting\n"
+ "the user to unlock it, if needed).\n";
 static gpg_error_t
 cmd_export_key (assuan_context_t ctx, char *line)
 {
@@ -2763,7 +2969,7 @@
 gcry_cipher_hd_t cipherhd = NULL;
 unsigned char *wrappedkey = NULL;
 size_t wrappedkeylen;
- int openpgp;
+ int openpgp, mode1003;
 char *cache_nonce;
 char *passphrase = NULL;
 unsigned char *shadow_info = NULL;
@@ -2774,6 +2980,10 @@
 return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
 
 openpgp = has_option (line, "--openpgp");
+ mode1003 = has_option (line, "--mode1003");
+ if (mode1003)
+ openpgp = 0;
+
 cache_nonce = option_value (line, "--cache-nonce");
 if (cache_nonce)
 {
@@ -2808,11 +3018,17 @@
 }
 
 /* Get the key from the file. With the openpgp flag we also ask for
- the passphrase so that we can use it to re-encrypt it. */
- err = agent_key_from_file (ctrl, cache_nonce,
- ctrl->server_local->keydesc, grip,
- &shadow_info, CACHE_MODE_IGNORE, NULL, &s_skey,
- openpgp ? &passphrase : NULL, NULL);
+ * the passphrase so that we can use it to re-encrypt it. In
+ * mode1003 we return the key as-is. FIXME: if the key is still in
+ * OpenPGP-native mode we should first convert it to our internal
+ * protection. */
+ if (mode1003)
+ err = agent_raw_key_from_file (ctrl, grip, &s_skey, NULL);
+ else
+ err = agent_key_from_file (ctrl, cache_nonce,
+ ctrl->server_local->keydesc, grip,
+ &shadow_info, CACHE_MODE_IGNORE, NULL, &s_skey,
+ openpgp ? &passphrase : NULL, NULL);
 if (err)
 goto leave;
 if (shadow_info)
@@ -2966,9 +3182,10 @@
 #endif
 
 static const char hlp_keytocard =
- "KEYTOCARD --force <hexgrip> <serialno> <keyref> <timestamp>\n"
+ "KEYTOCARD --force <hexgrip> <serialno> <keyref> <timestamp> <ecdh>\n"
 "\n"
- "TIMESTAMP is required for OpenPGP and defaults to the Epoch. The\n"
+ "TIMESTAMP is required for OpenPGP and defaults to the Epoch.\n"
+ "ECDH are the hexified ECDH parameters for OpenPGP.\n"
 "SERIALNO is used for checking; use \"-\" to disable the check.";
 static gpg_error_t
 cmd_keytocard (assuan_context_t ctx, char *line)
@@ -2985,6 +3202,9 @@
 size_t keydatalen;
 unsigned char *shadow_info = NULL;
 time_t timestamp;
+ char *ecdh_params = NULL;
+ unsigned int ecdh_params_len;
+ unsigned int extralen1, extralen2;
 
 if (ctrl->restricted)
 return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
@@ -3031,10 +3251,38 @@
 
 /* Default to the creation time as stored in the private key. The
 * parameter is here so that gpg can make sure that the timestamp as
- * used for key creation (and thus the openPGP fingerprint) is
- * used. */
+ * used. It is also important for OpenPGP cards to allow computing
+ * of the fingerprint. Same goes for the ECDH params. */
 if (argc > 3)
- timestamp = isotime2epoch (argv3);
+ {
+ timestamp = isotime2epoch (argv3);
+ if (argc > 4)
+ {
+ size_t n;
+
+ err = parse_hexstring (ctx, argv4, &n);
+ if (err)
+ goto leave; /* Badly formatted ecdh params. */
+ n /= 2;
+ if (n < 4)
+ {
+ err = set_error (GPG_ERR_ASS_PARAMETER, "ecdh param too short");
+ goto leave;
+ }
+ ecdh_params_len = n;
+ ecdh_params = xtrymalloc (ecdh_params_len);
+ if (!ecdh_params)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ if (hex2bin (argv4, ecdh_params, ecdh_params_len) < 0)
+ {
+ err = set_error (GPG_ERR_BUG, "hex2bin");
+ goto leave;
+ }
+ }
+ }
 else if (timestamp == (time_t)(-1))
 timestamp = isotime2epoch ("19700101T000000");
 
@@ -3045,9 +3293,12 @@
 }
 
 /* Note: We can't use make_canon_sexp because we need to allocate a
- * few extra bytes for our hack below. */
+ * few extra bytes for our hack below. The 20 for extralen2
+ * accounts for the sexp length of ecdh_params. */
 keydatalen = gcry_sexp_sprint (s_skey, GCRYSEXP_FMT_CANON, NULL, 0);
- keydata = xtrymalloc_secure (keydatalen + 30);
+ extralen1 = 30;
+ extralen2 = ecdh_params? (20+20+ecdh_params_len) : 0;
+ keydata = xtrymalloc_secure (keydatalen + extralen1 + extralen2);
 if (keydata == NULL)
 {
 err = gpg_error_from_syserror ();
@@ -3056,15 +3307,31 @@
 gcry_sexp_sprint (s_skey, GCRYSEXP_FMT_CANON, keydata, keydatalen);
 gcry_sexp_release (s_skey);
 s_skey = NULL;
+
 keydatalen--;			/* Decrement for last '\0'. */
+
 /* Hack to insert the timestamp "created-at" into the private key. */
- snprintf (keydata+keydatalen-1, 30, KEYTOCARD_TIMESTAMP_FORMAT, timestamp);
+ snprintf (keydata+keydatalen-1, extralen1, KEYTOCARD_TIMESTAMP_FORMAT,
+ timestamp);
 keydatalen += 10 + 19 - 1;
 
+ /* Hack to insert the timestamp "ecdh-params" into the private key. */
+ if (ecdh_params)
+ {
+ snprintf (keydata+keydatalen-1, extralen2, "(11:ecdh-params%u:",
+ ecdh_params_len);
+ keydatalen += strlen (keydata+keydatalen-1) -1;
+ memcpy (keydata+keydatalen, ecdh_params, ecdh_params_len);
+ keydatalen += ecdh_params_len;
+ memcpy (keydata+keydatalen, "))", 3);
+ keydatalen += 2;
+ }
+
 err = divert_writekey (ctrl, force, serialno, keyref, keydata, keydatalen);
 xfree (keydata);
 
 leave:
+ xfree (ecdh_params);
 gcry_sexp_release (s_skey);
 xfree (shadow_info);
 return leave_cmd (ctx, err);
@@ -3218,8 +3485,12 @@
 {
 err = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%u",MAXLEN_PUT_SECRET);
 if (!err)
- err = assuan_inquire (ctx, "SECRET",
- &value, &valuelen, MAXLEN_PUT_SECRET);
+ {
+ assuan_begin_confidential (ctx);
+ err = assuan_inquire (ctx, "SECRET",
+ &value, &valuelen, MAXLEN_PUT_SECRET);
+ assuan_end_confidential (ctx);
+ }
 if (err)
 goto leave;
 }
@@ -3951,6 +4222,11 @@
 if (!strcmp (cmdopt, "newsymkey"))
 return 1;
 }
+ else if (!strcmp (cmd, "EXPORT_KEY"))
+ {
+ if (!strcmp (cmdopt, "mode1003"))
+ return 1;
+ }
 
 return 0;
 }
@@ -4002,7 +4278,8 @@
 { "RELOADAGENT", cmd_reloadagent,hlp_reloadagent },
 { "GETINFO", cmd_getinfo, hlp_getinfo },
 { "KEYTOCARD", cmd_keytocard, hlp_keytocard },
- { "KEYTOTPM",	cmd_keytotpm, hlp_keytotpm },
+ { "KEYTOTPM", cmd_keytotpm, hlp_keytotpm },
+ { "KEYATTR", cmd_keyattr, hlp_keyattr },
 { NULL }
 };
 int i, rc;

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/cvt-openpgp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/cvt-openpgp.c Changed

@@ -802,9 +802,10 @@
   if (!list)
     goto bad_seckey;
   value = gcry_sexp_nth_data (list, 1, &valuelen);
-  if (!value || valuelen != 1 || !(value0 == '3' || value0 == '4'))
+  if (!value || valuelen != 1
+      || !(value0 == '3' || value0 == '4' || value0 == '5'))
     goto bad_seckey;
-  is_v4 = (value0 == '4');
+  is_v4 = (value0 == '4' || value0 == '5');
 
   gcry_sexp_release (list);
   list = gcry_sexp_find_token (top_list, "protection", 0);
@@ -948,7 +949,7 @@
   gcry_sexp_release (top_list); top_list = NULL;
 
 #if 0
-  log_debug ("XXX is_v4=%d\n", is_v4);
+  log_debug ("XXX is v4_or_later=%d\n", is_v4);
   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);
@@ -1145,9 +1146,9 @@
 
           if (!agent_protect (*r_key, passphrase,
                               &protectedkey, &protectedkeylen,
-                              ctrl->s2k_count, -1))
+                              ctrl->s2k_count))
             agent_write_private_key (grip, protectedkey, protectedkeylen, 1,
-                                     NULL, NULL, 0);
+                                     NULL, NULL, NULL, 0);
           xfree (protectedkey);
         }
       else
@@ -1156,7 +1157,7 @@
           agent_write_private_key (grip,
                                    *r_key,
                                    gcry_sexp_canon_len (*r_key, 0, NULL,NULL),
-                                   1, NULL, NULL, 0);
+                                   1, NULL, NULL, NULL, 0);
         }
     }

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/divert-scd.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/divert-scd.c Changed

@@ -32,113 +32,6 @@
 #include "../common/sexp-parse.h"
 
 
-static gpg_error_t
-ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info,
- const unsigned char *grip, char **r_kid)
-{
- char *serialno;
- char *desc;
- char *want_sn;
- int len;
- gpg_error_t err;
- char hexgrip41;
-
- *r_kid = NULL;
- bin2hex (grip, 20, hexgrip);
-
- if (shadow_info)
- {
- err = parse_shadow_info (shadow_info, &want_sn, NULL, NULL);
- if (err)
- return err;
- }
- else
- want_sn = NULL;
-
- len = want_sn? strlen (want_sn) : 0;
- if (len == 32 && !strncmp (want_sn, "D27600012401", 12))
- {
- /* This is an OpenPGP card - reformat */
- if (!strncmp (want_sn+16, "0006", 4))
- {
- /* This is a Yubikey. Print the s/n as it would be printed
- * on Yubikey 5. Example: D2760001240100000006120808620000
- * mmmm^^^^^^^^ */
- unsigned long sn;
-
- sn = atoi_4 (want_sn+20) * 10000;
- sn += atoi_4 (want_sn+24);
- snprintf (want_sn, 32, "%lu %03lu %03lu",
- (sn/1000000ul), (sn/1000ul % 1000ul), (sn % 1000ul));
- }
- else /* Default is the Zeitcontrol card print format. */
- {
- memmove (want_sn, want_sn+16, 4);
- want_sn4 = ' ';
- memmove (want_sn+5, want_sn+20, 8);
- want_sn13 = 0;
- }
- }
- else if (len == 20 && want_sn19 == '0')
- {
- /* We assume that a 20 byte serial number is a standard one
- * which has the property to have a zero in the last nibble (Due
- * to BCD representation). We don't display this '0' because it
- * may confuse the user. */
- want_sn19 = 0;
- }
-
- for (;;)
- {
- /* Scan device(s), and check if key for GRIP is available. */
- err = agent_card_serialno (ctrl, &serialno, NULL);
- if (!err)
- {
- struct card_key_info_s *keyinfo;
-
- xfree (serialno);
- err = agent_card_keyinfo (ctrl, hexgrip, 0, &keyinfo);
- if (!err)
- {
- /* Key for GRIP found, use it directly. */
- agent_card_free_keyinfo (keyinfo);
- xfree (want_sn);
- if ((*r_kid = xtrystrdup (hexgrip)))
- return 0;
- else
- return gpg_error_from_syserror ();
- }
- }
-
- if (!want_sn)
- ; /* No shadow info so we can't ask; ERR is already set. */
- else if (asprintf (&desc,
- "%s:%%0A%%0A"
- " %s",
- L_("Please insert the card with serial number"),
- want_sn) < 0)
- {
- err = out_of_core ();
- }
- else
- {
- err = agent_get_confirmation (ctrl, desc, NULL, NULL, 0);
- if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK &&
- gpg_err_code (err) == GPG_ERR_NO_PIN_ENTRY)
- err = gpg_error (GPG_ERR_CARD_NOT_PRESENT);
-
- xfree (desc);
- }
-
- if (err)
- {
- xfree (want_sn);
- return err;
- }
- }
-}
-
-
 /* Put the DIGEST into an DER encoded container and return it in R_VAL. */
 static int
 encode_md_for_card (const unsigned char *digest, size_t digestlen, int algo,
@@ -426,44 +319,37 @@
 
 
 /* This function is used when a sign operation has been diverted to a
- * smartcard. DESC_TEXT is the original text for a prompt has send by
- * gpg to gpg-agent.
+ * smartcard.
 *
 * Note: If SHADOW_INFO is NULL the user can't be asked to insert the
 * card, we simply try to use an inserted card with the given keygrip.
 *
 * FIXME: Explain the other args. */
 int
-divert_pksign (ctrl_t ctrl, const char *desc_text, const unsigned char *grip,
+divert_pksign (ctrl_t ctrl, const unsigned char *grip,
 const unsigned char *digest, size_t digestlen, int algo,
- const unsigned char *shadow_info, unsigned char **r_sig,
+ unsigned char **r_sig,
 size_t *r_siglen)
 {
 int rc;
- char *kid;
+ char hexgrip41;
 size_t siglen;
 unsigned char *sigval = NULL;
 
- (void)desc_text;
-
- rc = ask_for_card (ctrl, shadow_info, grip, &kid);
- if (rc)
- return rc;
- /* Note that the KID may be an keyref or a keygrip. The signing
- * functions handle both. */
+ bin2hex (grip, 20, hexgrip);
 
 if (!algo)
 {
 /* This is the PureEdDSA case. (DIGEST,DIGESTLEN) this the
 * entire data which will be signed. */
- rc = agent_card_pksign (ctrl, kid, getpin_cb, ctrl, NULL,
+ rc = agent_card_pksign (ctrl, hexgrip, getpin_cb, ctrl, NULL,
 0, digest, digestlen, &sigval, &siglen);
 }
 else if (algo == MD_USER_TLS_MD5SHA1)
 {
 int save = ctrl->use_auth_call;
 ctrl->use_auth_call = 1;
- rc = agent_card_pksign (ctrl, kid, getpin_cb, ctrl, NULL,
+ rc = agent_card_pksign (ctrl, hexgrip, getpin_cb, ctrl, NULL,
 algo, digest, digestlen, &sigval, &siglen);
 ctrl->use_auth_call = save;
 }
@@ -475,7 +361,7 @@
 rc = encode_md_for_card (digest, digestlen, algo, &data, &ndata);
 if (!rc)
 {
- rc = agent_card_pksign (ctrl, kid, getpin_cb, ctrl, NULL,
+ rc = agent_card_pksign (ctrl, hexgrip, getpin_cb, ctrl, NULL,
 algo, data, ndata, &sigval, &siglen);
 xfree (data);
 }
@@ -487,8 +373,6 @@
 *r_siglen = siglen;
 }
 
- xfree (kid);
-
 return rc;
 }
 
@@ -498,14 +382,13 @@
 allocated buffer in R_BUF. The padding information is stored at
 R_PADDING with -1 for not known. */
 int
-divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+divert_pkdecrypt (ctrl_t ctrl,
 const unsigned char *grip,
 const unsigned char *cipher,
- const unsigned char *shadow_info,
 char **r_buf, size_t *r_len, int *r_padding)
 {
 int rc;
- char *kid;
+ char hexgrip41;
 const unsigned char *s;
 size_t n;
 int depth;
@@ -514,7 +397,7 @@
 char *plaintext;
 size_t plaintextlen;
 
- (void)desc_text;
+ bin2hex (grip, 20, hexgrip);
 
 *r_padding = -1;
 s = cipher;
@@ -591,11 +474,7 @@
 ciphertext = s;
 ciphertextlen = n;
 
- rc = ask_for_card (ctrl, shadow_info, grip, &kid);
- if (rc)
- return rc;
-
- rc = agent_card_pkdecrypt (ctrl, kid, getpin_cb, ctrl, NULL,
+ rc = agent_card_pkdecrypt (ctrl, hexgrip, getpin_cb, ctrl, NULL,
 ciphertext, ciphertextlen,
 &plaintext, &plaintextlen, r_padding);
 if (!rc)
@@ -603,7 +482,6 @@
 *r_buf = plaintext;
 *r_len = plaintextlen;
 }
- xfree (kid);
 return rc;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/divert-tpm2.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/divert-tpm2.c Changed

@@ -13,12 +13,11 @@
 #include "../common/sexp-parse.h"
 
 int
-divert_tpm2_pksign (ctrl_t ctrl, const char *desc_text,
+divert_tpm2_pksign (ctrl_t ctrl,
                     const unsigned char *digest, size_t digestlen, int algo,
                     const unsigned char *shadow_info, unsigned char **r_sig,
                     size_t *r_siglen)
 {
-  (void)desc_text;
   (void)algo;
   return agent_tpm2d_pksign(ctrl, digest, digestlen,
 			    shadow_info, r_sig, r_siglen);
@@ -51,7 +50,7 @@
 
   len = gcry_sexp_canon_len (shdkey, 0, NULL, NULL);
   err = agent_write_private_key (grip, shdkey, len, 1 /*force*/,
-                                 NULL, NULL, 0);
+                                 NULL, NULL, NULL, 0);
   xfree (shdkey);
   if (err)
     log_error ("error writing key: %s\n", gpg_strerror (err));
@@ -76,7 +75,7 @@
 }
 
 int
-divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+divert_tpm2_pkdecrypt (ctrl_t ctrl,
                        const unsigned char *cipher,
                        const unsigned char *shadow_info,
                        char **r_buf, size_t *r_len, int *r_padding)
@@ -86,8 +85,6 @@
 
   *r_padding = -1;
 
-  (void)desc_text;
-
   s = cipher;
   if (*s != '(')
     return gpg_error (GPG_ERR_INV_SEXP);

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/findkey.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/findkey.c Changed

@@ -2,6 +2,7 @@
 * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007,
 * 2010, 2011 Free Software Foundation, Inc.
 * Copyright (C) 2014, 2019 Werner Koch
+ * Copyright (C) 2023 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -33,12 +34,17 @@
 #include "agent.h"
 #include "../common/i18n.h"
 #include "../common/ssh-utils.h"
-#include "../common/name-value.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
 
+
+static gpg_error_t read_key_file (const unsigned char *grip,
+ gcry_sexp_t *result, nvc_t *r_keymeta);
+static gpg_error_t is_shadowed_key (gcry_sexp_t s_skey);
+
+
 /* Helper to pass data to the check callback of the unprotect function. */
 struct try_unprotect_arg_s
 {
@@ -50,7 +56,23 @@
 };
 
 
-/* Repalce all linefeeds in STRING by "%0A" and return a new malloced
+/* Return the file name for the 20 byte keygrip GRIP. With FOR_NEW
+ * create a file name for later renaming to the actual name. Return
+ * NULL on error. */
+static char *
+fname_from_keygrip (const unsigned char *grip, int for_new)
+{
+ char hexgrip40+4+4+1;
+
+ bin2hex (grip, 20, hexgrip);
+ strcpy (hexgrip+40, for_new? ".key.tmp" : ".key");
+
+ return make_filename_try (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR,
+ hexgrip, NULL);
+}
+
+
+/* Replace all linefeeds in STRING by "%0A" and return a new malloced
 * string. May return NULL on memory error. */
 static char *
 linefeed_to_percent0A (const char *string)
@@ -80,33 +102,54 @@
 }
 
 
-/* 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, int newkey,
- const void *buf, size_t len,
- const char *serialno, const char *keyref,
- time_t timestamp)
+/* Write the S-expression formatted key (BUFFER,LENGTH) to our key
+ * storage. With FORCE passed as true an existing key with the given
+ * GRIP will get overwritten. If SERIALNO and KEYREF are given a
+ * Token line is added to the key if the extended format is used. If
+ * TIMESTAMP is not zero and the key does not yet exists it will be
+ * recorded as creation date. */
+gpg_error_t
+agent_write_private_key (const unsigned char *grip,
+ const void *buffer, size_t length, int force,
+ const char *serialno, const char *keyref,
+ const char *dispserialno,
+ time_t timestamp)
 {
 gpg_error_t err;
+ char *fname = NULL;
+ char *tmpfname = NULL;
+ estream_t fp;
+ int newkey;
 nvc_t pk = NULL;
 gcry_sexp_t key = NULL;
- int remove = 0;
+ int removetmp = 0;
+ char *token0 = NULL;
 char *token = NULL;
+ char *dispserialno_buffer = NULL;
+ char **tokenfields = NULL;
+ int is_regular;
+ int blocksigs = 0;
 
- if (update)
- {
- int line;
+ fname = fname_from_keygrip (grip, 0);
+ if (!fname)
+ return gpg_error_from_syserror ();
 
- err = nvc_parse_private_key (&pk, &line, fp);
- if (err && gpg_err_code (err) != GPG_ERR_ENOENT)
+ err = read_key_file (grip, &key, &pk);
+ if (err)
+ {
+ if (gpg_err_code (err) == GPG_ERR_ENOENT)
+ newkey = 1;
+ else
 {
- log_error ("error parsing '%s' line %d: %s\n",
- fname, line, gpg_strerror (err));
+ log_error ("can't open '%s': %s\n", fname, gpg_strerror (err));
 goto leave;
 }
 }
- else
+
+ if (!pk)
 {
+ /* Key is still in the old format or does not exist - create a
+ * new container. */
 pk = nvc_new_private_key ();
 if (!pk)
 {
@@ -114,34 +157,70 @@
 goto leave;
 }
 }
- es_clearerr (fp);
 
- err = gcry_sexp_sscan (&key, NULL, buf, len);
+ /* Check whether we already have a regular key. */
+ is_regular = (key && gpg_err_code (is_shadowed_key (key)) != GPG_ERR_TRUE);
+
+ /* Turn (BUFFER,LENGTH) into a gcrypt s-expression and set it into
+ * our name value container. */
+ gcry_sexp_release (key);
+ err = gcry_sexp_sscan (&key, NULL, buffer, length);
 if (err)
 goto leave;
-
 err = nvc_set_private_key (pk, key);
 if (err)
 goto leave;
 
+ /* Check that we do not update a regular key with a shadow key. */
+ if (is_regular && gpg_err_code (is_shadowed_key (key)) == GPG_ERR_TRUE)
+ {
+ log_info ("updating regular key file '%s'"
+ " by a shadow key inhibited\n", fname);
+ err = 0; /* Simply ignore the error. */
+ goto leave;
+ }
+
+ /* Check that we update a regular key only in force mode. */
+ if (is_regular && !force)
+ {
+ log_error ("secret key file '%s' already exists\n", fname);
+ err = gpg_error (GPG_ERR_EEXIST);
+ goto leave;
+ }
+
 /* If requested write a Token line. */
 if (serialno && keyref)
 {
 nve_t item;
 const char *s;
+ size_t token0len;
 
- token = strconcat (serialno, " ", keyref, NULL);
- if (!token)
+ if (dispserialno)
+ {
+ /* Escape the DISPSERIALNO. */
+ dispserialno_buffer = percent_plus_escape (dispserialno);
+ if (!dispserialno_buffer)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ dispserialno = dispserialno_buffer;
+ }
+
+ token0 = strconcat (serialno, " ", keyref, NULL);
+ if (token0)
+ token = strconcat (token0, " - ", dispserialno? dispserialno:"-", NULL);
+ if (!token0 || !token)
 {
 err = gpg_error_from_syserror ();
 goto leave;
 }
 
- /* fixme: the strcmp should compare only the first two strings. */
+ token0len = strlen (token0);
 for (item = nvc_lookup (pk, "Token:");
 item;
 item = nve_next_value (item, "Token:"))
- if ((s = nve_value (item)) && !strcmp (s, token))
+ if ((s = nve_value (item)) && !strncmp (s, token0, token0len))
 break;
 if (!item)
 {
@@ -152,9 +231,26 @@
 if (err)
 goto leave;
 }
+ else
+ {
+ /* Token exists: Update the display s/n. It may have
+ * changed due to changes in a newer software version. */
+ if (s && (tokenfields = strtokenize (s, " \t\n"))
+ && tokenfields0 && tokenfields1 && tokenfields2
+ && tokenfields3
+ && !strcmp (tokenfields3, dispserialno))
+ ; /* No need to update Token entry. */
+ else
+ {
+ err = nve_set (item, token);
+ if (err)
+ goto leave;
+ }
+ }
+
 }
 
- /* If a timestamp has been supplied and the key is new write a
+ /* If a timestamp has been supplied and the key is new, write a
 * creation timestamp. (We douple check that there is no Created
 * item yet.)*/
 if (timestamp && newkey && !nvc_lookup (pk, "Created:"))
@@ -167,175 +263,126 @@
 goto leave;
 }
 
-
- err = es_fseek (fp, 0, SEEK_SET);
- if (err)
- goto leave;
+ /* Create a temporary file for writing. */
+ tmpfname = fname_from_keygrip (grip, 1);
+ fp = tmpfname ? es_fopen (tmpfname, "wbx,mode=-rw") : NULL;
+ if (!fp)
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("can't create '%s': %s\n", tmpfname, gpg_strerror (err));
+ goto leave;
+ }
 
 err = nvc_write (pk, fp);
+ if (!err && es_fflush (fp))
+ err = gpg_error_from_syserror ();
 if (err)
 {
- log_error ("error writing '%s': %s\n", fname, gpg_strerror (err));
- remove = 1;
+ log_error ("error writing '%s': %s\n", tmpfname, gpg_strerror (err));
+ removetmp = 1;
 goto leave;
 }
 
- if (ftruncate (es_fileno (fp), es_ftello (fp)))
+ if (es_fclose (fp))
 {
 err = gpg_error_from_syserror ();
- log_error ("error truncating '%s': %s\n", fname, gpg_strerror (err));
- remove = 1;
+ log_error ("error closing '%s': %s\n", tmpfname, gpg_strerror (err));
+ removetmp = 1;
 goto leave;
 }
+ else
+ fp = NULL;
 
- if (es_fclose (fp))
+ err = gnupg_rename_file (tmpfname, fname, &blocksigs);
+ if (err)
 {
 err = gpg_error_from_syserror ();
- log_error ("error closing '%s': %s\n", fname, gpg_strerror (err));
- remove = 1;
+ log_error ("error renaming '%s': %s\n", tmpfname, gpg_strerror (err));
+ removetmp = 1;
 goto leave;
 }
- else
- fp = NULL;
 
 bump_key_eventcounter ();
 
 leave:
+ if (blocksigs)
+ gnupg_unblock_all_signals ();
 es_fclose (fp);
- if (remove)
- gnupg_remove (fname);
+ if (removetmp && tmpfname)
+ gnupg_remove (tmpfname);
 xfree (fname);
+ xfree (tmpfname);
+ xfree (token);
+ xfree (token0);
+ xfree (dispserialno_buffer);
+ xfree (tokenfields);
 gcry_sexp_release (key);
 nvc_release (pk);
- xfree (token);
 return err;
 }
 
-/* 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. If SERIALNO and KEYREF are given a Token line is
- * added to the key if the extended format is used. If TIMESTAMP is
- * not zero and the key doies 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 char *serialno, const char *keyref,
- time_t timestamp)
-{
- char *fname;
- estream_t fp;
- char hexgrip40+4+1;
-
- bin2hex (grip, 20, hexgrip);
- strcpy (hexgrip+40, ".key");
-
- fname = make_filename (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR,
- hexgrip, NULL);
-
- /* FIXME: Write to a temp file first so that write failures during
- key updates won't lead to a key loss. */
 
- if (!force && !gnupg_access (fname, F_OK))
+gpg_error_t
+agent_update_private_key (const unsigned char *grip, nvc_t pk)
+{
+ gpg_error_t err;
+ char *fname0 = NULL; /* The existing file name. */
+ char *fname = NULL; /* The temporary new file name. */
+ estream_t fp = NULL;
+ int removetmp = 0;
+ int blocksigs = 0;
+
+ fname0 = fname_from_keygrip (grip, 0);
+ if (!fname)
 {
- log_error ("secret key file '%s' already exists\n", fname);
- xfree (fname);
- return gpg_error (GPG_ERR_EEXIST);
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ fname = fname_from_keygrip (grip, 1);
+ if (!fname)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
 }
 
- fp = es_fopen (fname, force? "rb+,mode=-rw" : "wbx,mode=-rw");
+ fp = es_fopen (fname, "wbx,mode=-rw");
 if (!fp)
 {
- gpg_error_t tmperr = gpg_error_from_syserror ();
-
- if (force && gpg_err_code (tmperr) == GPG_ERR_ENOENT)
- {
- fp = es_fopen (fname, "wbx,mode=-rw");
- if (!fp)
- tmperr = gpg_error_from_syserror ();
- }
- if (!fp)
- {
- log_error ("can't create '%s': %s\n", fname, gpg_strerror (tmperr));
- xfree (fname);
- return tmperr;
- }
+ err = gpg_error_from_syserror ();
+ log_error ("can't create '%s': %s\n", fname, gpg_strerror (err));
+ goto leave;
 }
- else if (force)
- {
- gpg_error_t rc;
- char first;
 
- /* See if an existing key is in extended format. */
- if (es_fread (&first, 1, 1, fp) != 1)
- {
- rc = gpg_error_from_syserror ();
- log_error ("error reading first byte from '%s': %s\n",
- fname, strerror (errno));
- xfree (fname);
- es_fclose (fp);
- return rc;
- }
-
- rc = es_fseek (fp, 0, SEEK_SET);
- if (rc)
- {
- log_error ("error seeking in '%s': %s\n", fname, strerror (errno));
- xfree (fname);
- es_fclose (fp);
- return rc;
- }
-
- if (first != '(')
- {
- /* Key is already in the extended format. */
- return write_extended_private_key (fname, fp, 1, 0, buffer, length,
- serialno, keyref, 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, 0, buffer, length,
- serialno, keyref, timestamp);
- }
+ err = nvc_write (pk, fp);
+ if (err)
+ {
+ log_error ("error writing '%s': %s\n", fname, gpg_strerror (err));
+ removetmp = 1;
+ goto leave;
 }
 
- if (opt.enable_extended_key_format)
- return write_extended_private_key (fname, fp, 0, 1, buffer, length,
- serialno, keyref, timestamp);
+ es_fclose (fp);
+ fp = NULL;
 
- if (es_fwrite (buffer, length, 1, fp) != 1)
+ err = gnupg_rename_file (fname, fname0, &blocksigs);
+ if (err)
 {
- gpg_error_t tmperr = gpg_error_from_syserror ();
- log_error ("error writing '%s': %s\n", fname, gpg_strerror (tmperr));
- es_fclose (fp);
- gnupg_remove (fname);
- xfree (fname);
- return tmperr;
+ err = gpg_error_from_syserror ();
+ log_error ("error renaming '%s': %s\n", fname, gpg_strerror (err));
+ removetmp = 1;
+ goto leave;
 }
 
- /* When force is given, the file might have to be truncated. */
- if (force && ftruncate (es_fileno (fp), es_ftello (fp)))
- {
- gpg_error_t tmperr = gpg_error_from_syserror ();
- log_error ("error truncating '%s': %s\n", fname, gpg_strerror (tmperr));
- es_fclose (fp);
- gnupg_remove (fname);
- xfree (fname);
- return tmperr;
- }
 
- if (es_fclose (fp))
- {
- gpg_error_t tmperr = gpg_error_from_syserror ();
- log_error ("error closing '%s': %s\n", fname, gpg_strerror (tmperr));
- gnupg_remove (fname);
- xfree (fname);
- return tmperr;
- }
- bump_key_eventcounter ();
+ leave:
+ if (blocksigs)
+ gnupg_unblock_all_signals ();
+ es_fclose (fp);
+ if (removetmp && fname)
+ gnupg_remove (fname);
 xfree (fname);
- return 0;
+ xfree (fname0);
+ return err;
 }
 
 
@@ -807,7 +854,7 @@
 
 /* Read the key identified by GRIP from the private key directory and
 * return it as an gcrypt S-expression object in RESULT. If R_KEYMETA
- * is not NULl and the extended key format is used, the meta data
+ * is not NULL and the extended key format is used, the meta data
 * items are stored there. However the "Key:" item is removed from
 * it. On failure returns an error code and stores NULL at RESULT and
 * R_KEYMETA. */
@@ -821,18 +868,17 @@
 unsigned char *buf;
 size_t buflen, erroff;
 gcry_sexp_t s_skey;
- char hexgrip40+4+1;
 char first;
 
 *result = NULL;
 if (r_keymeta)
 *r_keymeta = NULL;
 
- bin2hex (grip, 20, hexgrip);
- strcpy (hexgrip+40, ".key");
-
- fname = make_filename (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR,
- hexgrip, NULL);
+ fname = fname_from_keygrip (grip, 0);
+ if (!fname)
+ {
+ return gpg_error_from_syserror ();
+ }
 fp = es_fopen (fname, "rb");
 if (!fp)
 {
@@ -948,12 +994,12 @@
 {
 gpg_error_t err = 0;
 char *fname;
- char hexgrip40+4+1;
 
- bin2hex (grip, 20, hexgrip);
- strcpy (hexgrip+40, ".key");
- fname = make_filename (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR,
- hexgrip, NULL);
+ fname = fname_from_keygrip (grip, 0);
+ if (!fname)
+ {
+ return gpg_error_from_syserror ();
+ }
 if (gnupg_remove (fname))
 err = gpg_error_from_syserror ();
 xfree (fname);
@@ -961,8 +1007,137 @@
 }
 
 
+/*
+ * Prompt a user the card insertion, when it's not available yet.
+ */
+static gpg_error_t
+prompt_for_card (ctrl_t ctrl, const unsigned char *grip,
+ nvc_t keymeta, const unsigned char *shadow_info)
+{
+ char *serialno;
+ char *desc;
+ char *want_sn = NULL;
+ int len;
+ gpg_error_t err;
+ char hexgrip41;
+ char *comment_buffer = NULL;
+ const char *comment = NULL;
+ int refuse_prompt = 0;
+
+ bin2hex (grip, 20, hexgrip);
+
+ if (keymeta)
+ {
+ const char *p;
+
+ if ((p = nvc_get_string (keymeta, "Prompt:")) && !strcmp (p, "no"))
+ refuse_prompt = 1;
+
+ if ((p = nvc_get_string (keymeta, "Label:")))
+ {
+ if (strchr (p, '\n')
+ && (comment_buffer = linefeed_to_percent0A (p)))
+ comment = comment_buffer;
+ else
+ comment = p;
+ }
+ }
+
+ err = parse_shadow_info (shadow_info, &want_sn, NULL, NULL);
+ if (err)
+ return err;
+
+ len = want_sn? strlen (want_sn) : 0;
+ if (len == 32 && !strncmp (want_sn, "D27600012401", 12))
+ {
+ /* This is an OpenPGP card - reformat */
+ if (!strncmp (want_sn+16, "0006", 4))
+ {
+ /* This is a Yubikey. Print the s/n as it would be printed
+ * on Yubikey 5. Example: D2760001240100000006120808620000
+ * mmmm^^^^^^^^ */
+ unsigned long sn;
+
+ sn = atoi_4 (want_sn+20) * 10000;
+ sn += atoi_4 (want_sn+24);
+ snprintf (want_sn, 32, "%lu %03lu %03lu",
+ (sn/1000000ul), (sn/1000ul % 1000ul), (sn % 1000ul));
+ }
+ else /* Default is the Zeitcontrol card print format. */
+ {
+ memmove (want_sn, want_sn+16, 4);
+ want_sn4 = ' ';
+ memmove (want_sn+5, want_sn+20, 8);
+ want_sn13 = 0;
+ }
+ }
+ else if (len == 20 && want_sn19 == '0')
+ {
+ /* We assume that a 20 byte serial number is a standard one
+ * which has the property to have a zero in the last nibble (Due
+ * to BCD representation). We don't display this '0' because it
+ * may confuse the user. */
+ want_sn19 = 0;
+ }
+
+ for (;;)
+ {
+ /* Scan device(s), and check if key for GRIP is available. */
+ err = agent_card_serialno (ctrl, &serialno, NULL);
+ if (!err)
+ {
+ struct card_key_info_s *keyinfo;
+
+ xfree (serialno);
+ err = agent_card_keyinfo (ctrl, hexgrip, 0, &keyinfo);
+ if (!err)
+ {
+ /* Key for GRIP found, use it. */
+ agent_card_free_keyinfo (keyinfo);
+ break;
+ }
+ }
+
+ /* Card is not available. Prompt the insertion. */
+ if (refuse_prompt)
+ {
+ err = gpg_error (GPG_ERR_UNUSABLE_SECKEY);
+ break;
+ }
+
+ if (asprintf (&desc,
+ "%s:%%0A%%0A"
+ " %s%%0A"
+ " %s",
+ L_("Please insert the card with serial number"),
+ want_sn ? want_sn : "",
+ comment? comment:"") < 0)
+ err = out_of_core ();
+ else
+ {
+ err = agent_get_confirmation (ctrl, desc, NULL, NULL, 0);
+ if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK &&
+ gpg_err_code (err) == GPG_ERR_NO_PIN_ENTRY)
+ err = gpg_error (GPG_ERR_CARD_NOT_PRESENT);
+
+ xfree (desc);
+ }
+
+ if (err)
+ break;
+ }
+
+ xfree (want_sn);
+ gcry_free (comment_buffer);
+ return err;
+}
+
+
 /* Return the secret key as an S-Exp in RESULT after locating it using
- the GRIP. If the operation shall be diverted to a token, an
+ the GRIP. Caller should set GRIP=NULL, when a key in a file is
+ intended to be used for cryptographic operation. In this case,
+ CTRL->keygrip is used to locate the file, and it may ask a user for
+ confirmation. If the operation shall be diverted to a token, an
 allocated S-expression with the shadow_info part from the file is
 stored at SHADOW_INFO; if not NULL will be stored at SHADOW_INFO.
 CACHE_MODE defines now the cache shall be used. DESC_TEXT may be
@@ -999,11 +1174,17 @@
 if (r_timestamp)
 *r_timestamp = (time_t)(-1);
 
- err = read_key_file (grip, &s_skey, &keymeta);
+ if (!grip && !ctrl->have_keygrip)
+ return gpg_error (GPG_ERR_NO_SECKEY);
+
+ err = read_key_file (grip? grip : ctrl->keygrip, &s_skey, &keymeta);
 if (err)
 {
 if (gpg_err_code (err) == GPG_ERR_ENOENT)
 err = gpg_error (GPG_ERR_NO_SECKEY);
+ else
+ log_error ("findkey: error reading key file: %s\n",
+ gpg_strerror (err));
 return err;
 }
 
@@ -1026,6 +1207,45 @@
 *r_timestamp = isotime2epoch (created);
 }
 
+ if (!grip && keymeta)
+ {
+ const char *ask_confirmation = nvc_get_string (keymeta, "Confirm:");
+
+ if (ask_confirmation
+ && ((!strcmp (ask_confirmation, "restricted") && ctrl->restricted)
+ || !strcmp (ask_confirmation, "yes")))
+ {
+ char hexgrip40+4+1;
+ char *prompt;
+ char *comment_buffer = NULL;
+ const char *comment = NULL;
+
+ bin2hex (ctrl->keygrip, 20, hexgrip);
+
+ if ((comment = nvc_get_string (keymeta, "Label:")))
+ {
+ if (strchr (comment, '\n')
+ && (comment_buffer = linefeed_to_percent0A (comment)))
+ comment = comment_buffer;
+ }
+
+ prompt = xtryasprintf (L_("Requested the use of key%%0A"
+ " %s%%0A"
+ " %s%%0A"
+ "Do you want to allow this?"),
+ hexgrip, comment? comment:"");
+
+ gcry_free (comment_buffer);
+
+ err = agent_get_confirmation (ctrl, prompt,
+ L_("Allow"), L_("Deny"), 0);
+ xfree (prompt);
+
+ if (err)
+ return err;
+ }
+ }
+
 switch (agent_private_key_type (buf))
 {
 case PRIVATE_KEY_CLEAR:
@@ -1087,14 +1307,15 @@
 &desc_text_final);
 gcry_free (comment_buffer);
 
-	if (!err)
-	 {
-	 err = unprotect (ctrl, cache_nonce, desc_text_final, &buf, grip,
- cache_mode, lookup_ttl, r_passphrase);
-	 if (err)
-	 log_error ("failed to unprotect the secret key: %s\n",
-			 gpg_strerror (err));
-	 }
+ if (!err)
+ {
+ err = unprotect (ctrl, cache_nonce, desc_text_final, &buf,
+ grip? grip : ctrl->keygrip,
+ cache_mode, lookup_ttl, r_passphrase);
+ if (err)
+ log_error ("failed to unprotect the secret key: %s\n",
+ gpg_strerror (err));
+ }
 
 	xfree (desc_text_final);
 }
@@ -1103,24 +1324,37 @@
 if (shadow_info)
 {
 const unsigned char *s;
+ unsigned char *shadow_type;
 size_t n;
 
- err = agent_get_shadow_info (buf, &s);
+ err = agent_get_shadow_info_type (buf, &s, &shadow_type);
 if (!err)
 {
 n = gcry_sexp_canon_len (s, 0, NULL,NULL);
 log_assert (n);
 *shadow_info = xtrymalloc (n);
 if (!*shadow_info)
- err = out_of_core ();
+ {
+ err = out_of_core ();
+ goto shadow_error;
+ }
 else
 {
 memcpy (*shadow_info, s, n);
- err = 0;
+ /*
+ * When it's a key on card (not on tpm2), maks sure
+ * it's available.
+ */
+ if (strcmp (shadow_type, "t1-v1") == 0 && !grip)
+ err = prompt_for_card (ctrl, ctrl->keygrip,
+ keymeta, *shadow_info);
 }
 }
- if (err)
+ else
+ shadow_error:
 log_error ("get_shadow_info failed: %s\n", gpg_strerror (err));
+
+ xfree (shadow_type);
 }
 else
 err = gpg_error (GPG_ERR_UNUSABLE_SECKEY);
@@ -1164,13 +1398,36 @@
 }
 
 
+/* This function returns GPG_ERR_TRUE if S_SKEY represents a shadowed
+ * key. 0 is return for other key types. Any other error may occur
+ * if S_SKEY is not valid. */
+static gpg_error_t
+is_shadowed_key (gcry_sexp_t s_skey)
+{
+ gpg_error_t err;
+ unsigned char *buf;
+ size_t buflen;
+
+ err = make_canon_sexp (s_skey, &buf, &buflen);
+ if (err)
+ return err;
+
+ if (agent_private_key_type (buf) == PRIVATE_KEY_SHADOWED)
+ err = gpg_error (GPG_ERR_TRUE);
+
+ wipememory (buf, buflen);
+ xfree (buf);
+ return err;
+}
+
+
 /* Return the key for the keygrip GRIP. The result is stored at
 RESULT. This function extracts the key from the private key
 database and returns it as an S-expression object as it is. On
 failure an error code is returned and NULL stored at RESULT. */
 gpg_error_t
 agent_raw_key_from_file (ctrl_t ctrl, const unsigned char *grip,
- gcry_sexp_t *result)
+ gcry_sexp_t *result, nvc_t *r_keymeta)
 {
 gpg_error_t err;
 gcry_sexp_t s_skey;
@@ -1179,7 +1436,7 @@
 
 *result = NULL;
 
- err = read_key_file (grip, &s_skey, NULL);
+ err = read_key_file (grip, &s_skey, r_keymeta);
 if (!err)
 *result = s_skey;
 return err;
@@ -1189,15 +1446,16 @@
 /* Return the public key for the keygrip GRIP. The result is stored
 at RESULT. This function extracts the public key from the private
 key database. On failure an error code is returned and NULL stored
- at RESULT. */
-gpg_error_t
-agent_public_key_from_file (ctrl_t ctrl,
- const unsigned char *grip,
- gcry_sexp_t *result)
+ at RESULT. If R_SSHORDER is not NULL the ordinal from the
+ Use-for-ssh attribute is stored at that address. */
+static gpg_error_t
+public_key_from_file (ctrl_t ctrl, const unsigned char *grip,
+ gcry_sexp_t *result, int for_ssh, int *r_sshorder)
 {
 gpg_error_t err;
 int i, idx;
 gcry_sexp_t s_skey;
+ nvc_t keymeta = NULL;
 const char *algoname, *elems;
 int npkey;
 gcry_mpi_t array10;
@@ -1218,11 +1476,31 @@
 (void)ctrl;
 
 *result = NULL;
+ if (r_sshorder)
+ *r_sshorder = 0;
 
- err = read_key_file (grip, &s_skey, NULL);
+ err = read_key_file (grip, &s_skey, for_ssh? &keymeta : NULL);
 if (err)
 return err;
 
+ if (for_ssh)
+ {
+ /* Use-for-ssh: yes */
+ int is_ssh = 0;
+
+ if (keymeta == NULL)
+ return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
+
+ is_ssh = nvc_get_boolean (keymeta, "Use-for-ssh:");
+ nvc_release (keymeta);
+ keymeta = NULL;
+
+ if (!is_ssh)
+ return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
+ if (r_sshorder)
+ *r_sshorder = is_ssh;
+ }
+
 for (i=0; i < DIM (array); i++)
 arrayi = NULL;
 
@@ -1311,6 +1589,22 @@
 return err;
 }
 
+gpg_error_t
+agent_public_key_from_file (ctrl_t ctrl,
+ const unsigned char *grip,
+ gcry_sexp_t *result)
+{
+ return public_key_from_file (ctrl, grip, result, 0, NULL);
+}
+
+gpg_error_t
+agent_ssh_key_from_file (ctrl_t ctrl,
+ const unsigned char *grip,
+ gcry_sexp_t *result, int *r_order)
+{
+ return public_key_from_file (ctrl, grip, result, 1, r_order);
+}
+
 
 /* Check whether the secret key identified by GRIP is available.
 Returns 0 is the key is available. */
@@ -1544,7 +1838,8 @@
 gpg_error_t
 agent_write_shadow_key (const unsigned char *grip,
 const char *serialno, const char *keyid,
- const unsigned char *pkbuf, int force)
+ const unsigned char *pkbuf, int force,
+ const char *dispserialno)
 {
 gpg_error_t err;
 unsigned char *shadow_info;
@@ -1571,7 +1866,8 @@
 }
 
 len = gcry_sexp_canon_len (shdkey, 0, NULL, NULL);
- err = agent_write_private_key (grip, shdkey, len, force, serialno, keyid, 0);
+ err = agent_write_private_key (grip, shdkey, len, force,
+ serialno, keyid, dispserialno, 0);
 xfree (shdkey);
 if (err)
 log_error ("error writing key: %s\n", gpg_strerror (err));

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/genkey.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/genkey.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/gpg-agent-w32info.rc -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/gpg-agent-w32info.rc Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/gpg-agent.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/gpg-agent.c Changed

@@ -116,8 +116,6 @@
   oCheckSymPassphrasePattern,
   oMaxPassphraseDays,
   oEnablePassphraseHistory,
-  oDisableExtendedKeyFormat,
-  oEnableExtendedKeyFormat,
   oStealSocket,
   oUseStandardSocket,
   oNoUseStandardSocket,
@@ -128,6 +126,8 @@
   oIgnoreCacheForSigning,
   oAllowMarkTrusted,
   oNoAllowMarkTrusted,
+  oNoUserTrustlist,
+  oSysTrustlistName,
   oAllowPresetPassphrase,
   oAllowLoopbackPinentry,
   oNoAllowLoopbackPinentry,
@@ -138,12 +138,14 @@
   oSSHSupport,
   oSSHFingerprintDigest,
   oPuttySupport,
+  oWin32OpenSSHSupport,
   oDisableScdaemon,
   oDisableCheckOwnSocket,
   oS2KCount,
   oS2KCalibration,
   oAutoExpandSecmem,
   oListenBacklog,
+  oInactivityTimeout,
 
   oWriteEnvFile,
 
@@ -182,7 +184,7 @@
   ARGPARSE_s_s (oHomedir,    "homedir",      "@"),
   ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
   ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
-
+  ARGPARSE_s_i (oInactivityTimeout, "inactivity-timeout", "@"),
 
   ARGPARSE_header ("Monitor", N_("Options controlling the diagnostic output")),
 
@@ -227,8 +229,13 @@
                 /* */           "@"
 #endif
                 ),
-  ARGPARSE_s_n (oDisableExtendedKeyFormat, "disable-extended-key-format", "@"),
-  ARGPARSE_s_n (oEnableExtendedKeyFormat, "enable-extended-key-format", "@"),
+  ARGPARSE_o_s (oWin32OpenSSHSupport, "enable-win32-openssh-support",
+#ifdef HAVE_W32_SYSTEM
+                /* */           N_("enable Win32-OpenSSH support")
+#else
+                /* */           "@"
+#endif
+                ),
   ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
   ARGPARSE_op_u (oAutoExpandSecmem, "auto-expand-secmem", "@"),
   ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
@@ -251,6 +258,8 @@
   ARGPARSE_s_n (oNoAllowMarkTrusted, "no-allow-mark-trusted",
                 /* */    N_("disallow clients to mark keys as \"trusted\"")),
   ARGPARSE_s_n (oAllowMarkTrusted,   "allow-mark-trusted", "@"),
+  ARGPARSE_s_n (oNoUserTrustlist,    "no-user-trustlist", "@"),
+  ARGPARSE_s_s (oSysTrustlistName,   "sys-trustlist-name", "@"),
   ARGPARSE_s_n (oAllowPresetPassphrase, "allow-preset-passphrase",
                 /* */                    N_("allow presetting passphrase")),
   ARGPARSE_s_u (oS2KCount, "s2k-count", "@"),
@@ -302,7 +311,8 @@
   ARGPARSE_s_n (oNoUseStandardSocket, "no-use-standard-socket", "@"),
 
   /* Dummy options.  */
-
+  ARGPARSE_s_n (oNoop, "disable-extended-key-format", "@"),
+  ARGPARSE_s_n (oNoop, "enable-extended-key-format", "@"),
 
   ARGPARSE_end () /* End of list */
 };
@@ -333,17 +343,12 @@
 
 /* The timer tick used for housekeeping stuff.  Note that on Windows
  * we use a SetWaitableTimer seems to signal earlier than about 2
- * seconds.  Thus we use 4 seconds on all platforms except for
- * Windowsce.  CHECK_OWN_SOCKET_INTERVAL defines how often we check
+ * seconds.  Thus we use 4 seconds on all platforms.
+ * CHECK_OWN_SOCKET_INTERVAL defines how often we check
  * our own socket in standard socket mode.  If that value is 0 we
  * don't check at all.  All values are in seconds. */
-#if defined(HAVE_W32CE_SYSTEM)
-# define TIMERTICK_INTERVAL         (60)
-# define CHECK_OWN_SOCKET_INTERVAL   (0)  /* Never */
-#else
-# define TIMERTICK_INTERVAL          (4)
-# define CHECK_OWN_SOCKET_INTERVAL  (60)
-#endif
+#define TIMERTICK_INTERVAL          (4)
+#define CHECK_OWN_SOCKET_INTERVAL  (60)
 
 
 /* Flag indicating that the ssh-agent subsystem has been enabled.  */
@@ -358,6 +363,10 @@
    value.  Putty currently (0.62) uses 8k, thus 16k should be enough
    for the foreseeable future.  */
 #define PUTTY_IPC_MAXLEN 16384
+
+/* Path to the pipe, which handles requests from Win32-OpenSSH.  */
+static const char *win32_openssh_support;
+#define W32_DEFAILT_AGENT_PIPE_NAME "\\\\.\\pipe\\openssh-ssh-agent"
 #endif /*HAVE_W32_SYSTEM*/
 
 /* The list of open file descriptors at startup.  Note that this list
@@ -873,9 +882,9 @@
       opt.check_sym_passphrase_pattern = NULL;
       opt.max_passphrase_days = MAX_PASSPHRASE_DAYS;
       opt.enable_passphrase_history = 0;
-      opt.enable_extended_key_format = 1;
       opt.ignore_cache_for_signing = 0;
       opt.allow_mark_trusted = 1;
+      opt.sys_trustlist_name = NULL;
       opt.allow_external_cache = 1;
       opt.allow_loopback_pinentry = 1;
       opt.allow_emacs_pinentry = 0;
@@ -961,18 +970,12 @@
       opt.enable_passphrase_history = 1;
       break;
 
-    case oEnableExtendedKeyFormat:
-      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;
 
     case oAllowMarkTrusted: opt.allow_mark_trusted = 1; break;
     case oNoAllowMarkTrusted: opt.allow_mark_trusted = 0; break;
+    case oNoUserTrustlist: opt.no_user_trustlist = 1; break;
+    case oSysTrustlistName: opt.sys_trustlist_name = pargs->r.ret_str; break;
 
     case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break;
 
@@ -1018,6 +1021,11 @@
   /* Hack to allow --grab to override --no-grab.  */
   if ((opt.no_grab & 2))
     opt.no_grab = 0;
+
+  /* With --no-user-trustlist it does not make sense to allow the mark
+   * trusted feature.  */
+  if (opt.no_user_trustlist)
+    opt.allow_mark_trusted = 0;
 }
 
 
@@ -1282,6 +1290,15 @@
 #        endif
           break;
 
+        case oWin32OpenSSHSupport:
+#        ifdef HAVE_W32_SYSTEM
+          if (pargs.r_type)
+            win32_openssh_support = pargs.r.ret_str;
+          else
+            win32_openssh_support = W32_DEFAILT_AGENT_PIPE_NAME;
+#        endif
+          break;
+
         case oExtraSocket:
           opt.extra_socket = 1;  /* (1 = points into argv)  */
           socket_name_extra = pargs.r.ret_str;
@@ -1510,6 +1527,17 @@
       agent_deinit_default_ctrl (ctrl);
       xfree (ctrl);
     }
+  else if (is_supervised && comopt.no_autostart)
+    {
+      /* If we are running on a server and the user has set
+       * no-autostart for gpg or gpgsm.  gpg-agent would anyway be
+       * started by the supervisor which has the bad effect that it
+       * will steal the socket from a remote server.  Note that
+       * systemd has no knowledge about the lock files we take during
+       * the start operation.  */
+      log_info ("%s %s not starting in supervised mode due to no-autostart.\n",
+                gpgrt_strusage(11), gpgrt_strusage(13) );
+    }
   else if (is_supervised)
     {
 #ifndef HAVE_W32_SYSTEM
@@ -2105,7 +2133,7 @@
 /* Under W32, this function returns the handle of the scdaemon
    notification event.  Calling it the first time creates that
    event.  */
-#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
 void *
 get_agent_daemon_notify_event (void)
 {
@@ -2142,7 +2170,7 @@
 
   return the_event;
 }
-#endif /*HAVE_W32_SYSTEM && !HAVE_W32CE_SYSTEM*/
+#endif /*HAVE_W32_SYSTEM*/
 
 
 
@@ -2230,8 +2258,8 @@
   len = SUN_LEN (unaddr);
   rc = assuan_sock_bind (fd, addr, len);
 
-  /* Our error code mapping on W32CE returns EEXIST thus we also test
-     for this. */
+  /* At least our error code mapping on Windows-CE used to return
+   * EEXIST thus we better test for this on Windows . */
   if (rc == -1
       && (errno == EADDRINUSE
 #ifdef HAVE_W32_SYSTEM
@@ -2738,6 +2766,99 @@
     log_info ("putty message loop thread stopped\n");
   return NULL;
 }
+
+#define BUFSIZE (5 * 1024)
+
+/* The thread handling Win32-OpenSSH requests through NamedPipe.  */
+static void *
+win32_openssh_thread (void *arg)
+{
+  HANDLE pipe;
+
+  (void)arg;
+
+  if (opt.verbose)
+    log_info ("Win32-OpenSSH thread started\n");
+
+  while (1)
+    {
+      ctrl_t ctrl = NULL;
+      estream_t ssh_stream = NULL;
+      es_syshd_t syshd;
+
+      npth_unprotect ();
+      pipe = CreateNamedPipeA (win32_openssh_support, PIPE_ACCESS_DUPLEX,
+                               (PIPE_TYPE_BYTE | PIPE_READMODE_BYTE
+                                | PIPE_WAIT | PIPE_REJECT_REMOTE_CLIENTS),
+                               PIPE_UNLIMITED_INSTANCES,
+                               BUFSIZE, BUFSIZE, 0, NULL);
+
+      if (pipe == INVALID_HANDLE_VALUE)
+        {
+          npth_protect ();
+          log_error ("cannot create pipe: %ld\n", GetLastError ());
+          break;
+        }
+
+      if (ConnectNamedPipe (pipe, NULL) == 0)
+        {
+          npth_protect ();
+          CloseHandle (pipe);
+          log_error ("Error at ConnectNamedPipe: %ld\n", GetLastError ());
+          break;
+        }
+
+      npth_protect ();
+      ctrl = xtrycalloc (1, sizeof *ctrl);
+      if (!ctrl)
+        {
+          CloseHandle (pipe);
+          log_error ("error allocating connection control data: %s\n",
+                     strerror (errno));
+          break;
+        }
+
+#if _WIN32_WINNT >= 0x600
+      if (!GetNamedPipeClientProcessId (pipe, &ctrl->client_pid))
+        log_info ("failed to get client process id: %ld\n", GetLastError ());
+      else
+        ctrl->client_uid = -1;
+#endif
+
+      ctrl->session_env = session_env_new ();
+      if (!ctrl->session_env)
+        {
+          log_error ("error allocating session environment block: %s\n",
+                     strerror (errno));
+          agent_deinit_default_ctrl (ctrl);
+          xfree (ctrl);
+          CloseHandle (pipe);
+          break;
+        }
+      agent_init_default_ctrl (ctrl);
+
+      syshd.type = ES_SYSHD_HANDLE;
+      syshd.u.handle = pipe;
+      ssh_stream = es_sysopen (&syshd, "r+b");
+      if (!ssh_stream)
+        {
+          agent_deinit_default_ctrl (ctrl);
+          xfree (ctrl);
+          CloseHandle (pipe);
+          break;
+        }
+
+      start_command_handler_ssh_stream (ctrl, ssh_stream);
+
+      agent_deinit_default_ctrl (ctrl);
+      xfree (ctrl);
+      CloseHandle (pipe);
+    }
+
+  if (opt.verbose)
+    log_info ("Win32-OpenSSH thread stopped\n");
+  return NULL;
+}
 #endif /*HAVE_W32_SYSTEM*/
 
 
@@ -2895,14 +3016,8 @@
   npth_sigev_add (SIGTERM);
   npth_sigev_fini ();
 #else
-# ifdef HAVE_W32CE_SYSTEM
-  /* Use a dummy event. */
-  sigs = 0;
-  ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
-# else
   events0 = get_agent_daemon_notify_event ();
   events1 = INVALID_HANDLE_VALUE;
-# endif
 #endif
 
   if (disable_check_own_socket)
@@ -2936,9 +3051,16 @@
 
       ret = npth_create (&thread, &tattr, putty_message_thread, NULL);
       if (ret)
-        {
-          log_error ("error spawning putty message loop: %s\n", strerror (ret));
-        }
+        log_error ("error spawning putty message loop: %s\n", strerror (ret));
+    }
+
+  if (win32_openssh_support)
+    {
+      npth_t thread;
+
+      ret = npth_create (&thread, &tattr, win32_openssh_thread, NULL);
+      if (ret)
+        log_error ("error spawning Win32-OpenSSH loop: %s\n", strerror (ret));
     }
 #endif /*HAVE_W32_SYSTEM*/

_service:tar_scm:gnupg-2.4.3.tar.bz2/agent/gpg-agent.w32-manifest.in Added

@@ -0,0 +1,25 @@
+<?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="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+</compatibility>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/learncard.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/learncard.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/pkdecrypt.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/pkdecrypt.c Changed

@@ -68,14 +68,13 @@
       log_printhex (ciphertext, ciphertextlen, "cipher: ");
     }
   err = agent_key_from_file (ctrl, NULL, desc_text,
-                             ctrl->keygrip, &shadow_info,
+                             NULL, &shadow_info,
                              CACHE_MODE_NORMAL, NULL, &s_skey, NULL, NULL);
   if (gpg_err_code (err) == GPG_ERR_NO_SECKEY)
     no_shadow_info = 1;
   else if (err)
     {
-      if (gpg_err_code (err) != GPG_ERR_NO_SECKEY)
-        log_error ("failed to read the secret key\n");
+      log_error ("failed to read the secret key\n");
       goto leave;
     }
 
@@ -88,15 +87,23 @@
           goto leave;
         }
 
-      if (agent_is_tpm2_key (s_skey))
-	err = divert_tpm2_pkdecrypt (ctrl, desc_text, ciphertext, shadow_info,
+      if (s_skey && agent_is_tpm2_key (s_skey))
+	err = divert_tpm2_pkdecrypt (ctrl, ciphertext, shadow_info,
                                      &buf, &len, r_padding);
       else
-        err = divert_pkdecrypt (ctrl, desc_text, ctrl->keygrip, ciphertext,
-                                shadow_info, &buf, &len, r_padding);
+        err = divert_pkdecrypt (ctrl, ctrl->keygrip, ciphertext,
+                                &buf, &len, r_padding);
       if (err)
         {
-          log_error ("smartcard decryption failed: %s\n", gpg_strerror (err));
+          /* We restore the original error (ie. no seckey) is no card
+           * has been found and we have no shadow key.  This avoids a
+           * surprising "card removed" error code.  */
+          if ((gpg_err_code (err) == GPG_ERR_CARD_REMOVED
+               || gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT)
+              && no_shadow_info)
+            err = gpg_error (GPG_ERR_NO_SECKEY);
+          else
+            log_error ("smartcard decryption failed: %s\n", gpg_strerror (err));
           goto leave;
         }

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/pksign.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/pksign.c Changed

@@ -314,7 +314,7 @@
   if (!ctrl->have_keygrip)
     return gpg_error (GPG_ERR_NO_SECKEY);
 
-  err = agent_key_from_file (ctrl, cache_nonce, desc_text, ctrl->keygrip,
+  err = agent_key_from_file (ctrl, cache_nonce, desc_text, NULL,
                              &shadow_info, cache_mode, lookup_ttl,
                              &s_skey, NULL, NULL);
   if (gpg_err_code (err) == GPG_ERR_NO_SECKEY)
@@ -372,8 +372,15 @@
             }
 
           if (keyref)
-            agent_write_shadow_key (ctrl->keygrip, serialno, keyref, pkbuf, 0);
+            {
+              char *dispserialno;
 
+              agent_card_getattr (ctrl, "$DISPSERIALNO", &dispserialno,
+                                  hexgrip);
+              agent_write_shadow_key (ctrl->keygrip, serialno, keyref, pkbuf,
+                                      0, dispserialno);
+              xfree (dispserialno);
+            }
           algo = get_pk_algo_from_key (s_pkey);
 
           xfree (serialno);
@@ -392,23 +399,17 @@
         }
 
       {
-        char *desc2 = NULL;
-
-        if (desc_text)
-          agent_modify_description (desc_text, NULL, s_pkey, &desc2);
-
 	if (agent_is_tpm2_key (s_skey))
-	  err = divert_tpm2_pksign (ctrl, desc2? desc2 : desc_text,
+	  err = divert_tpm2_pksign (ctrl,
 				    data, datalen,
 				    ctrl->digest.algo,
 				    shadow_info, &buf, &len);
 	else
-	  err = divert_pksign (ctrl, desc2? desc2 : desc_text,
+	  err = divert_pksign (ctrl,
 			       ctrl->keygrip,
 			       data, datalen,
 			       ctrl->digest.algo,
-			       shadow_info, &buf, &len);
-        xfree (desc2);
+			       &buf, &len);
       }
       if (err)
         {

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/preset-passphrase.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/preset-passphrase.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/protect-tool.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/protect-tool.c Changed

@@ -97,7 +97,6 @@
 static char *opt_prompt;
 static int opt_status_msg;
 static const char *opt_agent_program;
-static int opt_debug_use_ocb;
 
 static char *get_passphrase (int promptno);
 static void release_passphrase (char *pw);
@@ -343,8 +342,7 @@
     return;
 
   pw = get_passphrase (1);
-  rc = agent_protect (key, pw, &result, &resultlen, 0,
-                      opt_debug_use_ocb? 1 : -1);
+  rc = agent_protect (key, pw, &result, &resultlen, 0);
   release_passphrase (pw);
   xfree (key);
   if (rc)
@@ -610,7 +608,7 @@
         case oHaveCert: opt_have_cert = 1; break;
         case oPrompt: opt_prompt = pargs.r.ret_str; break;
         case oStatusMsg: opt_status_msg = 1; break;
-        case oDebugUseOCB: opt_debug_use_ocb = 1; break;
+        case oDebugUseOCB: /* dummy */; break;
 
         default: pargs.err = ARGPARSE_PRINT_ERROR; break;
 	}
@@ -815,11 +813,11 @@
 
 /* Replacement for the function in findkey.c.  Here we write the key
  * to stdout. */
-int
+gpg_error_t
 agent_write_private_key (const unsigned char *grip,
                          const void *buffer, size_t length, int force,
                          const char *serialno, const char *keyref,
-                         time_t timestamp)
+                         const char *dispserialno, time_t timestamp)
 {
   char hexgrip40+4+1;
   char *p;
@@ -828,6 +826,7 @@
   (void)serialno;
   (void)keyref;
   (void)timestamp;
+  (void)dispserialno;
 
   bin2hex (grip, 20, hexgrip);
   strcpy (hexgrip+40, ".key");

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/protect.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/protect.c Changed

@@ -122,15 +122,9 @@
 calibrate_get_time (struct calibrate_time_s *data)
 {
 #ifdef HAVE_W32_SYSTEM
-# ifdef HAVE_W32CE_SYSTEM
- GetThreadTimes (GetCurrentThread (),
- &data->creation_time, &data->exit_time,
- &data->kernel_time, &data->user_time);
-# else
 GetProcessTimes (GetCurrentProcess (),
 &data->creation_time, &data->exit_time,
 &data->kernel_time, &data->user_time);
-# endif
 #elif defined (USE_CLOCK_GETTIME)
 struct timespec tmp;
 
@@ -385,12 +379,11 @@
 const char *passphrase,
 const char *timestamp_exp, size_t timestamp_exp_len,
 unsigned char **result, size_t *resultlen,
-	 unsigned long s2k_count, int use_ocb)
+	 unsigned long s2k_count)
 {
 gcry_cipher_hd_t hd;
 const char *modestr;
- unsigned char hashvalue20;
- int blklen, enclen, outlen;
+ int enclen, outlen;
 unsigned char *iv = NULL;
 unsigned int ivsize; /* Size of the buffer allocated for IV. */
 const unsigned char *s2ksalt; /* Points into IV. */
@@ -404,44 +397,26 @@
 *resultlen = 0;
 *result = NULL;
 
- modestr = (use_ocb? "openpgp-s2k3-ocb-aes"
- /* */: "openpgp-s2k3-sha1-" PROT_CIPHER_STRING "-cbc");
+ modestr = "openpgp-s2k3-ocb-aes";
 
 rc = gcry_cipher_open (&hd, PROT_CIPHER,
- use_ocb? GCRY_CIPHER_MODE_OCB :
- GCRY_CIPHER_MODE_CBC,
+ GCRY_CIPHER_MODE_OCB,
 GCRY_CIPHER_SECURE);
 if (rc)
 return rc;
 
 /* We need to work on a copy of the data because this makes it
 * easier to add the trailer and the padding and more important we
- * have to prefix the text with 2 parenthesis. In CBC mode we
- * have to allocate enough space for:
- *
- * ((<parameter_list>)(4:hash4:sha120:<hashvalue>)) + padding
- *
- * we always append a full block of random bytes as padding but
- * encrypt only what is needed for a full blocksize. In OCB mode we
+ * have to prefix the text with 2 parenthesis. Due to OCB mode we
 * have to allocate enough space for just:
 *
 * ((<parameter_list>))
 */
- blklen = gcry_cipher_get_algo_blklen (PROT_CIPHER);
- if (use_ocb)
- {
- /* (( )) */
- outlen = 2 + protlen + 2 ;
- enclen = outlen + 16 /* taglen */;
- outbuf = gcry_malloc_secure (enclen);
- }
- else
- {
- /* (( )( 4:hash 4:sha1 20:<hash> )) <padding> */
- outlen = 2 + protlen + 2 + 6 + 6 + 23 + 2 + blklen;
- enclen = outlen/blklen * blklen;
- outbuf = gcry_malloc_secure (outlen);
- }
+
+ /* (( )) */
+ outlen = 2 + protlen + 2 ;
+ enclen = outlen + 16 /* taglen */;
+ outbuf = gcry_malloc_secure (enclen);
 if (!outbuf)
 {
 rc = out_of_core ();
@@ -451,10 +426,10 @@
 /* Allocate a buffer for the nonce and the salt. */
 if (!rc)
 {
- /* Allocate random bytes to be used as IV, padding and s2k salt
- * or in OCB mode for a nonce and the s2k salt. The IV/nonce is
- * set later because for OCB we need to set the key first. */
- ivsize = (use_ocb? 12 : (blklen*2)) + 8;
+ /* Allocate random bytes to be used as nonce and s2k salt. The
+ * nonce is set later because for OCB we need to set the key
+ * first. */
+ ivsize = 12 + 8;
 iv = xtrymalloc (ivsize);
 if (!iv)
 rc = gpg_error_from_syserror ();
@@ -490,40 +465,17 @@
 goto leave;
 
 /* Set the IV/nonce. */
- rc = gcry_cipher_setiv (hd, iv, use_ocb? 12 : blklen);
+ rc = gcry_cipher_setiv (hd, iv, 12);
 if (rc)
 goto leave;
 
- if (use_ocb)
- {
- /* In OCB Mode we use only the public key parameters as AAD. */
- rc = gcry_cipher_authenticate (hd, hashbegin, protbegin - hashbegin);
- if (!rc)
- rc = gcry_cipher_authenticate (hd, timestamp_exp, timestamp_exp_len);
- if (!rc)
- rc = gcry_cipher_authenticate
- (hd, protbegin+protlen, hashlen - (protbegin+protlen - hashbegin));
- }
- else
- {
- /* Hash the entire expression for CBC mode. Because
- * TIMESTAMP_EXP won't get protected, we can't simply hash a
- * continuous buffer but need to call md_write several times. */
- gcry_md_hd_t md;
-
- rc = gcry_md_open (&md, GCRY_MD_SHA1, 0 );
- if (!rc)
- {
- gcry_md_write (md, hashbegin, protbegin - hashbegin);
- gcry_md_write (md, protbegin, protlen);
- gcry_md_write (md, timestamp_exp, timestamp_exp_len);
- gcry_md_write (md, protbegin+protlen,
- hashlen - (protbegin+protlen - hashbegin));
- memcpy (hashvalue, gcry_md_read (md, GCRY_MD_SHA1), 20);
- gcry_md_close (md);
- }
- }
-
+ /* In OCB Mode we use only the public key parameters as AAD. */
+ rc = gcry_cipher_authenticate (hd, hashbegin, protbegin - hashbegin);
+ if (!rc)
+ rc = gcry_cipher_authenticate (hd, timestamp_exp, timestamp_exp_len);
+ if (!rc)
+ rc = gcry_cipher_authenticate
+ (hd, protbegin+protlen, hashlen - (protbegin+protlen - hashbegin));
 
 /* Encrypt. */
 if (!rc)
@@ -533,36 +485,15 @@
 *p++ = '(';
 memcpy (p, protbegin, protlen);
 p += protlen;
- if (use_ocb)
- {
- *p++ = ')';
- *p++ = ')';
- }
- else
- {
- memcpy (p, ")(4:hash4:sha120:", 17);
- p += 17;
- memcpy (p, hashvalue, 20);
- p += 20;
- *p++ = ')';
- *p++ = ')';
- memcpy (p, iv+blklen, blklen); /* Add padding. */
- p += blklen;
- }
+ *p++ = ')';
+ *p++ = ')';
 log_assert ( p - outbuf == outlen);
- if (use_ocb)
- {
- gcry_cipher_final (hd);
- rc = gcry_cipher_encrypt (hd, outbuf, outlen, NULL, 0);
- if (!rc)
- {
- log_assert (outlen + 16 == enclen);
- rc = gcry_cipher_gettag (hd, outbuf + outlen, 16);
- }
- }
- else
+ gcry_cipher_final (hd);
+ rc = gcry_cipher_encrypt (hd, outbuf, outlen, NULL, 0);
+ if (!rc)
 {
- rc = gcry_cipher_encrypt (hd, outbuf, enclen, NULL, 0);
+ log_assert (outlen + 16 == enclen);
+ rc = gcry_cipher_gettag (hd, outbuf + outlen, 16);
 }
 }
 
@@ -590,7 +521,7 @@
 (int)strlen (modestr), modestr,
 &saltpos,
 (unsigned int)strlen (countbuf), countbuf,
- use_ocb? 12 : blklen, &ivpos, use_ocb? 12 : blklen, "",
+ 12, &ivpos, 12, "",
 enclen, &encpos, enclen, "");
 if (!p)
 {
@@ -604,7 +535,7 @@
 *resultlen = strlen (p);
 *result = (unsigned char*)p;
 memcpy (p+saltpos, s2ksalt, 8);
- memcpy (p+ivpos, iv, use_ocb? 12 : blklen);
+ memcpy (p+ivpos, iv, 12);
 memcpy (p+encpos, outbuf, enclen);
 xfree (iv);
 xfree (outbuf);
@@ -620,13 +551,11 @@
 
 
 /* Protect the key encoded in canonical format in PLAINKEY. We assume
- a valid S-Exp here. With USE_UCB set to -1 the default scheme is
- used (ie. either CBC or OCB), set to 0 the old CBC mode is used,
- and set to 1 OCB is used. */
+ * a valid S-Exp here. */
 int
 agent_protect (const unsigned char *plainkey, const char *passphrase,
 unsigned char **result, size_t *resultlen,
-	 unsigned long s2k_count, int use_ocb)
+	 unsigned long s2k_count)
 {
 int rc;
 const char *parmlist;
@@ -643,9 +572,6 @@
 unsigned char *p;
 int have_curve = 0;
 
- if (use_ocb == -1)
- use_ocb = !!opt.enable_extended_key_format;
-
 /* Create an S-expression with the protected-at timestamp. */
 memcpy (timestamp_exp, "(12:protected-at15:", 19);
 gnupg_get_isotime (timestamp_exp+19);
@@ -749,7 +675,7 @@
 rc = do_encryption (hash_begin, hash_end - hash_begin + 1,
 prot_begin, prot_end - prot_begin + 1,
 passphrase, timestamp_exp, sizeof (timestamp_exp),
- &protected, &protectedlen, s2k_count, use_ocb);
+ &protected, &protectedlen, s2k_count);
 if (rc)
 return rc;
 
@@ -1638,6 +1564,7 @@
 size_t n, saved_n;
 int depth = 0;
 
+ (void)depth;
 s = shadowkey;
 if (*s != '(')
 return gpg_error (GPG_ERR_INV_SEXP);

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/t-protect.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/t-protect.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/agent/trustlist.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/agent/trustlist.c Changed

@@ -45,6 +45,7 @@
                              constraints. */
     int cm:1;             /* Use chain model for validation. */
     int qual:1;           /* Root CA for qualified signatures.  */
+    int de_vs:1;          /* Root CA for de-vs compliant PKI.    */
   } flags;
   unsigned char fpr20;  /* The binary fingerprint. */
 };
@@ -128,6 +129,24 @@
 }
 
 
+/* Return the name of the system trustlist.  Caller must free.  */
+static char *
+make_sys_trustlist_name (void)
+{
+  if (opt.sys_trustlist_name
+      && (strchr (opt.sys_trustlist_name, '/')
+          || strchr (opt.sys_trustlist_name, '\\')
+          || (*opt.sys_trustlist_name == '~'
+              && opt.sys_trustlist_name1 == '/')))
+    return make_absfilename (opt.sys_trustlist_name, NULL);
+  else
+    return make_filename (gnupg_sysconfdir (),
+                          (opt.sys_trustlist_name ?
+                           opt.sys_trustlist_name : "trustlist.txt"),
+                          NULL);
+}
+
+
 static gpg_error_t
 read_one_trustfile (const char *fname, int systrust,
                     trustitem_t **addr_of_table,
@@ -196,7 +215,7 @@
             }
           /* fixme: Should check for trailing garbage.  */
 
-          etcname = make_filename (gnupg_sysconfdir (), "trustlist.txt", NULL);
+          etcname = make_sys_trustlist_name ();
           if ( !strcmp (etcname, fname) ) /* Same file. */
             log_info (_("statement \"%s\" ignored in '%s', line %d\n"),
                       "include-default", fname, lnr);
@@ -306,6 +325,8 @@
             ti->flags.cm = 1;
           else if (n == 4 && !memcmp (p, "qual", 4) && systrust)
             ti->flags.qual = 1;
+          else if (n == 4 && !memcmp (p, "de-vs", 4) && systrust)
+            ti->flags.de_vs = 1;
           else
             log_error ("flag '%.*s' in '%s', line %d ignored\n",
                        n, p, fname, lnr);
@@ -348,17 +369,24 @@
     return gpg_error_from_syserror ();
   tableidx = 0;
 
-  fname = make_filename_try (gnupg_homedir (), "trustlist.txt", NULL);
-  if (!fname)
+  if (opt.no_user_trustlist)
+    fname = NULL;
+  else
     {
-      err = gpg_error_from_syserror ();
-      xfree (table);
-      return err;
+      fname = make_filename_try (gnupg_homedir (), "trustlist.txt", NULL);
+      if (!fname)
+        {
+          err = gpg_error_from_syserror ();
+          xfree (table);
+          return err;
+        }
     }
 
-  if ((ec = gnupg_access (fname, F_OK)))
+  if (!fname || (ec = gnupg_access (fname, F_OK)))
     {
-      if ( ec == GPG_ERR_ENOENT )
+      if (!fname)
+        ; /* --no-user-trustlist active.  */
+      else if ( ec == GPG_ERR_ENOENT )
         ; /* Silently ignore a non-existing trustfile.  */
       else
         {
@@ -366,7 +394,7 @@
           log_error (_("error opening '%s': %s\n"), fname, gpg_strerror (err));
         }
       xfree (fname);
-      fname = make_filename (gnupg_sysconfdir (), "trustlist.txt", NULL);
+      fname = make_sys_trustlist_name ();
       systrust = 1;
     }
   err = read_one_trustfile (fname, systrust, &table, &tablesize, &tableidx);
@@ -451,7 +479,8 @@
                in a locked state.  */
             if (already_locked)
               ;
-            else if (ti->flags.relax || ti->flags.cm || ti->flags.qual)
+            else if (ti->flags.relax || ti->flags.cm || ti->flags.qual
+                     || ti->flags.de_vs)
               {
                 unlock_trusttable ();
                 locked = 0;
@@ -462,6 +491,8 @@
                   err = agent_write_status (ctrl,"TRUSTLISTFLAG", "cm", NULL);
                 if (!err && ti->flags.qual)
                   err = agent_write_status (ctrl,"TRUSTLISTFLAG", "qual",NULL);
+                if (!err && ti->flags.de_vs)
+                  err = agent_write_status (ctrl,"TRUSTLISTFLAG", "de-vs",NULL);
               }
 
             if (!err)
@@ -623,7 +654,7 @@
   if (!fname)
     return gpg_error_from_syserror ();
 
-  if ((ec = access (fname, W_OK)) && ec != GPG_ERR_ENOENT)
+  if ((ec = gnupg_access (fname, W_OK)) && ec != GPG_ERR_ENOENT)
     {
       xfree (fname);
       return gpg_error (GPG_ERR_EPERM);

_service:tar_scm:gnupg-2.3.6.tar.bz2/am/cmacros.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/am/cmacros.am Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/autogen.sh -> _service:tar_scm:gnupg-2.4.3.tar.bz2/autogen.sh Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # autogen.sh
-# Copyright (C) 2003, 2014, 2017, 2018 g10 Code GmbH
+# Copyright (C) 2003, 2014, 2017, 2018, 2022 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
@@ -15,7 +15,7 @@
 # configure it for the respective package.  It is maintained as part of
 # GnuPG and source copied by other packages.
 #
-# Version: 2018-02-21
+# Version: 2022-12-09
 
 configure_ac="configure.ac"
 
@@ -137,8 +137,6 @@
 # List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc
 w32_toolprefixes=
 w32_extraoptions=
-w32ce_toolprefixes=
-w32ce_extraoptions=
 w64_toolprefixes=
 w64_extraoptions=
 amd64_toolprefixes=
@@ -146,7 +144,6 @@
 # What follows are variables which are sourced but default to
 # environment variables or lacking them hardcoded values.
 #w32root=
-#w32ce_root=
 #w64root=
 #amd64root=
 
@@ -163,11 +160,6 @@
         myhost="w32"
         shift
         ;;
-    --build-w32ce)
-        myhost="w32"
-        myhostsub="ce"
-        shift
-        ;;
     --build-w64)
         myhost="w32"
         myhostsub="64"
@@ -274,12 +266,6 @@
 # ******************
 if  "$myhost" = "w32" ; then
     case $myhostsub in
-        ce)
-          w32root="$w32ce_root"
-           -z "$w32root"  && w32root="$HOME/w32ce_root"
-          toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
-          extraoptions="$extraoptions $w32ce_extraoptions"
-          ;;
         64)
           w32root="$w64root"
            -z "$w32root"  && w32root="$HOME/w64root"

_service:tar_scm:gnupg-2.3.6.tar.bz2/build-aux/config.guess -> _service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/config.guess Changed

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2016-05-15'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-09'
 
 # This file 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
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,7 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,11 +29,19 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX. However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -39,7 +49,7 @@
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
 -h, --help print this help, then exit
 -t, --time-stamp print date of last modification, then exit
 -v, --version print version number, then exit
@@ -50,7 +60,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,7 +94,8 @@
 exit 1
 fi
 
-trap 'exit 1' 1 2 15
+# Just in case it came from the environment.
+GUESS=
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -96,66 +107,90 @@
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	 if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	 CC_FOR_BUILD="$c"; break ;
-	 fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	 CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+ # prevent multiple calls if $tmp is already set
+ test "$tmp" && return 0
+ : "${TMPDIR=/tmp}"
+ # shellcheck disable=SC2039,SC3028
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+ dummy=$tmp/dummy
+ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,) echo "int x;" > "$dummy.c"
+	 for driver in cc gcc c89 c99 ; do
+		 if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		 CC_FOR_BUILD=$driver
+		 break
+		 fi
+	 done
+	 if test x"$CC_FOR_BUILD" = x ; then
+		 CC_FOR_BUILD=no_compiler_found
+	 fi
+	 ;;
+	,,*) CC_FOR_BUILD=$CC ;;
+	,*,*) CC_FOR_BUILD=$HOST_CC ;;
+ esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
+	LIBC=unknown
 
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
+	set_cc_for_build
+	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#else
+	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc. */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "$cc_set_libc"
+
+	# Second heuristic to detect musl libc.
+	if "$LIBC" = unknown &&
+	 command -v ldd >/dev/null &&
+	 ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if "$LIBC" = unknown ; then
+		LIBC=gnu
+	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -167,32 +202,32 @@
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name. We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
 	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	 /sbin/$sysctl 2>/dev/null || \
-	 /usr/sbin/$sysctl 2>/dev/null || \
+	 /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	 /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
 	 echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
+	case $UNAME_MACHINE_ARCH in
+	 aarch64eb) machine=aarch64_be-unknown ;;
 	 armeb) machine=armeb-unknown ;;
 	 arm*) machine=arm-unknown ;;
 	 sh3el) machine=shl-unknown ;;
 	 sh3eb) machine=sh-unknown ;;
 	 sh5el) machine=sh5le-unknown ;;
 	 earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e$armv0-9$.*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*$eb$$,\1,p'`
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv0-9$.*$,\1,'`
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'`
 		machine=${arch}${endian}-unknown
 		;;
-	 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	 *) machine=$UNAME_MACHINE_ARCH-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently (or will in the future) and ABI.
-	case "${UNAME_MACHINE_ARCH}" in
+	case $UNAME_MACHINE_ARCH in
 	 earm*)
 		os=netbsdelf
 		;;
 	 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -208,10 +243,10 @@
 		;;
 	esac
 	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
+	case $UNAME_MACHINE_ARCH in
 	 earm*)
 		expr='s/^earmv0-9/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
 		;;
 	esac
 	# The OS release
@@ -219,47 +254,68 @@
 	# thus, need a distinct triplet. However, they do not need
 	# kernel version information, so it can be replaced with a
 	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
+	case $UNAME_VERSION in
 	 Debian*)
 		release='-gnu'
 		;;
 	 *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/-_.*//' | cut -d. -f1,2`
+		release=`echo "$UNAME_RELEASE" | sed -e 's/-_.*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
-	exit ;;
+	GUESS=$machine-${os}${release}${abi-}
+	;;
 *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+	;;
 *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+	;;
+ *:SecBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+	;;
 *:LibertyBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+	;;
+ *:MidnightBSD:*:*)
+	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+	;;
 *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+	;;
 *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+	;;
+ *:OS108:*:*)
+	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+	;;
 macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+	;;
 *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+	;;
 *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-sortix
+	;;
+ *:Twizzler:*:*)
+	GUESS=$UNAME_MACHINE-unknown-twizzler
+	;;
+ *:Redox:*:*)
+	GUESS=$UNAME_MACHINE-unknown-redox
+	;;
+ mips:OSF1:*.*)
+	GUESS=mips-dec-osf1
+	;;
 alpha:OSF1:*:*)
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	trap '' 0
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -273,7 +329,7 @@
 	# covers most systems running today. This code pipes the CPU
 	# types through head -n 1, so we only detect the type of CPU 0.
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha $.*$ processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
+	case $ALPHA_CPU_TYPE in
 	 "EV4 (21064)")
 		UNAME_MACHINE=alpha ;;
 	 "EV4.5 (21064)")
@@ -310,126 +366,121 @@
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
- 21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
+	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+	;;
 Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
+	GUESS=m68k-unknown-sysv4
+	;;
 *:AamigaOoSs:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-amigaos
+	;;
 *:MmorphOoSs:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-morphos
+	;;
 *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
+	GUESS=i370-ibm-openedition
+	;;
 *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
+	GUESS=s390-ibm-zvmoe
+	;;
 *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
+	GUESS=powerpc-ibm-os400
+	;;
 arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
+	GUESS=arm-acorn-riscix$UNAME_RELEASE
+	;;
 arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	GUESS=arm-unknown-riscos
+	;;
 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	GUESS=hppa1.1-hitachi-hiuxmpp
+	;;
 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
+	case `(/bin/universe) 2>/dev/null` in
+	 att) GUESS=pyramid-pyramid-sysv3 ;;
+	 *) GUESS=pyramid-pyramid-bsd ;;
+	esac
+	;;
 NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
+	GUESS=pyramid-pyramid-svr4
+	;;
 DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
+	GUESS=sparc-icl-nx6
+	;;
 DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	 sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
+	 sparc) GUESS=sparc-icl-nx7 ;;
+	esac
+	;;
 s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+	;;
 sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-hal-solaris2$SUN_REL
+	;;
 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-sun-solaris2$SUN_REL
+	;;
 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-pc-auroraux$UNAME_RELEASE
+	;;
 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
+	set_cc_for_build
 	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if "$CC_FOR_BUILD" != no_compiler_found ; then
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	 then
 		SUN_ARCH=x86_64
 	 fi
 	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+	;;
 sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=sparc-sun-solaris3$SUN_REL
+	;;
 sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
+	case `/usr/bin/arch -k` in
 	 Series*|S4*)
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+	GUESS=sparc-sun-sunos$SUN_REL
+	;;
 sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-sun-sunos$UNAME_RELEASE
+	;;
 sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+	case `/bin/arch` in
 	 sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
+		GUESS=m68k-sun-sunos$UNAME_RELEASE
 		;;
 	 sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
+		GUESS=sparc-sun-sunos$UNAME_RELEASE
 		;;
 	esac
-	exit ;;
+	;;
 aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-auspex-sunos$UNAME_RELEASE
+	;;
 # The situation for MiNT is a little confusing. The machine name
 # can be virtually everything (everything which is not
 # "atarist" or "atariste" at least should have a processor
@@ -439,44 +490,44 @@
 # MiNT. But MiNT is downward compatible to TOS, so this should
 # be no problem.
 atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
 atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-milan-mint$UNAME_RELEASE
+	;;
 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-hades-mint$UNAME_RELEASE
+	;;
 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-unknown-mint$UNAME_RELEASE
+	;;
 m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-apple-machten$UNAME_RELEASE
+	;;
 powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-apple-machten$UNAME_RELEASE
+	;;
 RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
+	GUESS=mips-dec-mach_bsd4.3
+	;;
 RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-dec-ultrix$UNAME_RELEASE
+	;;
 VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	GUESS=vax-dec-ultrix$UNAME_RELEASE
+	;;
 2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	GUESS=clipper-intergraph-clix$UNAME_RELEASE
+	;;
 mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h> /* for printf() prototype */
 	int main (int argc, char *argv) {
@@ -485,95 +536,96 @@
 #endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
-	 printf ("mips-mips-riscos%ssysv\n", argv1); exit (0);
+	 printf ("mips-mips-riscos%ssysv\\n", argv1); exit (0);
 	#endif
 	#if defined (SYSTYPE_SVR4)
-	 printf ("mips-mips-riscos%ssvr4\n", argv1); exit (0);
+	 printf ("mips-mips-riscos%ssvr4\\n", argv1); exit (0);
 	#endif
 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	 printf ("mips-mips-riscos%sbsd\n", argv1); exit (0);
+	 printf ("mips-mips-riscos%sbsd\\n", argv1); exit (0);
 	#endif
 	#endif
 	 exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	 dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$0-9*$.*/\1/p'` &&
-	 SYSTEM_NAME=`$dummy $dummyarg` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+	 dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$0-9*$.*/\1/p'` &&
+	 SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
 	 { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-mips-riscos$UNAME_RELEASE
+	;;
 Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
+	GUESS=powerpc-motorola-powermax
+	;;
 Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
 Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
+	GUESS=powerpc-harris-powerunix
+	;;
 m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
+	GUESS=m88k-harris-cxux7
+	;;
 m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
+	GUESS=m88k-motorola-sysv4
+	;;
 m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
 AViiON:dgux:*:*)
 	# DG/UX returns AViiON for all architectures
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if $UNAME_PROCESSOR = mc88100 || $UNAME_PROCESSOR = mc88110 
+	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
 	then
-	 if ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx || \
-	 ${TARGET_BINARY_INTERFACE}x = x 
+	 if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+	 test "$TARGET_BINARY_INTERFACE"x = x
 	 then
-		echo m88k-dg-dgux${UNAME_RELEASE}
+		GUESS=m88k-dg-dgux$UNAME_RELEASE
 	 else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
 	 fi
 	else
-	 echo i586-dg-dgux${UNAME_RELEASE}
+	 GUESS=i586-dg-dgux$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
 M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
+	GUESS=m88k-dolphin-sysv3
+	;;
 M88*:*:R3*:*)
 	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
+	GUESS=m88k-tektronix-sysv3
+	;;
 Tek430-90-9:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
+	GUESS=m68k-tektronix-bsd
+	;;
 *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+	GUESS=mips-sgi-irix$IRIX_REL
+	;;
 ????????:AIX?:12.1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-	exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+	GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+	;; # Note that: echo "'`uname -s`'" gives 'AIX '
 i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
+	GUESS=i386-ibm-aix
+	;;
 ia64:AIX:*:*)
-	if -x /usr/bin/oslevel ; then
+	if test -x /usr/bin/oslevel ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+	;;
 *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
+		set_cc_for_build
+		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
 		main()
@@ -584,77 +636,77 @@
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 		then
-			echo "$SYSTEM_NAME"
+			GUESS=$SYSTEM_NAME
 		else
-			echo rs6000-ibm-aix3.2.5
+			GUESS=rs6000-ibm-aix3.2.5
 		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
+		GUESS=rs6000-ibm-aix3.2.4
 	else
-		echo rs6000-ibm-aix3.2
+		GUESS=rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	;;
 *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
 	fi
-	if -x /usr/bin/lslpp ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+	if test -x /usr/bin/lslpp ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
 			 awk -F: '{ print $3 }' | sed s/0-9*$/0/`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+	;;
 *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
+	GUESS=rs6000-ibm-aix
+	;;
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+	GUESS=romp-ibm-bsd4.4
+	;;
 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
-	exit ;; # report: romp-ibm BSD 4.3
+	GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to
+	;; # report: romp-ibm BSD 4.3
 *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
+	GUESS=rs6000-bull-bosx
+	;;
 DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
+	GUESS=m68k-bull-sysv3
+	;;
 9000/34??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
+	GUESS=m68k-hp-bsd
+	;;
 hp300:4.4BSD:*:* | 9000/34??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
+	GUESS=m68k-hp-bsd4.4
+	;;
 9000/34678??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/^.*.0B*//'`
-	case "${UNAME_MACHINE}" in
-	 9000/31? ) HP_ARCH=m68000 ;;
-	 9000/34?? ) HP_ARCH=m68k ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/^.*.0B*//'`
+	case $UNAME_MACHINE in
+	 9000/31?) HP_ARCH=m68000 ;;
+	 9000/34??) HP_ARCH=m68k ;;
 	 9000/6780-90-9)
-		if -x /usr/bin/getconf ; then
+		if test -x /usr/bin/getconf; then
 		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		 case "${sc_cpu_version}" in
+		 case $sc_cpu_version in
 		 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
 		 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		 532) # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
+			case $sc_kernel_bits in
 			 32) HP_ARCH=hppa2.0n ;;
 			 64) HP_ARCH=hppa2.0w ;;
 			 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
 			esac ;;
 		 esac
 		fi
-		if "${HP_ARCH}" = "" ; then
-		 eval $set_cc_for_build
-		 sed 's/^		//' << EOF >$dummy.c
+		if test "$HP_ARCH" = ""; then
+		 set_cc_for_build
+		 sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
 		#include <stdlib.h>
@@ -687,13 +739,13 @@
 		 exit (0);
 		}
 EOF
-		 (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		 (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
 		 test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if ${HP_ARCH} = hppa2.0w 
+	if test "$HP_ARCH" = hppa2.0w
 	then
-	 eval $set_cc_for_build
+	 set_cc_for_build
 
 	 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -712,15 +764,15 @@
 		HP_ARCH=hppa64
 	 fi
 	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+	;;
 ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/^.*.0B*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/^.*.0B*//'`
+	GUESS=ia64-hp-hpux$HPUX_REV
+	;;
 3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
 	main ()
@@ -745,38 +797,38 @@
 	 exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
+	GUESS=unknown-hitachi-hiuxwe2
+	;;
+ 9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:*)
+	GUESS=hppa1.1-hp-bsd
+	;;
 9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
+	GUESS=hppa1.0-hp-bsd
+	;;
 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
- hp7??:OSF1:*:* | hp8?79:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-mpeix
+	;;
+ hp7??:OSF1:*:* | hp8?79:OSF1:*:*)
+	GUESS=hppa1.1-hp-osf
+	;;
 hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-osf
+	;;
 i*86:OSF1:*:*)
-	if -x /usr/sbin/sysversion ; then
-	 echo ${UNAME_MACHINE}-unknown-osf1mk
+	if test -x /usr/sbin/sysversion ; then
+	 GUESS=$UNAME_MACHINE-unknown-osf1mk
 	else
-	 echo ${UNAME_MACHINE}-unknown-osf1
+	 GUESS=$UNAME_MACHINE-unknown-osf1
 	fi
-	exit ;;
+	;;
 parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
+	GUESS=hppa1.1-hp-lites
+	;;
 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
+	GUESS=c1-convex-bsd
+	;;
 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
@@ -784,139 +836,148 @@
 	fi
 	exit ;;
 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
+	GUESS=c34-convex-bsd
+	;;
 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
+	GUESS=c38-convex-bsd
+	;;
 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
+	GUESS=c4-convex-bsd
+	;;
 CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=ymp-cray-unicos$CRAY_REL
+	;;
 CRAY*A-Z90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
 	| sed -e 's/CRAY.*$A-Z90$/\1/' \
 	 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	 -e 's/\.^.*$/.X/'
 	exit ;;
 CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=t90-cray-unicos$CRAY_REL
+	;;
 CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=alphaev5-cray-unicosmk$CRAY_REL
+	;;
 CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=sv1-cray-unicos$CRAY_REL
+	;;
 *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
+	GUESS=craynv-cray-unicosmp$CRAY_REL
+	;;
 F3001:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
 5000:UNIX_System_V:4.*:*)
 	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+	;;
 sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+	;;
 *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+	;;
+ arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	 | grep -q __ARM_PCS_VFP
+	then
+	 FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	 GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+	else
+	 FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	 GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+	fi
+	;;
 *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+	case $UNAME_PROCESSOR in
 	 amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
-	 *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	 i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
-	exit ;;
+	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+	;;
 i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-cygwin
+	;;
 *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw64
+	;;
 *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw32
+	;;
 *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
- i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-msys
+	;;
 i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-pw32
+	;;
+ *:SerenityOS:*:*)
+ GUESS=$UNAME_MACHINE-pc-serenity
+ ;;
 *:Interix*:*)
-	case ${UNAME_MACHINE} in
+	case $UNAME_MACHINE in
 	 x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=i586-pc-interix$UNAME_RELEASE
+		;;
 	 authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=x86_64-unknown-interix$UNAME_RELEASE
+		;;
 	 IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=ia64-unknown-interix$UNAME_RELEASE
+		;;
 	esac ;;
- 34586:Windows_95:* | 34586:Windows_98:* | 34586:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
- 8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
 i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-uwin
+	;;
 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
- p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
+	GUESS=x86_64-pc-cygwin
+	;;
 prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
+	GUESS=powerpcle-unknown-solaris2$SUN_REL
+	;;
 *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,-/.*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
+	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,-/.*$,,'`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+	;;
 *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^^/*/,,' | tr ":upper:" ":lower:"``echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`-${LIBC}
-	exit ;;
- i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
+	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^^/*/,,' | tr ":upper:" ":lower:"`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+	;;
+ *:Minix:*:*)
+	GUESS=$UNAME_MACHINE-unknown-minix
+	;;
 aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' /proc/cpuinfo 2>/dev/null` in
 	 EV5) UNAME_MACHINE=alphaev5 ;;
 	 EV56) UNAME_MACHINE=alphaev56 ;;
 	 PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -927,177 +988,225 @@
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
- arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+ arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 arm*:Linux:*:*)
-	eval $set_cc_for_build
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	 | grep -q __ARM_EABI__
 	then
-	 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	 GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	else
 	 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	 then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
 	 else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
 	 fi
 	fi
-	exit ;;
+	;;
 avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
 crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
 e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+	;;
 ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 k1om:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+ loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	IS_GLIBC=0
+	test x"${LIBC}" = xgnu && IS_GLIBC=1
+	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
+	#undef mips
+	#undef mipsel
+	#undef mips64
+	#undef mips64el
+	#if ${IS_GLIBC} && defined(_ABI64)
+	LIBCABI=gnuabi64
+	#else
+	#if ${IS_GLIBC} && defined(_ABIN32)
+	LIBCABI=gnuabin32
+	#else
+	LIBCABI=${LIBC}
+	#endif
+	#endif
+
+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa64r6
+	#else
+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa32r6
+	#else
+	#if defined(__mips64)
+	CPU=mips64
+	#else
+	CPU=mips
+	#endif
+	#endif
+	#endif
+
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
+	MIPS_ENDIAN=el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
+	MIPS_ENDIAN=
 	#else
-	CPU=
+	MIPS_ENDIAN=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+	eval "$cc_set_vars"
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+	;;
+ mips64el:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
 openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=or1k-unknown-linux-$LIBC
+	;;
 or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=sparc-unknown-linux-$LIBC
+	;;
 parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=hppa64-unknown-linux-$LIBC
+	;;
 parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	 *) echo hppa-unknown-linux-${LIBC} ;;
+	 PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
+	 PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
+	 *) GUESS=hppa-unknown-linux-$LIBC ;;
 	esac
-	exit ;;
+	;;
 ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc64-unknown-linux-$LIBC
+	;;
 ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc-unknown-linux-$LIBC
+	;;
 ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc64le-unknown-linux-$LIBC
+	;;
 ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpcle-unknown-linux-$LIBC
+	;;
+ riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+	;;
 sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+	;;
 x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
+	set_cc_for_build
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	 if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	 then
+		LIBCABI=${LIBC}x32
+	 fi
+	fi
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+	;;
 xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
 i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
+	GUESS=i386-sequent-sysv4
+	;;
 i*86:UNIX_SV:4.2MP:2.*)
 	# Unixware is an offshoot of SVR4, but it has its own version
 	# number series starting with 2...
 	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope. -- rms.
 	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+	;;
 i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-os2-emx
+	;;
 i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-stop
+	;;
 i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-atheos
+	;;
 i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-syllable
+	;;
 i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.02*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-unknown-lynxos$UNAME_RELEASE
+	;;
 i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+	;;
+ i*86:*:4.*:*)
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
 	fi
-	exit ;;
+	;;
 i*86:*:5:678*)
 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
@@ -1105,12 +1214,12 @@
 	 *Pentium)	 UNAME_MACHINE=i586 ;;
 	 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	;;
 i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1120,11 +1229,11 @@
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv32
+		GUESS=$UNAME_MACHINE-pc-sysv32
 	fi
-	exit ;;
+	;;
 pc:*:*:*)
 	# Left here for compatibility:
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1132,31 +1241,31 @@
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
+	GUESS=i586-pc-msdosdjgpp
+	;;
 Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
+	GUESS=i386-pc-mach3
+	;;
 paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
+	GUESS=i860-intel-osf1
+	;;
 i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	 GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+	 GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4
 	fi
-	exit ;;
+	;;
 mini*:CTIX:SYS*5:*)
 	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
+	GUESS=m68010-convergent-sysv
+	;;
 mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
+	GUESS=m68k-convergent-sysv
+	;;
 M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
+	GUESS=m68k-diab-dnix
+	;;
 M68*:*:R3V5678*:*)
 	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
 3345??:*:4.0:3.0 | 334??A:*:4.0:3.0 | 334??,*:*:4.0:3.0 | 334??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
@@ -1164,9 +1273,9 @@
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	 && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	 && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
 334??:*:4.0:* | 334??,*:*:4.0:*)
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 	 && { echo i486-ncr-sysv4; exit; } ;;
@@ -1175,249 +1284,437 @@
 	test -r /etc/.relid \
 	 && OS_REL=.`sed -n 's/^ * ^ * $0-90-9$.*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	 && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	 && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	 && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+	;;
 mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
+	GUESS=m68k-atari-sysv4
+	;;
 TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+	;;
 rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+	;;
 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.02*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+	;;
 SMBES:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-dde-sysv$UNAME_RELEASE
+	;;
 RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
 RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
 *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
+		GUESS=$UNAME_MACHINE-sni-sysv4
 	else
-		echo ns32k-sni-sysv
+		GUESS=ns32k-sni-sysv
 	fi
-	exit ;;
+	;;
 PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+	GUESS=i586-unisys-sysv4
+	;;
 *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
+	GUESS=hppa1.1-stratus-sysv4
+	;;
 *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
+	GUESS=i860-stratus-sysv4
+	;;
 i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	GUESS=$UNAME_MACHINE-stratus-vos
+	;;
 *:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
+	GUESS=hppa1.1-stratus-vos
+	;;
 mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-apple-aux$UNAME_RELEASE
+	;;
 news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
+	GUESS=mips-sony-newsos6
+	;;
 R34000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if -d /usr/nec ; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	if test -d /usr/nec; then
+		GUESS=mips-nec-sysv$UNAME_RELEASE
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+		GUESS=mips-unknown-sysv$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
 BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
+	GUESS=powerpc-be-beos
+	;;
 BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
+	GUESS=powerpc-apple-beos
+	;;
 BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
+	GUESS=i586-pc-beos
+	;;
 BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
+	GUESS=i586-pc-haiku
+	;;
 x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
+	GUESS=x86_64-unknown-haiku
+	;;
 SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx4-nec-superux$UNAME_RELEASE
+	;;
 SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx5-nec-superux$UNAME_RELEASE
+	;;
 SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx6-nec-superux$UNAME_RELEASE
+	;;
 SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx7-nec-superux$UNAME_RELEASE
+	;;
 SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx8-nec-superux$UNAME_RELEASE
+	;;
 SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx8r-nec-superux$UNAME_RELEASE
+	;;
 SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sxace-nec-superux$UNAME_RELEASE
+	;;
 Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+	;;
 *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+	;;
+ arm64:Darwin:*:*)
+	GUESS=aarch64-apple-darwin$UNAME_RELEASE
+	;;
 *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	 UNAME_PROCESSOR=powerpc
+	UNAME_PROCESSOR=`uname -p`
+	case $UNAME_PROCESSOR in
+	 unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	if command -v xcode-select > /dev/null 2> /dev/null && \
+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
+	 # Avoid executing cc if there is no toolchain installed as
+	 # cc will be a stub that puts up a graphical alert
+	 # prompting the user to install developer tools.
+	 CC_FOR_BUILD=no_compiler_found
+	else
+	 set_cc_for_build
 	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	 if "$CC_FOR_BUILD" != no_compiler_found ; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		 grep IS_64BIT_ARCH >/dev/null
-		then
-		 case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		 esac
-		fi
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_64BIT_ARCH >/dev/null
+	 then
+		case $UNAME_PROCESSOR in
+		 i386) UNAME_PROCESSOR=x86_64 ;;
+		 powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	 fi
+	 # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+	 if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_PPC >/dev/null
+	 then
+		UNAME_PROCESSOR=powerpc
 	 fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
-	 # Avoid executing cc on OS X 10.9, as it ships with a stub
-	 # that puts up a graphical alert prompting to install
-	 # developer tools. Any system running Mac OS X 10.7 or
-	 # later (Darwin 11 and later) is required to have a 64-bit
-	 # processor. This is not true of the ARM version of Darwin
-	 # that Apple uses in portable devices.
-	 UNAME_PROCESSOR=x86_64
+	 # uname -m returns i386 or x86_64
+	 UNAME_PROCESSOR=$UNAME_MACHINE
 	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+	;;
 *:procnto*:*:* | *:QNX:0123456789*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+	;;
 *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-pc-qnx
+	;;
+ NEO-*:NONSTOP_KERNEL:*:*)
+	GUESS=neo-tandem-nsk$UNAME_RELEASE
+	;;
 NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	GUESS=nse-tandem-nsk$UNAME_RELEASE
+	;;
+ NSR-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsr-tandem-nsk$UNAME_RELEASE
+	;;
+ NSV-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsv-tandem-nsk$UNAME_RELEASE
+	;;
+ NSX-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsx-tandem-nsk$UNAME_RELEASE
+	;;
 *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
+	GUESS=mips-compaq-nonstopux
+	;;
 BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
+	GUESS=bs2000-siemens-sysv
+	;;
 DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+	;;
 *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = 386; then
+	if test "${cputype-}" = 386; then
 	 UNAME_MACHINE=i386
-	else
-	 UNAME_MACHINE="$cputype"
+	elif test "x${cputype-}" != x; then
+	 UNAME_MACHINE=$cputype
 	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-plan9
+	;;
 *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
+	GUESS=pdp10-unknown-tops10
+	;;
 *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
+	GUESS=pdp10-unknown-tenex
+	;;
 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
+	GUESS=pdp10-dec-tops20
+	;;
 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
+	GUESS=pdp10-xkl-tops20
+	;;
 *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
+	GUESS=pdp10-unknown-tops20
+	;;
 *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
+	GUESS=pdp10-unknown-its
+	;;
 SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-sei-seiux$UNAME_RELEASE
+	;;
 *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`
-	exit ;;
+	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
+	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+	;;
 *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	 A*) echo alpha-dec-vms ; exit ;;
-	 I*) echo ia64-dec-vms ; exit ;;
-	 V*) echo vax-dec-vms ; exit ;;
+	case $UNAME_MACHINE in
+	 A*) GUESS=alpha-dec-vms ;;
+	 I*) GUESS=ia64-dec-vms ;;
+	 V*) GUESS=vax-dec-vms ;;
 	esac ;;
 *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
+	GUESS=i386-pc-xenix
+	;;
 i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
-	exit ;;
+	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+	;;
 i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
- i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-rdos
+	;;
+ i*86:Fiwix:*:*)
+	GUESS=$UNAME_MACHINE-pc-fiwix
+	;;
+ *:AROS:*:*)
+	GUESS=$UNAME_MACHINE-unknown-aros
+	;;
 x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-esx
+	;;
 amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
+	GUESS=x86_64-unknown-onefs
+	;;
+ *:Unleashed:*:*)
+	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+	;;
+esac
+
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+ echo "$GUESS"
+ exit
+fi
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach $0-9*$.*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+ printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+ printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+ struct utsname un;
+ uname (&un);
+ printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+ printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+ struct utsname *un;
+ uname (&un);
+ printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+ printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
+echo "$0: unable to guess system type" >&2
+
+case $UNAME_MACHINE:$UNAME_SYSTEM in
+ mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+	;;
 esac
 
 cat >&2 <<EOF
-$0: unable to guess system type
 
 This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
 
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+EOF
+
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
+# shellcheck disable=SC2003
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
+ cat >&2 <<EOF
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
@@ -1440,16 +1737,17 @@
 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

_service:tar_scm:gnupg-2.3.6.tar.bz2/build-aux/config.rpath -> _service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/config.rpath Changed

@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-# Copyright 1996-2013 Free Software Foundation, Inc.
+# Copyright 1996-2020 Free Software Foundation, Inc.
 # Taken from GNU libtool, 2001
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -367,11 +367,7 @@
 dgux*)
 hardcode_libdir_flag_spec='-L$libdir'
 ;;
- freebsd2.2*)
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- ;;
- freebsd2*)
+ freebsd2.01*)
 hardcode_direct=yes
 hardcode_minus_L=yes
 ;;
@@ -548,13 +544,11 @@
 dgux*)
 library_names_spec='$libname$shrext'
 ;;
+ freebsd23.*)
+ library_names_spec='$libname$shrext$versuffix'
+ ;;
 freebsd* | dragonfly*)
- case "$host_os" in
- freebsd123*)
- library_names_spec='$libname$shrext$versuffix' ;;
- *)
- library_names_spec='$libname$shrext' ;;
- esac
+ library_names_spec='$libname$shrext'
 ;;
 gnu*)
 library_names_spec='$libname$shrext'

_service:tar_scm:gnupg-2.3.6.tar.bz2/build-aux/config.sub -> _service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/config.sub Changed

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2016-06-20'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-03'
 
 # This file 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
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,7 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +35,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -50,6 +52,13 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX. However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -57,7 +66,7 @@
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
 -h, --help print this help, then exit
 -t, --time-stamp print date of last modification, then exit
 -v, --version print version number, then exit
@@ -67,7 +76,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,12 +98,12 @@
 - )	# Use stdin as input.
 break ;;
 -* )
- echo "$me: invalid option $1$help"
+ echo "$me: invalid option $1$help" >&2
 exit 1 ;;
 
 *local*)
 # First pass through any local machine types.
- echo $1
+ echo "$1"
 exit ;;
 
 * )
@@ -110,1242 +119,1186 @@
 exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-^-*$//'`
- if $basic_machine != $1 
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
 
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun234* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c123* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.4-9*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v4-9*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
 		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		basic_os=$field3-$field4
 		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				basic_os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				basic_os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				basic_os=$field3
+				;;
+		esac
 		;;
-	-psos*)
-		os=-psos
+	*-*)
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun234* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c123* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						basic_os=
+						;;
+					*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+				esac
+			;;
+		esac
 		;;
-	-mint | -mint0-9*)
-		basic_machine=m68k-atari
-		os=-mint
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				basic_os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				basic_os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				basic_os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				basic_os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				basic_os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				basic_os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				basic_os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				basic_os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				basic_os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				basic_os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				basic_os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				basic_os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				basic_os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				basic_os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				basic_os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				basic_os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				basic_os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				basic_os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				basic_os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				basic_os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				basic_os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				basic_os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				basic_os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				basic_os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				basic_os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				basic_os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				basic_os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				basic_os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				basic_os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				basic_os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				basic_os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				basic_os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				basic_os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				basic_os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				basic_os=sysv3
+				;;
+			hp300 | hp300hpux)
+				basic_machine=m68k-hp
+				basic_os=hpux
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				basic_os=bsd
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				basic_os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				basic_os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				basic_os=mach
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				basic_os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				basic_os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				basic_os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				basic_os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				basic_os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				basic_os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				basic_os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				basic_os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				basic_os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				basic_os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				basic_os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				basic_os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				basic_os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				basic_os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				basic_os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				basic_os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				basic_os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				basic_os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				basic_os=cxux
+				;;
+			nh45000)
+				basic_machine=m88k-harris
+				basic_os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				basic_os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				basic_os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				basic_os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				basic_os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				basic_os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				basic_os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				basic_os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				basic_os=linux
+				;;
+			psp)
+				basic_machine=mipsallegrexel-sony
+				basic_os=psp
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				basic_os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				basic_os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				basic_os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				basic_os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				basic_os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				basic_os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				basic_os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				basic_os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				basic_os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				basic_os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				basic_os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				basic_os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				basic_os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				basic_os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				basic_os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				basic_os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				basic_os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				basic_os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				basic_os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				basic_os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				basic_os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				basic_os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				basic_os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				basic_os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				basic_os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				basic_os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				basic_os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				basic_os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				basic_os=vms
+				;;
+			vsta)
+				basic_machine=i386-pc
+				basic_os=vsta
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				basic_os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				basic_os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				basic_os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				basic_os=unicos
+				;;
+			*)
+				basic_machine=$1
+				basic_os=
+				;;
+		esac
 		;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev4-8 | alphaev56 | alphaev678 | alphapca567 \
-	| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 | alpha64pca567 \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | armble | armelb | armv2-8 | armv3-8lb | armv7arm \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh1234 | sh24a | sh24aeb | sh23e | sh234eb | sheb | shbe | shle | sh1234le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon3-9)
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	# Here we handle the default manufacturer of certain CPU types. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
 		;;
-	m88110 | m680123460 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	ms1)
-		basic_machine=mt-unknown
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
+	ibm*)
+		cpu=i370
+		vendor=ibm
 		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	orion105)
+		cpu=clipper
+		vendor=highlevel
 		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
 		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
 		;;
 
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	 basic_machine=$basic_machine-pc
-	 ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev4-8-* | alphaev56-* | alphaev678-* \
-	| alpha64-* | alpha64ev4-8-* | alpha64ev56-* | alpha64ev678-* \
-	| alphapca567-* | alpha64pca567-* | arc-* | arceb-* \
-	| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c123* | c30-* | cjt90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f3001-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.01-* | hppa2.0-* | hppa2.0nw-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m6800123460-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh1234-* | sh24a-* | sh24aeb-* | sh23e-* | sh34eb-* | sheb-* | shbe-* \
-	| shle-* | sh1234le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+		cpu=m68000
+		vendor=att
 		;;
 	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
+		cpu=we32k
+		vendor=att
 		;;
 	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+		cpu=powerpc
+		vendor=ibm
+		basic_os=cnk
 		;;
 	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops10
 		;;
 	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	 | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
+		cpu=m68k
+		vendor=motorola
 		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v12)
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v12-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^^-*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
+	dpx2*)
+		cpu=m68k
+		vendor=bull
+		basic_os=sysv3
 		;;
 	encore | umax | mmax)
-		basic_machine=ns32k-encore
+		cpu=ns32k
+		vendor=encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		basic_os=${basic_os:-bsd}
 		;;
 	fx2800)
-		basic_machine=i860-alliant
+		cpu=i860
+		vendor=alliant
 		;;
 	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
+		cpu=ns32k
+		vendor=ns
 		;;
 	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	hp3k90-90-9 | hp90-90-9)
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k20-90-9 | hp9k310-9)
-		basic_machine=m68000-hp
+		cpu=m68000
+		vendor=hp
 		;;
 	hp9k32-90-9)
-		basic_machine=m68k-hp
+		cpu=m68k
+		vendor=hp
 		;;
 	hp9k60-90-9 | hp60-90-9)
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k70-790-9 | hp70-790-9)
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k780-9 | hp780-9)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8671 | hp8671 | hp9k8024 | hp8024 | hp9k8789 | hp8789 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k80-913679 | hp80-913679)
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k80-90-9 | hp80-90-9)
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=solaris2
 		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		basic_os=${basic_os:-unicos}
 		;;
 	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		 -irix*)
+		cpu=mips
+		vendor=sgi
+		case $basic_os in
+		 irix*)
 			;;
 		 *)
-			os=-irix4
+			basic_os=irix4
 			;;
 		esac
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon3-9-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint0-9* | *MiNT | *MiNT0-9*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
+		cpu=m68000
+		vendor=convergent
 		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	*mint | mint0-9* | *MiNT | *MiNT0-9*)
+		cpu=m68k
+		vendor=atari
+		basic_os=mint
 		;;
 	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		 -nextstep* )
+		cpu=mips
+		vendor=sony
+		basic_os=newsos
+		;;
+	next | m*-next)
+		cpu=m68k
+		vendor=next
+		case $basic_os in
+		 openstep*)
+		 ;;
+		 nextstep*)
 			;;
-		 -ns2*)
-		 os=-nextstep2
+		 ns2*)
+		 basic_os=nextstep2
 			;;
 		 *)
-		 os=-nextstep3
+		 basic_os=nextstep3
 			;;
 		esac
 		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh45000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
+		cpu=np1
+		vendor=gould
 		;;
 	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
+		cpu=hppa1.1
+		vendor=oki
+		basic_os=proelf
 		;;
 	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^^-*-//'`
-		os=-linux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	pbd)
-		basic_machine=sparc-tti
+		cpu=sparc
+		vendor=tti
 		;;
 	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
+		cpu=m68k
+		vendor=tti
 		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^^-*-//'`
+	pc532)
+		cpu=ns32k
+		vendor=pc532
 		;;
 	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+		cpu=pn
+		vendor=gould
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^^-*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^^-*-//'`
+	power)
+		cpu=power
+		vendor=ibm
 		;;
 	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
+		cpu=i386
+		vendor=ibm
 		;;
 	rm4600)
-		basic_machine=mips-siemens
+		cpu=mips
+		vendor=siemens
 		;;
 	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
+		cpu=romp
+		vendor=ibm
 		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		basic_os=${basic_os:-elf}
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		basic_os=vxworks
 		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
+	w65)
+		cpu=w65
+		vendor=wdc
 		;;
-	sequent)
-		basic_machine=i386-sequent
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		basic_os=proelf
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
+	none)
+		cpu=none
+		vendor=none
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
+	leon|leon3-9)
+		cpu=sparc
+		vendor=$basic_machine
 		;;
-	sh64)
-		basic_machine=sh64-unknown
+	leon-*|leon3-9-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
+
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
+		IFS=$saved_IFS
 		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		cpu=$basic_machine
+		vendor=pc
 		;;
-	spur)
-		basic_machine=spur-unknown
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
 		;;
-	st2000)
-		basic_machine=m68k-tandem
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
 		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^^-*-//'`
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		basic_os=${basic_os:-unicosmp}
 		;;
-	sun2)
-		basic_machine=m68000-sun
+	c90-unknown | c90-cray)
+		vendor=cray
+		basic_os=${Basic_os:-unicos}
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
+	fx80-unknown)
+		vendor=alliant
 		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
+	romp-unknown)
+		vendor=ibm
 		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
+	mmix-unknown)
+		vendor=knuth
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	rs6000-unknown)
+		vendor=ibm
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+	vax-unknown)
+		vendor=dec
 		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
+	pdp11-unknown)
+		vendor=dec
 		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
+	we32k-unknown)
+		vendor=att
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	cydra-unknown)
+		vendor=cydrome
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	i370-ibm*)
+		vendor=ibm
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
+	orion-unknown)
+		vendor=highlevel
 		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
 		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
+
+	# Here we normalize CPU types with a missing or matching vendor
+	armh-unknown | armh-alt)
+		cpu=armv7l
+		vendor=alt
+		basic_os=${basic_os:-linux-gnueabihf}
 		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		basic_os=${basic_os:-bosx}
 		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
 		;;
-	tx39)
-		basic_machine=mipstx39-unknown
+	blackfin-*)
+		cpu=bfin
+		basic_os=linux
 		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
+	c54x-*)
+		cpu=tic54x
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
+	c55x-*)
+		cpu=tic55x
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	c6x-*)
+		cpu=tic6x
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
+	e500v12-*)
+		cpu=powerpc
+		basic_os=${basic_os}"spe"
 		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
+	mips3*-*)
+		cpu=mips64
 		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
+	ms1-*)
+		cpu=mt
 		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
+	m68knommu-*)
+		cpu=m68k
+		basic_os=linux
 		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	openrisc-*)
+		cpu=or32
 		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
+	parisc-*)
+		cpu=hppa
+		basic_os=linux
 		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
 		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
 		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
+	pentium4-*)
+		cpu=i786
 		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
+	pc98-*)
+		cpu=i386
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	ppc-* | ppcbe-*)
+		cpu=powerpc
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
 		;;
-	xscale-* | xscaleebl-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+	ppc64-*)
+		cpu=powerpc64
 		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
+	sb1-*)
+		cpu=mipsisa64sb1
 		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
+	sb1el-*)
+		cpu=mipsisa64sb1el
 		;;
-	none)
-		basic_machine=none-none
-		os=-none
+	sh5elb-*)
+		cpu=`echo "$cpu" | sed 's/^$sh.$e$.$$/\1\2e/'`
 		;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
+	spur-*)
+		cpu=spur
 		;;
-	op50n)
-		basic_machine=hppa1.1-oki
+	strongarm-* | thumb-*)
+		cpu=arm
 		;;
-	op60c)
-		basic_machine=hppa1.1-oki
+	tx39-*)
+		cpu=mipstx39
 		;;
-	romp)
-		basic_machine=romp-ibm
+	tx39el-*)
+		cpu=mipstx39el
 		;;
-	mmix)
-		basic_machine=mmix-knuth
+	x64-*)
+		cpu=x86_64
 		;;
-	rs6000)
-		basic_machine=rs6000-ibm
+	xscale-* | xscaleebl-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	vax)
-		basic_machine=vax-dec
+	arm64-* | aarch64le-*)
+		cpu=aarch64
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
+
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		basic_os=${basic_os:-elf}
 		;;
-	pdp11)
-		basic_machine=pdp11-dec
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
 		;;
-	we32k)
-		basic_machine=we32k-att
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
 		;;
-	sh1234 | sh24a | sh24aeb | sh34eb | sh1234le | sh23ele)
-		basic_machine=sh-unknown
+	crx-*)
+		basic_os=${basic_os:-elf}
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
 		;;
-	cydra)
-		basic_machine=cydra-cydrome
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
 		;;
-	orion)
-		basic_machine=orion-highlevel
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
 		;;
-	orion105)
-		basic_machine=clipper-highlevel
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
 		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
+	mipsallegrexel-sony)
+		cpu=mipsallegrexel
+		vendor=sony
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	tile*-*)
+		basic_os=${basic_os:-linux-gnu}
 		;;
+
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev4-8 | alphaev56 | alphaev678 \
+			| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 \
+			| alphapca567 | alpha64pca567 \
+			| am33_2.0 \
+			| amdgcn \
+			| arc | arceb | arc32 | arc64 \
+			| arm | armlbe | armelb | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bpf | bs2000 \
+			| c123* | c30 | cjt90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f3001 | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| loongarch32 | loongarch64 | loongarchx32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m6800123460 | m68360 | m683?2 | m68k \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r3 | mipsisa32r3el \
+			| mipsisa32r5 | mipsisa32r5el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r3 | mipsisa64r3el \
+			| mipsisa64r5 | mipsisa64r5el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k | nvptx \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| picochip \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+			| rl78 | romp | rs6000 | rx \
+			| s390 | s390x \
+			| score \
+			| sh | shl \
+			| sh1234 | sh24a | sh24aelb | sh23e | shelb | shlbe \
+			| sh1234elb | sh12345lbe | sh23ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| thumbv7* \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| w65 \
+			| wasm32 | wasm64 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+case $vendor in
+	digital*)
+		vendor=dec
 		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+	commodore*)
+		vendor=cbm
 		;;
 	*)
 		;;
@@ -1353,203 +1306,215 @@
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if x"$os" != x"" 
+if test x$basic_os != x
 then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+	gnu/linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
+		;;
+	os2-emx)
+		kernel=os2
+		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+		;;
+	nto-qnx*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+		;;
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+		IFS=$saved_IFS
+		;;
+	# Default OS when just kernel was specified
+	nto*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+		;;
+	linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
 		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+	*)
+		kernel=
+		os=$basic_os
+		;;
+esac
+
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
+case $os in
+	# First match some system type aliases that might get confused
+	# with valid system types.
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
 		;;
-	-solaris)
-		os=-solaris2
+	bluegene*)
+		os=cnk
 		;;
-	-svr4*)
-		os=-sysv4
+	solaris1 | solaris1.*)
+		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
 		;;
-	-unixware*)
-		os=-sysv4.2uw
+	solaris)
+		os=solaris2
 		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+	unixware*)
+		os=sysv4.2uw
 		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos34*\
-	 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	 | -sym* | -kopensolaris* | -plan9* \
-	 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	 | -aos* | -aros* | -cloudabi* | -sortix* \
-	 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	 | -chorusos* | -chorusrdb* | -cegcc* \
-	 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	 | -onefs* | -tirtos* | -phoenix*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		 x86-* | i*86-*)
-			;;
-		 *)
-			os=-nto$os
-			;;
-		esac
+	# es1800 is here to avoid being matched by es* (a different OS)
+	es1800*)
+		os=ose
 		;;
-	-nto-qnx*)
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
 		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+	isc)
+		os=isc2.2
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	 | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	sco6)
+		os=sco5v6
 		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+	sco5)
+		os=sco3.2v5
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
+	sco4)
+		os=sco3.2v4
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+	sco3.2.4-9*)
+		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
 		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+	sco*v* | scout)
+		# Don't match below
 		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+	sco*)
+		os=sco3.2v2
 		;;
-	-opened*)
-		os=-openedition
+	psos*)
+		os=psos
 		;;
-	-os400*)
-		os=-os400
+	qnx*)
+		os=qnx
 		;;
-	-wince*)
-		os=-wince
+	hiux*)
+		os=hiuxwe2
 		;;
-	-osfrose*)
-		os=-osfrose
+	lynx*178)
+		os=lynxos178
 		;;
-	-osf*)
-		os=-osf
+	lynx*5)
+		os=lynxos5
 		;;
-	-utek*)
-		os=-bsd
+	lynxos*)
+		# don't get caught up in next wildcard
 		;;
-	-dynix*)
-		os=-bsd
+	lynx*)
+		os=lynxos
 		;;
-	-acis*)
-		os=-aos
+	mac0-9*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	-atheos*)
-		os=-atheos
+	opened*)
+		os=openedition
 		;;
-	-syllable*)
-		os=-syllable
+	os400*)
+		os=os400
 		;;
-	-386bsd)
-		os=-bsd
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	-ctix* | -uts*)
-		os=-sysv
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	-nova*)
-		os=-rtmk-nova
+	wince*)
+		os=wince
 		;;
-	-ns2 )
-		os=-nextstep2
+	utek*)
+		os=bsd
 		;;
-	-nsk*)
-		os=-nsk
+	dynix*)
+		os=bsd
 		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
+	acis*)
+		os=aos
 		;;
-	-sinix*)
-		os=-sysv4
+	atheos*)
+		os=atheos
 		;;
-	-tpf*)
-		os=-tpf
+	syllable*)
+		os=syllable
 		;;
-	-triton*)
-		os=-sysv3
+	386bsd)
+		os=bsd
 		;;
-	-oss*)
-		os=-sysv3
+	ctix* | uts*)
+		os=sysv
 		;;
-	-svr4)
-		os=-sysv4
+	nova*)
+		os=rtmk-nova
 		;;
-	-svr3)
-		os=-sysv3
+	ns2)
+		os=nextstep2
 		;;
-	-sysvr4)
-		os=-sysv4
+	# Preserve the version number of sinix5.
+	sinix5.*)
+		os=`echo "$os" | sed -e 's|sinix|sysv|'`
 		;;
-	# This must come after -sysvr4.
-	-sysv*)
+	sinix*)
+		os=sysv4
 		;;
-	-ose*)
-		os=-ose
+	tpf*)
+		os=tpf
 		;;
-	-es1800*)
-		os=-ose
+	triton*)
+		os=sysv3
 		;;
-	-xenix)
-		os=-xenix
+	oss*)
+		os=sysv3
 		;;
-	-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
-		os=-mint
+	svr4*)
+		os=sysv4
 		;;
-	-aros*)
-		os=-aros
+	svr3)
+		os=sysv3
 		;;
-	-zvmoe)
-		os=-zvmoe
+	sysvr4)
+		os=sysv4
 		;;
-	-dicos*)
-		os=-dicos
+	ose*)
+		os=ose
 		;;
-	-nacl*)
+	*mint | mint0-9* | *MiNT | MiNT0-9*)
+		os=mint
 		;;
-	-ios)
+	dicos*)
+		os=dicos
 		;;
-	-none)
+	pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $cpu in
+		 arm*)
+			os=eabi
+			;;
+		 *)
+			os=elf
+			;;
+		esac
 		;;
 	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/^-*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
+		# No normalization, but not necessarily accepted, that comes below.
 		;;
 esac
+
 else
 
 # Here we handle the default operating systems that come with various machines.
@@ -1562,261 +1527,363 @@
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+kernel=
+case $cpu-$vendor in
 	score-*)
-		os=-elf
+		os=elf
 		;;
 	spu-*)
-		os=-elf
+		os=elf
 		;;
 	*-acorn)
-		os=-riscix1.2
+		os=riscix1.2
 		;;
 	arm*-rebel)
-		os=-linux
+		kernel=linux
+		os=gnu
 		;;
 	arm*-semi)
-		os=-aout
+		os=aout
 		;;
 	c4x-* | tic4x-*)
-		os=-coff
+		os=coff
 		;;
 	c8051-*)
-		os=-elf
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
 		;;
 	hexagon-*)
-		os=-elf
+		os=elf
 		;;
 	tic54x-*)
-		os=-coff
+		os=coff
 		;;
 	tic55x-*)
-		os=-coff
+		os=coff
 		;;
 	tic6x-*)
-		os=-coff
+		os=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=-tops20
+		os=tops20
 		;;
 	pdp11-*)
-		os=-none
+		os=none
 		;;
 	*-dec | vax-*)
-		os=-ultrix4.2
+		os=ultrix4.2
 		;;
 	m68*-apollo)
-		os=-domain
+		os=domain
 		;;
 	i386-sun)
-		os=-sunos4.0.2
+		os=sunos4.0.2
 		;;
 	m68000-sun)
-		os=-sunos3
+		os=sunos3
 		;;
 	m68*-cisco)
-		os=-aout
+		os=aout
 		;;
 	mep-*)
-		os=-elf
+		os=elf
 		;;
 	mips*-cisco)
-		os=-elf
+		os=elf
 		;;
 	mips*-*)
-		os=-elf
+		os=elf
 		;;
 	or32-*)
-		os=-coff
+		os=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
+		os=sysv3
 		;;
 	sparc-* | *-sun)
-		os=-sunos4.1.1
+		os=sunos4.1.1
 		;;
-	*-be)
-		os=-beos
+	pru-*)
+		os=elf
 		;;
-	*-haiku)
-		os=-haiku
+	*-be)
+		os=beos
 		;;
 	*-ibm)
-		os=-aix
+		os=aix
 		;;
 	*-knuth)
-		os=-mmixware
+		os=mmixware
 		;;
 	*-wec)
-		os=-proelf
+		os=proelf
 		;;
 	*-winbond)
-		os=-proelf
+		os=proelf
 		;;
 	*-oki)
-		os=-proelf
+		os=proelf
 		;;
 	*-hp)
-		os=-hpux
+		os=hpux
 		;;
 	*-hitachi)
-		os=-hiux
+		os=hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
+		os=sysv
 		;;
 	*-cbm)
-		os=-amigaos
+		os=amigaos
 		;;
 	*-dg)
-		os=-dgux
+		os=dgux
 		;;
 	*-dolphin)
-		os=-sysv3
+		os=sysv3
 		;;
 	m68k-ccur)
-		os=-rtu
+		os=rtu
 		;;
 	m88k-omron*)
-		os=-luna
+		os=luna
 		;;
-	*-next )
-		os=-nextstep
+	*-next)
+		os=nextstep
 		;;
 	*-sequent)
-		os=-ptx
+		os=ptx
 		;;
 	*-crds)
-		os=-unos
+		os=unos
 		;;
 	*-ns)
-		os=-genix
+		os=genix
 		;;
 	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
+		os=mvs
 		;;
 	*-gould)
-		os=-sysv
+		os=sysv
 		;;
 	*-highlevel)
-		os=-bsd
+		os=bsd
 		;;
 	*-encore)
-		os=-bsd
+		os=bsd
 		;;
 	*-sgi)
-		os=-irix
+		os=irix
 		;;
 	*-siemens)
-		os=-sysv4
+		os=sysv4
 		;;
 	*-masscomp)
-		os=-rtu
+		os=rtu
 		;;
 	f3001-fujitsu | f700-fujitsu)
-		os=-uxpv
+		os=uxpv
 		;;
 	*-rom68k)
-		os=-coff
+		os=coff
 		;;
 	*-*bug)
-		os=-coff
+		os=coff
 		;;
 	*-apple)
-		os=-macos
+		os=macos
 		;;
 	*-atari*)
-		os=-mint
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
 		;;
 	*)
-		os=-none
+		os=none
 		;;
 esac
+
 fi
 
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+	# Sometimes we do "kernel-libc", so those need to count as OSes.
+	musl* | newlib* | relibc* | uclibc*)
+		;;
+	# Likewise for "kernel-abi"
+	eabi* | gnueabi*)
+		;;
+	# VxWorks passes extra cpu info in the 4th filed.
+	simlinux | simwindows | spe)
+		;;
+	# Now accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST end in a * to match a version number.
+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	 | *vms* | esix* | aix* | cnk* | sunos | sunos34* \
+	 | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	 | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \
+	 | hiux* | abug | nacl* | netware* | windows* \
+	 | os9* | macos* | osx* | ios* \
+	 | mpw* | magic* | mmixware* | mon960* | lnews* \
+	 | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	 | aos* | aros* | cloudabi* | sortix* | twizzler* \
+	 | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	 | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	 | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+	 | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+	 | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+	 | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	 | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	 | udi* | lites* | ieee* | go32* | aux* | hcos* \
+	 | chorusrdb* | cegcc* | glidix* | serenity* \
+	 | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	 | midipix* | mingw32* | mingw64* | mint* \
+	 | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	 | interix* | uwin* | mks* | rhapsody* | darwin* \
+	 | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	 | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	 | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+	 | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+	 | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	 | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	 | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	 | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	 | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+	 | fiwix* )
+		;;
+	# This one is extra strict with allowed versions
+	sco3.2v2 | sco3.2v4-9* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	none)
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+		 | linux-musl* | linux-relibc* | linux-uclibc* )
+		;;
+	uclinux-uclibc* )
+		;;
+	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+		# These are just libc implementations, not actual OSes, and thus
+		# require a kernel.
+		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	kfreebsd*-gnu* | kopensolaris*-gnu*)
+		;;
+	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+		;;
+	nto-qnx*)
+		;;
+	os2-emx)
+		;;
+	*-eabi* | *-gnueabi*)
+		;;
+	-*)
+		# Blank kernel with real OS is always fine.
+		;;
+	*-*)
+		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		exit 1
+		;;
+esac
+
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
+case $vendor in
+	unknown)
+		case $cpu-$os in
+			*-riscix*)
 				vendor=acorn
 				;;
-			-sunos*)
+			*-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			*-cnk* | *-aix*)
 				vendor=ibm
 				;;
-			-beos*)
+			*-beos*)
 				vendor=be
 				;;
-			-hpux*)
+			*-hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
+			*-mpeix*)
 				vendor=hp
 				;;
-			-hiux*)
+			*-hiux*)
 				vendor=hitachi
 				;;
-			-unos*)
+			*-unos*)
 				vendor=crds
 				;;
-			-dgux*)
+			*-dgux*)
 				vendor=dg
 				;;
-			-luna*)
+			*-luna*)
 				vendor=omron
 				;;
-			-genix*)
+			*-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			*-clix*)
+				vendor=intergraph
+				;;
+			*-mvs* | *-opened*)
+				vendor=ibm
+				;;
+			*-os400*)
 				vendor=ibm
 				;;
-			-os400*)
+			s390-* | s390x-*)
 				vendor=ibm
 				;;
-			-ptx*)
+			*-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
+			*-tpf*)
 				vendor=ibm
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			*-vxsim* | *-vxworks* | *-windiss*)
 				vendor=wrs
 				;;
-			-aux*)
+			*-aux*)
 				vendor=apple
 				;;
-			-hms*)
+			*-hms*)
 				vendor=hitachi
 				;;
-			-mpw* | -macos*)
+			*-mpw* | *-macos*)
 				vendor=apple
 				;;
-			-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
+			*-*mint | *-mint0-9* | *-*MiNT | *-MiNT0-9*)
 				vendor=atari
 				;;
-			-vos*)
+			*-vos*)
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo $basic_machine$os
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

_service:tar_scm:gnupg-2.3.6.tar.bz2/build-aux/speedo.mk -> _service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/speedo.mk Changed

@@ -141,6 +141,10 @@
 	@echo 'Afterwards w32-msi-release will also build a wixlib.'
 
 
+# NB: we can't use +$(MAKE) here because we would need to define the
+# dependencies of our packages.  This does not make much sense given that
+# we have a clear order in how they are build and concurrent builds
+# would anyway clutter up the logs.
 SPEEDOMAKE := $(MAKE) -f $(SPEEDO_MK) UPD_SWDB=1
 
 native: check-tools
@@ -235,7 +239,7 @@
 # external packages.
 TARBALLS=$(shell pwd)/../tarballs
 
-#  Number of parallel make jobs
+#  Number of parallel make jobs for each package
 MAKE_J=3
 
 # Name to use for the w32 installer and sources
@@ -258,6 +262,8 @@
 $(eval $(call READ_AUTOGEN_template,OSSLSIGNCODE))
 $(eval $(call READ_AUTOGEN_template,OSSLPKCS11ENGINE))
 $(eval $(call READ_AUTOGEN_template,SCUTEMODULE))
+$(eval $(call READ_AUTOGEN_template,OVERRIDE_TARBALLS))
+
 
 # All files given in AUTHENTICODE_FILES are signed before
 # they are put into the installer.
@@ -267,6 +273,7 @@
                     gpg-agent.exe             \
                     gpg-connect-agent.exe     \
                     gpg-preset-passphrase.exe \
+                    gpg-check-pattern.exe     \
                     gpg-wks-client.exe        \
                     gpg.exe                   \
                     gpgconf.exe               \
@@ -500,7 +507,7 @@
 gitrep = ${HOME}/s
 
 # The tarball directories
-pkgrep = ftp://ftp.gnupg.org/gcrypt
+pkgrep = https://gnupg.org/ftp/gcrypt
 pkg10rep = ftp://ftp.g10code.com/g10code
 pkg2rep = $(TARBALLS)
 
@@ -596,8 +603,8 @@
 
 speedo_pkg_npth_configure = --enable-static
 
-speedo_pkg_libgpg_error_configure = --enable-static
-speedo_pkg_w64_libgpg_error_configure = --enable-static
+speedo_pkg_libgpg_error_configure = --enable-static --enable-install-gpg-error-config
+speedo_pkg_w64_libgpg_error_configure = --enable-static --enable-install-gpg-error-config
 
 speedo_pkg_libassuan_configure = --enable-static
 speedo_pkg_w64_libassuan_configure = --enable-static
@@ -692,9 +699,13 @@
 # External packages
 #
 
+# gcc 10.2 takes __udivdi3 from the exception handler DLL and thus
+# requires it.  This is a regression from gcc 8.3 and earlier.  To fix
+# this we need to pass -static-libgcc.
 ifeq ($(TARGETOS),w32)
 speedo_pkg_zlib_make_args = \
-        -fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a
+        -fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a \
+         LDFLAGS=-static-libgcc
 
 speedo_pkg_zlib_make_args_inst = \
         -fwin32/Makefile.gcc \
@@ -884,14 +895,14 @@
 # The playground area is our scratch area, where we unpack, build and
 # install the packages.
 $(stampdir)/stamp-directories:
-	$(MKDIR) $(root) || true
-	$(MKDIR) $(stampdir) || true
-	$(MKDIR) $(sdir)  || true
-	$(MKDIR) $(bdir)  || true
-	$(MKDIR) $(idir)   || true
+	$(MKDIR) -p $(root)
+	$(MKDIR) -p $(stampdir)
+	$(MKDIR) -p $(sdir)
+	$(MKDIR) -p $(bdir)
+	$(MKDIR) -p $(idir)
 ifeq ($(TARGETOS),w32)
-	$(MKDIR) $(bdir6)  || true
-	$(MKDIR) $(idir6)   || true
+	$(MKDIR) -p $(bdir6)
+	$(MKDIR) -p $(idir6)
 endif
 	touch $(stampdir)/stamp-directories
 
@@ -1010,6 +1021,13 @@
 	   cd "$$$${pkg}"; 				\
 	   AUTOGEN_SH_SILENT=1 ./autogen.sh;            \
          elif  -n "$$$${tar}" ; then			\
+           tar2="$(OVERRIDE_TARBALLS)/$$$$(basename $$$${tar})";\
+           if  -f "$$$${tar2}" ; then                 \
+             tar="$$$$tar2";                            \
+             echo "speedo: /*";                         \
+             echo "speedo:  * Note: using an override"; \
+             echo "speedo:  */";                        \
+           fi;                                          \
 	   echo "speedo: unpacking $(1) from $$$${tar}"; \
            case "$$$${tar}" in				\
              *.gz) pretar=zcat ;;	   		\
@@ -1322,10 +1340,14 @@
            | sed -e '/^#/d' \
            | awk '{printf "%s\r\n", $$0}' >$(bdir)/README.txt
 
-$(bdir)/g4wihelp.dll: $(w32src)/g4wihelp.c $(w32src)/exdll.h
+$(bdir)/g4wihelp.dll: $(w32src)/g4wihelp.c $(w32src)/exdll.h $(w32src)/exdll.c
 	(set -e; cd $(bdir); \
-	 $(W32CC) -I. -shared -O2 -o g4wihelp.dll $(w32src)/g4wihelp.c \
-	          -lwinmm -lgdi32; \
+         $(W32CC) -DUNICODE -static-libgcc -I . -O2 -c \
+                          -o exdll.o $(w32src)/exdll.c; \
+	 $(W32CC) -DUNICODE -static-libgcc -I. -shared -O2 \
+                          -o g4wihelp.dll $(w32src)/g4wihelp.c exdll.o \
+	                  -lwinmm -lgdi32 -luserenv \
+                          -lshell32 -loleaut32 -lshlwapi -lmsimg32; \
 	 $(STRIP) g4wihelp.dll)
 
 w32_insthelpers: $(bdir)/g4wihelp.dll
@@ -1354,8 +1376,7 @@
            done; \
          fi \
         )
-	$(MAKENSIS) -V2 $$($(MAKENSIS) -version \
-                           | grep -q ^v3 && echo "-INPUTCHARSET CP1252 ") \
+	$(MAKENSIS) -V2 \
                     -DINST_DIR=$(idir) \
                     -DINST6_DIR=$(idir6) \
                     -DBUILD_DIR=$(bdir) \
@@ -1448,7 +1469,7 @@
      scp "$(AUTHENTICODE_SIGNHOST):a.exe" $(2);\
      echo "speedo: signed file is '$(2)'" ;\
    elif  "$(AUTHENTICODE_KEY)" = card ; then \
-     echo "speedo: Signing using a card";\
+     echo "speedo: Signing using a card: '$(1)'";\
      $(OSSLSIGNCODE) sign \
        -pkcs11engine $(OSSLPKCS11ENGINE) \
        -pkcs11module $(SCUTEMODULE) \
@@ -1522,10 +1543,8 @@
 	 if  -f "$${msifile}" ; then \
 	   $(call MKSWDB_commands,$${msifile},$${reldate},"wixlib_"); \
 	 fi; \
-	 echo "speedo: /*" ;\
-	 echo "speedo:  * Verification result" ;\
-	 echo "speedo:  */" ;\
-         osslsigncode verify $${exefile} \
+	 echo "speedo: /* (osslsigncode verify disabled) */" ;\
+	 echo osslsigncode verify $${exefile} \
 	)
 
 
@@ -1535,9 +1554,10 @@
 
 
 #
-# Check availibility of standard tools
+# Check availibility of standard tools and prepare everything.
 #
-check-tools:
+check-tools: $(stampdir)/stamp-directories
+
 
 
 #

_service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/speedo/w32/exdll.c Added

@@ -0,0 +1,286 @@
+#include "exdll.h"
+
+unsigned int g_stringsize;
+stack_t **g_stacktop;
+LPTSTR g_variables;
+
+// utility functions (not required but often useful)
+
+int NSISCALL popstring(LPTSTR str)
+{
+ stack_t *th;
+ if (!g_stacktop || !*g_stacktop) return 1;
+ th=(*g_stacktop);
+ if (str) lstrcpy(str,th->text);
+ *g_stacktop = th->next;
+ GlobalFree((HGLOBAL)th);
+ return 0;
+}
+
+int NSISCALL popstringn(LPTSTR str, int maxlen)
+{
+ stack_t *th;
+ if (!g_stacktop || !*g_stacktop) return 1;
+ th=(*g_stacktop);
+ if (str) lstrcpyn(str,th->text,maxlen?maxlen:g_stringsize);
+ *g_stacktop = th->next;
+ GlobalFree((HGLOBAL)th);
+ return 0;
+}
+
+void NSISCALL pushstring(LPCTSTR str)
+{
+ stack_t *th;
+ if (!g_stacktop) return;
+ th=(stack_t*)GlobalAlloc(GPTR,(sizeof(stack_t)+(g_stringsize)*sizeof(*str)));
+ lstrcpyn(th->text,str,g_stringsize);
+ th->next=*g_stacktop;
+ *g_stacktop=th;
+}
+
+LPTSTR NSISCALL getuservariable(const int varnum)
+{
+ if (!isvalidnsisvarindex(varnum)) return NULL;
+ return (LPWSTR)((wchar_t*)g_variables+varnum*g_stringsize);
+}
+
+void NSISCALL setuservariable(const int varnum, LPCTSTR var)
+{
+ if (var && isvalidnsisvarindex(varnum))
+ lstrcpy((LPWSTR)((wchar_t*)g_variables + varnum*g_stringsize), var);
+}
+
+#ifdef UNICODE
+int NSISCALL PopStringA(LPSTR ansiStr)
+{
+ LPWSTR wideStr = (LPWSTR) GlobalAlloc(GPTR, g_stringsize*sizeof(WCHAR));
+ int rval = popstring(wideStr);
+ WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, g_stringsize, NULL, NULL);
+ GlobalFree((HGLOBAL)wideStr);
+ return rval;
+}
+
+int NSISCALL PopStringNA(LPSTR ansiStr, int maxlen)
+{
+ int realLen = maxlen ? maxlen : g_stringsize;
+ LPWSTR wideStr = (LPWSTR) GlobalAlloc(GPTR, realLen*sizeof(WCHAR));
+ int rval = popstringn(wideStr, realLen);
+ WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, realLen, NULL, NULL);
+ GlobalFree((HGLOBAL)wideStr);
+ return rval;
+}
+
+void NSISCALL PushStringA(LPCSTR ansiStr)
+{
+ LPWSTR wideStr = (LPWSTR) GlobalAlloc(GPTR, g_stringsize*sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, g_stringsize);
+ pushstring(wideStr);
+ GlobalFree((HGLOBAL)wideStr);
+ return;
+}
+
+void NSISCALL GetUserVariableW(const int varnum, LPWSTR wideStr)
+{
+ lstrcpyW(wideStr, getuservariable(varnum));
+}
+
+void NSISCALL GetUserVariableA(const int varnum, LPSTR ansiStr)
+{
+ LPWSTR wideStr = getuservariable(varnum);
+ WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, g_stringsize, NULL, NULL);
+}
+
+void NSISCALL SetUserVariableA(const int varnum, LPCSTR ansiStr)
+{
+ if (ansiStr && isvalidnsisvarindex(varnum))
+ {
+ LPWSTR wideStr = (LPWSTR)((char*)g_variables + varnum * g_stringsize);
+ MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, g_stringsize);
+ }
+}
+
+#else
+// ANSI defs
+int NSISCALL PopStringW(LPWSTR wideStr)
+{
+ LPSTR ansiStr = (LPSTR) GlobalAlloc(GPTR, g_stringsize);
+ int rval = popstring(ansiStr);
+ MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, g_stringsize);
+ GlobalFree((HGLOBAL)ansiStr);
+ return rval;
+}
+
+int NSISCALL PopStringNW(LPWSTR wideStr, int maxlen)
+{
+ int realLen = maxlen ? maxlen : g_stringsize;
+ LPSTR ansiStr = (LPSTR) GlobalAlloc(GPTR, realLen);
+ int rval = popstringn(ansiStr, realLen);
+ MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, realLen);
+ GlobalFree((HGLOBAL)ansiStr);
+ return rval;
+}
+
+void NSISCALL PushStringW(LPWSTR wideStr)
+{
+ LPSTR ansiStr = (LPSTR) GlobalAlloc(GPTR, g_stringsize);
+ WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, g_stringsize, NULL, NULL);
+ pushstring(ansiStr);
+ GlobalFree((HGLOBAL)ansiStr);
+}
+
+void NSISCALL GetUserVariableW(const int varnum, LPWSTR wideStr)
+{
+ LPSTR ansiStr = getuservariable(varnum);
+ MultiByteToWideChar(CP_ACP, 0, ansiStr, -1, wideStr, g_stringsize);
+}
+
+void NSISCALL GetUserVariableA(const int varnum, LPSTR ansiStr)
+{
+ lstrcpyA(ansiStr, getuservariable(varnum));
+}
+
+void NSISCALL SetUserVariableW(const int varnum, LPCWSTR wideStr)
+{
+ if (wideStr && isvalidnsisvarindex(varnum))
+ {
+ LPSTR ansiStr = (char*)g_variables + varnum * g_stringsize;
+ WideCharToMultiByte(CP_ACP, 0, wideStr, -1, ansiStr, g_stringsize, NULL, NULL);
+ }
+}
+#endif
+
+// playing with integers
+
+INT_PTR NSISCALL nsishelper_str_to_ptr(LPCTSTR s)
+{
+ INT_PTR v=0;
+ if (*s == _T('0') && (s1 == _T('x') || s1 == _T('X')))
+ {
+ s++;
+ for (;;)
+ {
+ int c=*(++s);
+ if (c >= _T('0') && c <= _T('9')) c-=_T('0');
+ else if (c >= _T('a') && c <= _T('f')) c-=_T('a')-10;
+ else if (c >= _T('A') && c <= _T('F')) c-=_T('A')-10;
+ else break;
+ v<<=4;
+ v+=c;
+ }
+ }
+ else if (*s == _T('0') && s1 <= _T('7') && s1 >= _T('0'))
+ {
+ for (;;)
+ {
+ int c=*(++s);
+ if (c >= _T('0') && c <= _T('7')) c-=_T('0');
+ else break;
+ v<<=3;
+ v+=c;
+ }
+ }
+ else
+ {
+ int sign=0;
+ if (*s == _T('-')) sign++; else s--;
+ for (;;)
+ {
+ int c=*(++s) - _T('0');
+ if (c < 0 || c > 9) break;
+ v*=10;
+ v+=c;
+ }
+ if (sign) v = -v;
+ }
+
+ return v;
+}
+
+unsigned int NSISCALL myatou(LPCTSTR s)
+{
+ unsigned int v=0;
+
+ for (;;)
+ {
+ unsigned int c=*s++;
+ if (c >= _T('0') && c <= _T('9')) c-=_T('0');
+ else break;
+ v*=10;
+ v+=c;
+ }
+ return v;
+}
+
+int NSISCALL myatoi_or(LPCTSTR s)
+{
+ int v=0;
+ if (*s == _T('0') && (s1 == _T('x') || s1 == _T('X')))
+ {
+ s++;
+ for (;;)
+ {
+ int c=*(++s);
+ if (c >= _T('0') && c <= _T('9')) c-=_T('0');
+ else if (c >= _T('a') && c <= _T('f')) c-=_T('a')-10;
+ else if (c >= _T('A') && c <= _T('F')) c-=_T('A')-10;
+ else break;
+ v<<=4;
+ v+=c;
+ }
+ }
+ else if (*s == _T('0') && s1 <= _T('7') && s1 >= _T('0'))
+ {
+ for (;;)
+ {
+ int c=*(++s);
+ if (c >= _T('0') && c <= _T('7')) c-=_T('0');
+ else break;
+ v<<=3;
+ v+=c;
+ }
+ }
+ else
+ {
+ int sign=0;
+ if (*s == _T('-')) sign++; else s--;
+ for (;;)
+ {
+ int c=*(++s) - _T('0');
+ if (c < 0 || c > 9) break;
+ v*=10;
+ v+=c;
+ }
+ if (sign) v = -v;
+ }
+
+ // Support for simple ORed expressions
+ if (*s == _T('|'))
+ {
+ v |= myatoi_or(s+1);
+ }
+
+ return v;
+}
+
+INT_PTR NSISCALL popintptr()
+{
+ TCHAR buf128;
+ if (popstringn(buf,COUNTOF(buf)))
+ return 0;
+ return nsishelper_str_to_ptr(buf);
+}
+
+int NSISCALL popint_or()
+{
+ TCHAR buf128;
+ if (popstringn(buf,COUNTOF(buf)))
+ return 0;
+ return myatoi_or(buf);
+}
+
+void NSISCALL pushintptr(INT_PTR value)
+{
+ TCHAR buffer30;
+ wsprintf(buffer, sizeof(void*) > 4 ? _T("%Id") : _T("%d"), value);
+ pushstring(buffer);
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/build-aux/speedo/w32/exdll.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/speedo/w32/exdll.h Changed

@@ -1,91 +1,47 @@
-/* exdll.h for use with gpg4win
- * Copyright (C) 1999-2005 Nullsoft, Inc.
- *
- * This license applies to everything in the NSIS package, except
- * where otherwise noted.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any
- * damages arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any
- * purpose, including commercial applications, and to alter it and
- * redistribute it freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must
- * not claim that you wrote the original software. If you use this
- * software in a product, an acknowledgment in the product
- * documentation would be appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must
- * not be misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source
- * distribution.
- ************************************************************
- * 2005-11-14 wk Applied license text to original exdll.h file from
- * NSIS 2.0.4 and did some formatting changes.
- */
-
-#ifndef _EXDLL_H_
-#define _EXDLL_H_
-
-/* only include this file from one place in your DLL. (it is all
- static, if you use it in two places it will fail) */
+#include <windows.h>
+#ifndef ___NSIS_PLUGIN__H___
+#define ___NSIS_PLUGIN__H___
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef NSISCALL
+# define NSISCALL __stdcall
+#endif
+#if !defined(_WIN32) && !defined(LPTSTR)
+# define LPTSTR TCHAR*
+#endif
+
+
+
+#ifndef NSISCALL
+# define NSISCALL WINAPI
+#endif
 
 #define EXDLL_INIT() { \
 g_stringsize=string_size; \
 g_stacktop=stacktop; \
 g_variables=variables; }
 
-/* For page showing plug-ins */
-#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
-#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
-#define NOTIFY_BYE_BYE 'x'
+
+enum NSPIM
+{
+ NSPIM_UNLOAD,
+ NSPIM_GUIUNLOAD
+};
+
+typedef UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM);
 
 typedef struct _stack_t {
 struct _stack_t *next;
- char text1; /* This should be the length of string_size. */
+#ifdef UNICODE
+ WCHAR text1; // this should be the length of g_stringsize when allocating
+#else
+ char text1;
+#endif
 } stack_t;
 
-
-static unsigned int g_stringsize;
-static stack_t **g_stacktop;
-static char *g_variables;
-
-static int __stdcall popstring(char *str, size_t maxlen); /* 0 on success, 1 on empty stack */
-static void __stdcall pushstring(const char *str);
-
-enum
- {
- INST_0, // $0
- INST_1, // $1
- INST_2, // $2
- INST_3, // $3
- INST_4, // $4
- INST_5, // $5
- INST_6, // $6
- INST_7, // $7
- INST_8, // $8
- INST_9, // $9
- INST_R0, // $R0
- INST_R1, // $R1
- INST_R2, // $R2
- INST_R3, // $R3
- INST_R4, // $R4
- INST_R5, // $R5
- INST_R6, // $R6
- INST_R7, // $R7
- INST_R8, // $R8
- INST_R9, // $R9
- INST_CMDLINE, // $CMDLINE
- INST_INSTDIR, // $INSTDIR
- INST_OUTDIR, // $OUTDIR
- INST_EXEDIR, // $EXEDIR
- INST_LANG, // $LANGUAGE
- __INST_LAST
-};
-
 typedef struct {
 int autoclose;
 int all_user_var;
@@ -94,58 +50,127 @@
 int exec_reboot;
 int reboot_called;
 int XXX_cur_insttype; /* deprecated */
- int XXX_insttype_changed; /* deprecated */
+ int plugin_api_version; /* Used to be insttype_changed */
 int silent;
 int instdir_error;
 int rtl;
 int errlvl;
+ int alter_reg_view;
+ int status_update;
 } exec_flags_t;
 
 typedef struct {
 exec_flags_t *exec_flags;
 int (__stdcall *ExecuteCodeSegment)(int, HWND);
+ void (__stdcall *validate_filename)(LPTSTR);
+ int (__stdcall *RegisterPluginCallback)(HMODULE, NSISPLUGINCALLBACK);
 } extra_parameters_t;
 
 
-/* Utility functions (not required but often useful). */
-static int __stdcall
-popstring(char *str, size_t maxlen)
-{
- stack_t *th;
- if (!g_stacktop || !*g_stacktop)
- return 1;
- th=(*g_stacktop);
- lstrcpyn (str, th->text, maxlen);
- *g_stacktop = th->next;
- GlobalFree((HGLOBAL)th);
- return 0;
-}
-
-static void __stdcall
-pushstring(const char *str)
-{
- stack_t *th;
- if (!g_stacktop) return;
- th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+g_stringsize);
- lstrcpyn(th->text,str,g_stringsize);
- th->next=*g_stacktop;
- *g_stacktop=th;
-}
-
-static char * __stdcall
-getuservariable(const int varnum)
+enum
 {
- if (varnum < 0 || varnum >= __INST_LAST) return NULL;
- return g_variables+varnum*g_stringsize;
-}
+INST_0, // $0
+INST_1, // $1
+INST_2, // $2
+INST_3, // $3
+INST_4, // $4
+INST_5, // $5
+INST_6, // $6
+INST_7, // $7
+INST_8, // $8
+INST_9, // $9
+INST_R0, // $R0
+INST_R1, // $R1
+INST_R2, // $R2
+INST_R3, // $R3
+INST_R4, // $R4
+INST_R5, // $R5
+INST_R6, // $R6
+INST_R7, // $R7
+INST_R8, // $R8
+INST_R9, // $R9
+INST_CMDLINE, // $CMDLINE
+INST_INSTDIR, // $INSTDIR
+INST_OUTDIR, // $OUTDIR
+INST_EXEDIR, // $EXEDIR
+INST_LANG, // $LANGUAGE
+__INST_LAST
+};
 
-static void __stdcall
-setuservariable(const int varnum, const char *var)
-{
- if (var != NULL && varnum >= 0 && varnum < __INST_LAST)
- lstrcpy(g_variables + varnum*g_stringsize, var);
+extern unsigned int g_stringsize;
+extern stack_t **g_stacktop;
+extern LPTSTR g_variables;
+
+void NSISCALL pushstring(LPCTSTR str);
+void NSISCALL pushintptr(INT_PTR value);
+#define pushint(v) pushintptr((INT_PTR)(v))
+int NSISCALL popstring(LPTSTR str); // 0 on success, 1 on empty stack
+int NSISCALL popstringn(LPTSTR str, int maxlen); // with length limit, pass 0 for g_stringsize
+INT_PTR NSISCALL popintptr();
+#define popint() ( (int) popintptr() )
+int NSISCALL popint_or(); // with support for or'ing (2|4|8)
+INT_PTR NSISCALL nsishelper_str_to_ptr(LPCTSTR s);
+#define myatoi(s) ( (int) nsishelper_str_to_ptr(s) ) // converts a string to an integer
+unsigned int NSISCALL myatou(LPCTSTR s); // converts a string to an unsigned integer, decimal only
+int NSISCALL myatoi_or(LPCTSTR s); // with support for or'ing (2|4|8)
+LPTSTR NSISCALL getuservariable(const int varnum);
+void NSISCALL setuservariable(const int varnum, LPCTSTR var);
+
+#ifdef UNICODE
+#define PopStringW(x) popstring(x)
+#define PushStringW(x) pushstring(x)
+#define SetUserVariableW(x,y) setuservariable(x,y)
+
+int NSISCALL PopStringA(LPSTR ansiStr);
+int NSISCALL PopStringNA(LPSTR ansiStr, int maxlen);
+void NSISCALL PushStringA(LPCSTR ansiStr);
+void NSISCALL GetUserVariableW(const int varnum, LPWSTR wideStr);
+void NSISCALL GetUserVariableA(const int varnum, LPSTR ansiStr);
+void NSISCALL SetUserVariableA(const int varnum, LPCSTR ansiStr);
+
+#else
+// ANSI defs
+
+#define PopStringA(x) popstring(x)
+#define PushStringA(x) pushstring(x)
+#define SetUserVariableA(x,y) setuservariable(x,y)
+
+int NSISCALL PopStringW(LPWSTR wideStr);
+void NSISCALL PushStringW(LPWSTR wideStr);
+void NSISCALL GetUserVariableW(const int varnum, LPWSTR wideStr);
+void NSISCALL GetUserVariableA(const int varnum, LPSTR ansiStr);
+void NSISCALL SetUserVariableW(const int varnum, LPCWSTR wideStr);
+
+#endif
+
+#ifdef __cplusplus
 }
-
-
-
-#endif/*_EXDLL_H_*/
+#endif
+
+#endif//!___NSIS_PLUGIN__H___
+
+#ifndef COUNTOF
+#define COUNTOF(a) (sizeof(a)/sizeof(a0))
+#endif
+
+// minimal tchar.h emulation
+#ifndef _T
+# define _T TEXT
+#endif
+#if !defined(TCHAR) && !defined(_TCHAR_DEFINED)
+# ifdef UNICODE
+# define TCHAR WCHAR
+# else
+# define TCHAR char
+# endif
+#endif
+
+#define isvalidnsisvarindex(varnum) ( ((unsigned int)(varnum)) < (__INST_LAST) )
+
+#define ERRORPRINTF(fmt, ...) \
+ { \
+ char buf512; \
+ snprintf(buf, 511, "ERROR: " fmt, ##__VA_ARGS__); \
+ buf511 = '\0'; \
+ OutputDebugStringA(buf); \
+ }

_service:tar_scm:gnupg-2.3.6.tar.bz2/build-aux/speedo/w32/g4wihelp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/speedo/w32/g4wihelp.c Changed

@@ -1,6 +1,7 @@
-/* g4wihelp.c - NSIS Helper DLL used with gpg4win. -*- coding: latin-1; -*-
- * Copyright (C) 2005 g10 Code GmbH
+/* g4wihelp.c - NSIS Helper DLL used with gpg4win.
+ * Copyright (C) 2005, 2023 g10 Code GmbH
 * Copyright (C) 2001 Justin Frankel
+ * Copyright (C) 2016, 2017 Intevation GmbH
 *
 * This software is provided 'as-is', without any express or implied
 * warranty. In no event will the authors be held liable for any
@@ -23,22 +24,41 @@
 ************************************************************
 * The code for the splash screen has been taken from the Splash
 * plugin of the NSIS 2.04 distribution. That code comes without
- * explicit copyright notices in the source files or author names, it
+ * explicit copyright notices in tyhe source files or author names, it
 * seems that it has been written by Justin Frankel; not sure about
 * the year, though. wk 2005-11-28
 *
 * Fixed some compiler warnings. wk 2014-02-24.
+ * Merged code from GnuPG version. wk 2023-04-24.
+ *
+ * Compile time macros:
+ * ENABLE_SLIDE_SHOW :: Define for Gpg4win.
 */
 
-#include <stdio.h>
 #include <windows.h>
+#include <stdio.h>
+#include <tlhelp32.h>
+#include <psapi.h>
+#include <stdio.h>
+#include <string.h>
 #include "exdll.h"
 
+/* We keep some code here for documentation reasons. That code has not
+ * yet been converted to the Unicode NSIS plugin API. */
+/* #define ENABLE_SOUND_GADGET 1 */
+/* #define ENABLE_SPLASH_GADGET 1 */
+/* #define ENABLE_SERVICE_MANAGEMENT 1 */
+
+
 static HINSTANCE g_hInstance; /* Our Instance. */
 static HWND g_hwndParent; /* Handle of parent window or NULL. */
 static HBITMAP g_hbm; /* Handle of the splash image. */
 static int sleepint; /* Milliseconds to show the spals image. */
 
+#ifdef ENABLE_SLIDE_SHOW
+void
+slide_stop(HWND hwndParent, int string_size, TCHAR *variables, stack_t **stacktop);
+#endif
 
 /* Standard entry point for DLLs. */
 int WINAPI
@@ -46,6 +66,12 @@
 {
 if (reason == DLL_PROCESS_ATTACH)
 g_hInstance = hinst;
+ else if (reason == DLL_PROCESS_DETACH)
+ {
+#ifdef ENABLE_SLIDE_SHOW
+ slide_stop (NULL, 0, NULL, NULL);
+#endif
+ }
 return TRUE;
 }
 
@@ -53,7 +79,7 @@
 
 /* Dummy function for testing. */
 void __declspec(dllexport)
-dummy (HWND hwndParent, int string_size, char *variables,
+dummy (HWND hwndParent, int string_size, LPTSTR variables,
 stack_t **stacktop, extra_parameters_t *extra)
 {
 g_hwndParent = hwndParent;
@@ -67,21 +93,66 @@
 // you should empty the stack of your parameters, and ONLY your
 // parameters.
 
- // do your stuff here
+ /* Let's dump the variables. */
 {
- char buf1024;
- snprintf (buf, sizeof buf, "$R0=%s\r\n$R1=%s\r\n",
- getuservariable(INST_R0),
- getuservariable(INST_R1));
- MessageBox (g_hwndParent,buf,0,MB_OK);
-
- snprintf (buf, sizeof buf,
- "autoclose =%d\r\n"
+ char line512;
+ char *p;
+ const unsigned char *s = (void*)g_variables;
+ int i,j;
+
+ for (i=0; i < string_size* __INST_LAST; i+=32, s += 32)
+ {
+ for (j=0; j < 32; j++)
+ if (sj)
+ break;
+ if (j != 32)
+ {
+ p = line;
+ *p = 0;
+ snprintf (p, 10, "%05x: ", i);
+ p += strlen (p);
+ for (j=0; j < 32; j++)
+ {
+ snprintf (p, 10, "%02x", sj);
+ p += strlen (p);
+ }
+ strcat (p, " |");
+ p += strlen (p);
+ for (j=0; j < 32; j++)
+ {
+ if (sj >= 32 && sj < 127)
+ *p = sj;
+ else
+ *p = '.';
+ p++;
+ }
+ strcat (p, "|");
+ OutputDebugStringA (line);
+ }
+ }
+ }
+
+
+ {
+ wchar_t buf1024;
+
+ swprintf(buf, 1024,
+ L"stringsize=%d\r\n$0=%s\r\n$1=%s\r\n$R0=%s\r\n$R1=%s\r\n",
+ string_size,
+ getuservariable(INST_0),
+ getuservariable(INST_1),
+ getuservariable(INST_R0),
+ getuservariable(INST_R1));
+ MessageBoxW(g_hwndParent,buf,0,MB_OK);
+
+ swprintf (buf, 1024,
+ L"autoclose =%d\r\n"
 "all_user_var =%d\r\n"
 "exec_error =%d\r\n"
 "abort =%d\r\n"
 "exec_reboot =%d\r\n"
 "reboot_called=%d\r\n"
+	 "api_version =%d\r\n"
 "silent =%d\r\n"
 "instdir_error=%d\r\n"
 "rtl =%d\r\n"
@@ -92,30 +163,34 @@
 extra->exec_flags->abort,
 extra->exec_flags->exec_reboot,
 extra->exec_flags->reboot_called,
+ extra->exec_flags->plugin_api_version,
 extra->exec_flags->silent,
 extra->exec_flags->instdir_error,
 extra->exec_flags->rtl,
 extra->exec_flags->errlvl);
- MessageBox(g_hwndParent,buf,0,MB_OK);
+ MessageBoxW(g_hwndParent,buf,0,MB_OK);
 }
 }
 
 
+
 void __declspec(dllexport)
-runonce (HWND hwndParent, int string_size, char *variables,
+runonce (HWND hwndParent, int string_size, LPTSTR variables,
 stack_t **stacktop, extra_parameters_t *extra)
 {
- const char *result;
+ LPCWSTR result;
 
 g_hwndParent = hwndParent;
 EXDLL_INIT();
 
- CreateMutexA (NULL, 0, getuservariable(INST_R0));
- result = GetLastError ()? "1":"0";
+ CreateMutexW (NULL, 0, getuservariable(INST_R0));
+ result = GetLastError ()? L"1" : L"0";
 setuservariable (INST_R0, result);
 }
 
 
+
+#ifdef ENABLE_SOUND_GADGET
 void __declspec(dllexport)
 playsound (HWND hwndParent, int string_size, char *variables,
 stack_t **stacktop, extra_parameters_t *extra)
@@ -139,8 +214,10 @@
 EXDLL_INIT();
 PlaySound (NULL, NULL, 0);
 }
+#endif /*ENABLE_SOUND_GADGET*/
 
 
+#ifdef ENABLE_SPLASH_GADGET
 /* Windows procedure to control the splashimage. This one pauses the
 execution until the sleep time is over or the user closes this
 windows. */
@@ -268,10 +345,10 @@
 }
 UnregisterClass (classname, g_hInstance);
 }
+#endif /*ENABLE_SPLASH_GADGET*/
 
-&#xc;
-/* Service Management. */
 
+#ifdef ENABLE_SERVICE_MANAGEMENT
 /* Use this to report unexpected errors. FIXME: This is really not
 very descriptive. */
 void
@@ -626,9 +703,8 @@
 setuservariable (INST_R0, "0");
 return;
 }
+#endif /*ENABLE_SERVICE_MANAGEMENT*/
 
-&#xc;
-#include <stdio.h>
 
 /* Extract config file parameters. FIXME: Not particularly robust.
 We expect some reasonable formatting. The parser below is very
@@ -644,6 +720,7 @@
 config_init (char **keys, char **values, int max)
 {
 /* First, parse the command line. */
+ LPCWSTR wcmdline;
 char *cmdline;
 char *begin = NULL;
 char *end = NULL;
@@ -655,7 +732,15 @@
 *keys = NULL;
 *values = NULL;
 
- cmdline = getuservariable (INST_CMDLINE);
+ cmdline = malloc (4096);
+ if (!cmdline)
+ return;
+
+ wcmdline = getuservariable (INST_CMDLINE);
+ *cmdline = 0;
+ WideCharToMultiByte(CP_ACP, 0, wcmdline, -1, cmdline, 4095, NULL, NULL);
+ if (!*cmdline)
+ return;
 
 mark = (*cmdline == '"') ? (cmdline++, '"') : ' ';
 while (*cmdline && *cmdline != mark)
@@ -721,6 +806,7 @@
 
 conf = fopen (fname, "r");
 free (fname);
+ free (cmdline);
 if (!conf)
 return;
 
@@ -843,7 +929,7 @@
 
 
 void __declspec(dllexport)
-config_fetch (HWND hwndParent, int string_size, char *variables,
+config_fetch (HWND hwndParent, int string_size, LPTSTR variables,
 	 stack_t **stacktop, extra_parameters_t *extra)
 {
 char key256;
@@ -854,23 +940,23 @@
 EXDLL_INIT();
 
 /* The expected stack layout: key. */
- if (popstring (key, sizeof (key)))
+ if (PopStringNA (key, sizeof (key)))
 err = 1;
 if (err)
 {
- setuservariable (INST_R0, "");
+ setuservariable (INST_R0, L"");
 return;
 }
 
 value = config_lookup (key);
 
- setuservariable (INST_R0, value == NULL ? "" : value);
+ SetUserVariableA (INST_R0, value == NULL ? "" : value);
 return;
 }
 
 
 void __declspec(dllexport)
-config_fetch_bool (HWND hwndParent, int string_size, char *variables,
+config_fetch_bool (HWND hwndParent, int string_size, LPTSTR variables,
 		 stack_t **stacktop, extra_parameters_t *extra)
 {
 char key256;
@@ -882,18 +968,18 @@
 EXDLL_INIT();
 
 /* The expected stack layout: key. */
- if (popstring (key, sizeof (key)))
+ if (PopStringNA (key, sizeof (key)))
 err = 1;
 if (err)
 {
- setuservariable (INST_R0, "");
+ setuservariable (INST_R0, L"");
 return;
 }
 
 value = config_lookup (key);
 if (value == NULL || *value == '\0')
 {
- setuservariable (INST_R0, "");
+ setuservariable (INST_R0, L"");
 return;
 }
 
@@ -903,7 +989,7 @@
 || atoi (value) != 0)
 result = 1;
 
- setuservariable (INST_R0, result == 0 ? "0" : "1");
+ SetUserVariableA (INST_R0, result == 0 ? "0" : "1");
 return;
 }
 
@@ -911,99 +997,107 @@
 /* Return a string from the Win32 Registry or NULL in case of error.
 Caller must release the return value. A NULL for root is an alias
 for HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE in turn. */
-char *
-read_w32_registry_string (HKEY root, const char *dir, const char *name)
+static wchar_t *
+read_w32_registry_string (HKEY root, const wchar_t *dir, const wchar_t *name)
 {
 HKEY root_key;
 HKEY key_handle;
 DWORD n1, nbytes, type;
- char *result = NULL;
+ wchar_t *result = NULL;
 
 root_key = root;
- if (! root_key)
+ if (!root_key)
 root_key = HKEY_CURRENT_USER;
 
- if( RegOpenKeyEx( root_key, dir, 0, KEY_READ, &key_handle ) )
+ if (RegOpenKeyExW (root_key, dir, 0, KEY_READ, &key_handle))
 {
 if (root)
 	return NULL; /* no need for a RegClose, so return direct */
 /* It seems to be common practise to fall back to HKLM. */
- if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
+ if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle))
 	return NULL; /* still no need for a RegClose, so return direct */
 }
 
 nbytes = 1;
- if( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) ) {
- if (root)
- goto leave;
- /* Try to fallback to HKLM also vor a missing value. */
- RegCloseKey (key_handle);
- if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
- return NULL; /* Nope. */
- if (RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes))
- goto leave;
+ if (RegQueryValueExW (key_handle, name, 0, NULL, NULL, &nbytes))
+ {
+ if (root)
+ goto leave;
+ /* Try to fallback to HKLM also for a missing value. */
+ RegCloseKey (key_handle);
+ if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle))
+ return NULL; /* Nope. */
+ if (RegQueryValueExW (key_handle, name, 0, NULL, NULL, &nbytes))
+ goto leave;
 }
 
- result = malloc( (n1=nbytes+1) );
-
- if( !result )
- goto leave;
- if( RegQueryValueEx( key_handle, name, 0, &type, result, &n1 ) ) {
- free(result); result = NULL;
+ result = calloc ((n1=nbytes+1), sizeof *result);
+ if (!result)
 goto leave;
- }
- resultnbytes = 0; /* make sure it is really a string */
+
+ if (RegQueryValueExW (key_handle, name, 0, &type,
+ (unsigned char *)result, &n1))
+ {
+ free (result);
+ result = NULL;
+ goto leave;
+ }
+ resultnbytes = 0; /* Make sure it is really a string */
 
 leave:
- RegCloseKey( key_handle );
+ RegCloseKey (key_handle);
 return result;
 }
 
 
+/* Registry keys for PATH for HKLM and HKCU. */
 #define ENV_HK HKEY_LOCAL_MACHINE
-#define ENV_REG "SYSTEM\\CurrentControlSet\\Control\\" \
- "Session Manager\\Environment"
- /* The following setting can be used for a per-user setting. */
+#define ENV_REG L"SYSTEM\\CurrentControlSet\\Control\\" \
+ "Session Manager\\Environment"
 #define ENV_HK_USER HKEY_CURRENT_USER
-#define ENV_REG_USER "Environment"
+#define ENV_REG_USER L"Environment"
+
 /* Due to a bug in Windows7 (kb 2685893) we better put a lower limit
- than 8191 on the maximum length of the PATH variable. Note, that
- depending on the used toolchain we used to had a 259 byte limit in
- the past. */
+ * than 8191 on the maximum length of the PATH variable. Note, that
+ * depending on the used toolchain we used to had a 259 byte limit in
+ * the past.
+ * wk 2023-04-24: Can this be lifted now that we use the wchar_t API?
+ */
 #define PATH_LENGTH_LIMIT 2047
 
 void __declspec(dllexport)
-path_add (HWND hwndParent, int string_size, char *variables,
+path_add (HWND hwndParent, int string_size, LPTSTR variables,
 	 stack_t **stacktop, extra_parameters_t *extra)
 {
- char dirPATH_LENGTH_LIMIT;
- char is_user_install2;
- char *path;
- char *path_new;
- int path_new_size;
- char *comp;
- const char delims = ";";
+ wchar_t dirPATH_LENGTH_LIMIT;
+ wchar_t is_user_install2;
+ wchar_t *path;
+ wchar_t *path_new;
+ size_t path_new_size;
+ wchar_t *comp;
+ const wchar_t delims = L";";
 int is_user;
 HKEY key_handle = 0;
 HKEY root_key;
- const char *env_reg;
+ const wchar_t *env_reg;
+ /* wchar_t *tokctx; Context var for wcstok - not yet needed. */
 
 g_hwndParent = hwndParent;
 EXDLL_INIT();
 
- setuservariable (INST_R0, "0");
-
-/* MessageBox (g_hwndParent, "XXX 1", 0, MB_OK); */
+ setuservariable (INST_R0, L"0"); /* Default return value. */
 
 /* The expected stack layout: path component. */
- if (popstring (dir, sizeof (dir)))
+ if (popstringn (dir, COUNTOF (dir)))
 return;
+ dirCOUNTOF(dir)-1 = 0;
 
 /* The expected stack layout: HKEY component. */
- if (popstring (is_user_install, sizeof (is_user_install)))
+ if (popstringn (is_user_install, COUNTOF (is_user_install)))
 return;
+ is_user_installCOUNTOF(is_user_install)-1 = 0;
 
- if (!strcmp(is_user_install, "1"))
+ if (!wcscmp (is_user_install, L"1"))
 {
 root_key = ENV_HK_USER;
 env_reg = ENV_REG_USER;
@@ -1014,107 +1108,100 @@
 env_reg = ENV_REG;
 }
 
- path = read_w32_registry_string (root_key, env_reg, "Path");
-
- if (! path)
+ path = read_w32_registry_string (root_key, env_reg, L"Path");
+ if (!path)
 {
- path = strdup ("");
+ path = wcsdup (L"");
 }
 
-/* MessageBox (g_hwndParent, "XXX 3", 0, MB_OK); */
-
 /* Old path plus semicolon plus dir plus terminating nul. */
- path_new_size = strlen (path) + 1 + strlen (dir) + 1;
+ path_new_size = wcslen (path) + 1 + wcslen (dir) + 1;
 if (path_new_size > PATH_LENGTH_LIMIT)
 {
- MessageBox (g_hwndParent, "PATH env variable too big", 0, MB_OK);
+ MessageBox (g_hwndParent, L"PATH env variable too big", 0, MB_OK);
 free (path);
 return;
 }
 
-/* MessageBox (g_hwndParent, "XXX 4", 0, MB_OK); */
-
- path_new = malloc (path_new_size);
+ path_new = calloc (path_new_size, sizeof *path_new);
 if (!path_new)
 {
 free (path);
 return;
 }
 
-/* MessageBox (g_hwndParent, "XXX 5", 0, MB_OK); */
-
- strcpy (path_new, path);
- strcat (path_new, ";");
- strcat (path_new, dir);
-
-/* MessageBox (g_hwndParent, "XXX 6", 0, MB_OK); */
-/* MessageBox (g_hwndParent, dir, 0, MB_OK); */
-/* MessageBox (g_hwndParent, "XXX 7", 0, MB_OK); */
+ wcscpy (path_new, path);
+ wcscat (path_new, L";");
+ wcscat (path_new, dir);
 
 /* Check if the directory already exists in the path. */
- comp = strtok (path, delims);
+ comp = wcstok (path, delims/*, &tokctx*/);
 do
 {
-/* MessageBox (g_hwndParent, comp, 0, MB_OK); */
+ /* MessageBox (g_hwndParent, comp, 0, MB_OK); */
 if (!comp)
 break;
 
- if (!strcmp (comp, dir))
+ if (!wcscmp (comp, dir))
 	{
 	 free (path);
 	 free (path_new);
 	 return;
 	}
- comp = strtok (NULL, delims);
+ comp = wcstok (NULL, delims/*, &tokctx*/);
 }
 while (comp);
 free (path);
 
 /* Update the path key. */
- RegCreateKey (root_key, env_reg, &key_handle);
- RegSetValueEx (key_handle, "Path", 0, REG_EXPAND_SZ,
-		 path_new, path_new_size);
+ RegCreateKeyW (root_key, env_reg, &key_handle);
+ RegSetValueEx (key_handle, L"Path", 0, REG_EXPAND_SZ,
+		 (unsigned char*)path_new,
+ wcslen (path_new) * sizeof *path_new);
 RegCloseKey (key_handle);
- SetEnvironmentVariable("PATH", path_new);
+ SetEnvironmentVariableW(L"PATH", path_new);
 free (path_new);
 
 /* MessageBox (g_hwndParent, "XXX 9", 0, MB_OK); */
 
- setuservariable (INST_R0, "1");
+ setuservariable (INST_R0, L"1"); /* success. */
 }
 
 
 void __declspec(dllexport)
-path_remove (HWND hwndParent, int string_size, char *variables,
+path_remove (HWND hwndParent, int string_size, LPTSTR variables,
 	 stack_t **stacktop, extra_parameters_t *extra)
 {
- char dirPATH_LENGTH_LIMIT;
- char is_user_install2;
- char *path;
- char *path_new;
- int path_new_size;
- char *comp;
- const char delims = ";";
+ wchar_t dirPATH_LENGTH_LIMIT;
+ wchar_t is_user_install2;
+ wchar_t *path;
+ wchar_t *path_new;
+ size_t path_new_size;
+ wchar_t *comp;
+ const wchar_t delims = L";";
 HKEY key_handle = 0;
 int changed = 0;
 int count = 0;
 HKEY root_key;
- const char *env_reg;
+ const wchar_t *env_reg;
+ /* wchar_t *tokctx; Context var for wcstok - not yet needed. */
 
 g_hwndParent = hwndParent;
 EXDLL_INIT();
 
- setuservariable (INST_R0, "0");
+ setuservariable (INST_R0, L"0");
 
 /* The expected stack layout: path component. */
- if (popstring (dir, sizeof (dir)))
+ if (popstringn (dir, COUNTOF (dir)))
 return;
+ dirCOUNTOF(dir)-1 = 0;
 
 /* The expected stack layout: HKEY component. */
- if (popstring (is_user_install, sizeof (is_user_install)))
+ if (popstringn (is_user_install, COUNTOF (is_user_install)))
 return;
+ is_user_installCOUNTOF(is_user_install)-1 = 0;
 
- if (!strcmp(is_user_install, "1"))
+ if (!wcscmp (is_user_install, L"1"))
 {
 root_key = ENV_HK_USER;
 env_reg = ENV_REG_USER;
@@ -1125,51 +1212,112 @@
 env_reg = ENV_REG;
 }
 
- path = read_w32_registry_string (root_key, env_reg, "Path");
-
+ path = read_w32_registry_string (root_key, env_reg, L"Path");
 if (!path)
 return;
+
 /* Old path plus semicolon plus dir plus terminating nul. */
- path_new_size = strlen (path) + 1;
- path_new = malloc (path_new_size);
+ path_new_size = wcslen (path) + 1;
+ path_new = calloc (path_new_size, sizeof *path_new);
 if (!path_new)
 {
 free (path);
 return;
 }
- path_new0 = '\0';
 
 /* Compose the new path. */
- comp = strtok (path, delims);
+ comp = wcstok (path, delims/*, &tokctx*/);
 do
 {
- if (strcmp (comp, dir))
+ if (wcscmp (comp, dir))
 	{
-	 if (count != 0)
-	 strcat (path_new, ";");
-	 strcat (path_new, comp);
+	 if (count)
+	 wcscat (path_new, L";");
+	 wcscat (path_new, comp);
 	 count++;
 	}
 else
 	changed = 1;
-
- comp = strtok (NULL, delims);
 }
- while (comp);
+ while ((comp = wcstok (NULL, delims/*, &tokctx*/)));
 free (path);
 
- if (! changed)
+ if (!changed)
 {
 free (path_new);
 return;
 }
 
 /* Set a key for our CLSID. */
- RegCreateKey (root_key, env_reg, &key_handle);
- RegSetValueEx (key_handle, "Path", 0, REG_EXPAND_SZ,
-		 path_new, path_new_size);
+ RegCreateKeyW (root_key, env_reg, &key_handle);
+ RegSetValueEx (key_handle, L"Path", 0, REG_EXPAND_SZ,
+		 (unsigned char*)path_new,
+ wcslen (path_new) * sizeof *path_new);
 RegCloseKey (key_handle);
 free (path_new);
 
- setuservariable (INST_R0, "1");
+ setuservariable (INST_R0, L"1"); /* success */
+}
+
+
+/** @brief Kill processes with the name name.
+ *
+ * This function tries to kill a process using ExitProcess.
+ *
+ * If it does not work it does not work. No return values.
+ * The intention is to make an effort to kill something during
+ * installation / uninstallation.
+ *
+ * The function signature is explained by NSIS.
+ */
+void __declspec(dllexport) __cdecl KillProc(HWND hwndParent,
+ int string_size,
+ char *variables,
+ stack_t **stacktop)
+{
+ HANDLE h;
+ PROCESSENTRY32 pe32;
+
+ if (!stacktop || !*stacktop || !(*stacktop)->text)
+ {
+ ERRORPRINTF ("Invalid call to KillProc.");
+ return;
+ }
+
+
+ h = CreateToolhelp32Snapshot (TH32CS_SNAPPROCESS, 0);
+ if (h == INVALID_HANDLE_VALUE)
+ {
+ ERRORPRINTF ("Failed to create Toolhelp snapshot");
+ return;
+ }
+ pe32.dwSize = sizeof (PROCESSENTRY32);
+
+ if (!Process32First (h, &pe32))
+ {
+ ERRORPRINTF ("Failed to get first process");
+ CloseHandle (h);
+ return;
+ }
+
+ do
+ {
+ if (!wcscmp ((*stacktop)->text, pe32.szExeFile))
+ {
+ HANDLE hProc = OpenProcess (PROCESS_ALL_ACCESS, FALSE,
+ pe32.th32ProcessID);
+ if (!hProc)
+ {
+ ERRORPRINTF ("Failed to open process handle.");
+ continue;
+ }
+ if (!TerminateProcess (hProc, 1))
+ {
+ ERRORPRINTF ("Failed to terminate process.");
+ }
+ CloseHandle (hProc);
+ }
+ }
+ while (Process32Next (h, &pe32));
+ CloseHandle (h);
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/build-aux/speedo/w32/inst.nsi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/speedo/w32/inst.nsi Changed

@@ -1,4 +1,4 @@
-# inst.nsi - Installer for GnuPG on Windows.      -*- coding: latin-1; -*-
+# inst.nsi - Installer for GnuPG on Windows.
 # Copyright (C) 2005, 2014, 2019-2021 g10 Code GmbH
 #               2017 Intevation GmbH
 #
@@ -31,6 +31,9 @@
 #
 #  WITH_GUI        - Include the GPA GUI
 
+# This one must be done before addplugindir.
+Unicode true
+
 !cd "${INST_DIR}"
 !addincludedir "${W32_SRCDIR}"
 !addplugindir "${BUILD_DIR}"
@@ -64,7 +67,7 @@
   File version: ${PROD_VERSION}\r\n\
   Release date: ${BUILD_ISODATE}"
 !define ABOUT_GERMAN \
- "GnuPG is die häufigst verwendete Software zur Mail- und Datenverschlüsselung.\
+ "GnuPG is die hÃ¤ufigst verwendete Software zur Mail- und DatenverschlÃ¼sselung.\
    \r\n\r\n$_CLICK \
    \r\n\r\n\r\n\r\n\r\nDies ist GnuPG Version ${VERSION}.\r\n\
    Dateiversion: ${PROD_VERSION}\r\n\
@@ -256,14 +259,14 @@
    You may distribute it as long as you give the recipients the same \
    rights you have received."
 LangString T_GPLShort ${LANG_GERMAN} \
-  "In aller Kürze: Sie haben das Recht, die Software zu jedem Zweck \
-   einzusetzen.  Sie können die Software weitergeben, sofern Sie dem \
-   Empfänger dieselben Rechte einräumen, die auch Sie erhalten haben."
+  "In aller KÃ¼rze: Sie haben das Recht, die Software zu jedem Zweck \
+   einzusetzen.  Sie kÃ¶nnen die Software weitergeben, sofern Sie dem \
+   EmpfÃ¤nger dieselben Rechte einrÃ¤umen, die auch Sie erhalten haben."
 
 LangString T_RunKeyManager ${LANG_ENGLISH} \
    "Run the key manager"
 LangString T_RunKeyManager ${LANG_GERMAN} \
-   "Die Schlüsselverwaltung aufrufen"
+   "Die SchlÃ¼sselverwaltung aufrufen"
 
 LangString T_MoreInfo ${LANG_ENGLISH} \
    "Click here to see how to help the GnuPG Project"
@@ -280,8 +283,8 @@
 LangString T_NoKeyManager ${LANG_ENGLISH} \
    "No key manager has been installed, thus we can't run one now."
 LangString T_NoKeyManager ${LANG_GERMAN} \
-   "Es wurde keine Schlüsselverwaltung installiert. \
-    Deswegen kann sie jetzt auch nicht ausgeführt werden."
+   "Es wurde keine SchlÃ¼sselverwaltung installiert. \
+    Deswegen kann sie jetzt auch nicht ausgefÃ¼hrt werden."
 
 # Functions
 
@@ -289,7 +292,7 @@
 LangString T_AlreadyRunning ${LANG_ENGLISH} \
    "An instance of this installer is already running."
 LangString T_AlreadyRunning ${LANG_GERMAN} \
-   "Ein Exemplar dieses Installers läuft bereits."
+   "Ein Exemplar dieses Installers lÃ¤uft bereits."
 
 Function G4wRunOnce
   Push $R0
@@ -416,23 +419,23 @@
 LangString T_InstOptLabelA  ${LANG_ENGLISH} \
      "Please select where GnuPG shall install links:"
 LangString T_InstOptLabelA  ${LANG_GERMAN} \
-     "Bitte wählen Sie, welche Verknüpfungen angelegt werden sollen:"
+     "Bitte wÃ¤hlen Sie, welche VerknÃ¼pfungen angelegt werden sollen:"
 
 LangString T_InstOptLabelB  ${LANG_ENGLISH} \
      "(Only programs will be linked into the quick launch bar.)"
 LangString T_InstOptLabelB  ${LANG_GERMAN} \
-     "(In die Schnellstartleiste werden nur Verknüpfungen für \
+     "(In die Schnellstartleiste werden nur VerknÃ¼pfungen fÃ¼r \
       Programme angelegt.) "
 
 LangString T_InstOptFieldA  ${LANG_ENGLISH} \
      "Start Menu"
 LangString T_InstOptFieldA  ${LANG_GERMAN} \
-     "Startmenü"
+     "StartmenÃ¼"
 
 LangString T_InstOptFieldB  ${LANG_ENGLISH} \
      "Desktop"
 LangString T_InstOptFieldB  ${LANG_GERMAN} \
-     "Arbeitsfläche"
+     "ArbeitsflÃ¤che"
 
 LangString T_InstOptFieldC  ${LANG_ENGLISH} \
      "Quick Launch Bar"
@@ -447,9 +450,9 @@
       Do you want to overwrite it with version ${VERSION}?"
 LangString T_FoundExistingVersion ${LANG_GERMAN} \
      "Version $R1 ist hier bereits installiert. $\r$\n\
-      Möchten Sie diese mit Version ${VERSION} überschreiben? $\r$\n\
+      MÃ¶chten Sie diese mit Version ${VERSION} Ã¼berschreiben? $\r$\n\
        $\r$\n\
-      (Sie können in jedem Fall mit JA antworten, falls es sich um \
+      (Sie kÃ¶nnen in jedem Fall mit JA antworten, falls es sich um \
        eine neuere oder dieselbe Version handelt.)"
 LangString T_FoundExistingVersionB ${LANG_ENGLISH} \
      "A version of GnuPG has already been installed on the system. \
@@ -460,7 +463,7 @@
      "Eine Version von GnuPG ist hier bereits installiert. \
         $\r$\n\
         $\r$\n\
-      Möchten die die Installation von GnuPG fortführen?"
+      MÃ¶chten die die Installation von GnuPG fortfÃ¼hren?"
 
 
 
@@ -476,16 +479,16 @@
     Administratorrechten zu installieren. \
       $\r$\n\
       $\r$\n\
-    Möchten die die Installation von GnuPG ohne Administratorrechte fortführen?"
+    MÃ¶chten die die Installation von GnuPG ohne Administratorrechte fortfÃ¼hren?"
 
 # From Function PrintCloseOtherApps
 LangString T_CloseOtherApps ${LANG_ENGLISH} \
    "Please make sure that other applications are not running. \
     GnuPG will try to install anyway but a reboot may be required."
 LangString T_CloseOtherApps ${LANG_GERMAN} \
-   "Bitte stellen Sie sicher, daß alle anderen Anwendugen geschlossen \
+   "Bitte stellen Sie sicher, daÃ alle anderen Anwendugen geschlossen \
     sind.  GnuPG wird auf jeden Fall versuchen, eine Installation \
-    durchzuführen; es ist dann aber u.U. notwendig, das System neu zu starten."
+    durchzufÃ¼hren; es ist dann aber u.U. notwendig, das System neu zu starten."
 
 
 # TrimNewlines  - taken from the NSIS reference
@@ -669,8 +672,6 @@
   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"
@@ -738,7 +739,7 @@
 LangString DESC_SEC_gnupg ${LANG_GERMAN} \
    "Der GnuPG Core ist, wie der Name schon sagt, der Kernbestandteil \
     dieser Software.  Der GnuPG Core stellt die eigentliche \
-    Verschlüsselung sowie die Verwaltung der Schlüssel bereit."
+    VerschlÃ¼sselung sowie die Verwaltung der SchlÃ¼ssel bereit."
 
 LangString DESC_Menu_gnupg_manual ${LANG_ENGLISH} \
    "Show the manual for the GnuPG Core"
@@ -991,7 +992,7 @@
 LangString DESC_SEC_gpa ${LANG_ENGLISH} \
    "The GnuPG Assistant is the graphical interface of GnuPG"
 LangString DESC_SEC_gpa ${LANG_GERMAN} \
-   "Der GnuPG Assistent ist die graphische Oberfläche von GnuPG."
+   "Der GnuPG Assistent ist die graphische OberflÃ¤che von GnuPG."
 
 LangString DESC_Menu_gpa ${LANG_ENGLISH} \
    "Run the GnuGP Assistant."
@@ -1066,9 +1067,7 @@
     nsExec::ExecToLog '"$INSTDIR\bin\launch-gpa" "--stop-server"'
   no_uiserver:
   ifFileExists "$INSTDIR\bin\gpgconf.exe"  0 no_gpgconf
-    nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"'
-    nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"'
-    nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "keyboxd"'
+    nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "all"'
   no_gpgconf:
 SectionEnd
 
@@ -1337,8 +1336,6 @@
   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"

_service:tar_scm:gnupg-2.3.6.tar.bz2/build-aux/speedo/w32/wixlib.wxs -> _service:tar_scm:gnupg-2.4.3.tar.bz2/build-aux/speedo/w32/wixlib.wxs Changed

@@ -71,7 +71,7 @@
 <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"/>
+ <File Id="fil8A3F9D3F6E36120B183DDF4981D84C1B" KeyPath="yes" Source="$(var.SourceDir)\bin\gpg-wks-client.exe"/>
 </Component>
 <Component Id="cmpEC270B071977C15E14328A04D3BBC3E8" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="4BE9D7E7-6054-4D78-9292-4D58DBA81684">
 <File Id="fil822B20E83B1A966BABB0574CE6611B02" KeyPath="yes" Source="$(var.SourceDir)\bin\gpg.exe"/>
@@ -160,12 +160,6 @@
 <Component Id="cmpB5509E83C14EE3080355A3EAF09D1C8D" Directory="dir6694D0A4AAD84EF827096DD86D1B4FA2" Guid="FEC81836-944E-4613-A498-E620B981EB04">
 <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\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>

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/Makefile.am Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/Makefile.in Changed

@@ -125,10 +125,9 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@HAVE_W32CE_SYSTEM_FALSE@am__append_1 = libsimple-pwquery.a
 noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
 @DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_3)
-@HAVE_DOSISH_SYSTEM_FALSE@am__append_2 = -DGNUPG_BINDIR="\"$(bindir)\""            \
+@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@\""  \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
@@ -139,22 +138,21 @@
 # If a specific protect tool program has been defined, pass its name
 # to cc.  Note that these macros should not be used directly but via
 # the gnupg_module_name function.
-@GNUPG_AGENT_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
-@GNUPG_PINENTRY_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
-@GNUPG_SCDAEMON_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
-@GNUPG_TPM2DAEMON_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_TPM2DAEMON="\"@GNUPG_TPM2DAEMON_PGM@\""
-@GNUPG_DIRMNGR_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
-@GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_8 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
-@GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_9 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
-@HAVE_W32_SYSTEM_TRUE@am__append_10 = w32-reg.c w32-cmdline.c
+@GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+@GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+@GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+@GNUPG_TPM2DAEMON_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_TPM2DAEMON="\"@GNUPG_TPM2DAEMON_PGM@\""
+@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@\""
 
 # To make the code easier to read we have split home some code into
 # separate source files.
-@HAVE_W32CE_SYSTEM_TRUE@@HAVE_W32_SYSTEM_TRUE@am__append_11 = exechelp-w32ce.c
-@HAVE_W32CE_SYSTEM_FALSE@@HAVE_W32_SYSTEM_TRUE@am__append_12 = exechelp-w32.c
-@HAVE_W32_SYSTEM_FALSE@am__append_13 = exechelp-posix.c
-@HAVE_W32_SYSTEM_TRUE@am__append_14 = t-w32-reg
-@HAVE_W32_SYSTEM_FALSE@am__append_15 = t-exechelp t-exectool
+@HAVE_W32_SYSTEM_TRUE@am__append_9 = w32-reg.c w32-cmdline.c \
+@HAVE_W32_SYSTEM_TRUE@	exechelp-w32.c
+@HAVE_W32_SYSTEM_FALSE@am__append_10 = exechelp-posix.c
+@HAVE_W32_SYSTEM_TRUE@am__append_11 = t-w32-reg
+@HAVE_W32_SYSTEM_FALSE@am__append_12 = t-exechelp t-exectool
 subdir = common
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -216,15 +214,14 @@
 	name-value.c name-value.h recsel.c recsel.h ksba-io-support.c \
 	ksba-io-support.h openpgp-fpr.c comopt.c comopt.h compliance.c \
 	compliance.h pkscreening.c pkscreening.h w32-reg.c \
-	w32-cmdline.c exechelp-w32ce.c exechelp-w32.c exechelp-posix.c \
-	get-passphrase.c get-passphrase.h
+	w32-cmdline.c exechelp-w32.c exechelp-posix.c get-passphrase.c \
+	get-passphrase.h
 @HAVE_W32_SYSTEM_TRUE@am__objects_1 = libcommon_a-w32-reg.$(OBJEXT) \
-@HAVE_W32_SYSTEM_TRUE@	libcommon_a-w32-cmdline.$(OBJEXT)
-@HAVE_W32CE_SYSTEM_TRUE@@HAVE_W32_SYSTEM_TRUE@am__objects_2 = libcommon_a-exechelp-w32ce.$(OBJEXT)
-@HAVE_W32CE_SYSTEM_FALSE@@HAVE_W32_SYSTEM_TRUE@am__objects_3 = libcommon_a-exechelp-w32.$(OBJEXT)
-@HAVE_W32_SYSTEM_FALSE@am__objects_4 =  \
+@HAVE_W32_SYSTEM_TRUE@	libcommon_a-w32-cmdline.$(OBJEXT) \
+@HAVE_W32_SYSTEM_TRUE@	libcommon_a-exechelp-w32.$(OBJEXT)
+@HAVE_W32_SYSTEM_FALSE@am__objects_2 =  \
 @HAVE_W32_SYSTEM_FALSE@	libcommon_a-exechelp-posix.$(OBJEXT)
-am__objects_5 = libcommon_a-i18n.$(OBJEXT) \
+am__objects_3 = libcommon_a-i18n.$(OBJEXT) \
 	libcommon_a-mapstrings.$(OBJEXT) \
 	libcommon_a-stringhelp.$(OBJEXT) libcommon_a-strlist.$(OBJEXT) \
 	libcommon_a-utf8conv.$(OBJEXT) libcommon_a-dotlock.$(OBJEXT) \
@@ -257,9 +254,9 @@
 	libcommon_a-openpgp-fpr.$(OBJEXT) libcommon_a-comopt.$(OBJEXT) \
 	libcommon_a-compliance.$(OBJEXT) \
 	libcommon_a-pkscreening.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_2) $(am__objects_3) $(am__objects_4)
-am__objects_6 = libcommon_a-get-passphrase.$(OBJEXT)
-am_libcommon_a_OBJECTS = $(am__objects_5) $(am__objects_6)
+	$(am__objects_2)
+am__objects_4 = libcommon_a-get-passphrase.$(OBJEXT)
+am_libcommon_a_OBJECTS = $(am__objects_3) $(am__objects_4)
 libcommon_a_OBJECTS = $(am_libcommon_a_OBJECTS)
 libcommonpth_a_AR = $(AR) $(ARFLAGS)
 libcommonpth_a_LIBADD =
@@ -281,15 +278,14 @@
 	name-value.c name-value.h recsel.c recsel.h ksba-io-support.c \
 	ksba-io-support.h openpgp-fpr.c comopt.c comopt.h compliance.c \
 	compliance.h pkscreening.c pkscreening.h w32-reg.c \
-	w32-cmdline.c exechelp-w32ce.c exechelp-w32.c exechelp-posix.c \
-	call-gpg.c call-gpg.h
-@HAVE_W32_SYSTEM_TRUE@am__objects_7 =  \
+	w32-cmdline.c exechelp-w32.c exechelp-posix.c call-gpg.c \
+	call-gpg.h
+@HAVE_W32_SYSTEM_TRUE@am__objects_5 =  \
 @HAVE_W32_SYSTEM_TRUE@	libcommonpth_a-w32-reg.$(OBJEXT) \
-@HAVE_W32_SYSTEM_TRUE@	libcommonpth_a-w32-cmdline.$(OBJEXT)
-@HAVE_W32CE_SYSTEM_TRUE@@HAVE_W32_SYSTEM_TRUE@am__objects_8 = libcommonpth_a-exechelp-w32ce.$(OBJEXT)
-@HAVE_W32CE_SYSTEM_FALSE@@HAVE_W32_SYSTEM_TRUE@am__objects_9 = libcommonpth_a-exechelp-w32.$(OBJEXT)
-@HAVE_W32_SYSTEM_FALSE@am__objects_10 = libcommonpth_a-exechelp-posix.$(OBJEXT)
-am__objects_11 = libcommonpth_a-i18n.$(OBJEXT) \
+@HAVE_W32_SYSTEM_TRUE@	libcommonpth_a-w32-cmdline.$(OBJEXT) \
+@HAVE_W32_SYSTEM_TRUE@	libcommonpth_a-exechelp-w32.$(OBJEXT)
+@HAVE_W32_SYSTEM_FALSE@am__objects_6 = libcommonpth_a-exechelp-posix.$(OBJEXT)
+am__objects_7 = libcommonpth_a-i18n.$(OBJEXT) \
 	libcommonpth_a-mapstrings.$(OBJEXT) \
 	libcommonpth_a-stringhelp.$(OBJEXT) \
 	libcommonpth_a-strlist.$(OBJEXT) \
@@ -335,10 +331,10 @@
 	libcommonpth_a-openpgp-fpr.$(OBJEXT) \
 	libcommonpth_a-comopt.$(OBJEXT) \
 	libcommonpth_a-compliance.$(OBJEXT) \
-	libcommonpth_a-pkscreening.$(OBJEXT) $(am__objects_7) \
-	$(am__objects_8) $(am__objects_9) $(am__objects_10)
-am__objects_12 = libcommonpth_a-call-gpg.$(OBJEXT)
-am_libcommonpth_a_OBJECTS = $(am__objects_11) $(am__objects_12)
+	libcommonpth_a-pkscreening.$(OBJEXT) $(am__objects_5) \
+	$(am__objects_6)
+am__objects_8 = libcommonpth_a-call-gpg.$(OBJEXT)
+am_libcommonpth_a_OBJECTS = $(am__objects_7) $(am__objects_8)
 libcommonpth_a_OBJECTS = $(am_libcommonpth_a_OBJECTS)
 libgpgrl_a_AR = $(AR) $(ARFLAGS)
 libgpgrl_a_LIBADD =
@@ -346,10 +342,9 @@
 libgpgrl_a_OBJECTS = $(am_libgpgrl_a_OBJECTS)
 libsimple_pwquery_a_AR = $(AR) $(ARFLAGS)
 libsimple_pwquery_a_LIBADD =
-am__libsimple_pwquery_a_SOURCES_DIST = simple-pwquery.c \
-	simple-pwquery.h asshelp.c asshelp.h
-@HAVE_W32CE_SYSTEM_FALSE@am_libsimple_pwquery_a_OBJECTS = libsimple_pwquery_a-simple-pwquery.$(OBJEXT) \
-@HAVE_W32CE_SYSTEM_FALSE@	libsimple_pwquery_a-asshelp.$(OBJEXT)
+am_libsimple_pwquery_a_OBJECTS =  \
+	libsimple_pwquery_a-simple-pwquery.$(OBJEXT) \
+	libsimple_pwquery_a-asshelp.$(OBJEXT)
 libsimple_pwquery_a_OBJECTS = $(am_libsimple_pwquery_a_OBJECTS)
 t_b64_SOURCES = t-b64.c
 t_b64_OBJECTS = t-b64.$(OBJEXT)
@@ -407,8 +402,8 @@
 t_ssh_utils_SOURCES = t-ssh-utils.c
 t_ssh_utils_OBJECTS = t-ssh-utils.$(OBJEXT)
 t_ssh_utils_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am__objects_13 =
-am_t_stringhelp_OBJECTS = t-stringhelp.$(OBJEXT) $(am__objects_13)
+am__objects_9 =
+am_t_stringhelp_OBJECTS = t-stringhelp.$(OBJEXT) $(am__objects_9)
 t_stringhelp_OBJECTS = $(am_t_stringhelp_OBJECTS)
 t_stringhelp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 t_strlist_SOURCES = t-strlist.c
@@ -417,19 +412,19 @@
 t_sysutils_SOURCES = t-sysutils.c
 t_sysutils_OBJECTS = t-sysutils.$(OBJEXT)
 t_sysutils_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_t_timestuff_OBJECTS = t-timestuff.$(OBJEXT) $(am__objects_13)
+am_t_timestuff_OBJECTS = t-timestuff.$(OBJEXT) $(am__objects_9)
 t_timestuff_OBJECTS = $(am_t_timestuff_OBJECTS)
 t_timestuff_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_t_w32_cmdline_OBJECTS = t-w32-cmdline.$(OBJEXT) \
-	w32-cmdline.$(OBJEXT) $(am__objects_13)
+	w32-cmdline.$(OBJEXT) $(am__objects_9)
 t_w32_cmdline_OBJECTS = $(am_t_w32_cmdline_OBJECTS)
 t_w32_cmdline_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am__t_w32_reg_SOURCES_DIST = t-w32-reg.c t-support.h
 @HAVE_W32_SYSTEM_TRUE@am_t_w32_reg_OBJECTS = t-w32-reg.$(OBJEXT) \
-@HAVE_W32_SYSTEM_TRUE@	$(am__objects_13)
+@HAVE_W32_SYSTEM_TRUE@	$(am__objects_9)
 t_w32_reg_OBJECTS = $(am_t_w32_reg_OBJECTS)
 @HAVE_W32_SYSTEM_TRUE@t_w32_reg_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_t_zb32_OBJECTS = t-zb32.$(OBJEXT) $(am__objects_13)
+am_t_zb32_OBJECTS = t-zb32.$(OBJEXT) $(am__objects_9)
 t_zb32_OBJECTS = $(am_t_zb32_OBJECTS)
 t_zb32_DEPENDENCIES = $(am__DEPENDENCIES_2)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -461,7 +456,6 @@
 	./$(DEPDIR)/libcommon_a-dotlock.Po \
 	./$(DEPDIR)/libcommon_a-exechelp-posix.Po \
 	./$(DEPDIR)/libcommon_a-exechelp-w32.Po \
-	./$(DEPDIR)/libcommon_a-exechelp-w32ce.Po \
 	./$(DEPDIR)/libcommon_a-exectool.Po \
 	./$(DEPDIR)/libcommon_a-get-passphrase.Po \
 	./$(DEPDIR)/libcommon_a-gettime.Po \
@@ -519,7 +513,6 @@
 	./$(DEPDIR)/libcommonpth_a-dotlock.Po \
 	./$(DEPDIR)/libcommonpth_a-exechelp-posix.Po \
 	./$(DEPDIR)/libcommonpth_a-exechelp-w32.Po \
-	./$(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po \
 	./$(DEPDIR)/libcommonpth_a-exectool.Po \
 	./$(DEPDIR)/libcommonpth_a-gettime.Po \
 	./$(DEPDIR)/libcommonpth_a-helpfile.Po \
@@ -605,7 +598,7 @@
 	$(t_w32_reg_SOURCES) $(t_zb32_SOURCES)
 DIST_SOURCES = $(am__libcommon_a_SOURCES_DIST) \
 	$(am__libcommonpth_a_SOURCES_DIST) $(libgpgrl_a_SOURCES) \
-	$(am__libsimple_pwquery_a_SOURCES_DIST) t-b64.c t-ccparray.c \
+	$(libsimple_pwquery_a_SOURCES) t-b64.c t-ccparray.c \
 	t-convert.c t-exechelp.c t-exectool.c t-gettime.c t-helpfile.c \
 	t-iobuf.c t-mapstrings.c t-mbox-util.c t-name-value.c \
 	t-openpgp-oid.c t-percent.c t-recsel.c t-session-env.c \
@@ -859,27 +852,17 @@
 	     all-tests.scm
 
 noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a \
-	$(am__append_1)
+	libsimple-pwquery.a
 BUILT_SOURCES = audit-events.h status-codes.h
 MAINTAINERCLEANFILES = audit-events.h status-codes.h
 
 # NB: AM_CFLAGS may also be used by tools running on the build
 # platform to create source files.
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(am__append_2) \
-	$(am__append_3) $(am__append_4) $(am__append_5) \
-	$(am__append_6) $(am__append_7) $(am__append_8) \
-	$(am__append_9)
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(am__append_1) \
+	$(am__append_2) $(am__append_3) $(am__append_4) \
+	$(am__append_5) $(am__append_6) $(am__append_7) \
+	$(am__append_8)
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx.  WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library.  We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc.  256k is the largest stack
-# we use with pth.
-@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 = 
 
 # Convenience macros
@@ -905,8 +888,7 @@
 	server-help.c server-help.h name-value.c name-value.h recsel.c \
 	recsel.h ksba-io-support.c ksba-io-support.h openpgp-fpr.c \
 	comopt.c comopt.h compliance.c compliance.h pkscreening.c \
-	pkscreening.h $(am__append_10) $(am__append_11) \
-	$(am__append_12) $(am__append_13)
+	pkscreening.h $(am__append_9) $(am__append_10)
 
 # Sources only useful without NPTH.
 without_npth_sources = \
@@ -921,10 +903,10 @@
 libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1
 libcommonpth_a_SOURCES = $(common_sources) $(with_npth_sources)
 libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
-@HAVE_W32CE_SYSTEM_FALSE@libsimple_pwquery_a_SOURCES = \
-@HAVE_W32CE_SYSTEM_FALSE@	simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
+libsimple_pwquery_a_SOURCES = \
+	simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
 
-@HAVE_W32CE_SYSTEM_FALSE@libsimple_pwquery_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
+libsimple_pwquery_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
 libgpgrl_a_SOURCES = \
         gpgrlhelp.c
 
@@ -935,8 +917,8 @@
 module_tests = t-stringhelp t-timestuff t-convert t-percent t-gettime \
 	t-sysutils t-sexputil t-session-env t-openpgp-oid t-ssh-utils \
 	t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist t-name-value \
-	t-ccparray t-recsel t-w32-cmdline $(am__append_14) \
-	$(am__append_15)
+	t-ccparray t-recsel t-w32-cmdline $(am__append_11) \
+	$(am__append_12)
 @MAINTAINER_MODE_FALSE@module_maint_tests = 
 @MAINTAINER_MODE_TRUE@module_maint_tests = t-helpfile t-b64
 t_extra_src = t-support.h
@@ -1160,7 +1142,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-dotlock.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-exechelp-posix.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-exechelp-w32.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-exechelp-w32ce.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-exectool.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-get-passphrase.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-gettime.Po@am__quote@ # am--include-marker
@@ -1218,7 +1199,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-dotlock.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-exechelp-posix.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-exechelp-w32.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-exectool.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-gettime.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-helpfile.Po@am__quote@ # am--include-marker
@@ -2051,20 +2031,6 @@
 @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) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-w32-cmdline.obj `if test -f 'w32-cmdline.c'; then $(CYGPATH_W) 'w32-cmdline.c'; else $(CYGPATH_W) '$(srcdir)/w32-cmdline.c'; fi`
 
-libcommon_a-exechelp-w32ce.o: exechelp-w32ce.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-w32ce.o -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-w32ce.Tpo -c -o libcommon_a-exechelp-w32ce.o `test -f 'exechelp-w32ce.c' || echo '$(srcdir)/'`exechelp-w32ce.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-w32ce.Tpo $(DEPDIR)/libcommon_a-exechelp-w32ce.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='exechelp-w32ce.c' object='libcommon_a-exechelp-w32ce.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) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-exechelp-w32ce.o `test -f 'exechelp-w32ce.c' || echo '$(srcdir)/'`exechelp-w32ce.c
-
-libcommon_a-exechelp-w32ce.obj: exechelp-w32ce.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-w32ce.obj -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-w32ce.Tpo -c -o libcommon_a-exechelp-w32ce.obj `if test -f 'exechelp-w32ce.c'; then $(CYGPATH_W) 'exechelp-w32ce.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32ce.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-w32ce.Tpo $(DEPDIR)/libcommon_a-exechelp-w32ce.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='exechelp-w32ce.c' object='libcommon_a-exechelp-w32ce.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) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-exechelp-w32ce.obj `if test -f 'exechelp-w32ce.c'; then $(CYGPATH_W) 'exechelp-w32ce.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32ce.c'; fi`
-
 libcommon_a-exechelp-w32.o: exechelp-w32.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-exechelp-w32.o -MD -MP -MF $(DEPDIR)/libcommon_a-exechelp-w32.Tpo -c -o libcommon_a-exechelp-w32.o `test -f 'exechelp-w32.c' || echo '$(srcdir)/'`exechelp-w32.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-exechelp-w32.Tpo $(DEPDIR)/libcommon_a-exechelp-w32.Po
@@ -2849,20 +2815,6 @@
 @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) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-w32-cmdline.obj `if test -f 'w32-cmdline.c'; then $(CYGPATH_W) 'w32-cmdline.c'; else $(CYGPATH_W) '$(srcdir)/w32-cmdline.c'; fi`
 
-libcommonpth_a-exechelp-w32ce.o: exechelp-w32ce.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-w32ce.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Tpo -c -o libcommonpth_a-exechelp-w32ce.o `test -f 'exechelp-w32ce.c' || echo '$(srcdir)/'`exechelp-w32ce.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Tpo $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='exechelp-w32ce.c' object='libcommonpth_a-exechelp-w32ce.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) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-exechelp-w32ce.o `test -f 'exechelp-w32ce.c' || echo '$(srcdir)/'`exechelp-w32ce.c
-
-libcommonpth_a-exechelp-w32ce.obj: exechelp-w32ce.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-w32ce.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Tpo -c -o libcommonpth_a-exechelp-w32ce.obj `if test -f 'exechelp-w32ce.c'; then $(CYGPATH_W) 'exechelp-w32ce.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32ce.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Tpo $(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='exechelp-w32ce.c' object='libcommonpth_a-exechelp-w32ce.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) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-exechelp-w32ce.obj `if test -f 'exechelp-w32ce.c'; then $(CYGPATH_W) 'exechelp-w32ce.c'; else $(CYGPATH_W) '$(srcdir)/exechelp-w32ce.c'; fi`
-
 libcommonpth_a-exechelp-w32.o: exechelp-w32.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-exechelp-w32.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-exechelp-w32.Tpo -c -o libcommonpth_a-exechelp-w32.o `test -f 'exechelp-w32.c' || echo '$(srcdir)/'`exechelp-w32.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-exechelp-w32.Tpo $(DEPDIR)/libcommonpth_a-exechelp-w32.Po
@@ -3171,7 +3123,6 @@
 	-rm -f ./$(DEPDIR)/libcommon_a-dotlock.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-exechelp-posix.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-exechelp-w32.Po
-	-rm -f ./$(DEPDIR)/libcommon_a-exechelp-w32ce.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-exectool.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-get-passphrase.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-gettime.Po
@@ -3229,7 +3180,6 @@
 	-rm -f ./$(DEPDIR)/libcommonpth_a-dotlock.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-exechelp-posix.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-exechelp-w32.Po
-	-rm -f ./$(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-exectool.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-gettime.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-helpfile.Po
@@ -3358,7 +3308,6 @@
 	-rm -f ./$(DEPDIR)/libcommon_a-dotlock.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-exechelp-posix.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-exechelp-w32.Po
-	-rm -f ./$(DEPDIR)/libcommon_a-exechelp-w32ce.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-exectool.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-get-passphrase.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-gettime.Po
@@ -3416,7 +3365,6 @@
 	-rm -f ./$(DEPDIR)/libcommonpth_a-dotlock.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-exechelp-posix.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-exechelp-w32.Po
-	-rm -f ./$(DEPDIR)/libcommonpth_a-exechelp-w32ce.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-exectool.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-gettime.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-helpfile.Po

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/all-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/all-tests.scm Changed

@@ -19,27 +19,31 @@
  ;; XXX: Currently, the makefile parser does not understand this
  ;; Makefile.am, so we hardcode the list of tests here.
  (map (lambda (name)
-	(test::binary #f
-		      (path-join "common" name)
-		      (path-join (getenv "objdir") "common" name)))
-      (list "t-stringhelp"
-	    "t-timestuff"
-	    "t-convert"
-	    "t-percent"
-	    "t-gettime"
-	    "t-sysutils"
-	    "t-sexputil"
-	    "t-session-env"
-	    "t-openpgp-oid"
-	    "t-ssh-utils"
-	    "t-mapstrings"
-	    "t-zb32"
-	    "t-mbox-util"
-	    "t-iobuf"
-	    "t-strlist"
-	    "t-name-value"
-	    "t-ccparray"
-	    "t-recsel"
-	    "t-exechelp"
-	    "t-exectool"
-	    )))
+        (let ((name-ext (string-append name (getenv "EXEEXT"))))
+	  (test::binary #f
+		        (path-join "common" name-ext)
+		        (path-join (getenv "objdir") "common" name-ext))))
+      `("t-stringhelp"
+	"t-timestuff"
+	"t-convert"
+	"t-percent"
+	"t-gettime"
+	"t-sysutils"
+	"t-sexputil"
+	"t-session-env"
+	"t-openpgp-oid"
+	"t-ssh-utils"
+	"t-mapstrings"
+	"t-zb32"
+	"t-mbox-util"
+	"t-iobuf"
+	"t-strlist"
+	"t-name-value"
+	"t-ccparray"
+	"t-recsel"
+	,@(if *win32*
+	      '("t-w32-reg"
+		"t-w32-cmdline")
+	      '("t-exechelp"
+		"t-exectool"))
+	)))

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/asshelp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/asshelp.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/audit.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/audit.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/call-gpg.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/call-gpg.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/common-defs.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/common-defs.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/comopt.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/comopt.c Changed

@@ -45,6 +45,7 @@
     oLogFile = 500,
     oUseKeyboxd,
     oKeyboxdProgram,
+    oNoAutostart,
 
     oNoop
   };
@@ -52,15 +53,18 @@
 static gpgrt_opt_t opts = {
   ARGPARSE_s_s (oLogFile,        "log-file", "@"),
   ARGPARSE_s_n (oUseKeyboxd,     "use-keyboxd", "@"),
+  ARGPARSE_s_n (oNoAutostart,    "no-autostart", "@"),
   ARGPARSE_s_s (oKeyboxdProgram, "keyboxd-program", "@"),
 
   ARGPARSE_end ()
 };
 
 
+struct gnupg_comopt_s comopt = {NULL};
+
 
 /* Parse the common options in the homedir and etc.  This needs to be
- * called after the gpgrt config directories are.  MODULE_ID is one of
+ * called after the gpgrt config directories are set.  MODULE_ID is one of
  * the GNUPG_MODULE_NAME_ constants.  If verbose is true info about
  * the parsing is printed.  Note that this function is not
  * thread-safe. */
@@ -102,6 +106,10 @@
           comopt.use_keyboxd = 1;
           break;
 
+        case oNoAutostart:
+          comopt.no_autostart = 1;
+          break;
+
         case oKeyboxdProgram:
           comopt.keyboxd_program = pargs.r.ret_str;
           break;

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/comopt.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/comopt.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/compliance.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/compliance.c Changed

@@ -83,7 +83,9 @@
   log_assert (! initialized);
 
   /* We accept both OpenPGP-style and gcrypt-style algorithm ids.
-   * Assert that they are compatible.  */
+   * Assert that they are compatible. At some places gcrypt ids are
+   * used which can't be encoded in an OpenPGP algo octet; we also
+   * assert this.  */
   log_assert ((int) GCRY_PK_RSA          == (int) PUBKEY_ALGO_RSA);
   log_assert ((int) GCRY_PK_RSA_E        == (int) PUBKEY_ALGO_RSA_E);
   log_assert ((int) GCRY_PK_RSA_S        == (int) PUBKEY_ALGO_RSA_S);
@@ -91,6 +93,9 @@
   log_assert ((int) GCRY_PK_DSA          == (int) PUBKEY_ALGO_DSA);
   log_assert ((int) GCRY_PK_ECC          == (int) PUBKEY_ALGO_ECDH);
   log_assert ((int) GCRY_PK_ELG          == (int) PUBKEY_ALGO_ELGAMAL);
+  log_assert ((int) GCRY_PK_ECDSA        > 255);
+  log_assert ((int) GCRY_PK_ECDH         > 255);
+  log_assert ((int) GCRY_PK_EDDSA        > 255);
   log_assert ((int) GCRY_CIPHER_NONE     == (int) CIPHER_ALGO_NONE);
   log_assert ((int) GCRY_CIPHER_IDEA     == (int) CIPHER_ALGO_IDEA);
   log_assert ((int) GCRY_CIPHER_3DES     == (int) CIPHER_ALGO_3DES);
@@ -159,6 +164,9 @@
     case PUBKEY_ALGO_ECDH:
     case PUBKEY_ALGO_ECDSA:
     case PUBKEY_ALGO_EDDSA:
+    case GCRY_PK_ECDSA:
+    case GCRY_PK_ECDH:
+    case GCRY_PK_EDDSA:
       algotype = is_ecc;
       break;
 
@@ -211,7 +219,9 @@
 
           result = (curvename
                     && (algo == PUBKEY_ALGO_ECDH
-                        || algo == PUBKEY_ALGO_ECDSA)
+                        || algo == PUBKEY_ALGO_ECDSA
+                        || algo == GCRY_PK_ECDH
+                        || algo == GCRY_PK_ECDSA)
                     && (!strcmp (curvename, "brainpoolP256r1")
                         || !strcmp (curvename, "brainpoolP384r1")
                         || !strcmp (curvename, "brainpoolP512r1")));
@@ -292,6 +302,7 @@
           break;
 
 	case PUBKEY_ALGO_ECDH:
+	case GCRY_PK_ECDH:
 	  if (use == PK_USE_DECRYPTION)
             result = 1;
           else if (use == PK_USE_ENCRYPTION)
@@ -316,6 +327,7 @@
           break;
 
 	case PUBKEY_ALGO_ECDSA:
+	case GCRY_PK_ECDSA:
           if (use == PK_USE_VERIFICATION)
             result = 1;
           else
@@ -341,6 +353,10 @@
 
 
 	case PUBKEY_ALGO_EDDSA:
+          if (use == PK_USE_VERIFICATION)
+            result = 1;
+          else /* We may not create such signatures in de-vs mode.  */
+            result = 0;
 	  break;
 
 	default:

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/compliance.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/compliance.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/dotlock.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/dotlock.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/dynload.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/dynload.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/exechelp-posix.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/exechelp-posix.c Changed

@@ -31,7 +31,7 @@
 
 #include <config.h>
 
-#if defined(HAVE_W32_SYSTEM) || defined (HAVE_W32CE_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
 #error This code is only used on POSIX
 #endif
 
@@ -277,7 +277,7 @@
 static void
 do_exec (const char *pgmname, const char *argv,
 int fd_in, int fd_out, int fd_err,
- int *except, void (*preexec)(void), unsigned int flags)
+ int *except, unsigned int flags)
 {
 char **arg_list;
 int i, j;
@@ -334,8 +334,6 @@
 /* Close all other files. */
 close_all_fds (3, except);
 
- if (preexec)
- preexec ();
 execv (pgmname, arg_list);
 /* No way to print anything, as we have closed all streams. */
 _exit (127);
@@ -437,7 +435,7 @@
 /* Fork and exec the PGMNAME, see exechelp.h for details. */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv,
- int *except, void (*preexec)(void), unsigned int flags,
+ int *except, unsigned int flags,
 estream_t *r_infp,
 estream_t *r_outfp,
 estream_t *r_errfp,
@@ -544,7 +542,7 @@
 es_fclose (outfp);
 es_fclose (errfp);
 do_exec (pgmname, argv, inpipe0, outpipe1, errpipe1,
- except, preexec, flags);
+ except, flags);
 /*NOTREACHED*/
 }
 
@@ -594,7 +592,7 @@
 {
 gcry_control (GCRYCTL_TERM_SECMEM);
 /* Run child. */
- do_exec (pgmname, argv, infd, outfd, errfd, NULL, NULL, 0);
+ do_exec (pgmname, argv, infd, outfd, errfd, NULL, 0);
 /*NOTREACHED*/
 }
 
@@ -893,7 +891,7 @@
 for (i=0; envpi; i++)
 putenv (xstrdup (envpi));
 
- do_exec (pgmname, argv, -1, -1, -1, NULL, NULL, 0);
+ do_exec (pgmname, argv, -1, -1, -1, NULL, 0);
 
 /*NOTREACHED*/
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/exechelp-w32.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/exechelp-w32.c Changed

@@ -31,7 +31,7 @@
 
 #include <config.h>
 
-#if !defined(HAVE_W32_SYSTEM) || defined (HAVE_W32CE_SYSTEM)
+#if !defined(HAVE_W32_SYSTEM)
 #error This code is only used on W32.
 #endif
 
@@ -410,7 +410,7 @@
 /* Fork and exec the PGMNAME, see exechelp.h for details. */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv,
- int *except, void (*preexec)(void), unsigned int flags,
+ int *except, unsigned int flags,
 estream_t *r_infp,
 estream_t *r_outfp,
 estream_t *r_errfp,
@@ -564,10 +564,6 @@
 nullhd2 = ((flags & GNUPG_SPAWN_KEEP_STDOUT)?
 GetStdHandle (STD_ERROR_HANDLE) : w32_open_null (1));
 
- /* Start the process. Note that we can't run the PREEXEC function
- because this might change our own environment. */
- (void)preexec;
-
 memset (&si, 0, sizeof si);
 si.cb = sizeof (si);
 si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/exechelp.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/exechelp.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/exectool.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/exectool.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/gettime.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/gettime.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/homedir.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/homedir.c Changed

@@ -154,6 +154,42 @@
 }
 #endif /*HAVE_W32_SYSTEM*/
 
+/* Given the directory name DNAME try to create a common.conf and
+ * enable the keyboxd.  This should only be called for the standard
+ * home directory and only if that directory has just been created.  */
+static void
+create_common_conf (const char *dname)
+{
+#ifdef BUILD_WITH_KEYBOXD
+  estream_t fp;
+  char *fcommon;
+
+  fcommon = make_filename (dname, "common.conf", NULL);
+  fp = es_fopen (fcommon, "wx,mode=-rw-r");
+  if (!fp)
+    {
+      log_info (_("error creating '%s': %s\n"), fcommon,
+                gpg_strerror (gpg_error_from_syserror ()));
+    }
+  else
+    {
+      if (es_fputs ("use-keyboxd\n", fp) == EOF)
+        {
+          log_info (_("error writing to '%s': %s\n"), fcommon,
+                    gpg_strerror (es_ferror (fp)
+                                  ? gpg_error_from_syserror ()
+                                  : gpg_error (GPG_ERR_EOF)));
+          es_fclose (fp);
+        }
+      else if (es_fclose (fp))
+        {
+          log_info (_("error closing '%s': %s\n"), fcommon,
+                    gpg_strerror (gpg_error_from_syserror ()));
+        }
+    }
+#endif /* BUILD_WITH_KEYBOXD */
+}
+
 
 /* Check whether DIR is the default homedir.  */
 static int
@@ -259,7 +295,9 @@
 
               /* Try to create the directory if it does not yet exists.  */
               if (gnupg_access (dir, F_OK))
-                gnupg_mkdir (dir, "-rwx");
+                if (!gnupg_mkdir (dir, "-rwx"))
+                  create_common_conf (dir);
+
             }
           else
             dir = GNUPG_DEFAULT_HOMEDIR;
@@ -473,6 +511,7 @@
       char *rootdir;
       char *sysconfdir;
       const char *name;
+      int ignoreall = 0;
 
       for (;;)
         {
@@ -590,6 +629,16 @@
               name = "sysconfdir";
               p = line + 12;
             }
+          else if (!strncmp (line, ".enable=", 8))
+            {
+              name = ".enable";
+              p = line + 8;
+            }
+          else if (!strncmp (line, ".enable =", 9))
+            {
+              name = ".enable";
+              p = line + 9;
+            }
           else
             continue;
           trim_spaces (p);
@@ -600,6 +649,17 @@
               log_info ("error getting %s from gpgconf.ctl: %s\n",
                         name, gpg_strerror (err));
             }
+          else if (!strcmp (name, ".enable"))
+            {
+              if (atoi (p)
+                  || !ascii_strcasecmp (p, "yes")
+                  || !ascii_strcasecmp (p, "true")
+                  || !ascii_strcasecmp (p, "fact"))
+                ;  /* Yes, this file shall be used.    */
+              else
+                ignoreall = 1; /* No, this file shall be ignored.  */
+              xfree (p);
+            }
           else if (!strcmp (name, "sysconfdir"))
             {
               xfree (sysconfdir);
@@ -627,7 +687,13 @@
       xfree (buffer);
       xfree (line);
 
-      if (!rootdir || !*rootdir || *rootdir != '/')
+      if (ignoreall)
+        {
+          xfree (rootdir);
+          xfree (sysconfdir);
+          sdir = dir = NULL;
+        }
+      else if (!rootdir || !*rootdir || *rootdir != '/')
         {
           log_info ("invalid rootdir '%s' specified in gpgconf.ctl\n", rootdir);
           xfree (rootdir);
@@ -761,8 +827,12 @@
       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 );
+      else
+        {
+          if (!quiet )
+            log_info ( _("directory '%s' created\n"), fname );
+          create_common_conf (fname);
+        }
     }
 }
 
@@ -1592,6 +1662,12 @@
     case GNUPG_MODULE_NAME_GPGCONF:
       X(bindir, "tools", "gpgconf");
 
+    case GNUPG_MODULE_NAME_CARD:
+      X(bindir, "tools", "gpg-card");
+
+    case GNUPG_MODULE_NAME_GPGTAR:
+      X(bindir, "tools", "gpgtar");
+
     default:
       BUG ();
     }

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/init.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/init.c Changed

@@ -30,14 +30,14 @@
 #include <config.h>
 
 #ifdef HAVE_W32_SYSTEM
+# if _WIN32_WINNT < 0x0600
+# define _WIN32_WINNT 0x0600 /* Required for SetProcessDEPPolicy. */
+# endif
 # ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
 # endif
 # include <windows.h>
 #endif
-#ifdef HAVE_W32CE_SYSTEM
-# include <assuan.h> /* For _assuan_w32ce_finish_pipe. */
-#endif
 
 #include <gcrypt.h>
 #include "util.h"
@@ -69,16 +69,6 @@
 gpg_err_source_t default_errsource = 0;
 
 
-#ifdef HAVE_W32CE_SYSTEM
-static void parse_std_file_handles (int *argcp, char ***argvp);
-static void
-sleep_on_exit (void)
-{
- /* The sshd on CE swallows some of the command output. Sleeping a
- while usually helps. */
- Sleep (400);
-}
-#endif /*HAVE_W32CE_SYSTEM*/
 
 #if HAVE_W32_SYSTEM
 static void prepare_w32_commandline (int *argcp, char ***argvp);
@@ -178,14 +168,6 @@
 }
 #endif
 
-#ifdef HAVE_W32CE_SYSTEM
- /* Register the sleep exit function before the estream init so that
- the sleep will be called after the estream registered atexit
- function which flushes the left open estream streams and in
- particular es_stdout. */
- atexit (sleep_on_exit);
-#endif
-
 if (!gcry_check_version (NEED_LIBGCRYPT_VERSION))
 {
 log_fatal (_("%s is too old (need %s, have %s)\n"), "libgcrypt",
@@ -196,11 +178,6 @@
 gpgrt_init ();
 gpgrt_set_alloc_func (gcry_realloc);
 
-#ifdef HAVE_W32CE_SYSTEM
- /* Special hack for Windows CE: We extract some options from arg
- to setup the standard handles. */
- parse_std_file_handles (argcp, argvp);
-#endif
 
 #ifdef HAVE_W32_SYSTEM
 /* We want gettext to always output UTF-8 and we put the console in
@@ -239,7 +216,21 @@
 log_set_socket_dir_cb (gnupg_socketdir);
 
 #if HAVE_W32_SYSTEM
- /* For Standard Windows we use our own parser for the command line
+ /* Make sure that Data Execution Prevention is enabled. */
+ if (GetSystemDEPPolicy () >= 2)
+ {
+ DWORD flags;
+ BOOL perm;
+
+ if (!GetProcessDEPPolicy (GetCurrentProcess (), &flags, &perm))
+ log_info ("error getting DEP policy: %s\n",
+ w32_strerror (GetLastError()));
+ else if (!(flags & PROCESS_DEP_ENABLE)
+ && !SetProcessDEPPolicy (PROCESS_DEP_ENABLE))
+ log_info ("Warning: Enabling DEP failed: %s (%d,%d)\n",
+ w32_strerror (GetLastError ()), (int)flags, (int)perm);
+ }
+ /* On Windows we use our own parser for the command line
 * so that we can return an array of utf-8 encoded strings. */
 prepare_w32_commandline (argcp, argvp);
 #else
@@ -251,77 +242,6 @@
 
 
 
-/* WindowsCE uses a very strange way of handling the standard streams.
- There is a function SetStdioPath to associate a standard stream
- with a file or a device but what we really want is to use pipes as
- standard streams. Despite that we implement pipes using a device,
- we would have some limitations on the number of open pipes due to
- the 3 character limit of device file name. Thus we don't take this
- path. Another option would be to install a file system driver with
- support for pipes; this would allow us to get rid of the device
- name length limitation. However, with GnuPG we can get away be
- redefining the standard streams and passing the handles to be used
- on the command line. This has also the advantage that it makes
- creating a process much easier and does not require the
- SetStdioPath set and restore game. The caller needs to pass the
- rendezvous ids using up to three options:
-
- -&S0=<rvid> -&S1=<rvid> -&S2=<rvid>
-
- They are all optional but they must be the first arguments on the
- command line. Parsing stops as soon as an invalid option is found.
- These rendezvous ids are then used to finish the pipe creation.*/
-#ifdef HAVE_W32CE_SYSTEM
-static void
-parse_std_file_handles (int *argcp, char ***argvp)
-{
- int argc = *argcp;
- char **argv = *argvp;
- const char *s;
- assuan_fd_t fd;
- int i;
- int fixup = 0;
-
- if (!argc)
- return;
-
- for (argc--, argv++; argc; argc--, argv++)
- {
- s = *argv;
- if (*s == '-' && s1 == '&' && s2 == 'S'
- && (s3 == '0' || s3 == '1' || s3 == '2')
- && s4 == '='
- && (strchr ("-01234567890", s5) || !strcmp (s+5, "null")))
- {
- if (s5 == 'n')
- fd = ASSUAN_INVALID_FD;
- else
- fd = _assuan_w32ce_finish_pipe (atoi (s+5), s3 != '0');
- _es_set_std_fd (s3 - '0', (int)fd);
- fixup++;
- }
- else
- break;
- }
-
- if (fixup)
- {
- argc = *argcp;
- argc -= fixup;
- *argcp = argc;
-
- argv = *argvp;
- for (i=1; i < argc; i++)
- argvi = argvi + fixup;
- for (; i < argc + fixup; i++)
- argvi = NULL;
- }
-
-
-}
-#endif /*HAVE_W32CE_SYSTEM*/
-
-
 /* For Windows we need to parse the command line so that we can
 * provide an UTF-8 encoded argv. If there is any Unicode character
 * we return a new array but if there is no Unicode character we do

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/init.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/init.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/iobuf.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/iobuf.c Changed

@@ -1,7 +1,7 @@
 /* iobuf.c - File Handling for OpenPGP.
 * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2007, 2008,
 * 2009, 2010, 2011 Free Software Foundation, Inc.
- * Copyright (C) 2015 g10 Code GmbH
+ * Copyright (C) 2015, 2023 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -27,6 +27,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: (LGPL-3.0-or-later OR GPL-2.0-or-later)
 */
 
 #include <config.h>
@@ -35,7 +36,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -78,13 +78,8 @@
 
 
 #ifdef HAVE_W32_SYSTEM
-# ifdef HAVE_W32CE_SYSTEM
-# define FD_FOR_STDIN (es_fileno (es_stdin))
-# define FD_FOR_STDOUT (es_fileno (es_stdout))
-# else
-# define FD_FOR_STDIN (GetStdHandle (STD_INPUT_HANDLE))
-# define FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE))
-# endif
+# define FD_FOR_STDIN (GetStdHandle (STD_INPUT_HANDLE))
+# define FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE))
 #else /*!HAVE_W32_SYSTEM*/
 # define FD_FOR_STDIN (0)
 # define FD_FOR_STDOUT (1)
@@ -100,6 +95,9 @@
 int eof_seen;
 int delayed_rc;
 int print_only_name; /* Flags indicating that fname is not a real file. */
+ char peeked32; /* Read ahead buffer. */
+ byte npeeked; /* Number of bytes valid in peeked. */
+ byte upeeked; /* Number of bytes used from peeked. */
 char fname1; /* Name of the file. */
 } file_filter_ctx_t;
 
@@ -212,7 +210,7 @@
 close_cache_t cc;
 int rc = 0;
 
- assert (fname);
+ log_assert (fname);
 if (DBG_IOBUF)
 log_debug ("fd_cache_invalidate (%s)\n", fname);
 
@@ -313,6 +311,13 @@
 {
 hfile = CreateFileW (wfname, da, sm, NULL, cd,
 FILE_ATTRIBUTE_NORMAL, NULL);
+ if (hfile == INVALID_HANDLE_VALUE)
+ {
+ gnupg_w32_set_errno (-1);
+ if (DBG_IOBUF)
+ log_debug ("iobuf:direct_open '%s' CreateFile failed: %s\n",
+ fname, gpg_strerror (gpg_error_from_syserror()));
+ }
 xfree (wfname);
 }
 else
@@ -375,7 +380,7 @@
 {
 close_cache_t cc;
 
- assert (fp);
+ log_assert (fp);
 if (!fname || !*fname)
 {
 #ifdef HAVE_W32_SYSTEM
@@ -416,7 +421,7 @@
 {
 close_cache_t cc;
 
- assert (fname);
+ log_assert (fname);
 for (cc = close_cache; cc; cc = cc->next)
 {
 if (cc->fp != GNUPG_INVALID_FD && !fd_cache_strcmp (cc->fname, fname))
@@ -428,8 +433,9 @@
 #ifdef HAVE_W32_SYSTEM
 	 if (SetFilePointer (fp, 0, NULL, FILE_BEGIN) == 0xffffffff)
 	 {
-	 log_error ("rewind file failed on handle %p: ec=%d\n",
-			 fp, (int) GetLastError ());
+ int ec = (int) GetLastError ();
+	 log_error ("rewind file failed on handle %p: ec=%d\n", fp, ec);
+ gnupg_w32_set_errno (ec);
 	 fp = GNUPG_INVALID_FD;
 	 }
 #else
@@ -463,7 +469,16 @@
 if (control == IOBUFCTRL_UNDERFLOW)
 {
 log_assert (size); /* We need a buffer. */
- if (a->eof_seen)
+ if (a->npeeked > a->upeeked)
+ {
+ nbytes = a->npeeked - a->upeeked;
+ if (nbytes > size)
+ nbytes = size;
+ memcpy (buf, a->peeked + a->upeeked, nbytes);
+ a->upeeked += nbytes;
+ *ret_len = nbytes;
+ }
+ else if (a->eof_seen)
 	{
 	 rc = -1;
 	 *ret_len = 0;
@@ -488,7 +503,8 @@
 	 if (ec != ERROR_BROKEN_PIPE)
 		{
 		 rc = gpg_error_from_errno (ec);
-		 log_error ("%s: read error: ec=%d\n", a->fname, ec);
+		 log_error ("%s: read error: %s (ec=%d)\n",
+ a->fname, gpg_strerror (rc), ec);
 		}
 	 }
 	 else if (!nread)
@@ -556,9 +572,10 @@
 	 {
 	 if (size && !WriteFile (f, p, nbytes, &n, NULL))
 		{
-		 int ec = (int) GetLastError ();
-		 rc = gpg_error_from_errno (ec);
-		 log_error ("%s: write error: ec=%d\n", a->fname, ec);
+		 int ec = gnupg_w32_set_errno (-1);
+		 rc = gpg_error_from_syserror ();
+		 log_error ("%s: write error: %s (ec=%d)\n",
+ a->fname, gpg_strerror (rc), ec);
 		 break;
 		}
 	 p += n;
@@ -601,6 +618,74 @@
 a->delayed_rc = 0;
 a->keep_open = 0;
 a->no_cache = 0;
+ a->npeeked = 0;
+ a->upeeked = 0;
+ }
+ else if (control == IOBUFCTRL_PEEK)
+ {
+ /* Peek on the input. */
+#ifdef HAVE_W32_SYSTEM
+ unsigned long nread;
+
+ nbytes = 0;
+ if (!ReadFile (f, a->peeked, sizeof a->peeked, &nread, NULL))
+ {
+ int ec = (int) GetLastError ();
+ if (ec != ERROR_BROKEN_PIPE)
+ {
+ rc = gpg_error_from_errno (ec);
+ log_error ("%s: read error: %s (ec=%d)\n",
+ a->fname, gpg_strerror (rc), ec);
+ }
+ a->npeeked = 0;
+ }
+ else if (!nread)
+ {
+ a->eof_seen = 1;
+ a->npeeked = 0;
+ }
+ else
+ {
+ a->npeeked = nread;
+ }
+
+#else /* Unix */
+
+ int n;
+
+ peek_more:
+ do
+ {
+ n = read (f, a->peeked + a->npeeked, sizeof a->peeked - a->npeeked);
+ }
+ while (n == -1 && errno == EINTR);
+ if (n > 0)
+ {
+ a->npeeked += n;
+ if (a->npeeked < sizeof a->peeked)
+ goto peek_more;
+ }
+ else if (!n) /* eof */
+ {
+ if (a->npeeked)
+ a->delayed_rc = -1;
+ else
+ a->eof_seen = 1;
+ }
+ else /* error */
+ {
+ rc = gpg_error_from_syserror ();
+ if (gpg_err_code (rc) != GPG_ERR_EPIPE)
+ log_error ("%s: read error: %s\n", a->fname, gpg_strerror (rc));
+ if (a->npeeked)
+ a->delayed_rc = rc;
+ }
+#endif /* Unix */
+
+ size = a->npeeked < size? a->npeeked : size;
+ memcpy (buf, a->peeked, size);
+ *ret_len = size;
+ rc = 0; /* Return success - the user needs to check ret_len. */
 }
 else if (control == IOBUFCTRL_DESC)
 {
@@ -637,7 +722,7 @@
 
 if (control == IOBUFCTRL_UNDERFLOW)
 {
- assert (size); /* We need a buffer. */
+ log_assert (size); /* We need a buffer. */
 if (a->eof_seen)
 	{
 	 rc = -1;
@@ -756,7 +841,7 @@
 
 if (control == IOBUFCTRL_UNDERFLOW)
 {
- assert (size);		/* need a buffer */
+ log_assert (size);		/* need a buffer */
 if (a->eof_seen)
 	{
 	 rc = -1;
@@ -799,7 +884,8 @@
 	 if (n == SOCKET_ERROR)
 		{
 		 int ec = (int) WSAGetLastError ();
-		 rc = gpg_error_from_errno (ec);
+		 gnupg_w32_set_errno (ec);
+		 rc = gpg_error_from_syserror ();
 		 log_error ("socket write error: ec=%d\n", ec);
 		 break;
 		}
@@ -851,7 +937,7 @@
 size_t n = 0;
 
 p = buf;
- assert (size);		/* need a buffer */
+ log_assert (size);	/* need a buffer */
 if (a->eof)		/* don't read any further */
 	rc = -1;
 while (!rc && size)
@@ -979,7 +1065,7 @@
 	{			/* the complicated openpgp scheme */
 	 size_t blen, n, nbytes = size + a->buflen;
 
-	 assert (a->buflen <= OP_MIN_PARTIAL_CHUNK);
+	 log_assert (a->buflen <= OP_MIN_PARTIAL_CHUNK);
 	 if (nbytes < OP_MIN_PARTIAL_CHUNK)
 	 {
 	 /* not enough to write a partial block out; so we store it */
@@ -1003,12 +1089,12 @@
 		 blen /= 2;
 		 c--;
 		 /* write the partial length header */
-		 assert (c <= 0x1f);	/*;-) */
+		 log_assert (c <= 0x1f);	/*;-) */
 		 c |= 0xe0;
 		 iobuf_put (chain, c);
 		 if ((n = a->buflen))
 		 {		/* write stuff from the buffer */
-		 assert (n == OP_MIN_PARTIAL_CHUNK);
+		 log_assert (n == OP_MIN_PARTIAL_CHUNK);
 		 if (iobuf_write (chain, a->buffer, n))
 			rc = gpg_error_from_syserror ();
 		 a->buflen = 0;
@@ -1025,8 +1111,8 @@
 	 /* store the rest in the buffer */
 	 if (!rc && nbytes)
 		{
-		 assert (!a->buflen);
-		 assert (nbytes < OP_MIN_PARTIAL_CHUNK);
+		 log_assert (!a->buflen);
+		 log_assert (nbytes < OP_MIN_PARTIAL_CHUNK);
 		 if (!a->buffer)
 		 a->buffer = xmalloc (OP_MIN_PARTIAL_CHUNK);
 		 memcpy (a->buffer, p, nbytes);
@@ -1188,8 +1274,8 @@
 iobuf_t a;
 static int number = 0;
 
- assert (use == IOBUF_INPUT || use == IOBUF_INPUT_TEMP
-	 || use == IOBUF_OUTPUT || use == IOBUF_OUTPUT_TEMP);
+ log_assert (use == IOBUF_INPUT || use == IOBUF_INPUT_TEMP
+ || use == IOBUF_OUTPUT || use == IOBUF_OUTPUT_TEMP);
 if (bufsize == 0)
 {
 log_bug ("iobuf_alloc() passed a bufsize of 0!\n");
@@ -1287,14 +1373,8 @@
 {
 /* Argg, MSDOS does not allow removing open files. So
 * we have to do it here */
-#ifdef HAVE_W32CE_SYSTEM
- wchar_t *wtmp = utf8_to_wchar (remove_name);
- if (wtmp)
- DeleteFile (wtmp);
- xfree (wtmp);
-#else
- remove (remove_name);
-#endif
+ gnupg_remove (remove_name);
+
 xfree (remove_name);
 }
 #endif
@@ -1315,7 +1395,7 @@
 int i;
 
 a = iobuf_alloc (IOBUF_INPUT_TEMP, length);
- assert (length == a->d.size);
+ log_assert (length == a->d.size);
 /* memcpy (a->d.buf, buffer, length); */
 for (i=0; i < length; i++)
 a->d.bufi = bufferi;
@@ -1346,7 +1426,7 @@
 int fd;
 byte descMAX_IOBUF_DESC;
 
- assert (use == IOBUF_INPUT || use == IOBUF_OUTPUT);
+ log_assert (use == IOBUF_INPUT || use == IOBUF_OUTPUT);
 
 if (special_filenames
 /* NULL or '-'. */
@@ -1587,6 +1667,25 @@
 return fd_cache_synchronize (ptrval);
 }
 }
+ else if (cmd == IOBUF_IOCTL_PEEK)
+ {
+ /* Peek at a justed opened file. Use this only directly after a
+ * file has been opened for reading. Don't use it after you did
+ * a seek. This works only if just file filter has been
+ * pushed. Expects a buffer wit size INTVAL at PTRVAL and returns
+ * the number of bytes put into the buffer. */
+ if (DBG_IOBUF)
+	log_debug ("iobuf-%d.%d: ioctl '%s' peek\n",
+		 a ? a->no : -1, a ? a->subno : -1, iobuf_desc (a, desc));
+ if (a->filter == file_filter && ptrval && intval)
+ {
+ file_filter_ctx_t *fcx = a->filter_ov;
+ size_t len = intval;
+
+ if (!file_filter (fcx, IOBUFCTRL_PEEK, NULL, ptrval, &len))
+ return (int)len;
+ }
+ }
 
 
 return -1;
@@ -1766,13 +1865,13 @@
 if (a->use == IOBUF_INPUT_TEMP || a->use == IOBUF_OUTPUT_TEMP)
 {
 /* This should be the last filter in the pipeline. */
- assert (! a->chain);
+ log_assert (! a->chain);
 return 0;
 }
 if (!a->filter)
 {				/* this is simple */
 b = a->chain;
- assert (b);
+ log_assert (b);
 xfree (a->d.buf);
 xfree (a->real_fname);
 memcpy (a, b, sizeof *a);
@@ -1867,14 +1966,14 @@
 buffer. */
 return -1;
 
- assert (a->use == IOBUF_INPUT);
+ log_assert (a->use == IOBUF_INPUT);
 
 a->e_d.used = 0;
 
 /* If there is still some buffered data, then move it to the start
 of the buffer and try to fill the end of the buffer. (This is
 useful if we are called from iobuf_peek().) */
- assert (a->d.start <= a->d.len);
+ log_assert (a->d.start <= a->d.len);
 a->d.len -= a->d.start;
 if (a->d.len)
 memmove (a->d.buf, &a->d.bufa->d.start, a->d.len);
@@ -2038,7 +2137,7 @@
 	}
 }
 
- assert (a->d.start <= a->d.len);
+ log_assert (a->d.start <= a->d.len);
 if (a->e_d.used > 0)
 return 0;
 if (a->d.start < a->d.len)
@@ -2118,7 +2217,7 @@
 return -1;
 }
 
- assert (a->d.start <= a->d.len);
+ log_assert (a->d.start <= a->d.len);
 
 if (a->nlimit && a->nbytes >= a->nlimit)
 return -1;			/* forced EOF */
@@ -2130,7 +2229,7 @@
 else if ((c = underflow (a, 1)) == -1)
 return -1;			/* EOF */
 
- assert (a->d.start <= a->d.len);
+ log_assert (a->d.start <= a->d.len);
 
 /* Note: if underflow doesn't return EOF, then it returns the first
 byte that was read and advances a->d.start appropriately. */
@@ -2255,8 +2354,8 @@
 {
 int n = 0;
 
- assert (buflen > 0);
- assert (a->use == IOBUF_INPUT || a->use == IOBUF_INPUT_TEMP);
+ log_assert (buflen > 0);
+ log_assert (a->use == IOBUF_INPUT || a->use == IOBUF_INPUT_TEMP);
 
 if (buflen > a->d.size)
 /* We can't peek more than we can buffer. */
@@ -2272,7 +2371,7 @@
 
 /* Underflow consumes the first character (it's the return
 	 value). unget() it by resetting the "file position". */
- assert (a->d.start == 1);
+ log_assert (a->d.start == 1);
 a->d.start = 0;
 }
 
@@ -2307,7 +2406,7 @@
 if ((rc=filter_flush (a)))
 return rc;
 
- assert (a->d.len < a->d.size);
+ log_assert (a->d.len < a->d.size);
 a->d.bufa->d.len++ = c;
 return 0;
 }
@@ -2408,8 +2507,8 @@
 int
 iobuf_write_temp (iobuf_t dest, iobuf_t source)
 {
- assert (source->use == IOBUF_OUTPUT || source->use == IOBUF_OUTPUT_TEMP);
- assert (dest->use == IOBUF_OUTPUT || dest->use == IOBUF_OUTPUT_TEMP);
+ log_assert (source->use == IOBUF_OUTPUT || source->use == IOBUF_OUTPUT_TEMP);
+ log_assert (dest->use == IOBUF_OUTPUT || dest->use == IOBUF_OUTPUT_TEMP);
 
 iobuf_flush_temp (source);
 return iobuf_write (dest, source->d.buf, source->d.len);
@@ -2441,7 +2540,7 @@
 
 /* Copies the data from the input iobuf SOURCE to the output iobuf
 DEST until either an error is encountered or EOF is reached.
- Returns the number of bytes copies. */
+ Returns the number of bytes copies or (size_t)(-1) on error. */
 size_t
 iobuf_copy (iobuf_t dest, iobuf_t source)
 {
@@ -2452,11 +2551,11 @@
 size_t max_read = 0;
 int err;
 
- assert (source->use == IOBUF_INPUT || source->use == IOBUF_INPUT_TEMP);
- assert (dest->use == IOBUF_OUTPUT || source->use == IOBUF_OUTPUT_TEMP);
+ log_assert (source->use == IOBUF_INPUT || source->use == IOBUF_INPUT_TEMP);
+ log_assert (dest->use == IOBUF_OUTPUT || source->use == IOBUF_OUTPUT_TEMP);
 
 if (iobuf_error (dest))
- return -1;
+ return (size_t)(-1);
 
 /* Use iobuf buffer size for temporary buffer. */
 temp_size = iobuf_set_buffer_size(0) * 1024;
@@ -2510,13 +2609,10 @@
 }
 
 
-
-off_t
-iobuf_get_filelength (iobuf_t a, int *overflow)
+/* Return the length of the file behind A. If there is no file, return 0. */
+uint64_t
+iobuf_get_filelength (iobuf_t a)
 {
- if (overflow)
- *overflow = 0;
-
 /* Hmmm: file_filter may have already been removed */
 for ( ; a->chain; a = a->chain )
 ;
@@ -2529,56 +2625,18 @@
 gnupg_fd_t fp = b->fp;
 
 #if defined(HAVE_W32_SYSTEM)
- ulong size;
- static int (* __stdcall get_file_size_ex) (void *handle,
-					 LARGE_INTEGER *r_size);
- static int get_file_size_ex_initialized;
-
- if (!get_file_size_ex_initialized)
- {
-	void *handle;
-
-	handle = dlopen ("kernel32.dll", RTLD_LAZY);
-	if (handle)
-	 {
-	 get_file_size_ex = dlsym (handle, "GetFileSizeEx");
-	 if (!get_file_size_ex)
-	 dlclose (handle);
-	 }
-	get_file_size_ex_initialized = 1;
- }
+ LARGE_INTEGER exsize;
 
- if (get_file_size_ex)
- {
-	/* This is a newer system with GetFileSizeEx; we use this
-	 then because it seem that GetFileSize won't return a
-	 proper error in case a file is larger than 4GB. */
-	LARGE_INTEGER exsize;
-
-	if (get_file_size_ex (fp, &exsize))
-	 {
-	 if (!exsize.u.HighPart)
-	 return exsize.u.LowPart;
-	 if (overflow)
-	 *overflow = 1;
-	 return 0;
-	 }
- }
- else
- {
-	if ((size=GetFileSize (fp, NULL)) != 0xffffffff)
-	 return size;
- }
+ if (GetFileSizeEx (fp, &exsize))
+ return exsize.QuadPart;
 log_error ("GetFileSize for handle %p failed: %s\n",
 	 fp, w32_strerror (-1));
 #else /*!HAVE_W32_SYSTEM*/
- {
- struct stat st;
+ struct stat st;
 
- if ( !fstat (FD2INT (fp), &st) )
- return st.st_size;
- log_error("fstat() failed: %s\n", strerror(errno) );
- }
+ if ( !fstat (fp, &st) )
+ return st.st_size;
+ log_error("fstat() failed: %s\n", strerror(errno) );
 #endif /*!HAVE_W32_SYSTEM*/
 }
 
@@ -2793,7 +2851,7 @@
 NUL character in the buffer. This requires at least 2 bytes. We
 don't complicate the code by handling the stupid corner case, but
 simply assert that it can't happen. */
- assert (!buffer || length >= 2 || maxlen >= 2);
+ log_assert (!buffer || length >= 2 || maxlen >= 2);
 
 if (!buffer || length <= 1)
 /* must allocate a new buffer */
@@ -2864,7 +2922,7 @@
 	 /* p is pointing at the last byte in the buffer. We
 		 always terminate the line with "\n\0" so overwrite
 		 the previous byte with a \n. */
-	 assert (p > buffer);
+	 log_assert (p > buffer);
 	 p-1 = '\n';
 
 	 /* Indicate truncation. */
@@ -2893,12 +2951,7 @@
 static int
 translate_file_handle (int fd, int for_write)
 {
-#if defined(HAVE_W32CE_SYSTEM)
- /* This is called only with one of the special filenames. Under
- W32CE the FD here is not a file descriptor but a rendezvous id,
- thus we need to finish the pipe first. */
- fd = _assuan_w32ce_finish_pipe (fd, for_write);
-#elif defined(HAVE_W32_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
 {
 int x;

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/iobuf.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/iobuf.h Changed

@@ -106,6 +106,7 @@
     IOBUFCTRL_FLUSH     = 4,
     IOBUFCTRL_DESC	= 5,
     IOBUFCTRL_CANCEL    = 6,
+    IOBUFCTRL_PEEK      = 7,
     IOBUFCTRL_USER	= 16
   };
 
@@ -116,7 +117,8 @@
     IOBUF_IOCTL_KEEP_OPEN        = 1, /* Uses intval.  */
     IOBUF_IOCTL_INVALIDATE_CACHE = 2, /* Uses ptrval.  */
     IOBUF_IOCTL_NO_CACHE         = 3, /* Uses intval.  */
-    IOBUF_IOCTL_FSYNC            = 4  /* Uses ptrval.  */
+    IOBUF_IOCTL_FSYNC            = 4, /* Uses ptrval.  */
+    IOBUF_IOCTL_PEEK             = 5  /* Uses intval and ptrval.  */
   } iobuf_ioctl_t;
 
 enum iobuf_use
@@ -582,12 +584,8 @@
 size_t iobuf_copy (iobuf_t dest, iobuf_t source);
 
 /* Return the size of any underlying file.  This only works with
-   file_filter based pipelines.
-
-   On Win32, it is sometimes not possible to determine the size of
-   files larger than 4GB.  In this case, *OVERFLOW (if not NULL) is
-   set to 1.  Otherwise, *OVERFLOW is set to 0.  */
-off_t iobuf_get_filelength (iobuf_t a, int *overflow);
+   file_filter based pipelines.  */
+uint64_t iobuf_get_filelength (iobuf_t a);
 #define IOBUF_FILELENGTH_LIMIT 0xffffffff
 
 /* Return the file descriptor designating the underlying file.  This

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/ksba-io-support.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/ksba-io-support.c Changed

@@ -1,6 +1,6 @@
 /* kska-io-support.c - Supporting functions for ksba reader and writer
 * Copyright (C) 2001-2005, 2007, 2010-2011, 2017 Werner Koch
- * Copyright (C) 2006 g10 Code GmbH
+ * Copyright (C) 2006, 2023 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -26,6 +26,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: (LGPL-3.0-or-later OR GPL-2.0-or-later)
 */
 
 #include <config.h>
@@ -40,6 +41,7 @@
 
 #include "util.h"
 #include "i18n.h"
+#include "tlv.h"
 #include "ksba-io-support.h"
 
 
@@ -65,6 +67,12 @@
 int autodetect; /* Try to detect the input encoding. */
 int assume_pem; /* Assume input encoding is PEM. */
 int assume_base64; /* Assume input is base64 encoded. */
+ int strip_zeroes; /* Expect a SEQUENCE followed by zero padding. */
+ /* 1 = check state; 2 = reading; 3 = checking */
+ /* for zeroes. */
+ int use_maxread; /* If true read not more than MAXREAD. */
+ unsigned int maxread; /* # of bytes left to read. */
+ off_t nzeroes; /* Number of padding zeroes red. */
 
 int identified;
 int is_pem;
@@ -89,6 +97,15 @@
 
 char *pem_name; /* Malloced. */
 
+ struct {
+ gnupg_ksba_progress_cb_t cb;
+ ctrl_t ctrl;
+ u32 last_time;		/* last time reported */
+ uint64_t last;		/* last amount reported */
+ uint64_t current;	 /* current amount */
+ uint64_t total;	 /* total amount */
+ } progress;
+
 int wrote_begin;
 int did_finish;
 
@@ -103,6 +120,7 @@
 
 /* Context for this module's functions. */
 struct gnupg_ksba_io_s {
+ int is_writer; /* True if this context refers a writer object. */
 union {
 struct reader_cb_parm_s rparm;
 struct writer_cb_parm_s wparm;
@@ -390,6 +408,55 @@
 }
 
 
+/* Read up to 10 bytes to test whether the data consist of a sequence;
+ * if that is true, set the limited flag and record the length of the
+ * entire sequence in PARM. Unget everything then. Return true if we
+ * have a sequence with a fixed length. */
+static int
+starts_with_sequence (struct reader_cb_parm_s *parm)
+{
+ gpg_error_t err;
+ unsigned char peekbuf10;
+ int npeeked, c;
+ int found = 0;
+ const unsigned char *p;
+ size_t n, objlen, hdrlen;
+ int class, tag, constructed, ndef;
+
+ for (npeeked=0; npeeked < sizeof peekbuf; npeeked++)
+ {
+ c = es_getc (parm->fp);
+ if (c == EOF)
+ goto leave;
+ peekbufnpeeked = c;
+ }
+ /* Enough to check for a sequence. */
+
+ p = peekbuf;
+ n = npeeked;
+ err = parse_ber_header (&p, &n, &class, &tag, &constructed,
+ &ndef, &objlen, &hdrlen);
+ if (err)
+ {
+ log_debug ("%s: error parsing data: %s\n", __func__, gpg_strerror (err));
+ goto leave;
+ }
+
+ if (class == CLASS_UNIVERSAL && constructed && tag == TAG_SEQUENCE && !ndef)
+ {
+ /* We need to add 1 due to the way we implement the limit. */
+ parm->maxread = objlen + hdrlen + 1;
+ if (!(parm->maxread < objlen + hdrlen) && parm->maxread)
+ parm->use_maxread = 1;
+ found = 1;
+ }
+
+ leave:
+ while (npeeked)
+ es_ungetc (peekbuf--npeeked, parm->fp);
+ return found;
+}
+
 
 static int
 simple_reader_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
@@ -402,9 +469,55 @@
 if (!buffer)
 return -1; /* not supported */
 
+ restart:
+ if (parm->strip_zeroes)
+ {
+ if (parm->strip_zeroes == 1)
+ {
+ if (starts_with_sequence (parm))
+ parm->strip_zeroes = 2; /* Found fixed length sequence. */
+ else
+ parm->strip_zeroes = 0; /* Disable zero padding check. */
+ }
+ else if (parm->strip_zeroes == 3)
+ {
+ /* Limit reached - check that only zeroes follow. */
+ while (!(c = es_getc (parm->fp)))
+ parm->nzeroes++;
+ if (c == EOF)
+ { /* only zeroes found. Reset zero padding engine and
+ * return EOF. */
+ parm->strip_zeroes = 0;
+ parm->eof_seen = 1;
+ return -1;
+ }
+ /* Not only zeroes. Reset engine and continue. */
+ parm->strip_zeroes = 0;
+ }
+ }
+
 for (n=0; n < count; n++)
 {
- c = es_getc (parm->fp);
+ if (parm->use_maxread && !--parm->maxread)
+ {
+ parm->use_maxread = 0;
+ if (parm->strip_zeroes)
+ {
+ parm->strip_zeroes = 3;
+ parm->nzeroes = 0;
+ if (n)
+ goto leave; /* Return what we already got. */
+ goto restart; /* Immediately check for trailing zeroes. */
+ }
+ }
+
+ if (parm->nzeroes)
+ {
+ parm->nzeroes--;
+ c = 0;
+ }
+ else
+ c = es_getc (parm->fp);
 if (c == EOF)
 {
 parm->eof_seen = 1;
@@ -417,6 +530,7 @@
 *(byte *)buffer++ = c;
 }
 
+ leave:
 *nread = n;
 return 0;
 }
@@ -424,6 +538,33 @@
 
 
 &#xc;
+/* Call the progress callback if its time. We do this very 2 seconds
+ * or if FORCE is set. However, we also require that at least 64KiB
+ * have been written to avoid unnecessary progress lines for small
+ * files. */
+static gpg_error_t
+update_write_progress (struct writer_cb_parm_s *parm, size_t count, int force)
+{
+ gpg_error_t err = 0;
+ u32 timestamp;
+
+ parm->progress.current += count;
+ if (parm->progress.current >= (64*1024))
+ {
+ timestamp = make_timestamp ();
+ if (force || (timestamp - parm->progress.last_time > 1))
+ {
+ parm->progress.last = parm->progress.current;
+ parm->progress.last_time = timestamp;
+ err = parm->progress.cb (parm->progress.ctrl,
+ parm->progress.current,
+ parm->progress.total);
+ }
+ }
+ return err;
+}
+
+
 static int
 base64_writer_cb (void *cb_value, const void *buffer, size_t count)
 {
@@ -432,6 +573,8 @@
 int i, c, idx, quad_count;
 const unsigned char *p;
 estream_t stream = parm->stream;
+ int rc;
+ size_t nleft;
 
 if (!count)
 return 0;
@@ -454,7 +597,7 @@
 for (i=0; i < idx; i++)
 radbufi = parm->base64.radbufi;
 
- for (p=buffer; count; p++, count--)
+ for (p=buffer, nleft = count; nleft; p++, nleft--)
 {
 radbufidx++ = *p;
 if (idx > 2)
@@ -480,7 +623,11 @@
 parm->base64.idx = idx;
 parm->base64.quad_count = quad_count;
 
- return es_ferror (stream)? gpg_error_from_syserror () : 0;
+ rc = es_ferror (stream)? gpg_error_from_syserror () : 0;
+ /* Note that we use the unencoded count for the progress. */
+ if (!rc && parm->progress.cb)
+ rc = update_write_progress (parm, count, 0);
+ return rc;
 }
 
 
@@ -491,13 +638,16 @@
 {
 struct writer_cb_parm_s *parm = cb_value;
 estream_t stream = parm->stream;
+ int rc;
 
 if (!count)
 return 0;
 
 es_write (stream, buffer, count, NULL);
-
- return es_ferror (stream)? gpg_error_from_syserror () : 0;
+ rc = es_ferror (stream)? gpg_error_from_syserror () : 0;
+ if (!rc && parm->progress.cb)
+ rc = update_write_progress (parm, count, 0);
+ return rc;
 }
 
 
@@ -507,6 +657,7 @@
 unsigned char *radbuf;
 int c, idx, quad_count;
 estream_t stream = parm->stream;
+ int rc;
 
 if (!parm->wrote_begin)
 return 0; /* Nothing written or we are not called in base-64 mode. */
@@ -553,7 +704,10 @@
 es_fputs ("-----\n", stream);
 }
 
- return es_ferror (stream)? gpg_error_from_syserror () : 0;
+ rc = es_ferror (stream)? gpg_error_from_syserror () : 0;
+ if (!rc && parm->progress.cb)
+ rc = update_write_progress (parm, 0, 1);
+ return rc;
 }
 
 
@@ -575,6 +729,7 @@
 * GNUPG_KSBA_IO_MULTIPEM - The reader expects that the caller uses
 * ksba_reader_clear after EOF until no more
 * objects were found.
+ * GNUPG_KSBA_IO_STRIP - Strip zero padding from some CMS objects.
 *
 * Note that the PEM flag has a higher priority than the BASE64 flag
 * which in turn has a gight priority than the AUTODETECT flag.
@@ -592,6 +747,7 @@
 if (!*ctx)
 return out_of_core ();
 (*ctx)->u.rparm.allow_multi_pem = !!(flags & GNUPG_KSBA_IO_MULTIPEM);
+ (*ctx)->u.rparm.strip_zeroes = !!(flags & GNUPG_KSBA_IO_STRIP);
 
 rc = ksba_reader_new (&r);
 if (rc)
@@ -683,6 +839,7 @@
 *ctx = xtrycalloc (1, sizeof **ctx);
 if (!*ctx)
 return gpg_error_from_syserror ();
+ (*ctx)->is_writer = 1;
 
 rc = ksba_writer_new (&w);
 if (rc)
@@ -760,3 +917,37 @@
 xfree (ctx->u.wparm.pem_name);
 xfree (ctx);
 }
+
+
+/* Set a callback to the writer object. CTRL will be bassed to the
+ * callback. */
+void
+gnupg_ksba_set_progress_cb (gnupg_ksba_io_t ctx,
+ gnupg_ksba_progress_cb_t cb, ctrl_t ctrl)
+{
+ struct writer_cb_parm_s *parm;
+
+ if (!ctx || !ctx->is_writer)
+ return; /* Currently only supported for writer objects. */
+ parm = &ctx->u.wparm;
+
+ parm->progress.cb = cb;
+ parm->progress.ctrl = ctrl;
+ parm->progress.last_time = 0;
+ parm->progress.last = 0;
+ parm->progress.current = 0;
+ parm->progress.total = 0;
+}
+
+
+/* Update the total count for the progress thingy. */
+void
+gnupg_ksba_set_total (gnupg_ksba_io_t ctx, uint64_t total)
+{
+ struct writer_cb_parm_s *parm;
+
+ if (!ctx || !ctx->is_writer)
+ return; /* Currently only supported for writer objects. */
+ parm = &ctx->u.wparm;
+ parm->progress.total = total;
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/ksba-io-support.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/ksba-io-support.h Changed

@@ -25,6 +25,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: (LGPL-3.0-or-later OR GPL-2.0-or-later)
 */
 
 #ifndef GNUPG_KSBA_IO_SUPPORT_H
@@ -36,11 +37,16 @@
 #define GNUPG_KSBA_IO_BASE64 2 /* Plain Base64 format. */
 #define GNUPG_KSBA_IO_AUTODETECT 4 /* Try to autodetect the format. */
 #define GNUPG_KSBA_IO_MULTIPEM 8 /* Allow more than one PEM chunk. */
+#define GNUPG_KSBA_IO_STRIP 16 /* Strip off zero padding. */
 
 
 /* Context object. */
 typedef struct gnupg_ksba_io_s *gnupg_ksba_io_t;
 
+/* Progress callback type. */
+typedef gpg_error_t (*gnupg_ksba_progress_cb_t)(ctrl_t ctrl,
+ uint64_t current,
+ uint64_t total);
 
 
 gpg_error_t gnupg_ksba_create_reader (gnupg_ksba_io_t *ctx,
@@ -56,10 +62,13 @@
 const char *pem_name,
 estream_t stream,
 ksba_writer_t *r_writer);
-
 gpg_error_t gnupg_ksba_finish_writer (gnupg_ksba_io_t ctx);
 void gnupg_ksba_destroy_writer (gnupg_ksba_io_t ctx);
 
+void gnupg_ksba_set_progress_cb (gnupg_ksba_io_t ctx,
+ gnupg_ksba_progress_cb_t cb, ctrl_t ctrl);
+void gnupg_ksba_set_total (gnupg_ksba_io_t ctx, uint64_t total);
+

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/mapstrings.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/mapstrings.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/miscellaneous.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/miscellaneous.c Changed

@@ -418,7 +418,7 @@
 /* Check whether (BUF,LEN) is valid header for an OpenPGP compressed
 * packet. LEN should be at least 6. */
 static int
-is_openpgp_compressed_packet (unsigned char *buf, size_t len)
+is_openpgp_compressed_packet (const unsigned char *buf, size_t len)
 {
 int c, ctb, pkttype;
 int lenbytes;
@@ -460,63 +460,64 @@
 
 
 /*
- * Check if the file is compressed.
+ * Check if the file is compressed. You need to pass the first bytes
+ * of the file as (BUF,BUFLEN). Returns true if the buffer seems to
+ * be compressed.
 */
 int
-is_file_compressed (const char *s, int *ret_rc)
+is_file_compressed (const byte *buf, unsigned int buflen)
 {
- iobuf_t a;
- byte buf6;
- int i;
- int rc = 0;
- int overflow;
-
- struct magic_compress_s {
- size_t len;
- byte magic4;
- } magic = {
- { 3, { 0x42, 0x5a, 0x68, 0x00 } }, /* bzip2 */
- { 3, { 0x1f, 0x8b, 0x08, 0x00 } }, /* gzip */
- { 4, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */
- };
-
- if ( iobuf_is_pipe_filename (s) || !ret_rc )
- return 0; /* We can't check stdin or no file was given */
-
- a = iobuf_open( s );
- if ( a == NULL ) {
- *ret_rc = gpg_error_from_syserror ();
- return 0;
- }
- iobuf_ioctl (a, IOBUF_IOCTL_NO_CACHE, 1, NULL);
-
- if ( iobuf_get_filelength( a, &overflow ) < 6 && !overflow) {
- *ret_rc = 0;
- goto leave;
- }
-
- if ( iobuf_read( a, buf, 6 ) == -1 ) {
- *ret_rc = a->error;
- goto leave;
+ int i;
+
+ struct magic_compress_s
+ {
+ byte len;
+ byte extchk;
+ byte magic5;
+ } magic =
+ {
+ { 3, 0, { 0x42, 0x5a, 0x68, 0x00 } }, /* bzip2 */
+ { 3, 0, { 0x1f, 0x8b, 0x08, 0x00 } }, /* gzip */
+ { 4, 0, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */
+ { 5, 0, { '%', 'P', 'D', 'F', '-'} }, /* PDF */
+ { 4, 1, { 0xff, 0xd8, 0xff, 0xe0 } }, /* Maybe JFIF */
+ { 5, 2, { 0x89, 'P','N','G', 0x0d} } /* Likely PNG */
+ };
+
+ if ( buflen < 6 )
+ {
+ return 0; /* Too short to check - assume uncompressed. */
 }
 
- for ( i = 0; i < DIM( magic ); i++ ) {
- if ( !memcmp( buf, magici.magic, magici.len ) ) {
- *ret_rc = 0;
- rc = 1;
- goto leave;
+ for ( i = 0; i < DIM (magic); i++ )
+ {
+ if (!memcmp( buf, magici.magic, magici.len))
+ {
+ switch (magici.extchk)
+ {
+ case 0:
+ return 1; /* Is compressed. */
+ case 1:
+ if (buflen > 11 && !memcmp (buf + 6, "JFIF", 5))
+ return 1; /* JFIF: this likely a compressed JPEG. */
+ break;
+ case 2:
+ if (buflen > 8
+ && buf5 == 0x0a && buf6 == 0x1a && buf7 == 0x0a)
+ return 1; /* This is a PNG. */
+ break;
+ default:
+ break;
+ }
 }
 }
 
- if (is_openpgp_compressed_packet (buf, 6))
- {
- *ret_rc = 0;
- rc = 1;
- }
+ if (buflen >= 6 && is_openpgp_compressed_packet (buf, buflen))
+ {
+ return 1; /* Already compressed. */
+ }
 
- leave:
- iobuf_close( a );
- return rc;
+ return 0; /* Not detected as compressed. */
 }
 
 
@@ -712,3 +713,83 @@
 *debugvar |= result;
 return 0;
 }
+
+
+&#xc;
+/* Parse an --comaptibility_flags style argument consisting of comma
+ * separated strings.
+ *
+ * Returns: 0 on success or -1 and ERRNO set on error. On success the
+ * supplied variable is updated by the parsed flags.
+ *
+ * If STRING is NULL the enabled flags are printed.
+ */
+int
+parse_compatibility_flags (const char *string, unsigned int *flagvar,
+ const struct compatibility_flags_s *flags)
+
+{
+ unsigned long result = 0;
+ int i, j;
+
+ if (!string)
+ {
+ if (flagvar)
+ {
+ log_info ("enabled compatibility flags:");
+ for (i=0; flagsi.name; i++)
+ if ((*flagvar & flagsi.flag))
+ log_printf (" %s", flagsi.name);
+ log_printf ("\n");
+ }
+ return 0;
+ }
+
+ while (spacep (string))
+ string++;
+
+ if (!strcmp (string, "?") || !strcmp (string, "help"))
+ {
+ log_info ("available compatibility flags:\n");
+ for (i=0; flagsi.name; i++)
+ log_info (" %s\n", flagsi.name);
+ if (flagsi.flag != 77)
+ exit (0);
+ }
+ else
+ {
+ char **words;
+ words = strtokenize (string, ",");
+ if (!words)
+ return -1;
+ for (i=0; wordsi; i++)
+ {
+ if (*wordsi)
+ {
+ for (j=0; flagsj.name; j++)
+ if (!strcmp (wordsi, flagsj.name))
+ {
+ result |= flagsj.flag;
+ break;
+ }
+ if (!flagsj.name)
+ {
+ if (!strcmp (wordsi, "none"))
+ {
+ *flagvar = 0;
+ result = 0;
+ }
+ else if (!strcmp (wordsi, "all"))
+ result = ~0;
+ else
+ log_info ("unknown compatibility flag '%s' ignored\n",
+ wordsi);
+ }
+ }
+ }
+ xfree (words);
+ }
+
+ *flagvar |= result;
+ return 0;
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/mischelp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/mischelp.c Changed

@@ -80,35 +80,30 @@
 #ifdef HAVE_W32_SYSTEM
       HANDLE file1, file2;
       BY_HANDLE_FILE_INFORMATION info1, info2;
+      wchar_t *wname;
+
+      wname = gpgrt_fname_to_wchar (name1);
+      if (wname)
+        {
+          file1 = CreateFileW (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
+          xfree (wname);
+        }
+      else
+        file1 = INVALID_HANDLE_VALUE;
 
-#ifdef HAVE_W32CE_SYSTEM
-      {
-        wchar_t *wname = utf8_to_wchar (name1);
-        if (wname)
-          file1 = CreateFile (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-        else
-          file1 = INVALID_HANDLE_VALUE;
-        xfree (wname);
-      }
-#else
-      file1 = CreateFile (name1, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-#endif
       if (file1 == INVALID_HANDLE_VALUE)
         yes = 0; /* If we can't open the file, it is not the same.  */
       else
         {
-#ifdef HAVE_W32CE_SYSTEM
-          {
-            wchar_t *wname = utf8_to_wchar (name2);
-            if (wname)
-              file2 = CreateFile (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-            else
-              file2 = INVALID_HANDLE_VALUE;
-            xfree (wname);
-          }
-#else
-          file2 = CreateFile (name2, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-#endif
+          wname = gpgrt_fname_to_wchar (name2);
+          if (wname)
+            {
+              file2 = CreateFileW (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
+              xfree (wname);
+            }
+          else
+            file2 = INVALID_HANDLE_VALUE;
+
           if (file2 == INVALID_HANDLE_VALUE)
             yes = 0; /* If we can't open the file, it is not the same.  */
           else

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/name-value.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/name-value.c Changed

@@ -497,6 +497,30 @@
 }
 
 
+/* Update entry E to VALUE.  */
+gpg_error_t
+nve_set (nve_t e, const char *value)
+{
+  char *v;
+
+  if (!e)
+    return GPG_ERR_INV_ARG;
+
+  v = xtrystrdup (value? value:"");
+  if (!v)
+    return my_error_from_syserror ();
+
+  free_strlist_wipe (e->raw_value);
+  e->raw_value = NULL;
+  if (e->value)
+    wipememory (e->value, strlen (e->value));
+  xfree (e->value);
+  e->value = v;
+
+  return 0;
+}
+
+
 /* Delete the given entry from PK.  */
 void
 nvc_delete (nvc_t pk, nve_t entry)
@@ -538,21 +562,32 @@
 nvc_first (nvc_t pk)
 {
   nve_t entry;
+
+  if (!pk)
+    return NULL;
+
   for (entry = pk->first; entry; entry = entry->next)
     if (entry->name)
       return entry;
+
   return NULL;
 }
 
 
-/* Get the first entry with the given name.  */
+/* Get the first entry with the given name.  Return NULL if it does
+ * not exist.  */
 nve_t
 nvc_lookup (nvc_t pk, const char *name)
 {
   nve_t entry;
+
+  if (!pk)
+    return NULL;
+
   for (entry = pk->first; entry; entry = entry->next)
     if (entry->name && ascii_strcasecmp (entry->name, name) == 0)
       return entry;
+
   return NULL;
 }
 
@@ -581,7 +616,7 @@
 
 /* Return the string for the first entry in NVC with NAME.  If an
  * entry with NAME is missing in NVC or its value is the empty string
- * NULL is returned.  Note that the The returned string is a pointer
+ * NULL is returned.  Note that the the returned string is a pointer
  * into NVC.  */
 const char *
 nvc_get_string (nvc_t nvc, const char *name)
@@ -597,6 +632,32 @@
 }
 
 
+/* Return true (ie. a non-zero value) if NAME exists and its value is
+ * true; that is either "yes", "true", or a decimal value unequal to 0.  */
+int
+nvc_get_boolean (nvc_t nvc, const char *name)
+{
+  nve_t item;
+  const char *s;
+  int n;
+
+  if (!nvc)
+    return 0;
+  item = nvc_lookup (nvc, name);
+  if (!item)
+    return 0;
+  s = nve_value (item);
+  if (!s)
+    return 0;
+  n = atoi (s);
+  if (n)
+    return n;
+  if (!ascii_strcasecmp (s, "yes") || !ascii_strcasecmp (s, "true"))
+    return 1;
+  return 0;
+}
+
+
 &#xc;
 
 /* Private key handling.  */

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/name-value.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/name-value.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/openpgp-oid.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/openpgp-oid.c Changed

@@ -48,6 +48,8 @@
 
 { "Curve25519", "1.3.6.1.4.1.3029.1.5.1", 255, "cv25519", PUBKEY_ALGO_ECDH },
 { "Ed25519", "1.3.6.1.4.1.11591.15.1", 255, "ed25519", PUBKEY_ALGO_EDDSA },
+ { "Curve25519", "1.3.101.110", 255, "cv25519", PUBKEY_ALGO_ECDH },
+ { "Ed25519", "1.3.101.112", 255, "ed25519", PUBKEY_ALGO_EDDSA },
 { "X448", "1.3.101.111", 448, "cv448", PUBKEY_ALGO_ECDH },
 { "Ed448", "1.3.101.113", 456, "ed448", PUBKEY_ALGO_EDDSA },
 
@@ -65,13 +67,17 @@
 };
 
 
-/* The OID for Curve Ed25519 in OpenPGP format. */
+/* The OID for Curve Ed25519 in OpenPGP format. The shorter v5
+ * variant may only be used with v5 keys. */
 static const char oid_ed25519 =
 { 0x09, 0x2b, 0x06, 0x01, 0x04, 0x01, 0xda, 0x47, 0x0f, 0x01 };
+static const char oid_ed25519_v5 = { 0x03, 0x2b, 0x65, 0x70 };
 
-/* The OID for Curve25519 in OpenPGP format. */
+/* The OID for Curve25519 in OpenPGP format. The shorter v5
+ * variant may only be used with v5 keys. */
 static const char oid_cv25519 =
 { 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x97, 0x55, 0x01, 0x05, 0x01 };
+static const char oid_cv25519_v5 = { 0x03, 0x2b, 0x65, 0x6e };
 
 /* The OID for X448 in OpenPGP format. */
 /*
@@ -321,8 +327,12 @@
 int
 openpgp_oidbuf_is_ed25519 (const void *buf, size_t len)
 {
- return (buf && len == DIM (oid_ed25519)
- && !memcmp (buf, oid_ed25519, DIM (oid_ed25519)));
+ if (!buf)
+ return 0;
+ return ((len == DIM (oid_ed25519)
+ && !memcmp (buf, oid_ed25519, DIM (oid_ed25519)))
+ || (len == DIM (oid_ed25519_v5)
+ && !memcmp (buf, oid_ed25519_v5, DIM (oid_ed25519_v5))));
 }
 
 
@@ -345,8 +355,12 @@
 int
 openpgp_oidbuf_is_cv25519 (const void *buf, size_t len)
 {
- return (buf && len == DIM (oid_cv25519)
- && !memcmp (buf, oid_cv25519, DIM (oid_cv25519)));
+ if (!buf)
+ return 0;
+ return ((len == DIM (oid_cv25519)
+ && !memcmp (buf, oid_cv25519, DIM (oid_cv25519)))
+ || (len == DIM (oid_cv25519_v5)
+ && !memcmp (buf, oid_cv25519_v5, DIM (oid_cv25519_v5))));
 }
 
 
@@ -430,8 +444,9 @@
 if (name)
 {
 for (i=0; oidtablei.name; i++)
- if (!strcmp (oidtablei.name, name)
- || (oidtablei.alias && !strcmp (oidtablei.alias, name)))
+ if (!ascii_strcasecmp (oidtablei.name, name)
+ || (oidtablei.alias
+ && !ascii_strcasecmp (oidtablei.alias, name)))
 {
 oidstr = oidtablei.oidstr;
 nbits = oidtablei.nbits;
@@ -443,7 +458,7 @@
 /* If not found assume the input is already an OID and check
 whether we support it. */
 for (i=0; oidtablei.name; i++)
- if (!strcmp (name, oidtablei.oidstr))
+ if (!ascii_strcasecmp (name, oidtablei.oidstr))
 {
 oidstr = oidtablei.oidstr;
 nbits = oidtablei.nbits;
@@ -492,9 +507,10 @@
 return NULL;
 
 for (i=0; oidtablei.name; i++)
- if (!strcmp (oidtablei.oidstr, oidname)
- || !strcmp (oidtablei.name, oidname)
- || (oidtablei.alias &&!strcmp (oidtablei.alias, oidname)))
+ if (!ascii_strcasecmp (oidtablei.oidstr, oidname)
+ || !ascii_strcasecmp (oidtablei.name, oidname)
+ || (oidtablei.alias
+ && !ascii_strcasecmp (oidtablei.alias, oidname)))
 return !canon && oidtablei.alias? oidtablei.alias : oidtablei.name;
 
 return NULL;
@@ -556,8 +572,9 @@
 *r_nbits = 0;
 for (idx = 0; idx < DIM (oidtable) && oidtableidx.name; idx++)
 {
- if ((!strcmp (name, oidtableidx.name)
- || (oidtableidx.alias && !strcmp (name, (oidtableidx.alias))))
+ if ((!ascii_strcasecmp (name, oidtableidx.name)
+ || (oidtableidx.alias
+ && !ascii_strcasecmp (name, (oidtableidx.alias))))
 && curve_supported_p (oidtableidx.name))
 {
 if (r_algo)
@@ -658,8 +675,8 @@
 for (i=0; i < keyalgo_strings_used; i++)
 {
 if (keyalgo_stringsi.algo == algo
- && keyalgo_stringsi.curve
- && !strcmp (keyalgo_stringsi.curve, curve))
+ && keyalgo_stringsi.curve && curve
+ && !ascii_strcasecmp (keyalgo_stringsi.curve, curve))
 return keyalgo_stringsi.name;
 }
 
@@ -672,7 +689,7 @@
 else
 name = xasprintf ("E_error");
 nbits = 0;
- curvebuf = xstrdup (curve);
+ curvebuf = curve? xstrdup (curve) : NULL;
 }
 else
 {

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/recsel.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/recsel.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/sexputil.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/sexputil.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/signal.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/signal.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/ssh-utils.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/ssh-utils.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/status-codes.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/status-codes.h Changed

@@ -48,6 +48,7 @@
 "TRUST_ULTIMATE" "\0"
 "NEED_PASSPHRASE" "\0"
 "VALIDSIG" "\0"
+ "ASSERT_SIGNER" "\0"
 "SIG_ID" "\0"
 "ENC_TO" "\0"
 "NODATA" "\0"
@@ -154,95 +155,96 @@
 136,
 152,
 161,
- 168,
 175,
 182,
- 197,
- 207,
- 217,
- 237,
- 252,
- 268,
- 286,
- 302,
- 321,
- 337,
- 345,
- 352,
+ 189,
+ 196,
+ 211,
+ 221,
+ 231,
+ 251,
+ 266,
+ 282,
+ 300,
+ 316,
+ 335,
+ 351,
 359,
- 368,
- 378,
- 393,
- 404,
- 417,
- 426,
- 437,
- 448,
- 458,
- 469,
- 486,
- 501,
- 518,
- 533,
+ 366,
+ 373,
+ 382,
+ 392,
+ 407,
+ 418,
+ 431,
+ 440,
+ 451,
+ 462,
+ 472,
+ 483,
+ 500,
+ 515,
+ 532,
 547,
- 562,
- 571,
- 580,
- 591,
- 598,
- 607,
- 619,
- 631,
+ 561,
+ 576,
+ 585,
+ 594,
+ 605,
+ 612,
+ 621,
+ 633,
 645,
- 660,
+ 659,
 674,
- 685,
- 697,
- 709,
- 720,
- 729,
- 738,
- 746,
- 754,
- 769,
- 784,
- 795,
- 806,
- 813,
- 823,
- 833,
- 843,
- 850,
+ 688,
+ 699,
+ 711,
+ 723,
+ 734,
+ 743,
+ 752,
+ 760,
+ 768,
+ 783,
+ 798,
+ 809,
+ 820,
+ 827,
+ 837,
+ 847,
+ 857,
 864,
- 874,
- 891,
- 907,
- 927,
- 936,
+ 878,
+ 888,
+ 905,
+ 921,
+ 941,
 950,
 964,
- 983,
+ 978,
 997,
- 1012,
- 1022,
- 1033,
- 1050,
- 1066,
- 1093,
- 1120,
- 1149,
- 1159,
- 1170,
- 1179,
- 1197,
- 1215,
- 1221,
+ 1011,
+ 1026,
+ 1036,
+ 1047,
+ 1064,
+ 1080,
+ 1107,
+ 1134,
+ 1163,
+ 1173,
+ 1184,
+ 1193,
+ 1211,
 1229,
- 1237,
- 1245,
+ 1235,
+ 1243,
+ 1251,
+ 1259,
 
 };
 
 #define statusstr_msgidxof(code) (0 ? -1 \
- : ((code >= 0) && (code <= 101)) ? (code - 0) \
+ : ((code >= 0) && (code <= 102)) ? (code - 0) \
 : -1)

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/status.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/status.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/status.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/status.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/stringhelp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/stringhelp.c Changed

@@ -783,11 +783,6 @@
 
 if (ec == -1)
 ec = (int)GetLastError ();
-#ifdef HAVE_W32CE_SYSTEM
- /* There is only a wchar_t FormatMessage. It does not make much
- sense to play the conversion game; we print only the code. */
- snprintf (strerr, sizeof strerr, "ec=%d", (int)GetLastError ());
-#else
 FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, ec,
 MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
 strerr, DIM (strerr)-1, NULL);
@@ -797,7 +792,6 @@
 if (n > 2 && strerrn-2 == '\r' && strerrn-1 == '\n' )
 strerrn-2 = 0;
 }
-#endif
 return strerr;
 }
 #endif /*HAVE_W32_SYSTEM*/
@@ -1695,10 +1689,16 @@
 }
 
 
-/* Substitute environment variables in STRING and return a new string.
- * On error the function returns NULL. */
+/* Substitute variables in STRING and return a new string. GETVAL is
+ * a function which maps NAME to its value; that value is a string
+ * which may not change during the execution time of this function.
+ * If GETVAL returns NULL substitute_vars returns NULL and the caller
+ * may inspect ERRNO for the reason. In all other error cases this
+ * function also returns NULL. Caller must free the returned string. */
 char *
-substitute_envvars (const char *string)
+substitute_vars (const char *string,
+ const char *(*getval)(void *cookie, const char *name),
+ void *cookie)
 {
 char *line, *p, *pend;
 const char *value;
@@ -1749,19 +1749,22 @@
 {
 int save = *pend;
 *pend = 0;
- value = getenv (p+2);
+ value = getval (cookie, p+2);
 *pend++ = save;
 }
 else
 {
 int save = *pend;
 *pend = 0;
- value = getenv (p+1);
+ value = getval (cookie, p+1);
 *pend = save;
 }
 
 if (!value)
- value = "";
+ {
+ xfree (result);
+ return NULL;
+ }
 valuelen = strlen (value);
 if (valuelen <= pend - p)
 {
@@ -1797,3 +1800,26 @@
 leave:
 return result;
 }
+
+
+/* Helper for substitute_envvars. */
+static const char *
+subst_getenv (void *cookie, const char *name)
+{
+ const char *s;
+
+ (void)cookie;
+
+ s = getenv (name);
+ return s? s : "";
+}
+
+
+/* Substitute environment variables in STRING and return a new string.
+ * On error the function returns NULL. */
+char *
+substitute_envvars (const char *string)
+{
+ return substitute_vars (string, subst_getenv, NULL);
+
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/stringhelp.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/stringhelp.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/sysutils.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/sysutils.c Changed

@@ -252,6 +252,9 @@
 case ERROR_ALREADY_EXISTS:
 return EEXIST;
 
+ case ERROR_FILE_INVALID:
+ return EIO;
+
 /* This mapping has been taken from reactOS. */
 case ERROR_TOO_MANY_OPEN_FILES: return EMFILE;
 case ERROR_ARENA_TRASHED: return ENOMEM;
@@ -324,9 +327,10 @@
 #endif /*HAVE_W32_SYSTEM*/
 
 
-/* Set ERRNO from the Windows error. EC may be -1 to use the last error. */
+/* Set ERRNO from the Windows error. EC may be -1 to use the last
+ * error. Returns the Windows error code. */
 #ifdef HAVE_W32_SYSTEM
-void
+int
 gnupg_w32_set_errno (int ec)
 {
 /* FIXME: Replace by gpgrt_w32_set_errno. */
@@ -535,10 +539,7 @@
 int
 translate_sys2libc_fd (gnupg_fd_t fd, int for_write)
 {
-#if defined(HAVE_W32CE_SYSTEM)
- (void)for_write;
- return (int) fd;
-#elif defined(HAVE_W32_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
 int x;
 
 if (fd == GNUPG_INVALID_FD)
@@ -563,10 +564,7 @@
 int
 translate_sys2libc_fd_int (int fd, int for_write)
 {
-#if HAVE_W32CE_SYSTEM
- fd = (int) _assuan_w32ce_finish_pipe (fd, for_write);
- return translate_sys2libc_fd ((void*)fd, for_write);
-#elif HAVE_W32_SYSTEM
+#ifdef HAVE_W32_SYSTEM
 if (fd <= 2)
 return fd;	/* Do not do this for error, stdin, stdout, stderr. */
 
@@ -611,18 +609,11 @@
 {
 #ifdef HAVE_W32_SYSTEM
 int attempts, n;
-#ifdef HAVE_W32CE_SYSTEM
- wchar_t bufferMAX_PATH+7+12+1;
-# define mystrlen(a) wcslen (a)
- wchar_t *name, *p;
-#else
 char bufferMAX_PATH+7+12+1;
-# define mystrlen(a) strlen (a)
 char *name, *p;
-#endif
 HANDLE file;
 int pid = GetCurrentProcessId ();
- unsigned int value;
+ unsigned int value = 0;
 int i;
 SECURITY_ATTRIBUTES sec_attr;
 
@@ -631,18 +622,13 @@
 sec_attr.bInheritHandle = TRUE;
 
 n = GetTempPath (MAX_PATH+1, buffer);
- if (!n || n > MAX_PATH || mystrlen (buffer) > MAX_PATH)
+ if (!n || n > MAX_PATH || strlen (buffer) > MAX_PATH)
 {
 gpg_err_set_errno (ENOENT);
 return NULL;
 }
- p = buffer + mystrlen (buffer);
-#ifdef HAVE_W32CE_SYSTEM
- wcscpy (p, L"_gnupg");
- p += 7;
-#else
+ p = buffer + strlen (buffer);
 p = stpcpy (p, "_gnupg");
-#endif
 /* We try to create the directory but don't care about an error as
 it may already exist and the CreateFile would throw an error
 anyway. */
@@ -652,17 +638,10 @@
 for (attempts=0; attempts < 10; attempts++)
 {
 p = name;
- value = (GetTickCount () ^ ((pid<<16) & 0xffff0000));
+ value += (GetTickCount () ^ ((pid<<16) & 0xffff0000));
 for (i=0; i < 8; i++)
- {
- *p++ = tohex (((value >> 28) & 0x0f));
- value <<= 4;
- }
-#ifdef HAVE_W32CE_SYSTEM
- wcscpy (p, L".tmp");
-#else
+	*p++ = tohex (((value >> (7 - i)*4) & 0x0f));
 strcpy (p, ".tmp");
-#endif
 file = CreateFile (buffer,
 GENERIC_READ | GENERIC_WRITE,
 0,
@@ -673,10 +652,6 @@
 if (file != INVALID_HANDLE_VALUE)
 {
 FILE *fp;
-#ifdef HAVE_W32CE_SYSTEM
- int fd = (int)file;
- fp = _wfdopen (fd, L"w+b");
-#else
 int fd = _open_osfhandle ((intptr_t)file, 0);
 if (fd == -1)
 {
@@ -684,7 +659,6 @@
 return NULL;
 }
 fp = fdopen (fd, "w+b");
-#endif
 if (!fp)
 {
 int save = errno;
@@ -698,9 +672,11 @@
 }
 gpg_err_set_errno (ENOENT);
 return NULL;
-#undef mystrlen
+
 #else /*!HAVE_W32_SYSTEM*/
+
 return tmpfile ();
+
 #endif /*!HAVE_W32_SYSTEM*/
 }
 
@@ -799,12 +775,16 @@
 if (!pid)
 log_info ("%s called with invalid pid %lu\n",
 "gnupg_allow_set_foregound_window", (unsigned long)pid);
-#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
 else if (inhibit_set_foregound_window)
 ;
 else if (!AllowSetForegroundWindow ((pid_t)pid == (pid_t)(-1)?ASFW_ANY:pid))
- log_info ("AllowSetForegroundWindow(%lu) failed: %s\n",
- (unsigned long)pid, w32_strerror (-1));
+ {
+ char *flags = getenv ("GNUPG_EXEC_DEBUG_FLAGS");
+ if (flags && (atoi (flags) & 2))
+ log_info ("AllowSetForegroundWindow(%lu) failed: %s\n",
+ (unsigned long)pid, w32_strerror (-1));
+ }
 #endif
 }
 
@@ -1148,13 +1128,7 @@
 int
 gnupg_setenv (const char *name, const char *value, int overwrite)
 {
-#ifdef HAVE_W32CE_SYSTEM
- (void)name;
- (void)value;
- (void)overwrite;
- return 0;
-#else /*!W32CE*/
-# ifdef HAVE_W32_SYSTEM
+#ifdef HAVE_W32_SYSTEM
 /* Windows maintains (at least) two sets of environment variables.
 One set can be accessed by GetEnvironmentVariable and
 SetEnvironmentVariable. This set is inherited by the children.
@@ -1172,11 +1146,11 @@
 return -1;
 }
 }
-# endif /*W32*/
+#endif /*W32*/
 
-# ifdef HAVE_SETENV
+#ifdef HAVE_SETENV
 return setenv (name, value, overwrite);
-# else /*!HAVE_SETENV*/
+#else /*!HAVE_SETENV*/
 if (! getenv (name) || overwrite)
 {
 char *buf;
@@ -1196,19 +1170,14 @@
 return putenv (buf);
 }
 return 0;
-# endif /*!HAVE_SETENV*/
-#endif /*!W32CE*/
+#endif /*!HAVE_SETENV*/
 }
 
 
 int
 gnupg_unsetenv (const char *name)
 {
-#ifdef HAVE_W32CE_SYSTEM
- (void)name;
- return 0;
-#else /*!W32CE*/
-# ifdef HAVE_W32_SYSTEM
+#ifdef HAVE_W32_SYSTEM
 /* Windows maintains (at least) two sets of environment variables.
 One set can be accessed by GetEnvironmentVariable and
 SetEnvironmentVariable. This set is inherited by the children.
@@ -1220,29 +1189,37 @@
 gpg_err_set_errno (EINVAL); /* (Might also be ENOMEM.) */
 return -1;
 }
-# endif /*W32*/
+#endif /*W32*/
 
-# ifdef HAVE_UNSETENV
+#ifdef HAVE_UNSETENV
 return unsetenv (name);
-# else /*!HAVE_UNSETENV*/
+#else /*!HAVE_UNSETENV*/
 {
 char *buf;
+ int r;
 
 if (!name)
 {
 gpg_err_set_errno (EINVAL);
 return -1;
 }
- buf = xtrystrdup (name);
+ buf = strconcat (name, "=", NULL);
 if (!buf)
 return -1;
+
+ r = putenv (buf);
+# ifdef HAVE_W32_SYSTEM
+ /* For Microsoft implementation, we can free the memory in this
+ use case. */
+ xfree (buf);
+# else
 # if __GNUC__
 # warning no unsetenv - trying putenv but leaking memory.
 # endif
- return putenv (buf);
+# endif
+ return r;
 }
-# endif /*!HAVE_UNSETENV*/
-#endif /*!W32CE*/
+#endif /*!HAVE_UNSETENV*/
 }
 
 
@@ -1270,10 +1247,20 @@
 gnupg_stat (const char *name, struct stat *statbuf)
 {
 # ifdef HAVE_W32_SYSTEM
+# if __MINGW32_MAJOR_VERSION > 3
+ /* mingw.org's MinGW */
+# define STRUCT_STAT _stat
+# elif defined(_USE_32BIT_TIME_T)
+ /* MinGW64 for i686 */
+# define STRUCT_STAT _stat32
+# else
+ /* MinGW64 for x86_64 */
+# define STRUCT_STAT _stat64i32
+# endif
 if (any8bitchar (name))
 {
 wchar_t *wname;
- struct _stat32 st32;
+ struct STRUCT_STAT st32;
 int ret;
 
 wname = utf8_to_wchar (name);
@@ -1571,43 +1558,6 @@
 
 
 &#xc;
-#ifdef HAVE_W32CE_SYSTEM
-/* There is a isatty function declaration in cegcc but it does not
- make sense, thus we redefine it. */
-int
-_gnupg_isatty (int fd)
-{
- (void)fd;
- return 0;
-}
-#endif
-
-
-#ifdef HAVE_W32CE_SYSTEM
-/* Replacement for getenv which takes care of the our use of getenv.
- The code is not thread safe but we expect it to work in all cases
- because it is called for the first time early enough. */
-char *
-_gnupg_getenv (const char *name)
-{
- static int initialized;
- static char *assuan_debug;
-
- if (!initialized)
- {
- assuan_debug = read_w32_registry_string (NULL,
- "\\Software\\GNU\\libassuan",
- "debug");
- initialized = 1;
- }
-
- if (!strcmp (name, "ASSUAN_DEBUG"))
- return assuan_debug;
- else
- return NULL;
-}
-
-#endif /*HAVE_W32CE_SYSTEM*/
 
 
 #ifdef HAVE_W32_SYSTEM

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/sysutils.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/sysutils.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/t-recsel.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/t-recsel.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/t-stringhelp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/t-stringhelp.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/t-sysutils.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/t-sysutils.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/t-w32-reg.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/t-w32-reg.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/tlv.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/tlv.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/utf8conv.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/utf8conv.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/util.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/util.h Changed

@@ -297,6 +297,8 @@
 #define GNUPG_MODULE_NAME_GPGV          12
 #define GNUPG_MODULE_NAME_KEYBOXD       13
 #define GNUPG_MODULE_NAME_TPM2DAEMON    14
+#define GNUPG_MODULE_NAME_CARD          15
+#define GNUPG_MODULE_NAME_GPGTAR        16
 const char *gnupg_module_name (int which);
 void gnupg_module_name_flush_some (void);
 void gnupg_set_builddir (const char *newdir);
@@ -358,7 +360,7 @@
 char *make_printable_string (const void *p, size_t n, int delim);
 char *decode_c_string (const char *src);
 
-int is_file_compressed (const char *s, int *ret_rc);
+int is_file_compressed (const byte *buf, unsigned int buflen);
 
 int match_multistr (const char *multistr,const char *match);
 
@@ -372,6 +374,15 @@
 int parse_debug_flag (const char *string, unsigned int *debugvar,
                       const struct debug_flags_s *flags);
 
+struct compatibility_flags_s
+{
+  unsigned int flag;
+  const char *name;
+  const char *desc;
+};
+int parse_compatibility_flags (const char *string, unsigned int *flagvar,
+                               const struct compatibility_flags_s *flags);
+
 
 /*-- Simple replacement functions. */
 
@@ -390,18 +401,7 @@
 # define gnupg_ttyname(n) ttyname ((n))
 #endif /*HAVE_TTYNAME */
 
-#ifdef HAVE_W32CE_SYSTEM
-#define getpid() GetCurrentProcessId ()
-char *_gnupg_getenv (const char *name); /* See sysutils.c */
-#define getenv(a)  _gnupg_getenv ((a))
-char *_gnupg_setenv (const char *name); /* See sysutils.c */
-#define setenv(a,b,c)  _gnupg_setenv ((a),(b),(c))
-int _gnupg_isatty (int fd);
-#define gnupg_isatty(a)  _gnupg_isatty ((a))
-#else
 #define gnupg_isatty(a)  isatty ((a))
-#endif
-
 
 
 /*-- Macros to replace ctype ones to avoid locale problems. --*/

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/w32-reg.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/w32-reg.c Changed

@@ -71,14 +71,19 @@
  *
  * Note that the first backslash and the first colon act as delimiters.
  *
- * Returns a malloced string or NULL if not found.
+ * Returns a malloced string or NULL if not found.  If R_HKLM_FALLBACK
+ * is not NULL, no class was given, and the result came from HKLM,
+ * true is stored there.
  */
 char *
-read_w32_reg_string (const char *key_arg)
+read_w32_reg_string (const char *key_arg, int *r_hklm_fallback)
 {
   char *key;
   char *p1, *p2;
-  char *result;
+  char *result, *result2;
+
+  if (r_hklm_fallback)
+    *r_hklm_fallback = 0;
 
   if (!key_arg)
     return NULL;
@@ -101,6 +106,15 @@
     *p2++ = 0;
 
   result = gpgrt_w32_reg_query_string (*key? key : NULL, p1, p2);
+  if (result && !*key && r_hklm_fallback)
+    {
+      /* No key given - see whether the result came from HKCU or HKLM.  */
+      result2 = gpgrt_w32_reg_query_string ("HKCU", p1, p2);
+      if (result2)
+        xfree (result2);
+      else
+        *r_hklm_fallback = 1;
+    }
   xfree (key);
   return result;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/w32help.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/w32help.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/common/w32info-rc.h.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/common/w32info-rc.h.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/config.h.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/config.h.in Changed

@@ -228,9 +228,9 @@
 /* Define to 1 if you have the `canonicalize_file_name' function. */
 #undef HAVE_CANONICALIZE_FILE_NAME
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
+/* Define to 1 if you have the Mac OS X function
+   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
 
 /* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
@@ -600,9 +600,6 @@
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
-/* Defined if we run on WindowsCE */
-#undef HAVE_W32CE_SYSTEM
-
 /* Defined if we run on a W32 API based system */
 #undef HAVE_W32_SYSTEM
 
@@ -909,21 +906,7 @@
 #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
 #define GNUPG_CACHE_DIR         "cache.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
+#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2023 g10 Code GmbH"
 
 /* For some systems (DOS currently), we hardcode the path here.  For
    POSIX systems the values are constructed by the Makefiles, so that

_service:tar_scm:gnupg-2.3.6.tar.bz2/configure -> _service:tar_scm:gnupg-2.4.3.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnupg 2.3.6.
+# Generated by GNU Autoconf 2.69 for gnupg 2.4.3.
 #
 # Report bugs to <https://bugs.gnupg.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnupg'
 PACKAGE_TARNAME='gnupg'
-PACKAGE_VERSION='2.3.6'
-PACKAGE_STRING='gnupg 2.3.6'
+PACKAGE_VERSION='2.4.3'
+PACKAGE_STRING='gnupg 2.4.3'
 PACKAGE_BUGREPORT='https://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -745,8 +745,6 @@
 GPG_ERROR_CONFIG
 HAVE_ANDROID_SYSTEM_FALSE
 HAVE_ANDROID_SYSTEM_TRUE
-HAVE_W32CE_SYSTEM_FALSE
-HAVE_W32CE_SYSTEM_TRUE
 HAVE_W32_SYSTEM_FALSE
 HAVE_W32_SYSTEM_TRUE
 USE_SIMPLE_GETTEXT_FALSE
@@ -1557,7 +1555,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.3.6 to adapt to many kinds of systems.
+\`configure' configures gnupg 2.4.3 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1628,7 +1626,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of gnupg 2.3.6:";;
+ short | recursive ) echo "Configuration of gnupg 2.4.3:";;
 esac
 cat <<\_ACEOF
 
@@ -1850,7 +1848,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-gnupg configure 2.3.6
+gnupg configure 2.4.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2559,7 +2557,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.3.6, which was
+It was created by gnupg $as_me 2.4.3, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
@@ -2912,13 +2910,14 @@
 
 # When changing the SWDB tag please also adjust the hard coded tags in
 # build-aux/speedo.mk, build-aux/getswdb.sh, and Makefile.am
+# As well as the source info for the man pages.
 
 cat >>confdefs.h <<_ACEOF
 #define GNUPG_SWDB_TAG "gnupg24"
 _ACEOF
 
 
-NEED_GPGRT_VERSION=1.41
+NEED_GPGRT_VERSION=1.46
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.9.1
@@ -2927,7 +2926,7 @@
 NEED_LIBASSUAN_VERSION=2.5.0
 
 NEED_KSBA_API=1
-NEED_KSBA_VERSION=1.3.4
+NEED_KSBA_VERSION=1.6.3
 
 NEED_NTBTLS_API=1
 NEED_NTBTLS_VERSION=0.1.0
@@ -3458,7 +3457,7 @@
 
 # Define the identity of the package.
 PACKAGE='gnupg'
- VERSION='2.3.6'
+ VERSION='2.4.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8124,7 +8123,6 @@
 require_iconv=yes
 have_dosish_system=no
 have_w32_system=no
-have_w32ce_system=no
 have_android_system=no
 use_simple_gettext=no
 mmap_needed=yes
@@ -8143,16 +8141,9 @@
 have_w32_system=yes
 require_iconv=no
 require_pipe_to_unblock_pselect=no
- case "${host}" in
- *-mingw32ce*)
- have_w32ce_system=yes
- ;;
- *)
 
 $as_echo "#define HAVE_DRIVE_LETTERS 1" >>confdefs.h
 
- ;;
- esac
 try_gettext="no"
 	use_simple_gettext=yes
 	mmap_needed=no
@@ -8253,11 +8244,6 @@
 
 $as_echo "#define HAVE_W32_SYSTEM 1" >>confdefs.h
 
- if test "$have_w32ce_system" = yes; then
-
-$as_echo "#define HAVE_W32CE_SYSTEM 1" >>confdefs.h
-
- fi
 for ac_header in winsock2.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
@@ -8279,14 +8265,6 @@
 HAVE_W32_SYSTEM_FALSE=
 fi
 
- if test "$have_w32ce_system" = yes; then
- HAVE_W32CE_SYSTEM_TRUE=
- HAVE_W32CE_SYSTEM_FALSE='#'
-else
- HAVE_W32CE_SYSTEM_TRUE='#'
- HAVE_W32CE_SYSTEM_FALSE=
-fi
-
 
 if test "$have_android_system" = yes; then
 
@@ -8322,7 +8300,6 @@
 # gpgrt (aka libgpg-error) is a library with error codes shared
 # between GnuPG related projects.
 #
-
 gpg_error_config_prefix=""
 
 # Check whether --with-libgpg-error-prefix was given.
@@ -8399,8 +8376,6 @@
 fi
 
 
- min_gpg_error_version="$NEED_GPGRT_VERSION"
- ok=no
 
 # Extract the first word of "gpgrt-config", so it can be a program name with args.
 set dummy gpgrt-config; ac_word=$2
@@ -8498,8 +8473,9 @@
 fi
 if test -n "$gpgrt_libdir"; then break; fi
 done
- else
- # When we cannot determine system libdir-format, use this:
+ fi
+ if test -z "$gpgrt_libdir"; then
+ # No valid pkgconfig dir in any of the system directories, fallback
 gpgrt_libdir=${possible_libdir1}
 fi
 else
@@ -8514,11 +8490,16 @@
 $as_echo "$as_me: Use gpgrt-config with $gpgrt_libdir as gpg-error-config" >&6;}
 gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
 else
+ gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
 unset GPGRT_CONFIG
 fi
 elif test "$GPG_ERROR_CONFIG" != "no"; then
 gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
+ unset GPGRT_CONFIG
 fi
+
+ min_gpg_error_version="$NEED_GPGRT_VERSION"
+ ok=no
 if test "$GPG_ERROR_CONFIG" != "no"; then
 req_major=`echo $min_gpg_error_version | \
 sed 's/$0-9*$\.$0-9*$/\1/'`
@@ -8616,7 +8597,7 @@
 fi
 
 use_gpgrt_config=""
- if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
 if $GPGRT_CONFIG libgcrypt --exists; then
 LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
 { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as libgcrypt-config" >&5
@@ -8840,7 +8821,7 @@
 fi
 
 use_gpgrt_config=""
- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
 if $GPGRT_CONFIG libassuan --exists; then
 LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
 { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as libassuan-config" >&5
@@ -9052,7 +9033,7 @@
 fi
 
 use_gpgrt_config=""
- if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
 if $GPGRT_CONFIG ksba --exists; then
 KSBA_CONFIG="$GPGRT_CONFIG ksba"
 { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as ksba-config" >&5
@@ -9644,7 +9625,7 @@
 fi
 
 use_gpgrt_config=""
- if test x"$NPTH_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
 if $GPGRT_CONFIG npth --exists; then
 NPTH_CONFIG="$GPGRT_CONFIG npth"
 { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as npth-config" >&5
@@ -9868,7 +9849,7 @@
 fi
 
 use_gpgrt_config=""
- if test x"${NTBTLS_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
 if $GPGRT_CONFIG ntbtls --exists; then
 NTBTLS_CONFIG="$GPGRT_CONFIG ntbtls"
 { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as ntbtls-config" >&5
@@ -10870,6 +10851,7 @@
 #include <winsock2.h>
 #include <winldap.h>
 #else
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 #endif
 
@@ -10897,6 +10879,7 @@
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 #include <lber.h>
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 int
 main ()
@@ -11153,9 +11136,6 @@
 # Construct a printable name of the OS
 #
 case "${host}" in
- *-mingw32ce*)
- PRINTABLE_OS_NAME="W32CE"
- ;;
 *-mingw32*)
 PRINTABLE_OS_NAME="MingW32"
 ;;
@@ -12509,9 +12489,9 @@
 $as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
 fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; }
+if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_LIBS="$LIBS"
@@ -12522,29 +12502,30 @@
 int
 main ()
 {
-CFLocaleCopyCurrent();
+CFLocaleCopyPreferredLanguages();
 ;
 return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_CFLocaleCopyCurrent=yes
+ gt_cv_func_CFLocaleCopyPreferredLanguages=yes
 else
- gt_cv_func_CFLocaleCopyCurrent=no
+ gt_cv_func_CFLocaleCopyPreferredLanguages=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
 
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
 
 fi
 INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
 fi
 
@@ -15270,11 +15251,7 @@
 # requiring any network stuff but linking to code in libcommon which
 # tracks in winsock stuff (e.g. init_common_subsystems).
 if test "$have_w32_system" = yes; then
- if test "$have_w32ce_system" = yes; then
- W32SOCKLIBS="-lws2"
- else
- W32SOCKLIBS="-lws2_32"
- fi
+ W32SOCKLIBS="-lws2_32"
 NETLIBS="${NETLIBS} ${W32SOCKLIBS}"
 fi
 
@@ -16535,7 +16512,7 @@
 #
 # Provide information about the build.
 #
-BUILD_REVISION="3a8164e69"
+BUILD_REVISION="d073f26d8"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16544,7 +16521,7 @@
 
 
 BUILD_VERSION=`echo "$VERSION" | sed 's/$0-9.*$.*/\1./'`
-BUILD_VERSION="${BUILD_VERSION}14977"
+BUILD_VERSION="${BUILD_VERSION}53363"
 BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
 
 
@@ -16644,22 +16621,6 @@
 *** (at least version $NEED_KSBA_VERSION using API $NEED_KSBA_API is required).
 ***" >&6;}
 fi
-if test "$gnupg_have_ldap" = yes; then
- if test "$have_w32ce_system" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}:
-*** Note that CeGCC might be broken, a package fixing this is:
-*** http://files.kolab.org/local/windows-ce/
-*** source/wldap32_0.1-mingw32ce.orig.tar.gz
-*** binary/wldap32-ce-arm-dev_0.1-1_all.deb
-***" >&5
-$as_echo "$as_me:
-*** Note that CeGCC might be broken, a package fixing this is:
-*** http://files.kolab.org/local/windows-ce/
-*** source/wldap32_0.1-mingw32ce.orig.tar.gz
-*** binary/wldap32-ce-arm-dev_0.1-1_all.deb
-***" >&6;}
- fi
-fi
 if test "$have_npth" = "no"; then
 die=yes
 { $as_echo "$as_me:${as_lineno-$LINENO}:
@@ -16726,7 +16687,7 @@
 
 
 
-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 tpm2d/Makefile g13/Makefile dirmngr/Makefile tools/Makefile doc/Makefile tests/Makefile tests/gpgscm/Makefile tests/openpgp/Makefile tests/cms/Makefile tests/migrations/Makefile tests/tpm2dtests/Makefile tests/gpgme/Makefile tests/pkits/Makefile g10/gpg.w32-manifest tools/gpg-connect-agent.w32-manifest tools/gpgconf.w32-manifest tools/gpgtar.w32-manifest tools/gpg-check-pattern.w32-manifest tools/gpg-wks-client.w32-manifest tools/gpg-card.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 tpm2d/Makefile g13/Makefile dirmngr/Makefile tools/Makefile doc/Makefile tests/Makefile tests/gpgscm/Makefile tests/openpgp/Makefile tests/cms/Makefile tests/migrations/Makefile tests/tpm2dtests/Makefile tests/gpgme/Makefile tests/pkits/Makefile g10/gpg.w32-manifest g10/gpgv.w32-manifest sm/gpgsm.w32-manifest kbx/keyboxd.w32-manifest agent/gpg-agent.w32-manifest scd/scdaemon.w32-manifest dirmngr/dirmngr.w32-manifest dirmngr/dirmngr_ldap.w32-manifest dirmngr/dirmngr-client.w32-manifest tools/gpg-connect-agent.w32-manifest tools/gpgconf.w32-manifest tools/gpgtar.w32-manifest tools/gpg-check-pattern.w32-manifest tools/gpg-wks-client.w32-manifest tools/gpg-card.w32-manifest"
 
 
 
@@ -16935,10 +16896,6 @@
 as_fn_error $? "conditional \"HAVE_W32_SYSTEM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_W32CE_SYSTEM_TRUE}" && test -z "${HAVE_W32CE_SYSTEM_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_W32CE_SYSTEM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_ANDROID_SYSTEM_TRUE}" && test -z "${HAVE_ANDROID_SYSTEM_FALSE}"; then
 as_fn_error $? "conditional \"HAVE_ANDROID_SYSTEM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17424,7 +17381,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.3.6, which was
+This file was extended by gnupg $as_me 2.4.3, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -17490,7 +17447,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.3.6
+gnupg config.status 2.4.3
 configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
@@ -17654,6 +17611,14 @@
 "tests/gpgme/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gpgme/Makefile" ;;
 "tests/pkits/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pkits/Makefile" ;;
 "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" ;;
+ "kbx/keyboxd.w32-manifest") CONFIG_FILES="$CONFIG_FILES kbx/keyboxd.w32-manifest" ;;
+ "agent/gpg-agent.w32-manifest") CONFIG_FILES="$CONFIG_FILES agent/gpg-agent.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" ;;
+ "dirmngr/dirmngr_ldap.w32-manifest") CONFIG_FILES="$CONFIG_FILES dirmngr/dirmngr_ldap.w32-manifest" ;;
+ "dirmngr/dirmngr-client.w32-manifest") CONFIG_FILES="$CONFIG_FILES dirmngr/dirmngr-client.w32-manifest" ;;
 "tools/gpg-connect-agent.w32-manifest") CONFIG_FILES="$CONFIG_FILES tools/gpg-connect-agent.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" ;;
@@ -18511,7 +18476,7 @@
 echo "
 GnuPG v${VERSION} has been configured as follows:
 
- Revision: 3a8164e69 (14977)
+ Revision: d073f26d8 (53363)
 Platform: $PRINTABLE_OS_NAME ($host)
 
 OpenPGP: $build_gpg

_service:tar_scm:gnupg-2.3.6.tar.bz2/configure.ac -> _service:tar_scm:gnupg-2.4.3.tar.bz2/configure.ac Changed

@@ -1,7 +1,7 @@
 # configure.ac - for GnuPG 2.1
 # Copyright (C) 1998-2019 Werner Koch
 # Copyright (C) 1998-2021 Free Software Foundation, Inc.
-# Copyright (C) 2003-2021 g10 Code GmbH
+# Copyright (C) 2003-2023 g10 Code GmbH
 #
 # This file is part of GnuPG.
 #
@@ -28,8 +28,8 @@
 # another commit and push so that the git magic is able to work.
 m4_define(mym4_package,gnupg)
 m4_define(mym4_major, 2)
-m4_define(mym4_minor, 3)
-m4_define(mym4_micro, 6)
+m4_define(mym4_minor, 4)
+m4_define(mym4_micro, 3)
 
 # 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
@@ -52,9 +52,10 @@
 
 # When changing the SWDB tag please also adjust the hard coded tags in
 # build-aux/speedo.mk, build-aux/getswdb.sh, and Makefile.am
+# As well as the source info for the man pages.
 AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg24", swdb tag for this branch)
 
-NEED_GPGRT_VERSION=1.41
+NEED_GPGRT_VERSION=1.46
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.9.1
@@ -63,7 +64,7 @@
 NEED_LIBASSUAN_VERSION=2.5.0
 
 NEED_KSBA_API=1
-NEED_KSBA_VERSION=1.3.4
+NEED_KSBA_VERSION=1.6.3
 
 NEED_NTBTLS_API=1
 NEED_NTBTLS_VERSION=0.1.0
@@ -524,21 +525,7 @@
 #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
 #define GNUPG_CACHE_DIR         "cache.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
+#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2023 g10 Code GmbH"
 
 /* For some systems (DOS currently), we hardcode the path here.  For
    POSIX systems the values are constructed by the Makefiles, so that
@@ -691,7 +678,6 @@
 require_iconv=yes
 have_dosish_system=no
 have_w32_system=no
-have_w32ce_system=no
 have_android_system=no
 use_simple_gettext=no
 mmap_needed=yes
@@ -710,15 +696,7 @@
         have_w32_system=yes
         require_iconv=no
         require_pipe_to_unblock_pselect=no
-        case "${host}" in
-          *-mingw32ce*)
-            have_w32ce_system=yes
-            ;;
-          *)
-            AC_DEFINE(HAVE_DRIVE_LETTERS,1,
-                      Defined if the OS supports drive letters.)
-            ;;
-        esac
+        AC_DEFINE(HAVE_DRIVE_LETTERS,1, Defined if the OS supports drive letters.)
         try_gettext="no"
 	use_simple_gettext=yes
 	mmap_needed=no
@@ -803,13 +781,9 @@
 
 if test "$have_w32_system" = yes; then
    AC_DEFINE(HAVE_W32_SYSTEM,1, Defined if we run on a W32 API based system)
-   if test "$have_w32ce_system" = yes; then
-      AC_DEFINE(HAVE_W32CE_SYSTEM,1,Defined if we run on WindowsCE)
-   fi
    AC_CHECK_HEADERS(winsock2.h)
 fi
 AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
-AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
 
 if test "$have_android_system" = yes; then
    AC_DEFINE(HAVE_ANDROID_SYSTEM,1, Defined if we build for an Android system)
@@ -1273,9 +1247,6 @@
 # Construct a printable name of the OS
 #
 case "${host}" in
-    *-mingw32ce*)
-        PRINTABLE_OS_NAME="W32CE"
-        ;;
     *-mingw32*)
         PRINTABLE_OS_NAME="MingW32"
         ;;
@@ -1575,11 +1546,7 @@
 # requiring any network stuff but linking to code in libcommon which
 # tracks in winsock stuff (e.g. init_common_subsystems).
 if test "$have_w32_system" = yes; then
-   if test "$have_w32ce_system" = yes; then
-     W32SOCKLIBS="-lws2"
-   else
-     W32SOCKLIBS="-lws2_32"
-   fi
+   W32SOCKLIBS="-lws2_32"
    NETLIBS="${NETLIBS} ${W32SOCKLIBS}"
 fi
 
@@ -2064,16 +2031,6 @@
 *** (at least version $NEED_KSBA_VERSION using API $NEED_KSBA_API is required).
 ***)
 fi
-if test "$gnupg_have_ldap" = yes; then
-  if test "$have_w32ce_system" = yes; then
-    AC_MSG_NOTICE(
-*** Note that CeGCC might be broken, a package fixing this is:
-***    http://files.kolab.org/local/windows-ce/
-***                           source/wldap32_0.1-mingw32ce.orig.tar.gz
-***                           binary/wldap32-ce-arm-dev_0.1-1_all.deb
-***)
-   fi
-fi
 if test "$have_npth" = "no"; then
     die=yes
     AC_MSG_NOTICE(
@@ -2145,6 +2102,14 @@
 tests/gpgme/Makefile
 tests/pkits/Makefile
 g10/gpg.w32-manifest
+g10/gpgv.w32-manifest
+sm/gpgsm.w32-manifest
+kbx/keyboxd.w32-manifest
+agent/gpg-agent.w32-manifest
+scd/scdaemon.w32-manifest
+dirmngr/dirmngr.w32-manifest
+dirmngr/dirmngr_ldap.w32-manifest
+dirmngr/dirmngr-client.w32-manifest
 tools/gpg-connect-agent.w32-manifest
 tools/gpgconf.w32-manifest
 tools/gpgtar.w32-manifest

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ChangeLog-2011 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ChangeLog-2011 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/Makefile.am Changed

@@ -21,7 +21,14 @@
 
 ## 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 \
+             dirmngr_ldap-w32info.rc dirmngr_ldap.w32-manifest.in \
+             dirmngr-client-w32info.rc dirmngr-client.w32-manifest.in
+
+
+
+
 dist_pkgdata_DATA = sks-keyservers.netCA.pem
 
 bin_PROGRAMS = dirmngr dirmngr-client
@@ -43,6 +50,16 @@
 
 include $(top_srcdir)/am/cmacros.am
 
+if HAVE_W32_SYSTEM
+dirmngr_rc_objs        = dirmngr-w32info.o
+dirmngr_ldap_rc_objs   = dirmngr_ldap-w32info.o
+dirmngr_client_rc_objs = dirmngr-client-w32info.o
+
+dirmngr-w32info.o        : dirmngr.w32-manifest        ../common/w32info-rc.h
+dirmngr_ldap-w32info.o   : dirmngr_ldap.w32-manifest   ../common/w32info-rc.h
+dirmngr-client-w32info.o : dirmngr-client.w32-manifest ../common/w32info-rc.h
+endif
+
 AM_CFLAGS = $(USE_C99_CFLAGS) \
             $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)	\
             $(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(NTBTLS_CFLAGS)		\
@@ -58,6 +75,7 @@
 noinst_HEADERS = dirmngr.h crlcache.h crlfetch.h misc.h
 
 dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c	\
+        fakecrl.c \
 	certcache.c certcache.h \
 	domaininfo.c \
 	workqueue.c \
@@ -88,12 +106,13 @@
         $(DNSLIBS) $(LIBASSUAN_LIBS) \
 	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
-        $(NETLIBS)
+        $(NETLIBS) $(dirmngr_rc_objs)
 
 if USE_LDAP
-dirmngr_LDADD += $(ldaplibs)
+dirmngr_LDADD += $(ldaplibs) $(LBER_LIBS)
 endif
-dirmngr_LDFLAGS = $(extra_bin_ldflags)
+dirmngr_LDFLAGS =
+dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)
 
 if USE_LDAP
 dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
@@ -101,14 +120,18 @@
 dirmngr_ldap_LDFLAGS =
 dirmngr_ldap_LDADD = $(libcommon) \
 		     $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
-		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
+		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)  \
+                     $(dirmngr_ldap_rc_objs)
+dirmngr_ldap_DEPENDENCIES = $(dirmngr_ldap_rc_objs)
 endif
 
 dirmngr_client_SOURCES = dirmngr-client.c
 dirmngr_client_LDADD = $(libcommon) \
                        $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
-                       $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
-dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
+                       $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV) \
+                       $(dirmngr_client_rc_objs)
+dirmngr_client_LDFLAGS =
+dirmngr_client_DEPENDENCIES = $(dirmngr_client_rc_objs)
 
 
 t_common_src = t-support.h t-support.c
@@ -167,7 +190,8 @@
         $(ldap_url) $(t_common_src)
 t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 			  $(LIBGCRYPT_CFLAGS) \
-                          $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
+              $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS) \
+              $(NTBTLS_CFLAGS)
 t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(KSBA_LIBS) $(DNSLIBS)
 
 t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/Makefile.in Changed

@@ -157,7 +157,7 @@
 @USE_LDAP_TRUE@ ldap-misc.c ldap-misc.h \
 @USE_LDAP_TRUE@ ks-engine-ldap.c $(ldap_url) ldap-wrapper.c
 
-@USE_LDAP_TRUE@am__append_11 = $(ldaplibs)
+@USE_LDAP_TRUE@am__append_11 = $(ldaplibs) $(LBER_LIBS)
 @USE_LIBDNS_TRUE@am__append_12 = dns.c dns.h
 @USE_LDAP_TRUE@am__append_13 = t-ldap-parse-uri t-ldap-misc
 subdir = dirmngr
@@ -180,7 +180,8 @@
 	$(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 dirmngr_ldap.w32-manifest \
+	dirmngr-client.w32-manifest
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(pkgdatadir)"
@@ -191,8 +192,8 @@
 @MAINTAINER_MODE_TRUE@am__EXEEXT_4 = t-http$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am__dirmngr_SOURCES_DIST = dirmngr.c dirmngr.h server.c crlcache.c \
-	crlfetch.c certcache.c certcache.h domaininfo.c workqueue.c \
-	loadswdb.c cdb.h cdblib.c misc.c dirmngr-err.h \
+	crlfetch.c fakecrl.c certcache.c certcache.h domaininfo.c \
+	workqueue.c loadswdb.c cdb.h cdblib.c misc.c dirmngr-err.h \
 	dirmngr-status.h ocsp.c ocsp.h validate.c validate.h \
 	dns-stuff.c dns-stuff.h http.c http.h http-common.c \
 	http-common.h http-ntbtls.c ks-action.c ks-action.h \
@@ -208,33 +209,23 @@
 @USE_LDAP_TRUE@	ks-engine-ldap.$(OBJEXT) $(am__objects_2) \
 @USE_LDAP_TRUE@	ldap-wrapper.$(OBJEXT)
 am_dirmngr_OBJECTS = dirmngr.$(OBJEXT) server.$(OBJEXT) \
-	crlcache.$(OBJEXT) crlfetch.$(OBJEXT) certcache.$(OBJEXT) \
-	domaininfo.$(OBJEXT) workqueue.$(OBJEXT) loadswdb.$(OBJEXT) \
-	cdblib.$(OBJEXT) misc.$(OBJEXT) ocsp.$(OBJEXT) \
-	validate.$(OBJEXT) dns-stuff.$(OBJEXT) http.$(OBJEXT) \
-	http-common.$(OBJEXT) http-ntbtls.$(OBJEXT) \
+	crlcache.$(OBJEXT) crlfetch.$(OBJEXT) fakecrl.$(OBJEXT) \
+	certcache.$(OBJEXT) domaininfo.$(OBJEXT) workqueue.$(OBJEXT) \
+	loadswdb.$(OBJEXT) cdblib.$(OBJEXT) misc.$(OBJEXT) \
+	ocsp.$(OBJEXT) validate.$(OBJEXT) dns-stuff.$(OBJEXT) \
+	http.$(OBJEXT) http-common.$(OBJEXT) http-ntbtls.$(OBJEXT) \
 	ks-action.$(OBJEXT) ks-engine-hkp.$(OBJEXT) \
 	ks-engine-http.$(OBJEXT) ks-engine-finger.$(OBJEXT) \
 	ks-engine-kdns.$(OBJEXT) $(am__objects_1) $(am__objects_3)
 dirmngr_OBJECTS = $(am_dirmngr_OBJECTS)
 am__DEPENDENCIES_1 =
 @USE_LDAP_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-@USE_LDAP_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
-dirmngr_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) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_3)
+@USE_LDAP_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) \
+@USE_LDAP_TRUE@	$(am__DEPENDENCIES_1)
 dirmngr_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dirmngr_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_dirmngr_client_OBJECTS = dirmngr-client.$(OBJEXT)
 dirmngr_client_OBJECTS = $(am_dirmngr_client_OBJECTS)
-dirmngr_client_DEPENDENCIES = $(libcommon) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
 dirmngr_client_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(dirmngr_client_LDFLAGS) $(LDFLAGS) -o $@
 am__dirmngr_ldap_SOURCES_DIST = dirmngr_ldap.c ldap-misc.c ldap-misc.h \
@@ -245,11 +236,6 @@
 @USE_LDAP_TRUE@	dirmngr_ldap-ldap-misc.$(OBJEXT) \
 @USE_LDAP_TRUE@	$(am__objects_4)
 dirmngr_ldap_OBJECTS = $(am_dirmngr_ldap_OBJECTS)
-@USE_LDAP_TRUE@dirmngr_ldap_DEPENDENCIES = $(libcommon) \
-@USE_LDAP_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@USE_LDAP_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@USE_LDAP_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@USE_LDAP_TRUE@	$(am__DEPENDENCIES_1)
 dirmngr_ldap_LINK = $(CCLD) $(dirmngr_ldap_CFLAGS) $(CFLAGS) \
 	$(dirmngr_ldap_LDFLAGS) $(LDFLAGS) -o $@
 am__t_dns_stuff_SOURCES_DIST = t-support.h t-support.c dns.c dns.h \
@@ -354,15 +340,16 @@
 	./$(DEPDIR)/dirmngr_ldap-ldap-misc.Po \
 	./$(DEPDIR)/dirmngr_ldap-ldap-url.Po ./$(DEPDIR)/dns-stuff.Po \
 	./$(DEPDIR)/dns.Po ./$(DEPDIR)/domaininfo.Po \
-	./$(DEPDIR)/http-common.Po ./$(DEPDIR)/http-ntbtls.Po \
-	./$(DEPDIR)/http.Po ./$(DEPDIR)/ks-action.Po \
-	./$(DEPDIR)/ks-engine-finger.Po ./$(DEPDIR)/ks-engine-hkp.Po \
-	./$(DEPDIR)/ks-engine-http.Po ./$(DEPDIR)/ks-engine-kdns.Po \
-	./$(DEPDIR)/ks-engine-ldap.Po ./$(DEPDIR)/ldap-misc.Po \
-	./$(DEPDIR)/ldap-parse-uri.Po ./$(DEPDIR)/ldap-url.Po \
-	./$(DEPDIR)/ldap-wrapper.Po ./$(DEPDIR)/ldap.Po \
-	./$(DEPDIR)/ldapserver.Po ./$(DEPDIR)/loadswdb.Po \
-	./$(DEPDIR)/misc.Po ./$(DEPDIR)/ocsp.Po ./$(DEPDIR)/server.Po \
+	./$(DEPDIR)/fakecrl.Po ./$(DEPDIR)/http-common.Po \
+	./$(DEPDIR)/http-ntbtls.Po ./$(DEPDIR)/http.Po \
+	./$(DEPDIR)/ks-action.Po ./$(DEPDIR)/ks-engine-finger.Po \
+	./$(DEPDIR)/ks-engine-hkp.Po ./$(DEPDIR)/ks-engine-http.Po \
+	./$(DEPDIR)/ks-engine-kdns.Po ./$(DEPDIR)/ks-engine-ldap.Po \
+	./$(DEPDIR)/ldap-misc.Po ./$(DEPDIR)/ldap-parse-uri.Po \
+	./$(DEPDIR)/ldap-url.Po ./$(DEPDIR)/ldap-wrapper.Po \
+	./$(DEPDIR)/ldap.Po ./$(DEPDIR)/ldapserver.Po \
+	./$(DEPDIR)/loadswdb.Po ./$(DEPDIR)/misc.Po \
+	./$(DEPDIR)/ocsp.Po ./$(DEPDIR)/server.Po \
 	./$(DEPDIR)/t_dns_stuff-dns-stuff.Po \
 	./$(DEPDIR)/t_dns_stuff-dns.Po \
 	./$(DEPDIR)/t_dns_stuff-t-dns-stuff.Po \
@@ -491,8 +478,11 @@
 std='&#x1b;m'; \
 fi; \
 }
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/am/cmacros.am \
-	$(top_srcdir)/build-aux/depcomp \
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/dirmngr-client.w32-manifest.in \
+	$(srcdir)/dirmngr.w32-manifest.in \
+	$(srcdir)/dirmngr_ldap.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@
@@ -686,7 +676,11 @@
 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 \
+ dirmngr_ldap-w32info.rc dirmngr_ldap.w32-manifest.in \
+ dirmngr-client-w32info.rc dirmngr-client.w32-manifest.in
+
 dist_pkgdata_DATA = sks-keyservers.netCA.pem
 
 # NB: AM_CFLAGS may also be used by tools running on the build
@@ -695,16 +689,6 @@
 	$(am__append_2) $(am__append_3) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
 	$(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx. WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library. We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc. 256k is the largest stack
-# we use with pth.
-@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 = 
 
 # Convenience macros
@@ -712,6 +696,9 @@
 libcommonpth = ../common/libcommonpth.a
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
+@HAVE_W32_SYSTEM_TRUE@dirmngr_rc_objs = dirmngr-w32info.o
+@HAVE_W32_SYSTEM_TRUE@dirmngr_ldap_rc_objs = dirmngr_ldap-w32info.o
+@HAVE_W32_SYSTEM_TRUE@dirmngr_client_rc_objs = dirmngr-client-w32info.o
 AM_CFLAGS = $(USE_C99_CFLAGS) \
 $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)	\
 $(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(NTBTLS_CFLAGS)		\
@@ -721,11 +708,12 @@
 @HAVE_W32_SYSTEM_TRUE@ldap_url = ldap-url.h ldap-url.c
 noinst_HEADERS = dirmngr.h crlcache.h crlfetch.h misc.h
 dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \
-	certcache.c certcache.h domaininfo.c workqueue.c loadswdb.c \
-	cdb.h cdblib.c misc.c dirmngr-err.h dirmngr-status.h ocsp.c \
-	ocsp.h validate.c validate.h dns-stuff.c dns-stuff.h http.c \
-	http.h http-common.c http-common.h http-ntbtls.c ks-action.c \
-	ks-action.h ks-engine.h ks-engine-hkp.c ks-engine-http.c \
+	fakecrl.c certcache.c certcache.h domaininfo.c workqueue.c \
+	loadswdb.c cdb.h cdblib.c misc.c dirmngr-err.h \
+	dirmngr-status.h ocsp.c ocsp.h validate.c validate.h \
+	dns-stuff.c dns-stuff.h http.c http.h http-common.c \
+	http-common.h http-ntbtls.c ks-action.c ks-action.h \
+	ks-engine.h ks-engine-hkp.c ks-engine-http.c \
 	ks-engine-finger.c ks-engine-kdns.c $(am__append_9) \
 	$(am__append_10)
 @USE_LDAP_FALSE@ldaplibs = 
@@ -733,21 +721,26 @@
 dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS) \
 	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
 	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
-	$(NETLIBS) $(am__append_11)
-dirmngr_LDFLAGS = $(extra_bin_ldflags)
+	$(NETLIBS) $(dirmngr_rc_objs) $(am__append_11)
+dirmngr_LDFLAGS = 
+dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)
 @USE_LDAP_TRUE@dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
 @USE_LDAP_TRUE@dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
 @USE_LDAP_TRUE@dirmngr_ldap_LDFLAGS = 
 @USE_LDAP_TRUE@dirmngr_ldap_LDADD = $(libcommon) \
 @USE_LDAP_TRUE@		 $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
-@USE_LDAP_TRUE@		 $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
+@USE_LDAP_TRUE@		 $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
+@USE_LDAP_TRUE@ $(dirmngr_ldap_rc_objs)
 
+@USE_LDAP_TRUE@dirmngr_ldap_DEPENDENCIES = $(dirmngr_ldap_rc_objs)
 dirmngr_client_SOURCES = dirmngr-client.c
 dirmngr_client_LDADD = $(libcommon) \
 $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
- $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
+ $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV) \
+ $(dirmngr_client_rc_objs)
 
-dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
+dirmngr_client_LDFLAGS = 
+dirmngr_client_DEPENDENCIES = $(dirmngr_client_rc_objs)
 t_common_src = t-support.h t-support.c $(am__append_12)
 t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) \
 $(NTBTLS_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
@@ -794,7 +787,8 @@
 
 t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \
 			 $(LIBGCRYPT_CFLAGS) \
- $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
+ $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS) \
+ $(NTBTLS_CFLAGS)
 
 t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(KSBA_LIBS) $(DNSLIBS)
 t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
@@ -844,6 +838,12 @@
 $(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)/$@
+dirmngr_ldap.w32-manifest: $(top_builddir)/config.status $(srcdir)/dirmngr_ldap.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+dirmngr-client.w32-manifest: $(top_builddir)/config.status $(srcdir)/dirmngr-client.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -982,6 +982,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns-stuff.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/domaininfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fakecrl.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http-common.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http-ntbtls.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@ # am--include-marker
@@ -1741,6 +1742,7 @@
 	-rm -f ./$(DEPDIR)/dns-stuff.Po
 	-rm -f ./$(DEPDIR)/dns.Po
 	-rm -f ./$(DEPDIR)/domaininfo.Po
+	-rm -f ./$(DEPDIR)/fakecrl.Po
 	-rm -f ./$(DEPDIR)/http-common.Po
 	-rm -f ./$(DEPDIR)/http-ntbtls.Po
 	-rm -f ./$(DEPDIR)/http.Po
@@ -1847,6 +1849,7 @@
 	-rm -f ./$(DEPDIR)/dns-stuff.Po
 	-rm -f ./$(DEPDIR)/dns.Po
 	-rm -f ./$(DEPDIR)/domaininfo.Po
+	-rm -f ./$(DEPDIR)/fakecrl.Po
 	-rm -f ./$(DEPDIR)/http-common.Po
 	-rm -f ./$(DEPDIR)/http-ntbtls.Po
 	-rm -f ./$(DEPDIR)/http.Po
@@ -1939,6 +1942,10 @@
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
 
+@HAVE_W32_SYSTEM_TRUE@dirmngr-w32info.o : dirmngr.w32-manifest ../common/w32info-rc.h
+@HAVE_W32_SYSTEM_TRUE@dirmngr_ldap-w32info.o : dirmngr_ldap.w32-manifest ../common/w32info-rc.h
+@HAVE_W32_SYSTEM_TRUE@dirmngr-client-w32info.o : dirmngr-client.w32-manifest ../common/w32info-rc.h
+
 $(PROGRAMS) : $(libcommon) $(libcommonpth)
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/certcache.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/certcache.c Changed

@@ -271,6 +271,21 @@
   cert_item_t ci;
   fingerprint_list_t ignored;
 
+  /* Do not keep expired certificates in the permanent cache.  */
+  if (permanent && !opt.debug_cache_expired_certs)
+    {
+      ksba_isotime_t not_after;
+      ksba_isotime_t current_time;
+
+      if (ksba_cert_get_validity (cert, 1, not_after))
+        return gpg_error (GPG_ERR_BAD_CERT);
+
+      gnupg_get_isotime (current_time);
+
+      if (*not_after && strcmp (current_time, not_after) > 0)
+        return gpg_error (GPG_ERR_CERT_EXPIRED);
+    }
+
   fpr = fpr_buffer? fpr_buffer : &help_fpr_buffer;
 
   /* If we already reached the caching limit, drop a couple of certs
@@ -753,7 +768,7 @@
   initialization_done = 1;
   release_cache_lock ();
 
-  cert_cache_print_stats ();
+  cert_cache_print_stats (NULL);
 }
 
 /* Deinitialize the certificate cache.  With FULL set to true even the
@@ -796,7 +811,7 @@
 
 /* Print some statistics to the log file.  */
 void
-cert_cache_print_stats (void)
+cert_cache_print_stats (ctrl_t ctrl)
 {
   cert_item_t ci;
   int idx;
@@ -833,16 +848,19 @@
 
   release_cache_lock ();
 
-  log_info (_("permanently loaded certificates: %u\n"),
-            n_permanent);
-  log_info (_("    runtime cached certificates: %u\n"),
-            n_nonperm);
-  log_info (_("           trusted certificates: %u (%u,%u,%u,%u)\n"),
-            n_trusted,
-            n_trustclass_system,
-            n_trustclass_config,
-            n_trustclass_hkp,
-            n_trustclass_hkpspool);
+  dirmngr_status_helpf (ctrl,
+                 _("permanently loaded certificates: %u\n"),
+                        n_permanent);
+  dirmngr_status_helpf (ctrl,
+                 _("    runtime cached certificates: %u\n"),
+                        n_nonperm);
+  dirmngr_status_helpf (ctrl,
+                 _("           trusted certificates: %u (%u,%u,%u,%u)\n"),
+                        n_trusted,
+                        n_trustclass_system,
+                        n_trustclass_config,
+                        n_trustclass_hkp,
+                        n_trustclass_hkpspool);
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/certcache.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/certcache.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/crlcache.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/crlcache.c Changed

@@ -125,6 +125,13 @@
 # define O_BINARY 0
 #endif
 
+
+/* Reason flags for an invalid CRL. */
+#define INVCRL_TOO_OLD 1
+#define INVCRL_UNKNOWN_EXTN 2
+#define INVCRL_GENERAL 127
+
+
 static const char oidstr_crlNumber = "2.5.29.20";
 /* static const char oidstr_issuingDistributionPoint = "2.5.29.28"; */
 static const char oidstr_authorityKeyIdentifier = "2.5.29.35";
@@ -157,7 +164,7 @@
 unsigned int cdb_use_count; /* Current use count. */
 unsigned int cdb_lru_count; /* Used for LRU purposes. */
 int dbfile_checked; /* Set to true if the dbfile_hash value has
- been checked one. */
+ been checked once. */
 };
 
 
@@ -569,8 +576,8 @@
 if (*line == 'i')
 {
 entry->invalid = atoi (line+1);
- if (entry->invalid < 1)
- entry->invalid = 1;
+ if (!entry->invalid)
+ entry->invalid = INVCRL_GENERAL;
 }
 else if (*line == 'u')
 entry->user_trust_req = 1;
@@ -984,8 +991,8 @@
 
 
 /* Hash the file FNAME and return the MD5 digest in MD5BUFFER. The
- caller must allocate MD%buffer wityh at least 16 bytes. Returns 0
- on success. */
+ * caller must allocate MD5buffer with at least 16 bytes. Returns 0
+ * on success. */
 static int
 hash_dbfile (const char *fname, unsigned char *md5buffer)
 {
@@ -1395,7 +1402,7 @@
 {
 if (opt.verbose)
 log_info ("no system trust and client does not trust either\n");
- retval = CRL_CACHE_CANTUSE;
+ retval = CRL_CACHE_NOTTRUSTED;
 }
 else
 {
@@ -1515,8 +1522,11 @@
 case CRL_CACHE_DONTKNOW:
 err = gpg_error (GPG_ERR_NO_CRL_KNOWN);
 break;
+ case CRL_CACHE_NOTTRUSTED:
+ err = gpg_error (GPG_ERR_NOT_TRUSTED);
+ break;
 case CRL_CACHE_CANTUSE:
- err = gpg_error (GPG_ERR_NO_CRL_KNOWN);
+ err = gpg_error (GPG_ERR_INV_CRL_OBJ);
 break;
 default:
 log_fatal ("cache_isvalid returned invalid status code %d\n", result);
@@ -1831,9 +1841,10 @@
 if (n > qbits/8)
 n = qbits/8;
 
- err = gcry_sexp_build (&s_hash, NULL, "%b",
+ err = gcry_sexp_build (&s_hash, NULL, "(data(flags raw)(value %b))",
 (int)n,
 gcry_md_read (md, algo));
+
 }
 else
 {
@@ -1852,7 +1863,7 @@
 /* Pass this on to the signature verification. */
 err = gcry_pk_verify (s_sig, s_hash, s_pkey);
 if (DBG_X509)
- log_debug ("gcry_pk_verify: %s\n", gpg_strerror (err));
+ log_debug ("%s: gcry_pk_verify: %s\n", __func__, gpg_strerror (err));
 
 leave:
 xfree (sigval);
@@ -2096,7 +2107,7 @@
 }
 }
 while (stopreason != KSBA_SR_READY);
- assert (!err);
+ log_assert (!err);
 
 
 failure:
@@ -2337,7 +2348,7 @@
 nextupdate);
 if (!err2)
 err2 = gpg_error (GPG_ERR_CRL_TOO_OLD);
- invalidate_crl |= 1;
+ invalidate_crl |= INVCRL_TOO_OLD;
 }
 }
 
@@ -2345,14 +2356,24 @@
 for (idx=0; !(err=ksba_crl_get_extension (crl, idx, &oid, &critical,
 NULL, NULL)); idx++)
 {
+ strlist_t sl;
+
 if (!critical
 || !strcmp (oid, oidstr_authorityKeyIdentifier)
 || !strcmp (oid, oidstr_crlNumber) )
 continue;
+
+ for (sl=opt.ignored_crl_extensions;
+ sl && strcmp (sl->d, oid); sl = sl->next)
+ ;
+ if (sl)
+ continue; /* Is in ignored list. */
+
 log_error (_("unknown critical CRL extension %s\n"), oid);
+ log_info ("(CRL='%s')\n", url);
 if (!err2)
 err2 = gpg_error (GPG_ERR_INV_CRL);
- invalidate_crl |= 2;
+ invalidate_crl |= INVCRL_UNKNOWN_EXTN;
 }
 if (gpg_err_code (err) == GPG_ERR_EOF
 || gpg_err_code (err) == GPG_ERR_NO_DATA )
@@ -2491,6 +2512,7 @@
 int rc;
 int warn = 0;
 const unsigned char *s;
+ unsigned int invalid;
 
 es_fputs ("--------------------------------------------------------\n", fp );
 es_fprintf (fp, _("Begin CRL dump (retrieved via %s)\n"), e->url );
@@ -2515,13 +2537,20 @@
 !e->user_trust_req? "system" :
 e->check_trust_anchor? e->check_trust_anchor:"missing");
 
- if ((e->invalid & 1))
- es_fprintf (fp, _(" ERROR: The CRL will not be used "
- "because it was still too old after an update!\n"));
- if ((e->invalid & 2))
- es_fprintf (fp, _(" ERROR: The CRL will not be used "
+ invalid = e->invalid;
+ if ((invalid & INVCRL_TOO_OLD))
+ {
+ invalid &= ~INVCRL_TOO_OLD;
+ es_fprintf (fp, _(" ERROR: The CRL will not be used "
+ "because it was still too old after an update!\n"));
+ }
+ if ((invalid & INVCRL_UNKNOWN_EXTN))
+ {
+ invalid &= ~INVCRL_UNKNOWN_EXTN;
+ es_fprintf (fp, _(" ERROR: The CRL will not be used "
 "due to an unknown critical extension!\n"));
- if ((e->invalid & ~3))
+ }
+ if (invalid) /* INVCRL_GENERAL or some other bits are set. */
 es_fprintf (fp, _(" ERROR: The CRL will not be used\n"));
 
 cdb = lock_db_file (cache, e);
@@ -2662,21 +2691,21 @@
 ksba_name_t distpoint = NULL;
 ksba_name_t issuername = NULL;
 char *distpoint_uri = NULL;
- char *issuername_uri = NULL;
 int any_dist_point = 0;
 int seq;
+ gpg_error_t last_err = 0;
 
 /* Loop over all distribution points, get the CRLs and put them into
 the cache. */
 if (opt.verbose)
 log_info ("checking distribution points\n");
 seq = 0;
- while ( !(err = ksba_cert_get_crl_dist_point (cert, seq++,
+ while (xfree (distpoint), xfree (issuername),
+ !(err = ksba_cert_get_crl_dist_point (cert, seq++,
 &distpoint,
 &issuername, NULL )))
 {
 int name_seq;
- gpg_error_t last_err = 0;
 
 if (!distpoint && !issuername)
 {
@@ -2687,13 +2716,11 @@
 suitable CRL. */
 }
 
- xfree (issuername_uri); issuername_uri = NULL;
-
 /* Get the URIs. We do this in a loop to iterate over all names
 in the crlDP. */
 for (name_seq=0; ksba_name_enum (distpoint, name_seq); name_seq++)
 {
- xfree (distpoint_uri); distpoint_uri = NULL;
+ xfree (distpoint_uri);
 distpoint_uri = ksba_name_get_uri (distpoint, name_seq);
 if (!distpoint_uri)
 continue;
@@ -2715,8 +2742,7 @@
 
 any_dist_point = 1;
 
- if (opt.verbose)
- log_info ("fetching CRL from '%s'\n", distpoint_uri);
+ crl_close_reader (reader);
 err = crl_fetch (ctrl, distpoint_uri, &reader);
 if (err)
 {
@@ -2736,28 +2762,16 @@
 last_err = err;
 continue; /* with the next name. */
 }
- last_err = 0;
- break; /* Ready. */
- }
- if (last_err)
- {
- err = last_err;
- goto leave;
+ goto leave; /* Ready - we got the CRL. */
 }
-
- ksba_name_release (distpoint); distpoint = NULL;
-
- /* We don't do anything with issuername_uri yet but we keep the
- code for documentation. */
- issuername_uri = ksba_name_get_uri (issuername, 0);
- ksba_name_release (issuername); issuername = NULL;
-
- /* Close the reader. */
- crl_close_reader (reader);
- reader = NULL;
 }
 if (gpg_err_code (err) == GPG_ERR_EOF)
 err = 0;
+ if (!err && last_err)
+ {
+ err = last_err;
+ goto leave;
+ }
 
 /* If we did not found any distpoint, try something reasonable. */
 if (!any_dist_point )
@@ -2765,9 +2779,6 @@
 if (opt.verbose)
 log_info ("no distribution point - trying issuer name\n");
 
- crl_close_reader (reader);
- reader = NULL;
-
 issuer = ksba_cert_get_issuer (cert, 0);
 if (!issuer)
 {
@@ -2778,6 +2789,7 @@
 
 if (opt.verbose)
 log_info ("fetching CRL from default location\n");
+ crl_close_reader (reader);
 err = crl_fetch_default (ctrl, issuer, &reader);
 if (err)
 {
@@ -2800,7 +2812,6 @@
 leave:
 crl_close_reader (reader);
 xfree (distpoint_uri);
- xfree (issuername_uri);
 ksba_name_release (distpoint);
 ksba_name_release (issuername);
 ksba_free (issuer);

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/crlcache.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/crlcache.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/crlfetch.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/crlfetch.c Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr-client-w32info.rc Added

@@ -0,0 +1,52 @@
+/* dirmngr-client-w32info.rc                                  -*- c -*-
+ * Copyright (C) 2023 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 dirmngr client\0"
+            VALUE "InternalName", "dirmngr-client\0"
+            VALUE "OriginalFilename", "dirmngr-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 "dirmngr-client.w32-manifest"

_service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr-client.w32-manifest.in Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Dirmngr Client)</description>
+<assemblyIdentity
+ type="win32"
+ name="GnuPG.dirmngr-client"
+ version="@BUILD_VERSION@"
+ />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ </application>
+</compatibility>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>

_service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr-w32info.rc Added

@@ -0,0 +1,52 @@
+/* dirmngr-w32info.rc                                         -*- c -*-
+ * Copyright (C) 2023 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 access 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"

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/dirmngr.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr.c Changed

@@ -108,6 +108,7 @@
   oDebugWait,
   oDebugLevel,
   oGnutlsDebug,
+  oDebugCacheExpiredCerts,
   oNoGreeting,
   oNoOptions,
   oHomedir,
@@ -146,6 +147,7 @@
   oHTTPWrapperProgram,
   oIgnoreCert,
   oIgnoreCertExtension,
+  oIgnoreCRLExtension,
   oUseTor,
   oNoUseTor,
   oKeyServer,
@@ -157,6 +159,8 @@
   oConnectTimeout,
   oConnectQuickTimeout,
   oListenBacklog,
+  oFakeCRL,
+  oCompatibilityFlags,
   aTest
 };
 
@@ -221,6 +225,7 @@
   ARGPARSE_s_n (oDisableCheckOwnSocket, "disable-check-own-socket", "@"),
   ARGPARSE_s_s (oIgnoreCert,"ignore-cert", "@"),
   ARGPARSE_s_s (oIgnoreCertExtension,"ignore-cert-extension", "@"),
+  ARGPARSE_s_s (oIgnoreCRLExtension,"ignore-crl-extension", "@"),
 
 
   ARGPARSE_header ("Network", N_("Network related options")),
@@ -273,7 +278,7 @@
                    " points to serverlist")),
   ARGPARSE_s_i (oLDAPTimeout, "ldaptimeout",
                 N_("|N|set LDAP timeout to N seconds")),
-
+  ARGPARSE_s_s (oFakeCRL, "fake-crl", "@"),
 
   ARGPARSE_header ("OCSP", N_("Configuration for OCSP")),
 
@@ -292,8 +297,10 @@
   ARGPARSE_header (NULL, N_("Other options")),
 
   ARGPARSE_s_n (oForce,    "force",    N_("force loading of outdated CRLs")),
-  ARGPARSE_s_s (oSocketName, "socket-name", "@"),  /* Only for debugging.  */
 
+  ARGPARSE_s_s (oSocketName, "socket-name", "@"),  /* Only for debugging.  */
+  ARGPARSE_s_n (oDebugCacheExpiredCerts, "debug-cache-expired-certs", "@"),
+  ARGPARSE_s_s (oCompatibilityFlags, "compatibility-flags", "@"),
 
   ARGPARSE_header (NULL, ""),  /* Stop the header group.  */
 
@@ -322,9 +329,18 @@
     { DBG_NETWORK_VALUE, "network" },
     { DBG_LOOKUP_VALUE , "lookup"  },
     { DBG_EXTPROG_VALUE, "extprog" },
+    { DBG_KEEPTMP_VALUE, "keeptmp" },
     { 77, NULL } /* 77 := Do not exit on "help" or "?".  */
   };
 
+/* The list of compatibility flags.  */
+static struct compatibility_flags_s compatibility_flags  =
+  {
+    { COMPAT_RESTRICT_HTTP_REDIR, "restrict-http-redir" },
+    { 0, NULL }
+  };
+
+
 #define DEFAULT_MAX_REPLIES 10
 #define DEFAULT_LDAP_TIMEOUT 15  /* seconds */
 
@@ -532,7 +548,7 @@
          select the highest debug value and would then clutter their
          disk with debug files which may reveal confidential data.  */
       if (numok)
-        opt.debug &= ~(DBG_HASHING_VALUE);
+        opt.debug &= ~(DBG_HASHING_VALUE|DBG_KEEPTMP_VALUE);
     }
   else
     {
@@ -692,6 +708,7 @@
           opt.ignored_certs = tmp;
         }
       FREE_STRLIST (opt.ignored_cert_extensions);
+      FREE_STRLIST (opt.ignored_crl_extensions);
       http_register_tls_ca (NULL);
       FREE_STRLIST (hkp_cacert_filenames);
       FREE_STRLIST (opt.keyserver);
@@ -705,6 +722,10 @@
       opt.connect_quick_timeout = 0;
       opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT;
       ldapserver_list_needs_reset = 1;
+      opt.debug_cache_expired_certs = 0;
+      xfree (opt.fake_crl);
+      opt.fake_crl = NULL;
+      opt.compat_flags = 0;
       return 1;
     }
 
@@ -801,6 +822,10 @@
       add_to_strlist (&opt.ignored_cert_extensions, pargs->r.ret_str);
       break;
 
+    case oIgnoreCRLExtension:
+      add_to_strlist (&opt.ignored_crl_extensions, pargs->r.ret_str);
+      break;
+
     case oUseTor:
       tor_mode = TOR_MODE_FORCE;
       break;
@@ -863,6 +888,24 @@
       opt.ldaptimeout = pargs->r.ret_int;
       break;
 
+    case oDebugCacheExpiredCerts:
+      opt.debug_cache_expired_certs = 0;
+      break;
+
+    case oFakeCRL:
+      xfree (opt.fake_crl);
+      opt.fake_crl = *pargs->r.ret_str? xstrdup (pargs->r.ret_str) : NULL;
+      break;
+
+    case oCompatibilityFlags:
+      if (parse_compatibility_flags (pargs->r.ret_str, &opt.compat_flags,
+                                     compatibility_flags))
+        {
+          pargs->r_opt = ARGPARSE_INVALID_ARG;
+          pargs->err = ARGPARSE_PRINT_WARNING;
+        }
+      break;
+
     default:
       return 0; /* Not handled. */
     }
@@ -879,7 +922,7 @@
 /* This function is called after option parsing to adjust some values
  * and call option setup functions.  */
 static void
-post_option_parsing (void)
+post_option_parsing (enum cmd_and_opt_values cmd)
 {
   /* It would be too surpirsing if the quick timeout is larger than
    * the standard value.  */
@@ -887,6 +930,18 @@
     opt.connect_quick_timeout = opt.connect_timeout;
 
   set_debug ();
+  /* For certain commands we do not want to set/test for Tor mode
+   * because that is somewhat expensive.  */
+  switch (cmd)
+    {
+    case aGPGConfList:
+    case aGPGConfTest:
+    case aGPGConfVersions:
+      break;
+    default:
+      set_tor_mode ();
+      break;
+    }
 }
 
 
@@ -1207,12 +1262,7 @@
       log_printf ("\n");
     }
 
-  /* Note that we do not run set_tor_mode in --gpgconf-list mode
-   * because it will attempt to connect to the tor client and that can
-   * be time consuming.  */
-  post_option_parsing ();
-  if (cmd != aGPGConfTest && cmd != aGPGConfList && cmd != aGPGConfVersions)
-    set_tor_mode ();
+  post_option_parsing (cmd);
 
   /* Get LDAP server list from file unless --ldapserver has been used.  */
 #if USE_LDAP
@@ -1275,6 +1325,8 @@
 #ifndef HAVE_W32_SYSTEM
   else if (cmd == aSupervised)
     {
+      struct stat statbuf;
+
       if (!opt.quiet)
         log_info(_("WARNING: \"%s\" is a deprecated option\n"), "--supervised");
 
@@ -1283,7 +1335,6 @@
 
          We will also not detach from the controlling process or close
          stderr; the supervisor should handle all of that.  */
-      struct stat statbuf;
       if (fstat (3, &statbuf) == -1 && errno == EBADF)
         {
           log_error ("file descriptor 3 must be validin --supervised mode\n");
@@ -1681,6 +1732,8 @@
 
   xfree (ctrl->http_proxy);
   ctrl->http_proxy = NULL;
+  nvc_release (ctrl->rootdse);
+  ctrl->rootdse = NULL;
 }
 
 
@@ -1957,7 +2010,7 @@
     }
   gpgrt_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
   xfree (twopart);
-  post_option_parsing ();
+  post_option_parsing (0);
 
  finish:
   /* Get a default log file from common.conf.  */
@@ -2015,8 +2068,9 @@
       break;
 
     case SIGUSR1:
-      cert_cache_print_stats ();
-      domaininfo_print_stats ();
+      /* See also cmd_getinfo:"stats".  */
+      cert_cache_print_stats (NULL);
+      domaininfo_print_stats (NULL);
       break;
 
     case SIGUSR2:

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/dirmngr.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr.h Changed

@@ -36,6 +36,7 @@
 #include "../common/sysutils.h" /* (gnupg_fd_t) */
 #include "../common/asshelp.h"  /* (assuan_context_t) */
 #include "../common/i18n.h"
+#include "../common/name-value.h"
 #include "dirmngr-status.h"
 #include "http.h"     /* (parsed_uri_t) */
 
@@ -53,6 +54,7 @@
   unsigned int starttls:1;       /* Use STARTTLS.  */
   unsigned int ldap_over_tls:1;  /* Use LDAP over an TLS tunnel */
   unsigned int ntds:1;           /* Use Active Directory authentication.  */
+  unsigned int areconly:1;       /* Set LDAP_OPT_AREC_EXCLUSIVE.  */
 };
 typedef struct ldap_server_s *ldap_server_t;
 
@@ -103,6 +105,7 @@
 
   int force;          /* Force loading outdated CRLs. */
 
+  char *fake_crl;     /* Name of a file with faked CRL entries.  */
 
   unsigned int connect_timeout;       /* Timeout for connect.  */
   unsigned int connect_quick_timeout; /* Shorter timeout for connect.  */
@@ -129,6 +132,14 @@
      OID per string.  */
   strlist_t ignored_cert_extensions;
 
+  /* A list of CRL extension OIDs which are ignored so that one can
+   * claim that a critical extension has been handled.  One OID per
+   * string.  */
+  strlist_t ignored_crl_extensions;
+
+  /* Allow expired certificates in the cache.  */
+  int debug_cache_expired_certs;
+
   int allow_ocsp;     /* Allow using OCSP. */
 
   int max_replies;
@@ -148,6 +159,9 @@
                                        current after nextUpdate. */
 
   strlist_t keyserver;              /* List of default keyservers.  */
+
+  /* Compatibility flags (COMPAT_FLAG_xxxx).  */
+  unsigned int compat_flags;
 } opt;
 
 
@@ -162,6 +176,7 @@
 #define DBG_NETWORK_VALUE 2048  /* debug network I/O.  */
 #define DBG_LOOKUP_VALUE  8192  /* debug lookup details */
 #define DBG_EXTPROG_VALUE 16384 /* debug external program calls */
+#define DBG_KEEPTMP_VALUE 32768 /* keep some temporary files    */
 
 #define DBG_X509    (opt.debug & DBG_X509_VALUE)
 #define DBG_CRYPTO  (opt.debug & DBG_CRYPTO_VALUE)
@@ -173,6 +188,19 @@
 #define DBG_NETWORK (opt.debug & DBG_NETWORK_VALUE)
 #define DBG_LOOKUP  (opt.debug & DBG_LOOKUP_VALUE)
 #define DBG_EXTPROG (opt.debug & DBG_EXTPROG_VALUE)
+#define DBG_KEEPTMP (opt.debug & DBG_KEEPTMP_VALUE)
+
+/* Compatibility flags */
+
+/* Since version 2.2.12 dirmngr restricted HTTP redirection in an
+ * attempt to mitigate certain CSRF attacks.  It turned out that this
+ * breaks too many WKD deployments and that the attack scenario is not
+ * due to gnupg's redirecting but due to insecure configured systems.
+ * Thus from 2.4.3 on we disable this restriction but allow to use the
+ * old behaviour by using this compatibility flag.  For details see
+ * https://dev.gnupg.org/T6477.  */
+#define COMPAT_RESTRICT_HTTP_REDIR   1
+
 
 /* A simple list of certificate references.  FIXME: Better use
    certlist_t also for references (Store NULL at .cert) */
@@ -183,8 +211,10 @@
 };
 typedef struct cert_ref_s *cert_ref_t;
 
+/* Forward reference; access only via ks-engine-ldap.c.  */
+struct ks_engine_ldap_local_s;
 
-/* Forward references; access only through server.c.  */
+/* Forward reference; access only through server.c.  */
 struct server_local_s;
 
 #if SIZEOF_UNSIGNED_LONG == 8
@@ -201,6 +231,7 @@
   int no_server;      /* We are not running under server control. */
   int status_fd;      /* Only for non-server mode. */
   struct server_local_s *server_local;
+  struct ks_engine_ldap_local_s *ks_get_state;
   int force_crl_refresh; /* Always load a fresh CRL. */
 
   int check_revocations_nest_level; /* Internal to check_revovations.  */
@@ -210,9 +241,12 @@
   int audit_events;  /* Send audit events to client.  */
   char *http_proxy;  /* The used http_proxy or NULL.  */
 
+  nvc_t rootdse;     /* Container wit the rootDSE properties.  */
+
   unsigned int timeout; /* Timeout for connect calls in ms.  */
 
   unsigned int http_no_crl:1;  /* Do not check CRLs for https.  */
+  unsigned int rootdse_tried:1;/* Already tried to get the rootDSE.  */
 };
 
 
@@ -231,6 +265,8 @@
 void ks_hkp_init (void);
 
 /*-- server.c --*/
+void release_uri_item_list (uri_item_t list);
+
 ldap_server_t get_ldapservers_from_ctrl (ctrl_t ctrl);
 ksba_cert_t get_cert_local (ctrl_t ctrl, const char *issuer);
 ksba_cert_t get_issuing_cert_local (ctrl_t ctrl, const char *issuer);
@@ -257,7 +293,7 @@
 
 
 /*-- domaininfo.c --*/
-void domaininfo_print_stats (void);
+void domaininfo_print_stats (ctrl_t ctrl);
 int  domaininfo_is_wkd_not_supported (const char *domain);
 void domaininfo_set_no_name (const char *domain);
 void domaininfo_set_wkd_supported (const char *domain);

_service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr.w32-manifest.in Added

@@ -0,0 +1,25 @@
+<?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.dirmngr"
+ version="@BUILD_VERSION@"
+ />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ </application>
+</compatibility>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>

_service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr_ldap-w32info.rc Added

@@ -0,0 +1,52 @@
+/* dirmngr_ldap-w32info.rc                                  -*- c -*-
+ * Copyright (C) 2023 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 LDAP helper\0"
+            VALUE "InternalName", "dirmngr_ldap\0"
+            VALUE "OriginalFilename", "dirmngr_ldap.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_ldap.w32-manifest"

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/dirmngr_ldap.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr_ldap.c Changed

@@ -92,6 +92,7 @@
     oStartTLS,
     oLdapTLS,
     oNtds,
+    oARecOnly,
     oOnlySearchTimeout,
     oLogWithPID
   };
@@ -109,6 +110,7 @@
   { oStartTLS, "starttls",  0, "use STARTLS for the conenction"},
   { oLdapTLS,  "ldaptls",   0, "use a TLS for the connection"},
   { oNtds,     "ntds",      0, "authenticate using AD"},
+  { oARecOnly, "areconly",  0, "do only an A record lookup"},
   { oHost,     "host",      2, "|NAME|connect to host NAME"},
   { oPort,     "port",      1, "|N|connect to port N"},
   { oUser,     "user",      2, "|NAME|use NAME for authentication"},
@@ -134,6 +136,7 @@
   int starttls;
   int ldaptls;
   int ntds;
+  int areconly;
 
   estream_t outstream;    /* Send output to this stream.  */
 
@@ -234,6 +237,7 @@
         case oStartTLS: opt.starttls = 1; opt.ldaptls = 0; break;
         case oLdapTLS:  opt.starttls = 0; opt.ldaptls = 1; break;
         case oNtds:     opt.ntds = 1; break;
+        case oARecOnly: opt.areconly = 1; break;
         case oMulti: opt.multi = 1; break;
         case oUser: opt.user = pargs.r.ret_str; break;
         case oPass: opt.pass = pargs.r.ret_str; break;
@@ -436,6 +440,17 @@
                  opt.host, opt.port, ldap_err2string (lerr));
       goto leave;
     }
+  if (opt.areconly)
+    {
+      lerr = ldap_set_option (ld, LDAP_OPT_AREC_EXCLUSIVE, LDAP_OPT_ON);
+      if (lerr != LDAP_SUCCESS)
+        {
+          log_error ("ldap: unable to set AREC_EXLUSIVE: %s\n",
+                     ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
+          goto leave;
+        }
+    }
 #else /* Unix */
   tmpstr = xtryasprintf ("%s://%s:%d",
                          opt.ldaptls? "ldaps" : "ldap",
@@ -808,7 +823,7 @@
 /* Main processing.  Take the filter and run the LDAP query. The
  * result is printed to stdout, errors are logged to the log stream.
  * To allow searching with a different base it is possible to extend
- * the filer.  For example:
+ * the filter.  For example:
  *
  *   ^CN=foo, OU=My Users&(objectClasses=*)
  *

_service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dirmngr_ldap.w32-manifest.in Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (LDAP Helper)</description>
+<assemblyIdentity
+ type="win32"
+ name="GnuPG.dirmngr-ldap"
+ version="@BUILD_VERSION@"
+ />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ </application>
+</compatibility>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/dns.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/dns.c Changed

@@ -130,7 +130,7 @@
 
 #if __GNUC__
 #define DNS_NOTUSED __attribute__((unused))
-#define DNS_NORETURN __attribute__((noreturn))
+#define DNS_NORETURN __attribute__((__noreturn__))
 #else
 #define DNS_NOTUSED
 #define DNS_NORETURN
@@ -3328,7 +3328,9 @@
 
 	return 0;
 } /* dns_a_parse() */
-
+static int dns_a_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return  dns_a_parse (&arg0->a, rr, P);
+}
 
 int dns_a_push(struct dns_packet *P, struct dns_a *a) {
 	unsigned long addr;
@@ -3348,6 +3350,9 @@
 
 	return 0;
 } /* dns_a_push() */
+static int dns_a_push0(struct dns_packet *P, void *a) {
+	return dns_a_push(P, a);
+}
 
 
 size_t dns_a_arpa(void *_dst, size_t lim, const struct dns_a *a) {
@@ -3375,7 +3380,9 @@
 
 	return 0;
 } /* dns_a_cmp() */
-
+static int dns_a_cmp0(const void *a, const void *b) {
+	return dns_a_cmp(a, b);
+}
 
 size_t dns_a_print(void *dst, size_t lim, struct dns_a *a) {
 	char addrINET_ADDRSTRLEN + 1	= "0.0.0.0";
@@ -3384,7 +3391,9 @@
 
 	return dns_strlcpy(dst, addr, lim);
 } /* dns_a_print() */
-
+static size_t dns_a_print0(void *dst, size_t lim, void *a) {
+	return dns_a_print(dst, lim, a);
+}
 
 int dns_aaaa_parse(struct dns_aaaa *aaaa, struct dns_rr *rr, struct dns_packet *P) {
 	if (rr->rd.len != sizeof aaaa->addr.s6_addr)
@@ -3394,6 +3403,9 @@
 
 	return 0;
 } /* dns_aaaa_parse() */
+static int dns_aaaa_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return dns_aaaa_parse (&arg0->aaaa, rr, P);
+}
 
 
 int dns_aaaa_push(struct dns_packet *P, struct dns_aaaa *aaaa) {
@@ -3409,7 +3421,9 @@
 
 	return 0;
 } /* dns_aaaa_push() */
-
+static int dns_aaaa_push0(struct dns_packet *P, void *aaaa) {
+	return dns_aaaa_push(P, aaaa);
+}
 
 int dns_aaaa_cmp(const struct dns_aaaa *a, const struct dns_aaaa *b) {
 	unsigned i;
@@ -3422,7 +3436,9 @@
 
 	return 0;
 } /* dns_aaaa_cmp() */
-
+static int dns_aaaa_cmp0(const void *a, const void *b) {
+	return dns_aaaa_cmp(a, b);
+}
 
 size_t dns_aaaa_arpa(void *_dst, size_t lim, const struct dns_aaaa *aaaa) {
 	static const unsigned char hex16 = "0123456789abcdef";
@@ -3453,7 +3469,9 @@
 
 	return dns_strlcpy(dst, addr, lim);
 } /* dns_aaaa_print() */
-
+static size_t dns_aaaa_print0(void *dst, size_t lim, void *aaaa) {
+	return dns_aaaa_print(dst, lim, aaaa);
+}
 
 int dns_mx_parse(struct dns_mx *mx, struct dns_rr *rr, struct dns_packet *P) {
 	size_t len;
@@ -3472,6 +3490,9 @@
 
 	return 0;
 } /* dns_mx_parse() */
+static int dns_mx_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return  dns_mx_parse (&arg0->mx, rr, P);
+}
 
 
 int dns_mx_push(struct dns_packet *P, struct dns_mx *mx) {
@@ -3501,7 +3522,9 @@
 
 	return error;
 } /* dns_mx_push() */
-
+static int dns_mx_push0(struct dns_packet *P, void *mx) {
+	return dns_mx_push (P, mx);
+}
 
 int dns_mx_cmp(const struct dns_mx *a, const struct dns_mx *b) {
 	int cmp;
@@ -3511,6 +3534,9 @@
 
 	return strcasecmp(a->host, b->host);
 } /* dns_mx_cmp() */
+static int dns_mx_cmp0(const void *a, const void *b) {
+	return dns_mx_cmp (a, b);
+}
 
 
 size_t dns_mx_print(void *_dst, size_t lim, struct dns_mx *mx) {
@@ -3522,12 +3548,16 @@
 
 	return dns_b_strllen(&dst);
 } /* dns_mx_print() */
-
+static size_t dns_mx_print0(void *_dst, size_t lim, void *mx) {
+	return dns_mx_print (_dst, lim, mx);
+}
 
 size_t dns_mx_cname(void *dst, size_t lim, struct dns_mx *mx) {
 	return dns_strlcpy(dst, mx->host, lim);
 } /* dns_mx_cname() */
-
+static size_t dns_mx_cname0(void *dst, size_t lim, void *mx) {
+	return dns_mx_cname (dst, lim, mx);
+}
 
 int dns_ns_parse(struct dns_ns *ns, struct dns_rr *rr, struct dns_packet *P) {
 	size_t len;
@@ -3540,6 +3570,9 @@
 
 	return 0;
 } /* dns_ns_parse() */
+int dns_ns_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return dns_ns_parse (&arg0->ns, rr, P);
+}
 
 
 int dns_ns_push(struct dns_packet *P, struct dns_ns *ns) {
@@ -3566,47 +3599,66 @@
 
 	return error;
 } /* dns_ns_push() */
-
+static int dns_ns_push0(struct dns_packet *P, void *ns) {
+	return dns_ns_push (P, ns);
+}
 
 int dns_ns_cmp(const struct dns_ns *a, const struct dns_ns *b) {
 	return strcasecmp(a->host, b->host);
 } /* dns_ns_cmp() */
-
+static int dns_ns_cmp0(const void *a, const void *b) {
+	return dns_ns_cmp (a, b);
+}
 
 size_t dns_ns_print(void *dst, size_t lim, struct dns_ns *ns) {
 	return dns_strlcpy(dst, ns->host, lim);
 } /* dns_ns_print() */
-
+static size_t dns_ns_print0(void *dst, size_t lim, void *ns) {
+	return dns_ns_print (dst, lim, ns);
+}
 
 size_t dns_ns_cname(void *dst, size_t lim, struct dns_ns *ns) {
 	return dns_strlcpy(dst, ns->host, lim);
 } /* dns_ns_cname() */
-
+static size_t dns_ns_cname0(void *dst, size_t lim, void *ns) {
+	return dns_ns_cname (dst, lim, ns);
+}
 
 int dns_cname_parse(struct dns_cname *cname, struct dns_rr *rr, struct dns_packet *P) {
 	return dns_ns_parse((struct dns_ns *)cname, rr, P);
 } /* dns_cname_parse() */
+static int dns_cname_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return dns_cname_parse (&arg0->cname, rr, P);
+}
 
 
 int dns_cname_push(struct dns_packet *P, struct dns_cname *cname) {
 	return dns_ns_push(P, (struct dns_ns *)cname);
 } /* dns_cname_push() */
-
+static int dns_cname_push0(struct dns_packet *P, void *cname) {
+	return dns_cname_push (P, cname);
+}
 
 int dns_cname_cmp(const struct dns_cname *a, const struct dns_cname *b) {
 	return strcasecmp(a->host, b->host);
 } /* dns_cname_cmp() */
-
+static int dns_cname_cmp0(const void *a, const void *b) {
+	return dns_cname_cmp (a, b);
+}
 
 size_t dns_cname_print(void *dst, size_t lim, struct dns_cname *cname) {
 	return dns_ns_print(dst, lim, (struct dns_ns *)cname);
 } /* dns_cname_print() */
-
+static size_t dns_cname_print0(void *dst, size_t lim, void *cname) {
+	return dns_cname_print (dst, lim, cname);
+}
 
 size_t dns_cname_cname(void *dst, size_t lim, struct dns_cname *cname) {
 	return dns_strlcpy(dst, cname->host, lim);
 } /* dns_cname_cname() */
-
+size_t dns_cname_cname0(void *dst, size_t lim, void *cname) {
+	return dns_cname_cname(dst, lim, cname);
+}
 
 int dns_soa_parse(struct dns_soa *soa, struct dns_rr *rr, struct dns_packet *P) {
 	struct { void *dst; size_t lim; } dn =
@@ -3645,6 +3697,9 @@
 
 	return 0;
 } /* dns_soa_parse() */
+static int dns_soa_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return  dns_soa_parse (&arg0->soa, rr, P);
+}
 
 
 int dns_soa_push(struct dns_packet *P, struct dns_soa *soa) {
@@ -3694,7 +3749,9 @@
 
 	return error;
 } /* dns_soa_push() */
-
+static int dns_soa_push0(struct dns_packet *P, void *soa) {
+	return dns_soa_push (P, soa);
+};
 
 int dns_soa_cmp(const struct dns_soa *a, const struct dns_soa *b) {
 	int cmp;
@@ -3732,6 +3789,9 @@
 
 	return 0;
 } /* dns_soa_cmp() */
+static int dns_soa_cmp0(const void *a, const void *b) {
+	return dns_soa_cmp (a, b);
+}
 
 
 size_t dns_soa_print(void *_dst, size_t lim, struct dns_soa *soa) {
@@ -3753,7 +3813,9 @@
 
 	return dns_b_strllen(&dst);
 } /* dns_soa_print() */
-
+static size_t dns_soa_print0(void *_dst, size_t lim, void *soa) {
+	return dns_soa_print(_dst, lim, soa);
+}
 
 int dns_srv_parse(struct dns_srv *srv, struct dns_rr *rr, struct dns_packet *P) {
 	unsigned short rp;
@@ -3790,6 +3852,9 @@
 
 	return 0;
 } /* dns_srv_parse() */
+static int dns_srv_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return  dns_srv_parse (&arg0->srv, rr, P);
+}
 
 
 int dns_srv_push(struct dns_packet *P, struct dns_srv *srv) {
@@ -3840,7 +3905,9 @@
 
 	return error;
 } /* dns_srv_push() */
-
+static int dns_srv_push0(struct dns_packet *P, void *srv) {
+	return dns_srv_push (P, srv);
+}
 
 int dns_srv_cmp(const struct dns_srv *a, const struct dns_srv *b) {
 	int cmp;
@@ -3860,6 +3927,9 @@
 
 	return strcasecmp(a->target, b->target);
 } /* dns_srv_cmp() */
+static int dns_srv_cmp0(const void *a, const void *b) {
+	return dns_srv_cmp (a, b);
+}
 
 
 size_t dns_srv_print(void *_dst, size_t lim, struct dns_srv *srv) {
@@ -3875,12 +3945,16 @@
 
 	return dns_b_strllen(&dst);
 } /* dns_srv_print() */
-
+static size_t dns_srv_print0(void *_dst, size_t lim, void *srv) {
+	return dns_srv_print (_dst, lim, srv);
+}
 
 size_t dns_srv_cname(void *dst, size_t lim, struct dns_srv *srv) {
 	return dns_strlcpy(dst, srv->target, lim);
 } /* dns_srv_cname() */
-
+static size_t dns_srv_cname0(void *dst, size_t lim, void *srv) {
+	return dns_srv_cname (dst, lim, srv);
+}
 
 unsigned int dns_opt_ttl(const struct dns_opt *opt) {
 	unsigned int ttl = 0;
@@ -3947,6 +4021,9 @@
 
 	return 0;
 } /* dns_opt_parse() */
+static int dns_opt_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return  dns_opt_parse (&arg0->opt, rr, P);
+}
 
 
 int dns_opt_push(struct dns_packet *P, struct dns_opt *opt) {
@@ -3976,7 +4053,9 @@
 error:
 	return error;
 } /* dns_opt_push() */
-
+static int dns_opt_push0(struct dns_packet *P, void *opt) {
+	return dns_opt_push (P, opt);
+}
 
 int dns_opt_cmp(const struct dns_opt *a, const struct dns_opt *b) {
 	(void)a;
@@ -3984,6 +4063,9 @@
 
 	return -1;
 } /* dns_opt_cmp() */
+static int dns_opt_cmp0(const void *a, const void *b) {
+	return dns_opt_cmp (a, b);
+}
 
 
 size_t dns_opt_print(void *_dst, size_t lim, struct dns_opt *opt) {
@@ -4001,17 +4083,24 @@
 
 	return dns_b_strllen(&dst);
 } /* dns_opt_print() */
-
+static size_t dns_opt_print0(void *_dst, size_t lim, void *opt) {
+	return dns_opt_print (_dst, lim, opt);
+}
 
 int dns_ptr_parse(struct dns_ptr *ptr, struct dns_rr *rr, struct dns_packet *P) {
 	return dns_ns_parse((struct dns_ns *)ptr, rr, P);
 } /* dns_ptr_parse() */
+int dns_ptr_parse0(union dns_any *ptr, struct dns_rr *rr, struct dns_packet *P) {
+	return dns_ns_parse0(ptr, rr, P);
+}
 
 
 int dns_ptr_push(struct dns_packet *P, struct dns_ptr *ptr) {
 	return dns_ns_push(P, (struct dns_ns *)ptr);
 } /* dns_ptr_push() */
-
+static int dns_ptr_push0(struct dns_packet *P, void *ptr) {
+	return dns_ns_push(P, ptr);
+}
 
 size_t dns_ptr_qname(void *dst, size_t lim, int af, void *addr) {
 	switch (af) {
@@ -4031,17 +4120,24 @@
 int dns_ptr_cmp(const struct dns_ptr *a, const struct dns_ptr *b) {
 	return strcasecmp(a->host, b->host);
 } /* dns_ptr_cmp() */
+static int dns_ptr_cmp0(const void *a, const void *b) {
+	return dns_ptr_cmp (a, b);
+}
 
 
 size_t dns_ptr_print(void *dst, size_t lim, struct dns_ptr *ptr) {
 	return dns_ns_print(dst, lim, (struct dns_ns *)ptr);
 } /* dns_ptr_print() */
-
+static size_t dns_ptr_print0(void *dst, size_t lim, void *ptr) {
+	return dns_ns_print(dst, lim, ptr);
+}
 
 size_t dns_ptr_cname(void *dst, size_t lim, struct dns_ptr *ptr) {
 	return dns_strlcpy(dst, ptr->host, lim);
 } /* dns_ptr_cname() */
-
+static size_t dns_ptr_cname0(void *dst, size_t lim, void *ptr) {
+	return dns_ptr_cname (dst, lim, ptr);
+}
 
 int dns_sshfp_parse(struct dns_sshfp *fp, struct dns_rr *rr, struct dns_packet *P) {
 	unsigned p = rr->rd.p, pe = rr->rd.p + rr->rd.len;
@@ -4066,6 +4162,9 @@
 
 	return 0;
 } /* dns_sshfp_parse() */
+static int dns_sshfp_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return  dns_sshfp_parse (&arg0->sshfp, rr, P);
+}
 
 
 int dns_sshfp_push(struct dns_packet *P, struct dns_sshfp *fp) {
@@ -4098,7 +4197,9 @@
 
 	return 0;
 } /* dns_sshfp_push() */
-
+static int dns_sshfp_push0(struct dns_packet *P, void *fp) {
+	return dns_sshfp_push (P, fp);
+}
 
 int dns_sshfp_cmp(const struct dns_sshfp *a, const struct dns_sshfp *b) {
 	int cmp;
@@ -4115,6 +4216,9 @@
 
 	/* NOT REACHED */
 } /* dns_sshfp_cmp() */
+static int dns_sshfp_cmp0(const void *a, const void *b) {
+	return dns_sshfp_cmp (a, b);
+}
 
 
 size_t dns_sshfp_print(void *_dst, size_t lim, struct dns_sshfp *fp) {
@@ -4143,7 +4247,9 @@
 
 	return dns_b_strllen(&dst);
 } /* dns_sshfp_print() */
-
+static size_t dns_sshfp_print0 (void *_dst, size_t lim, void *fp) {
+	return dns_sshfp_print (_dst, lim, fp);
+}
 
 struct dns_txt *dns_txt_init(struct dns_txt *txt, size_t size) {
 	assert(size > offsetof(struct dns_txt, data));
@@ -4190,6 +4296,9 @@
 
 	return 0;
 } /* dns_txt_parse() */
+static int dns_txt_parse0(union dns_any *arg0, struct dns_rr *rr, struct dns_packet *P) {
+	return  dns_txt_parse (&arg0->txt, rr, P);
+}
 
 
 int dns_txt_push(struct dns_packet *P, struct dns_txt *txt) {
@@ -4233,7 +4342,9 @@
 
 	return 0;
 } /* dns_txt_push() */
-
+static int dns_txt_push0(struct dns_packet *P, void *txt) {
+	return dns_txt_push(P, txt);
+}
 
 int dns_txt_cmp(const struct dns_txt *a, const struct dns_txt *b) {
 	(void)a;
@@ -4241,6 +4352,9 @@
 
 	return -1;
 } /* dns_txt_cmp() */
+static int dns_txt_cmp0(const void *a, const void *b) {
+	return dns_txt_cmp (a, b);
+}
 
 
 size_t dns_txt_print(void *_dst, size_t lim, struct dns_txt *txt) {
@@ -4273,44 +4387,35 @@
 
 	return dns_b_strllen(&dst);
 } /* dns_txt_print() */
-
-
-/* Some of the function pointers of DNS_RRTYPES are initialized with
- * slighlly different functions, thus we can't use prototypes.  */
-DNS_PRAGMA_PUSH
-#if __clang__
-#pragma clang diagnostic ignored "-Wstrict-prototypes"
-#elif DNS_GNUC_PREREQ(4,6,0)
-#pragma GCC   diagnostic ignored "-Wstrict-prototypes"
-#endif
+static size_t dns_txt_print0(void *_dst, size_t lim, void *txt) {
+	return dns_txt_print (_dst, lim, txt);
+}
 
 static const struct dns_rrtype {
 	enum dns_type type;
 	const char *name;
 	union dns_any *(*init)(union dns_any *, size_t);
-	int (*parse)();
-	int (*push)();
-	int (*cmp)();
-	size_t (*print)();
-	size_t (*cname)();
+	int (*parse)(union dns_any *, struct dns_rr *, struct dns_packet *);
+	int (*push)(struct dns_packet *, void *);
+	int (*cmp)(const void *, const void *);
+	size_t (*print)(void *, size_t, void *);
+	size_t (*cname)(void *, size_t, void *);
 } dns_rrtypes	= {
-	{ DNS_T_A,      "A",      0,                 &dns_a_parse,      &dns_a_push,      &dns_a_cmp,      &dns_a_print,      0,                },
-	{ DNS_T_AAAA,   "AAAA",   0,                 &dns_aaaa_parse,   &dns_aaaa_push,   &dns_aaaa_cmp,   &dns_aaaa_print,   0,                },
-	{ DNS_T_MX,     "MX",     0,                 &dns_mx_parse,     &dns_mx_push,     &dns_mx_cmp,     &dns_mx_print,     &dns_mx_cname,    },
-	{ DNS_T_NS,     "NS",     0,                 &dns_ns_parse,     &dns_ns_push,     &dns_ns_cmp,     &dns_ns_print,     &dns_ns_cname,    },
-	{ DNS_T_CNAME,  "CNAME",  0,                 &dns_cname_parse,  &dns_cname_push,  &dns_cname_cmp,  &dns_cname_print,  &dns_cname_cname, },
-	{ DNS_T_SOA,    "SOA",    0,                 &dns_soa_parse,    &dns_soa_push,    &dns_soa_cmp,    &dns_soa_print,    0,                },
-	{ DNS_T_SRV,    "SRV",    0,                 &dns_srv_parse,    &dns_srv_push,    &dns_srv_cmp,    &dns_srv_print,    &dns_srv_cname,   },
-	{ DNS_T_OPT,    "OPT",    &dns_opt_initany,  &dns_opt_parse,    &dns_opt_push,    &dns_opt_cmp,    &dns_opt_print,    0,                },
-	{ DNS_T_PTR,    "PTR",    0,                 &dns_ptr_parse,    &dns_ptr_push,    &dns_ptr_cmp,    &dns_ptr_print,    &dns_ptr_cname,   },
-	{ DNS_T_TXT,    "TXT",    &dns_txt_initany,  &dns_txt_parse,    &dns_txt_push,    &dns_txt_cmp,    &dns_txt_print,    0,                },
-	{ DNS_T_SPF,    "SPF",    &dns_txt_initany,  &dns_txt_parse,    &dns_txt_push,    &dns_txt_cmp,    &dns_txt_print,    0,                },
-	{ DNS_T_SSHFP,  "SSHFP",  0,                 &dns_sshfp_parse,  &dns_sshfp_push,  &dns_sshfp_cmp,  &dns_sshfp_print,  0,                },
+	{ DNS_T_A,      "A",      0,                 &dns_a_parse0,     &dns_a_push0,     &dns_a_cmp0,     &dns_a_print0,     0,                },
+	{ DNS_T_AAAA,   "AAAA",   0,                 &dns_aaaa_parse0,  &dns_aaaa_push0,  &dns_aaaa_cmp0,  &dns_aaaa_print0,  0,                },
+	{ DNS_T_MX,     "MX",     0,                 &dns_mx_parse0,    &dns_mx_push0,    &dns_mx_cmp0,    &dns_mx_print0,    &dns_mx_cname0,   },
+	{ DNS_T_NS,     "NS",     0,                 &dns_ns_parse0,    &dns_ns_push0,    &dns_ns_cmp0,    &dns_ns_print0,    &dns_ns_cname0,   },
+	{ DNS_T_CNAME,  "CNAME",  0,                 &dns_cname_parse0, &dns_cname_push0, &dns_cname_cmp0, &dns_cname_print0, &dns_cname_cname0,},
+	{ DNS_T_SOA,    "SOA",    0,                 &dns_soa_parse0,   &dns_soa_push0,   &dns_soa_cmp0,   &dns_soa_print0,   0,                },
+	{ DNS_T_SRV,    "SRV",    0,                 &dns_srv_parse0,   &dns_srv_push0,   &dns_srv_cmp0,   &dns_srv_print0,   &dns_srv_cname0,  },
+	{ DNS_T_OPT,    "OPT",    &dns_opt_initany,  &dns_opt_parse0,   &dns_opt_push0,   &dns_opt_cmp0,   &dns_opt_print0,   0,                },
+	{ DNS_T_PTR,    "PTR",    0,                 &dns_ptr_parse0,   &dns_ptr_push0,   &dns_ptr_cmp0,   &dns_ptr_print0,   &dns_ptr_cname0,  },
+	{ DNS_T_TXT,    "TXT",    &dns_txt_initany,  &dns_txt_parse0,   &dns_txt_push0,   &dns_txt_cmp0,   &dns_txt_print0,   0,                },
+	{ DNS_T_SPF,    "SPF",    &dns_txt_initany,  &dns_txt_parse0,   &dns_txt_push0,   &dns_txt_cmp0,   &dns_txt_print0,   0,                },
+	{ DNS_T_SSHFP,  "SSHFP",  0,                 &dns_sshfp_parse0, &dns_sshfp_push0, &dns_sshfp_cmp0, &dns_sshfp_print0, 0,                },
 	{ DNS_T_AXFR,   "AXFR",   0,                 0,                 0,                0,               0,                 0,                },
 }; /* dns_rrtypes */
 
-DNS_PRAGMA_POP  /*(-Wstrict-prototypes)*/
-
 
 
 static const struct dns_rrtype *dns_rrtype(enum dns_type type) {

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/domaininfo.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/domaininfo.c Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/fakecrl.c Added

@@ -0,0 +1,63 @@
+/* fakecrl.c - Debug code to test revocations.
+ * Copyright (C) 2023 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/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/*
+ * For regression testing it is useful to have a way to claim that
+ * certain certificates are revoked. We achieve this with the
+ * --fake-crl option which takes a file name as argument. The format
+ * of the file is: empty lines and lines starting with a hash sign are
+ * ignored. A line with the issuer DN in brackets starts entries for
+ * this issuer. All following lines up to the next line with a
+ * bracket list revoked certificates. For each revoked certificate
+ * the hexadecimal encoded serial number is listed, followed by the
+ * revocation date in ISO 14 byte notation, optionally followed by a
+ * reason keyword. Example:
+ *---------------------
+ * # Sample Fake CRL
+ * CN=Bayern-Softtoken-Issuing-CA-2019,OU=IT-DLZ,O=Freistaat Bayern,C=DE
+ * 7FD62B1A9EA5BBC84971183080717004 20221125T074346
+ * 11223344556677 20230101T000000 key_compromise
+ * 0000000000000042 20221206T121200 certificate_hold
+ *
+ * CN=CA IVBB Deutsche Telekom AG 18,OU=Bund,O=PKI-1-Verwaltung,C=DE
+ * 735D1B97389F 20230210T083947
+ *---------------------
+ */
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "dirmngr.h"
+#include "crlcache.h"
+
+
+
+/* Returns 0 if the given certificate is not listed in the faked CRL
+ * or no fake CRL is configured. It is expected that the caller then
+ * consults the real CRL. */
+gpg_error_t
+fakecrl_isvalid (ctrl_t ctrl, const char *issuer_hash, const char *cert_id)
+{
+ (void)ctrl;
+ (void)issuer_hash;
+ (void)cert_id;
+ return 0;
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/http.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/http.c Changed

@@ -64,6 +64,12 @@
 # include <winsock2.h>
 # endif
 # include <windows.h>
+# ifndef EHOSTUNREACH
+# define EHOSTUNREACH WSAEHOSTUNREACH
+# endif
+# ifndef EAFNOSUPPORT
+# define EAFNOSUPPORT WSAEAFNOSUPPORT
+# endif
 #else /*!HAVE_W32_SYSTEM*/
 # include <sys/types.h>
 # include <sys/socket.h>
@@ -440,20 +446,48 @@
 my_gnutls_read (gnutls_transport_ptr_t ptr, void *buffer, size_t size)
 {
 my_socket_t sock = ptr;
-#if USE_NPTH
+#ifdef HAVE_W32_SYSTEM
+ /* Under Windows we need to use recv for a socket. */
+ int nread;
+# if USE_NPTH
+ npth_unprotect ();
+# endif
+ nread = recv (FD2INT (sock->fd), buffer, size, 0);
+# if USE_NPTH
+ npth_protect ();
+# endif
+ return nread;
+
+#else /* !HAVE_W32_SYSTEM */
+# if USE_NPTH
 return npth_read (sock->fd, buffer, size);
-#else
+# else
 return read (sock->fd, buffer, size);
+# endif
 #endif
 }
 static ssize_t
 my_gnutls_write (gnutls_transport_ptr_t ptr, const void *buffer, size_t size)
 {
 my_socket_t sock = ptr;
-#if USE_NPTH
+#ifdef HAVE_W32_SYSTEM
+ int nwritten;
+# if USE_NPTH
+ npth_unprotect ();
+# endif
+ nwritten = send (FD2INT (sock->fd), buffer, size, 0);
+# if USE_NPTH
+ npth_protect ();
+# endif
+ return nwritten;
+
+#else /*!HAVE_W32_SYSTEM*/
+
+# if USE_NPTH
 return npth_write (sock->fd, buffer, size);
-#else
+# else
 return write (sock->fd, buffer, size);
+# endif
 #endif
 }
 #endif /*HTTP_USE_GNUTLS*/
@@ -2521,7 +2555,7 @@
 * Parse the response from a server.
 * Returns: Errorcode and sets some files in the handle
 */
-static gpg_err_code_t
+static gpg_error_t
 parse_response (http_t hd)
 {
 char *line, *p, *p2;
@@ -2545,11 +2579,11 @@
 len = es_read_line (hd->fp_read, &hd->buffer, &hd->buffer_size, &maxlen);
 line = hd->buffer;
 if (!line)
-	return gpg_err_code_from_syserror (); /* Out of core. */
+	return gpg_error_from_syserror (); /* Out of core. */
 if (!maxlen)
-	return GPG_ERR_TRUNCATED; /* Line has been truncated. */
+	return gpg_error (GPG_ERR_TRUNCATED); /* Line has been truncated. */
 if (!len)
-	return GPG_ERR_EOF;
+	return gpg_error (GPG_ERR_EOF);
 
 if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP))
 log_debug_string (line, "http.c:response:\n");
@@ -2589,10 +2623,10 @@
 len = es_read_line (hd->fp_read, &hd->buffer, &hd->buffer_size, &maxlen);
 line = hd->buffer;
 if (!line)
-	return gpg_err_code_from_syserror (); /* Out of core. */
+	return gpg_error_from_syserror (); /* Out of core. */
 /* Note, that we can silently ignore truncated lines. */
 if (!len)
-	return GPG_ERR_EOF;
+	return gpg_error (GPG_ERR_EOF);
 /* Trim line endings of empty lines. */
 if ((*line == '\r' && line1 == '\n') || *line == '\n')
 	*line = 0;
@@ -2603,7 +2637,7 @@
 {
 gpg_err_code_t ec = store_header (hd, line);
 if (ec)
- return ec;
+ return gpg_error (ec);
 }
 }
 while (len && *line);
@@ -3707,10 +3741,11 @@
 http_release_parsed_uri (locuri);
 return err;
 }
- else if (same_host_p (origuri, locuri))
+ else if (!info->restrict_redir || same_host_p (origuri, locuri))
 {
- /* The host is the same or on an exception list and thus we can
- * take the location verbatim. */
+ /* Take the syntactically correct location or if restrict_redir
+ * is set the host is the same or on an exception list and thus
+ * we can take the location verbatim. */
 http_release_parsed_uri (origuri);
 http_release_parsed_uri (locuri);
 newurl = xtrystrdup (location);
@@ -3720,7 +3755,7 @@
 return err;
 }
 }
- else
+ else /* Strictly rectricted redirection which we used in the past. */
 {
 /* We take only the host and port from the URL given in the
 * Location. This limits the effects of redirection attacks by

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/http.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/http.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ks-action.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ks-action.c Changed

@@ -34,6 +34,100 @@
 # include "ldap-parse-uri.h"
 #endif
 
+
+/* Parse an URI and store it in a new parsed URI item object which is
+ * returned at R_PARSEDURI (with its next set to NULL).  On error an
+ * error code is returned an NULL stored at R_PARSEDITEM.  */
+gpg_error_t
+ks_action_parse_uri (const char *uri, uri_item_t *r_parseduri)
+{
+  gpg_error_t err;
+  uri_item_t item;
+  char *tmpstr = NULL;
+#if USE_LDAP
+  const char *s;
+#endif
+
+  *r_parseduri = NULL;
+
+  if (!uri)
+    return gpg_error (GPG_ERR_INV_URI);
+
+  item = xtrymalloc (sizeof *item + strlen (uri));
+  if (!item)
+    return gpg_error_from_syserror ();
+
+  item->next = NULL;
+  item->parsed_uri = NULL;
+  strcpy (item->uri, uri);
+
+#if USE_LDAP
+  if (!strncmp (uri, "ldap:", 5) && !(uri5 == '/' && uri6 == '/'))
+    {
+      /* Special ldap scheme given.  This differs from a valid ldap
+       * scheme in that no double slash follows.  We use
+       * http_parse_uri to put it as opaque value into parsed_uri.  */
+      tmpstr = strconcat ("opaque:", uri+5, NULL);
+      if (!tmpstr)
+        err = gpg_error_from_syserror ();
+      else
+        err = http_parse_uri (&item->parsed_uri, tmpstr, 0);
+    }
+  else if ((s=strchr (uri, ':')) && !(s1 == '/' && s2 == '/'))
+    {
+      /* No valid scheme given.  We use http_parse_uri to put the
+       * string as opaque value into parsed_uri.  */
+      tmpstr = strconcat ("opaque:", uri, NULL);
+      if (!tmpstr)
+        err = gpg_error_from_syserror ();
+      else
+        err = http_parse_uri (&item->parsed_uri, tmpstr, 0);
+    }
+  else if (ldap_uri_p (uri))
+    {
+      int fixup = 0;
+      /* Fixme: We should get rid of that parser and replace it with
+       * our generic (http) URI parser.  */
+
+      /* If no port has been specified and the scheme ist ldaps we use
+       * our idea of the default port because the standard LDAP URL
+       * parser would use 636 here.  This is because we redefined
+       * ldaps to mean starttls.  */
+#ifdef HAVE_W32_SYSTEM
+      if (!strcmp (uri, "ldap:///"))
+          fixup = 1;
+      else
+#endif
+        if (!http_parse_uri (&item->parsed_uri,uri,HTTP_PARSE_NO_SCHEME_CHECK))
+        {
+          if (!item->parsed_uri->port
+              && !strcmp (item->parsed_uri->scheme, "ldaps"))
+            fixup = 2;
+          http_release_parsed_uri (item->parsed_uri);
+          item->parsed_uri = NULL;
+        }
+
+      err = ldap_parse_uri (&item->parsed_uri, uri);
+      if (!err && fixup == 1)
+        item->parsed_uri->ad_current = 1;
+      else if (!err && fixup == 2)
+        item->parsed_uri->port = 389;
+    }
+  else
+#endif /* USE_LDAP */
+    {
+      err = http_parse_uri (&item->parsed_uri, uri, HTTP_PARSE_NO_SCHEME_CHECK);
+    }
+
+  xfree (tmpstr);
+  if (err)
+    xfree (item);
+  else
+    *r_parseduri = item;
+  return err;
+}
+
+
 /* Called by the engine's help functions to print the actual help.  */
 gpg_error_t
 ks_print_help (ctrl_t ctrl, const char *text)
@@ -67,8 +161,10 @@
 {
   gpg_error_t err;
   parsed_uri_t parsed_uri;  /* The broken down URI.  */
+#if USE_LDAP
   char *tmpstr;
   const char *s;
+#endif
 
   if (!url || !*url)
     {
@@ -241,7 +337,8 @@
    keyservers and write the result to the provided output stream.  */
 gpg_error_t
 ks_action_get (ctrl_t ctrl, uri_item_t keyservers,
-	       strlist_t patterns, int ldap_only, estream_t outfp)
+	       strlist_t patterns, unsigned int ks_get_flags,
+               gnupg_isotime_t newer, estream_t outfp)
 {
   gpg_error_t err = 0;
   gpg_error_t first_err = 0;
@@ -268,7 +365,7 @@
                        || strcmp (uri->parsed_uri->scheme, "https") == 0);
       int is_ldap = 0;
 
-      if (ldap_only)
+      if ((ks_get_flags & (KS_GET_FLAG_ONLY_LDAP|KS_GET_FLAG_ONLY_AD)))
         is_hkp_s = is_http_s = 0;
 
 #if USE_LDAP
@@ -285,7 +382,8 @@
             {
 #if USE_LDAP
 	      if (is_ldap)
-		err = ks_ldap_get (ctrl, uri->parsed_uri, sl->d, &infp);
+		err = ks_ldap_get (ctrl, uri->parsed_uri, sl->d, ks_get_flags,
+                                   newer, &infp);
 	      else
 #endif
               if (is_hkp_s)
@@ -445,3 +543,53 @@
     err = first_err;
   return err;
 }
+
+
+
+/* Query the default LDAP server or the one given by URL using
+ * the filter expression FILTER.  Write the result to OUTFP.  */
+gpg_error_t
+ks_action_query (ctrl_t ctrl, const char *url, unsigned int ks_get_flags,
+                 const char *filter, char **attrs,
+                 gnupg_isotime_t newer, estream_t outfp)
+{
+#if USE_LDAP
+  gpg_error_t err;
+  estream_t infp = NULL;
+  uri_item_t puri;  /* The broken down URI (only one item used).  */
+
+  if (!url && (ks_get_flags & KS_GET_FLAG_ROOTDSE))
+    url = "ldap://";
+
+  err = ks_action_parse_uri (url, &puri);
+  if (err)
+    return err;
+
+  if ((ks_get_flags & KS_GET_FLAG_ROOTDSE))
+    {
+      /* Reset authentication for a serverless connection.  */
+      puri->parsed_uri->ad_current = 0;
+      puri->parsed_uri->auth = NULL;
+    }
+
+  if (!strcmp (puri->parsed_uri->scheme, "ldap")
+      || !strcmp (puri->parsed_uri->scheme, "ldaps")
+      || !strcmp (puri->parsed_uri->scheme, "ldapi")
+      || puri->parsed_uri->opaque)
+    {
+      err = ks_ldap_query (ctrl, puri->parsed_uri, ks_get_flags, filter,
+                           attrs, newer, &infp);
+      if (!err)
+        err = copy_stream (infp, outfp);
+    }
+  else
+    err = gpg_error (GPG_ERR_CONFIGURATION); /* No LDAP server known.  */
+
+  es_fclose (infp);
+  release_uri_item_list (puri);
+  return err;
+
+#else /* !USE_LDAP */
+  return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+#endif
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ks-action.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ks-action.h Changed

@@ -21,16 +21,22 @@
 #ifndef DIRMNGR_KS_ACTION_H
 #define DIRMNGR_KS_ACTION_H 1
 
+gpg_error_t ks_action_parse_uri (const char *uri, uri_item_t *r_parseduri);
 gpg_error_t ks_action_help (ctrl_t ctrl, const char *url);
 gpg_error_t ks_action_resolve (ctrl_t ctrl, uri_item_t keyservers);
 gpg_error_t ks_action_search (ctrl_t ctrl, uri_item_t keyservers,
 			      strlist_t patterns, estream_t outfp);
 gpg_error_t ks_action_get (ctrl_t ctrl, uri_item_t keyservers,
-			   strlist_t patterns, int ldap_only, estream_t outfp);
+			   strlist_t patterns, unsigned int ks_get_flags,
+                           gnupg_isotime_t newer, estream_t outfp);
 gpg_error_t ks_action_fetch (ctrl_t ctrl, const char *url, estream_t outfp);
 gpg_error_t ks_action_put (ctrl_t ctrl, uri_item_t keyservers,
 			   void *data, size_t datalen,
 			   void *info, size_t infolen);
+gpg_error_t ks_action_query (ctrl_t ctrl, const char *ldapserver,
+                             unsigned int ks_get_flags,
+                             const char *filter, char **attr,
+                             gnupg_isotime_t newer, estream_t outfp);
 
 
 #endif /*DIRMNGR_KS_ACTION_H*/

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ks-engine-hkp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ks-engine-hkp.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ks-engine-http.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ks-engine-http.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ks-engine-ldap.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ks-engine-ldap.c Changed

@@ -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, 2020 g10 Code GmbH
+ * Copyright (C) 2015, 2020, 2023 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -26,12 +26,20 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <npth.h>
+#ifdef HAVE_W32_SYSTEM
+# ifndef WINVER
+# define WINVER 0x0500 /* Same as in common/sysutils.c */
+# endif
+# include <winsock2.h>
+# include <sddl.h>
+#endif
 
 
 #include "dirmngr.h"
 #include "misc.h"
 #include "../common/userids.h"
 #include "../common/mbox-util.h"
+#include "ks-action.h"
 #include "ks-engine.h"
 #include "ldap-misc.h"
 #include "ldap-parse-uri.h"
@@ -40,9 +48,14 @@
 
 /* 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_PGPKEYV2 2 /* Needs "pgpKeyV2" instead of "pgpKey"*/
 #define SERVERINFO_SCHEMAV2 4 /* Version 2 of the Schema. */
 #define SERVERINFO_NTDS 8 /* Server is an Active Directory. */
+#define SERVERINFO_GENERIC 16 /* Connected in genric mode. */
+
+
+/* The page size requested from the server. */
+#define PAGE_SIZE 100
 
 
 #ifndef HAVE_TIMEGM
@@ -50,6 +63,28 @@
 #endif
 
 
+/* Object to keep state pertaining to this module. */
+struct ks_engine_ldap_local_s
+{
+ LDAP *ldap_conn;
+ LDAPMessage *message;
+ LDAPMessage *msg_iter; /* Iterator for message. */
+ unsigned int serverinfo;
+ int scope;
+ char *basedn;
+ char *keyspec;
+ char *filter;
+ struct berval *pagecookie;
+ unsigned int pageno; /* Current page number (starting at 1). */
+ unsigned int total; /* Total number of attributes read. */
+ int more_pages; /* More pages announced by server. */
+};
+
+/*-- prototypes --*/
+static char *map_rid_to_dn (ctrl_t ctrl, const char *rid);
+static char *basedn_from_rootdse (ctrl_t ctrl, parsed_uri_t uri);
+
+
 &#xc;
 static time_t
 ldap2epochtime (const char *timestr)
@@ -125,6 +160,114 @@
 }
 
 
+/* Print a description of supported variables. */
+void
+ks_ldap_help_variables (ctrl_t ctrl)
+{
+ const char data =
+ "Supported variables in LDAP filter expressions:\n"
+ "\n"
+ "domain - The defaultNamingContext.\n"
+ "domain_admins - Group of domain admins.\n"
+ "domain_users - Group with all user accounts.\n"
+ "domain_guests - Group with the builtin gues account.\n"
+ "domain_computers - Group with all clients and servers.\n"
+ "cert_publishers - Group with all cert issuing computers.\n"
+ "protected_users - Group of users with extra protection.\n"
+ "key_admins - Group for delegated access to msdsKeyCredentialLink.\n"
+ "enterprise_key_admins - Similar to key_admins.\n"
+ "domain_domain_controllers - Group with all domain controllers.\n"
+ "sid_domain - SubAuthority numbers.\n";
+
+ ks_print_help (ctrl, data);
+}
+
+
+/* Helper function for substitute_vars. */
+static const char *
+getval_for_filter (void *cookie, const char *name)
+{
+ ctrl_t ctrl = cookie;
+ const char *result = NULL;
+
+ if (!strcmp (name, "sid_domain"))
+ {
+#ifdef HAVE_W32_SYSTEM
+ PSID mysid;
+ static char *sidstr;
+ char *s, *s0;
+ int i;
+
+ if (!sidstr)
+ {
+ mysid = w32_get_user_sid ();
+ if (!mysid)
+ {
+ gpg_err_set_errno (ENOENT);
+ goto leave;
+ }
+
+ if (!ConvertSidToStringSid (mysid, &sidstr))
+ {
+ gpg_err_set_errno (EINVAL);
+ goto leave;
+ }
+ /* Example for SIDSTR:
+ * S-1-5-21-3636969917-2569447256-918939550-1127 */
+ for (s0=NULL,s=sidstr,i=0; (s=strchr (s, '-')); i++)
+ {
+ s++;
+ if (i == 3)
+ s0 = s;
+ else if (i==6)
+ {
+ s-1 = 0;
+ break;
+ }
+ }
+ if (!s0)
+ {
+ log_error ("oops: invalid SID received from OS");
+ gpg_err_set_errno (EINVAL);
+ LocalFree (sidstr);
+ goto leave;
+ }
+ sidstr = s0; /* (We never release SIDSTR thus no memmove.) */
+ }
+ result = sidstr;
+#else
+ gpg_err_set_errno (ENOSYS);
+ goto leave;
+#endif
+ }
+ else if (!strcmp (name, "domain"))
+ result = basedn_from_rootdse (ctrl, NULL);
+ else if (!strcmp (name, "domain_admins"))
+ result = map_rid_to_dn (ctrl, "512");
+ else if (!strcmp (name, "domain_users"))
+ result = map_rid_to_dn (ctrl, "513");
+ else if (!strcmp (name, "domain_guests"))
+ result = map_rid_to_dn (ctrl, "514");
+ else if (!strcmp (name, "domain_computers"))
+ result = map_rid_to_dn (ctrl, "515");
+ else if (!strcmp (name, "domain_domain_controllers"))
+ result = map_rid_to_dn (ctrl, "516");
+ else if (!strcmp (name, "cert_publishers"))
+ result = map_rid_to_dn (ctrl, "517");
+ else if (!strcmp (name, "protected_users"))
+ result = map_rid_to_dn (ctrl, "525");
+ else if (!strcmp (name, "key_admins"))
+ result = map_rid_to_dn (ctrl, "526");
+ else if (!strcmp (name, "enterprise_key_admins"))
+ result = map_rid_to_dn (ctrl, "527");
+ else
+ result = ""; /* Unknown variables are empty. */
+
+ leave:
+ return result;
+}
+
+
 &#xc;
 /* Print a help output for the schemata supported by this module. */
 gpg_error_t
@@ -166,6 +309,104 @@
 
 
 &#xc;
+/* Create a new empty state object. Returns NULL on error */
+static struct ks_engine_ldap_local_s *
+ks_ldap_new_state (void)
+{
+ struct ks_engine_ldap_local_s *state;
+
+ state = xtrycalloc (1, sizeof(struct ks_engine_ldap_local_s));
+ if (state)
+ state->scope = LDAP_SCOPE_SUBTREE;
+ return state;
+}
+
+
+/* Clear the state object STATE. Returns the STATE object. */
+static struct ks_engine_ldap_local_s *
+ks_ldap_clear_state (struct ks_engine_ldap_local_s *state)
+{
+ if (state->ldap_conn)
+ {
+ ldap_unbind (state->ldap_conn);
+ state->ldap_conn = NULL;
+ }
+ if (state->message)
+ {
+ ldap_msgfree (state->message);
+ state->message = NULL;
+ }
+ if (state->pagecookie)
+ {
+ ber_bvfree (state->pagecookie);
+ state->pagecookie = NULL;
+ }
+ state->serverinfo = 0;
+ xfree (state->basedn);
+ state->scope = LDAP_SCOPE_SUBTREE;
+ state->basedn = NULL;
+ xfree (state->keyspec);
+ state->keyspec = NULL;
+ xfree (state->filter);
+ state->filter = NULL;
+ state->pageno = 0;
+ state->total = 0;
+ state->more_pages = 0;
+ return state;
+}
+
+
+/* Release a state object. */
+void
+ks_ldap_free_state (struct ks_engine_ldap_local_s *state)
+{
+ if (!state)
+ return;
+ ks_ldap_clear_state (state);
+ xfree (state);
+}
+
+
+/* Helper for ks_ldap_get and ks_ldap_query. On return first_mode and
+ * next_mode are set accordingly. */
+static gpg_error_t
+ks_ldap_prepare_my_state (ctrl_t ctrl, unsigned int ks_get_flags,
+ int *first_mode, int *next_mode)
+{
+ *first_mode = *next_mode = 0;
+
+ if ((ks_get_flags & KS_GET_FLAG_FIRST))
+ {
+ if (ctrl->ks_get_state)
+ ks_ldap_clear_state (ctrl->ks_get_state);
+ else if (!(ctrl->ks_get_state = ks_ldap_new_state ()))
+ return gpg_error_from_syserror ();
+ *first_mode = 1;
+ }
+
+ if ((ks_get_flags & KS_GET_FLAG_NEXT))
+ {
+ if (!ctrl->ks_get_state || !ctrl->ks_get_state->ldap_conn
+ || !ctrl->ks_get_state->message)
+ {
+ log_error ("ks-ldap: --next requested but no state\n");
+ return gpg_error (GPG_ERR_INV_STATE);
+ }
+ *next_mode = 1;
+ }
+
+ /* Do not keep an old state around if not needed. */
+ if (!(*first_mode || *next_mode))
+ {
+ ks_ldap_free_state (ctrl->ks_get_state);
+ ctrl->ks_get_state = NULL;
+ }
+
+ return 0;
+}
+
+
+&#xc;
 /* Convert a keyspec to a filter. Return an error if the keyspec is
 bad or is not supported. The filter is escaped and returned in
 *filter. It is the caller's responsibility to free *filter.
@@ -223,13 +464,19 @@
 break;
 
 case KEYDB_SEARCH_MODE_MAILSUB:
- if (! only_exact)
+ if ((serverinfo & SERVERINFO_SCHEMAV2))
+	f = xasprintf("(&(gpgMailbox=*%s*)(!(|(pgpRevoked=1)(pgpDisabled=1))))",
+ (freeme = ldap_escape_filter (desc.u.name)));
+ else if (!only_exact)
 	f = xasprintf ("(pgpUserID=*<*%s*>*)",
 		 (freeme = ldap_escape_filter (desc.u.name)));
 break;
 
 case KEYDB_SEARCH_MODE_MAILEND:
- if (! only_exact)
+ if ((serverinfo & SERVERINFO_SCHEMAV2))
+	f = xasprintf("(&(gpgMailbox=*%s)(!(|(pgpRevoked=1)(pgpDisabled=1))))",
+ (freeme = ldap_escape_filter (desc.u.name)));
+ else if (!only_exact)
 	f = xasprintf ("(pgpUserID=*<*%s>*)",
 		 (freeme = ldap_escape_filter (desc.u.name)));
 break;
@@ -282,44 +529,96 @@
 }
 
 
-&#xc;
-/* Connect to an LDAP server and interrogate it.
 
- - uri describes the server to connect to and various options
- including whether to use TLS and the username and password (see
- ldap_parse_uri for a description of the various fields).
+/* Helper for my_ldap_connect. */
+static char *
+interrogate_ldap_dn (LDAP *ldap_conn, const char *basedn_search,
+ unsigned int *r_serverinfo)
+{
+ int lerr;
+ char **vals;
+ LDAPMessage *si_res;
+ int is_gnupg = 0;
+ char *basedn = NULL;
+ char *attr2 = { "pgpBaseKeySpaceDN", "pgpVersion", "pgpSoftware", NULL };
+ char *object;
 
- This function returns:
 
- - The ldap connection handle in *LDAP_CONNP.
+ object = xasprintf ("cn=pgpServerInfo,%s", basedn_search);
 
- - The base DN for the PGP key space by querying the
- pgpBaseKeySpaceDN attribute (This is normally
- 'ou=PGP Keys,dc=EXAMPLE,dc=ORG').
+ npth_unprotect ();
+ lerr = ldap_search_s (ldap_conn, object, LDAP_SCOPE_BASE,
+ "(objectClass=*)", attr2, 0, &si_res);
+ npth_protect ();
+ xfree (object);
 
- - The attribute to lookup to find the pgp key. This is either
- 'pgpKey' or 'pgpKeyV2'.
+ if (lerr == LDAP_SUCCESS)
+ {
+ vals = ldap_get_values (ldap_conn, si_res, "pgpBaseKeySpaceDN");
+ if (vals && vals0)
+ basedn = xtrystrdup (vals0);
+ my_ldap_value_free (vals);
 
- - Whether this is a real ldap server. (It's unclear what this
- exactly means.)
+ vals = ldap_get_values (ldap_conn, si_res, "pgpSoftware");
+ if (vals && vals0)
+ {
+ if (opt.debug)
+ log_debug ("Server: \t%s\n", vals0);
+ if (!ascii_strcasecmp (vals0, "GnuPG"))
+ is_gnupg = 1;
+ }
+ my_ldap_value_free (vals);
 
- 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.
+ vals = ldap_get_values (ldap_conn, si_res, "pgpVersion");
+ if (vals && vals0)
+ {
+ if (opt.debug)
+ log_debug ("Version:\t%s\n", vals0);
+ if (is_gnupg)
+ {
+ const char *fields2;
+ int nfields;
+ nfields = split_fields (vals0, fields, DIM(fields));
+ if (nfields > 0 && atoi(fields0) > 1)
+ *r_serverinfo |= SERVERINFO_SCHEMAV2;
+ if (nfields > 1
+ && !ascii_strcasecmp (fields1, "ntds"))
+ *r_serverinfo |= SERVERINFO_NTDS;
+ }
+ }
+ my_ldap_value_free (vals);
+ }
 
- 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.)
+ /* From man ldap_search_s: "res parameter of
+ ldap_search_ext_s() and ldap_search_s() should be
+ freed with ldap_msgfree() regardless of return
+ value of these functions. */
+ ldap_msgfree (si_res);
+ return basedn;
+}
 
- 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. */
+&#xc;
+/* Connect to an LDAP server and interrogate it.
+ *
+ * URI describes the server to connect to and various options
+ * including whether to use TLS and the username and password (see
+ * ldap_parse_uri for a description of the various fields). Be
+ * default a PGP keyserver is assumed; if GENERIC is true a generic
+ * ldap conenction is instead established.
+ *
+ * Returns: The ldap connection handle in *LDAP_CONNP, R_BASEDN is set
+ * to the base DN for the PGP key space, several flags will be stored
+ * at SERVERINFO, 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 to xfree *BASEDNP. On error these variables are
+ * cleared.
+ *
+ * Note: On success, you still need to check that *BASEDNP is valid.
+ * If it is NULL, then the server does not appear to be an OpenPGP
+ * keyserver. */
 static gpg_error_t
-my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
+my_ldap_connect (parsed_uri_t uri, unsigned int generic, LDAP **ldap_connp,
 char **r_basedn, char **r_host, int *r_use_tls,
 unsigned int *r_serverinfo)
 {
@@ -332,6 +631,7 @@
 int port; /* Port to use. */
 int use_tls; /* 1 = starttls, 2 = ldap-over-tls */
 int use_ntds; /* Use Active Directory authentication. */
+ int use_areconly; /* Lookup only via A record (Windows). */
 const char *bindname;
 const char *password;
 const char *basedn_arg;
@@ -359,6 +659,7 @@
 basedn_arg = server->base;
 use_tls = server->starttls? 1 : server->ldap_over_tls? 2 : 0;
 use_ntds = server->ntds;
+ use_areconly = server->areconly;
 }
 else
 {
@@ -369,12 +670,12 @@
 basedn_arg = uri->path;
 use_tls = uri->use_tls ? 1 : 0;
 use_ntds = uri->ad_current;
+ use_areconly = 0;
 }
 
 if (!port)
 port = use_tls == 2? 636 : 389;
 
-
 if (host)
 {
 host = xtrystrdup (host);
@@ -386,14 +687,15 @@
 }
 
 if (opt.verbose)
- log_info ("ldap connect to '%s:%d:%s:%s:%s:%s%s'\n",
+ log_info ("ldap connect to '%s:%d:%s:%s:%s:%s%s%s'%s\n",
 host, port,
 basedn_arg ? basedn_arg : "",
 bindname ? bindname : "",
 password ? "*****" : "",
 use_tls == 1? "starttls" : use_tls == 2? "ldaptls" : "plain",
- use_ntds ? ",ntds":"");
-
+ use_ntds ? ",ntds":"",
+ use_areconly? ",areconly":"",
+ generic? " (generic)":"");
 
 /* If the uri specifies a secure connection and we don't support
 TLS, then fail; don't silently revert to an insecure
@@ -401,7 +703,7 @@
 if (use_tls)
 {
 #ifndef HAVE_LDAP_START_TLS_S
- log_error ("ldap: can't connect to the server: no TLS support.");
+ log_error ("ks-ldap: can't connect to the server: no TLS support.");
 err = GPG_ERR_LDAP_NOT_SUPPORTED;
 goto out;
 #endif
@@ -421,6 +723,18 @@
 host, port, ldap_err2string (lerr));
 goto out;
 }
+ if (use_areconly)
+ {
+ lerr = ldap_set_option (ldap_conn, LDAP_OPT_AREC_EXCLUSIVE, LDAP_OPT_ON);
+ if (lerr != LDAP_SUCCESS)
+ {
+ log_error ("ks-ldap: unable to set LDAP_OPT_AREC_EXLUSIVE: %s\n",
+ ldap_err2string (lerr));
+ err = ldap_err_to_gpg_err (lerr);
+ goto out;
+ }
+ }
+
 #else /* Unix */
 tmpstr = xtryasprintf ("%s://%s:%d",
 use_tls == 2? "ldaps" : "ldap",
@@ -461,6 +775,8 @@
 {
 int ver = opt.ldaptimeout;
 
+ /* fixme: also use LDAP_OPT_SEND_TIMEOUT? */
+
 lerr = ldap_set_option (ldap_conn, LDAP_OPT_TIMELIMIT, &ver);
 if (lerr != LDAP_SUCCESS)
 {
@@ -553,17 +869,39 @@
 /* By default we don't bind as there is usually no need to. */
 }
 
- if (basedn_arg && *basedn_arg)
+ if (generic)
+ {
+ /* Generic use of this function for arbitrary LDAP servers. */
+ *r_serverinfo |= SERVERINFO_GENERIC;
+ if (basedn_arg && *basedn_arg)
+ {
+ basedn = xtrystrdup (basedn_arg);
+ if (!basedn)
+ {
+ err = gpg_error_from_syserror ();
+ goto out;
+ }
+ }
+ }
+ else if (basedn_arg && *basedn_arg)
 {
 /* User specified base DN. In this case we know the server is a
 * real LDAP server. */
- basedn = xtrystrdup (basedn_arg);
+ const char *user_basedn = basedn_arg;
+
+ *r_serverinfo |= SERVERINFO_REALLDAP;
+
+ /* First try with provided basedn, else retry up one level.
+ * Retry assumes that provided entry is for keyspace,
+ * matching old behavior */
+ basedn = interrogate_ldap_dn (ldap_conn, user_basedn, r_serverinfo);
 if (!basedn)
 {
- err = gpg_error_from_syserror ();
- goto out;
+ const char *basedn_parent = strchr (user_basedn, ',');
+ if (basedn_parent && *basedn_parent)
+ basedn = interrogate_ldap_dn (ldap_conn, basedn_parent + 1,
+ r_serverinfo);
 }
- *r_serverinfo |= SERVERINFO_REALLDAP;
 }
 else
 { /* Look for namingContexts. */
@@ -589,76 +927,12 @@
 * 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 };
 
 *r_serverinfo |= SERVERINFO_REALLDAP;
 
 	 for (i = 0; contexti && !basedn; i++)
-		{
-		 char **vals;
-		 LDAPMessage *si_res;
- int is_gnupg = 0;
-
- {
- char *object = xasprintf ("cn=pgpServerInfo,%s",
- contexti);
- npth_unprotect ();
- lerr = ldap_search_s (ldap_conn, object, LDAP_SCOPE_BASE,
- "(objectClass=*)", attr2, 0, &si_res);
- npth_protect ();
- xfree (object);
- }
-
-		 if (lerr == LDAP_SUCCESS)
-		 {
-		 vals = ldap_get_values (ldap_conn, si_res,
-					 "pgpBaseKeySpaceDN");
-		 if (vals && vals0)
-			{
-			 basedn = xtrystrdup (vals0);
-			}
- my_ldap_value_free (vals);
-
-		 vals = ldap_get_values (ldap_conn, si_res,
-					 "pgpSoftware");
-		 if (vals && vals0)
-			{
- if (opt.debug)
- log_debug ("Server: \t%s\n", vals0);
- if (!ascii_strcasecmp (vals0, "GnuPG"))
- is_gnupg = 1;
-			}
- my_ldap_value_free (vals);
-
-		 vals = ldap_get_values (ldap_conn, si_res,
-					 "pgpVersion");
-		 if (vals && vals0)
-			{
- if (opt.debug)
- log_debug ("Version:\t%s\n", vals0);
- if (is_gnupg)
- {
- const char *fields2;
- int nfields;
- nfields = split_fields (vals0,
- fields, DIM(fields));
- if (nfields > 0 && atoi(fields0) > 1)
- *r_serverinfo |= SERVERINFO_SCHEMAV2;
- if (nfields > 1
- && !ascii_strcasecmp (fields1, "ntds"))
- *r_serverinfo |= SERVERINFO_NTDS;
- }
-			}
- my_ldap_value_free (vals);
-		 }
-
-		 /* From man ldap_search_s: "res parameter of
-		 ldap_search_ext_s() and ldap_search_s() should be
-		 freed with ldap_msgfree() regardless of return
-		 value of these functions. */
-		 ldap_msgfree (si_res);
-		}
+ basedn = interrogate_ldap_dn (ldap_conn, contexti,
+ r_serverinfo);
 
 	 ldap_value_free (context);
 	 }
@@ -729,11 +1003,15 @@
 if (!err && opt.debug)
 {
 log_debug ("ldap_conn: %p\n", ldap_conn);
- log_debug ("server_type: %s\n", ((*r_serverinfo & SERVERINFO_REALLDAP)
- ? "LDAP" : "PGP.com keyserver") );
+ log_debug ("server_type: %s\n",
+ ((*r_serverinfo & SERVERINFO_GENERIC)
+ ? "Generic" :
+ (*r_serverinfo & SERVERINFO_REALLDAP)
+ ? "LDAP" : "PGP.com keyserver") );
 log_debug ("basedn: %s\n", basedn);
- log_debug ("pgpkeyattr: %s\n",
- (*r_serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2":"pgpKey");
+ if (!(*r_serverinfo & SERVERINFO_GENERIC))
+ log_debug ("pgpkeyattr: %s\n",
+ (*r_serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2":"pgpKey");
 }
 
 ldapserver_list_free (server);
@@ -844,6 +1122,15 @@
 }
 my_ldap_value_free (vals);
 
+ vals = ldap_get_values (ldap_conn, message, "modifyTimestamp");
+ if (vals && vals0)
+ {
+ gnupg_isotime_t atime;
+ if (!rfc4517toisotime (atime, vals0))
+ es_fprintf (output, "chg:%s:\n", atime);
+ }
+ my_ldap_value_free (vals);
+
 es_fprintf (output, "INFO %s END\n", certid);
 }
 
@@ -861,168 +1148,644 @@
 }
 
 
+/* Helper for ks_ldap_get. Returns 0 if a key was fetched and printed
+ * to FP. The error code GPG_ERR_NO_DATA is returned if no key was
+ * printed. Note that FP is updated by this function. */
+static gpg_error_t
+return_one_keyblock (LDAP *ldap_conn, LDAPMessage *msg, unsigned int serverinfo,
+ estream_t *fp, strlist_t *seenp)
+{
+ gpg_error_t err;
+ char **vals;
+ char **certid;
+
+ /* Use the long keyid to remove duplicates. The LDAP server returns
+ * the same keyid more than once if there are multiple user IDs on
+ * the key. Note that this does NOT mean that a keyid that exists
+ * multiple times on the keyserver will not be fetched. It means
+ * that each KEY, no matter how many user IDs share its keyid, will
+ * be fetched only once. If a keyid that belongs to more than one
+ * key is fetched, the server quite properly responds with all
+ * matching keys. -ds
+ *
+ * Note that in --first/--next mode we don't do any duplicate
+ * detection.
+ */
+
+ certid = ldap_get_values (ldap_conn, msg, "pgpcertid");
+ if (certid && certid0)
+ {
+ if (!seenp || !strlist_find (*seenp, certid0))
+ {
+ /* It's not a duplicate, add it */
+ if (seenp)
+ add_to_strlist (seenp, certid0);
+
+ if (!*fp)
+ {
+ *fp = es_fopenmem(0, "rw");
+ if (!*fp)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ }
+
+ extract_keys (*fp, ldap_conn, certid0, msg);
+
+ vals = ldap_get_values (ldap_conn, msg,
+ (serverinfo & SERVERINFO_PGPKEYV2)?
+ "pgpKeyV2" : "pgpKey");
+ if (!vals)
+ {
+ err = ldap_to_gpg_err (ldap_conn);
+ log_error("ks-ldap: unable to retrieve key %s "
+ "from keyserver\n", certid0);
+ }
+ else
+ {
+ /* We should strip the new lines. */
+ es_fprintf (*fp, "KEY 0x%s BEGIN\n", certid0);
+ es_fputs (vals0, *fp);
+ es_fprintf (*fp, "\nKEY 0x%s END\n", certid0);
+
+ ldap_value_free (vals);
+ err = 0;
+ }
+ }
+ else /* Duplicate. */
+ err = gpg_error (GPG_ERR_NO_DATA);
+ }
+ else
+ err = gpg_error (GPG_ERR_NO_DATA);
+
+ leave:
+ my_ldap_value_free (certid);
+ return err;
+}
+
+
+/* Helper for ks_ldap_query. Returns 0 if an attr was fetched and
+ * printed to FP. The error code GPG_ERR_NO_DATA is returned if no
+ * data was printed. Note that FP is updated by this function. */
+static gpg_error_t
+return_all_attributes (LDAP *ld, LDAPMessage *msg, estream_t *fp)
+{
+ gpg_error_t err = 0;
+ BerElement *berctx = NULL;
+ char *attr = NULL;
+ const char *attrprefix;
+ struct berval **values = NULL;
+ int idx;
+ int any = 0;
+ const char *s;
+ const char *val;
+ size_t len;
+ char *mydn;
+
+ mydn = ldap_get_dn (ld, msg);
+ if (!*fp)
+ {
+ *fp = es_fopenmem(0, "rw");
+ if (!*fp)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ }
+
+ /* Always print the DN - note that by using only unbkown attributes
+ * it is pissible to list just the DNs with out addiional
+ * linefeeds. */
+ es_fprintf (*fp, "Dn: %s\n", mydn? mydn : "oops DN missing");
+
+ for (npth_unprotect (), attr = ldap_first_attribute (ld, msg, &berctx),
+ npth_protect ();
+ attr;
+ npth_unprotect (), attr = ldap_next_attribute (ld, msg, berctx),
+ npth_protect ())
+ {
+ npth_unprotect ();
+ values = ldap_get_values_len (ld, msg, attr);
+ npth_protect ();
+
+ if (!values)
+ {
+ if (opt.verbose)
+ log_info ("attribute '%s' not found\n", attr);
+ ldap_memfree (attr);
+ attr = NULL;
+ continue;
+ }
+
+ any = 1;
+
+ if (opt.verbose > 1)
+ {
+ log_info ("found attribute '%s'\n", attr);
+ for (idx=0; valuesidx; idx++)
+ log_info (" length%d=%d\n",
+ idx, (int)values0->bv_len);
+ }
+
+ if (!ascii_strcasecmp (attr, "Dn"))
+ attrprefix = "X-";
+ else if (*attr == '#')
+ attrprefix = "X-hash-";
+ else if (*attr == ' ')
+ attrprefix = "X-blank-";
+ else
+ attrprefix = "";
+ /* FIXME: We should remap all invalid chars in ATTR. */
+
+ for (idx=0; valuesidx; idx++)
+ {
+ es_fprintf (*fp, "%s%s: ", attrprefix, attr);
+ val = valuesidx->bv_val;
+ len = valuesidx->bv_len;
+ while (len && (s = memchr (val, '\n', len)))
+ {
+ s++; /* We als want to print the LF. */
+ if (es_fwrite (val, s - val, 1, *fp) != 1)
+ goto fwrite_failed;
+ len -= (s-val);
+ val = s;
+ if (len && es_fwrite (" ", 1, 1, *fp) != 1)
+ goto fwrite_failed;
+ }
+ if (len && es_fwrite (val, len, 1, *fp) != 1)
+ goto fwrite_failed;
+ if (es_fwrite ("\n", 1, 1, *fp) != 1) /* Final LF. */
+ goto fwrite_failed;
+ }
+
+ ldap_value_free_len (values);
+ values = NULL;
+ ldap_memfree (attr);
+ attr = NULL;
+ }
+
+ /* One final linefeed to prettify the output. */
+ if (any && es_fwrite ("\n", 1, 1, *fp) != 1)
+ goto fwrite_failed;
+
+
+ leave:
+ if (values)
+ ldap_value_free_len (values);
+ ldap_memfree (attr);
+ if (mydn)
+ ldap_memfree (mydn);
+ ber_free (berctx, 0);
+ return err;
+
+ fwrite_failed:
+ err = gpg_error_from_syserror ();
+ log_error ("error writing to stdout: %s\n", gpg_strerror (err));
+ goto leave;
+}
+
+
+/* Helper for ks_ldap_get and ks_ldap_query. Note that KEYSPEC is
+ * only used for diagnostics. */
+static gpg_error_t
+search_and_parse (ctrl_t ctrl, const char *keyspec,
+ LDAP *ldap_conn, char *basedn, int scope, char *filter,
+ char **attrs, LDAPMessage **r_message)
+{
+ gpg_error_t err = 0;
+ int l_err, l_reserr;
+ LDAPControl *srvctrls2 = { NULL, NULL };
+ int count;
+ unsigned int totalcount = 0;
+ LDAPControl *pagectrl = NULL;
+ LDAPControl **resctrls = NULL;
+
+ /* first/next mode is used to retrieve many entries; thus we should
+ * use paged results. We assume first/next mode if we have a state.
+ * We make the paged mode non-critical so that we get at least as
+ * many entries the server delivers anyway. */
+ if (ctrl->ks_get_state)
+ {
+ l_err = ldap_create_page_control (ldap_conn, PAGE_SIZE,
+ ctrl->ks_get_state->pagecookie, 0,
+ &pagectrl);
+ if (err)
+ {
+ err = ldap_err_to_gpg_err (l_err);
+ log_error ("ks-ldap: create_page_control failed: %s\n",
+ ldap_err2string (l_err));
+ goto leave;
+ }
+
+ ctrl->ks_get_state->more_pages = 0;
+ srvctrls0 = pagectrl;
+ }
+
+ npth_unprotect ();
+ l_err = ldap_search_ext_s (ldap_conn, basedn, scope,
+ filter, attrs, 0,
+ srvctrls0? srvctrls : NULL, NULL, NULL, 0,
+ r_message);
+ npth_protect ();
+ if (l_err)
+ {
+ err = ldap_err_to_gpg_err (l_err);
+ log_error ("ks-ldap: LDAP search error: %s\n", ldap_err2string (l_err));
+ goto leave;
+ }
+
+ if (ctrl->ks_get_state)
+ {
+ l_err = ldap_parse_result (ldap_conn, *r_message, &l_reserr,
+ NULL, NULL, NULL, &resctrls, 0);
+ if (l_err)
+ {
+ err = ldap_err_to_gpg_err (l_err);
+ log_error ("ks-ldap: LDAP parse result error: %s\n",
+ ldap_err2string (l_err));
+ goto leave;
+ }
+ /* Get the current cookie. */
+ if (ctrl->ks_get_state->pagecookie)
+ {
+ ber_bvfree (ctrl->ks_get_state->pagecookie);
+ ctrl->ks_get_state->pagecookie = NULL;
+ }
+ l_err = ldap_parse_page_control (ldap_conn, resctrls,
+ &totalcount,
+ &ctrl->ks_get_state->pagecookie);
+ if (l_err)
+ {
+ err = ldap_err_to_gpg_err (l_err);
+ log_error ("ks-ldap: LDAP parse page control error: %s\n",
+ ldap_err2string (l_err));
+ goto leave;
+ }
+
+ ctrl->ks_get_state->pageno++;
+
+ /* Decide whether there will be more pages. */
+ ctrl->ks_get_state->more_pages =
+ (ctrl->ks_get_state->pagecookie
+ && ctrl->ks_get_state->pagecookie->bv_val
+ && *ctrl->ks_get_state->pagecookie->bv_val);
+
+ srvctrls0 = NULL;
+ }
+
+ count = ldap_count_entries (ldap_conn, *r_message);
+ if (ctrl->ks_get_state)
+ {
+ if (count >= 0)
+ ctrl->ks_get_state->total += count;
+ if (opt.verbose)
+ log_info ("ks-ldap: received result page %u%s (%d/%u/%u)\n",
+ ctrl->ks_get_state->pageno,
+ ctrl->ks_get_state->more_pages? "":" (last)",
+ count, ctrl->ks_get_state->total, totalcount);
+ }
+ if (count < 1)
+ {
+ if (!ctrl->ks_get_state || ctrl->ks_get_state->pageno == 1)
+ log_info ("ks-ldap: '%s' not found on LDAP server\n", keyspec);
+
+ if (count == -1)
+ err = ldap_to_gpg_err (ldap_conn);
+ else
+ err = gpg_error (GPG_ERR_NO_DATA);
+
+ goto leave;
+ }
+
+
+ leave:
+ if (resctrls)
+ ldap_controls_free (resctrls);
+ if (pagectrl)
+ ldap_control_free (pagectrl);
+ return err;
+}
+
+
+/* Fetch all entries from the RootDSE and return them as a name value
+ * object. */
+static nvc_t
+fetch_rootdse (ctrl_t ctrl, parsed_uri_t uri)
+{
+ gpg_error_t err;
+ estream_t infp = NULL;
+ uri_item_t puri; /* The broken down URI (only one item used). */
+ nvc_t nvc = NULL;
+
+ /* FIXME: We need the unparsed URI here - use uri_item_t instead
+ * of fix the parser to fill in original */
+ err = ks_action_parse_uri (uri && uri->original? uri->original : "ldap://",
+ &puri);
+ if (err)
+ return NULL;
+
+ /* Reset authentication for a serverless. */
+ puri->parsed_uri->ad_current = 0;
+ puri->parsed_uri->auth = NULL;
+
+ if (!strcmp (puri->parsed_uri->scheme, "ldap")
+ || !strcmp (puri->parsed_uri->scheme, "ldaps")
+ || !strcmp (puri->parsed_uri->scheme, "ldapi")
+ || puri->parsed_uri->opaque)
+ {
+ err = ks_ldap_query (ctrl, puri->parsed_uri, KS_GET_FLAG_ROOTDSE,
+ "^&base&(objectclass=*)", NULL, NULL, &infp);
+ if (err)
+ log_error ("ldap: reading the rootDES failed: %s\n",
+ gpg_strerror (err));
+ else if ((err = nvc_parse (&nvc, NULL, infp)))
+ log_error ("parsing the rootDES failed: %s\n", gpg_strerror (err));
+ }
+
+ es_fclose (infp);
+ release_uri_item_list (puri);
+ if (err)
+ {
+ nvc_release (nvc);
+ nvc = NULL;
+ }
+ return nvc;
+}
+
+
+/* Return the DN for the given RID. This is used with the Active
+ * Directory. */
+static char *
+map_rid_to_dn (ctrl_t ctrl, const char *rid)
+{
+ gpg_error_t err;
+ char *result = NULL;
+ estream_t infp = NULL;
+ uri_item_t puri; /* The broken down URI. */
+ nvc_t nvc = NULL;
+ char *filter = NULL;
+ const char *s;
+ char *attr2 = {"dn", NULL};
+
+ err = ks_action_parse_uri ("ldap:///", &puri);
+ if (err)
+ return NULL;
+
+ filter = strconcat ("(objectSid=S-1-5-21-$sid_domain-", rid, ")", NULL);
+ if (!filter)
+ goto leave;
+
+ err = ks_ldap_query (ctrl, puri->parsed_uri, KS_GET_FLAG_SUBST,
+ filter, attr, NULL, &infp);
+ if (err)
+ {
+ log_error ("ldap: AD query '%s' failed: %s\n", filter,gpg_strerror (err));
+ goto leave;
+ }
+ if ((err = nvc_parse (&nvc, NULL, infp)))
+ {
+ log_error ("ldap: parsing the result failed: %s\n",gpg_strerror (err));
+ goto leave;
+ }
+ if (!(s = nvc_get_string (nvc, "Dn:")))
+ {
+ err = gpg_error (GPG_ERR_NOT_FOUND);
+ log_error ("ldap: mapping rid '%s'failed: %s\n", rid, gpg_strerror (err));
+ goto leave;
+ }
+ result = xtrystrdup (s);
+ if (!result)
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("ldap: strdup failed: %s\n", gpg_strerror (err));
+ goto leave;
+ }
+
+ leave:
+ es_fclose (infp);
+ release_uri_item_list (puri);
+ xfree (filter);
+ nvc_release (nvc);
+ return result;
+}
+
+
+/* Return the baseDN for URI which might have already been cached for
+ * this session. */
+static char *
+basedn_from_rootdse (ctrl_t ctrl, parsed_uri_t uri)
+{
+ const char *s;
+
+ if (!ctrl->rootdse && !ctrl->rootdse_tried)
+ {
+ ctrl->rootdse = fetch_rootdse (ctrl, uri);
+ ctrl->rootdse_tried = 1;
+ if (ctrl->rootdse)
+ {
+ log_debug ("Dump of all rootDSE attributes:\n");
+ nvc_write (ctrl->rootdse, log_get_stream ());
+ log_debug ("End of dump\n");
+ }
+ }
+ s = nvc_get_string (ctrl->rootdse, "defaultNamingContext:");
+ return s? xtrystrdup (s): NULL;
+}
+
+
+
+&#xc;
 /* Get the key described key the KEYSPEC string from the keyserver
- identified by URI. On success R_FP has an open stream to read the
- data. */
+ * identified by URI. On success R_FP has an open stream to read the
+ * data. KS_GET_FLAGS conveys flags from the client. */
 gpg_error_t
 ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec,
-	 estream_t *r_fp)
+	 unsigned int ks_get_flags, gnupg_isotime_t newer, estream_t *r_fp)
 {
- gpg_error_t err = 0;
- int ldap_err;
+ gpg_error_t err;
 unsigned int serverinfo;
 char *host = NULL;
 int use_tls;
 char *filter = NULL;
 LDAP *ldap_conn = NULL;
 char *basedn = NULL;
+ int scope = LDAP_SCOPE_SUBTREE;
 estream_t fp = NULL;
 LDAPMessage *message = NULL;
-
- (void) ctrl;
+ LDAPMessage *msg;
+ int anykey = 0;
+ int first_mode = 0;
+ int next_mode = 0;
+ int get_first;
+ strlist_t seen = NULL; /* The set of entries that we've seen. */
+ /* The ordering is significant. Specifically, "pgpcertid" needs to
+ * be the second item in the list, since everything after it may be
+ * discarded if we aren't in verbose mode. */
+ char *attrs =
+ {
+ "dummy", /* (to be be replaced.) */
+ "pgpcertid", "pgpuserid", "pgpkeyid", "pgprevoked", "pgpdisabled",
+ "pgpkeycreatetime", "modifyTimestamp", "pgpkeysize", "pgpkeytype",
+ "gpgfingerprint",
+ NULL
+ };
 
 if (dirmngr_use_tor ())
 {
 return no_ldap_due_to_tor (ctrl);
 }
 
- /* Make sure we are talking to an OpenPGP LDAP server. */
- err = my_ldap_connect (uri, &ldap_conn,
- &basedn, &host, &use_tls, &serverinfo);
- if (err || !basedn)
- {
- if (!err)
-	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);
+ err = ks_ldap_prepare_my_state (ctrl, ks_get_flags, &first_mode, &next_mode);
 if (err)
- goto out;
+ return err;
 
- if (opt.debug)
- log_debug ("ks-ldap: using filter: %s\n", filter);
+ if (next_mode)
+ {
+ next_again:
+ if (!ctrl->ks_get_state->msg_iter && ctrl->ks_get_state->more_pages)
+ {
+ /* Get the next page of results. */
+ if (ctrl->ks_get_state->message)
+ {
+ ldap_msgfree (ctrl->ks_get_state->message);
+ ctrl->ks_get_state->message = NULL;
+ }
+ attrs0 = ((ctrl->ks_get_state->serverinfo & SERVERINFO_PGPKEYV2)?
+ "pgpKeyV2" : "pgpKey");
+ err = search_and_parse (ctrl, ctrl->ks_get_state->keyspec,
+ ctrl->ks_get_state->ldap_conn,
+ ctrl->ks_get_state->basedn,
+ ctrl->ks_get_state->scope,
+ ctrl->ks_get_state->filter,
+ attrs,
+ &ctrl->ks_get_state->message);
+ if (err)
+ goto leave;
+ ctrl->ks_get_state->msg_iter = ctrl->ks_get_state->message;
+ get_first = 1;
+ }
+ else
+ get_first = 0;
 
- {
- /* The ordering is significant. Specifically, "pgpcertid" needs
- to be the second item in the list, since everything after it
- may be discarded if we aren't in verbose mode. */
- char *attrs =
- {
-	"dummy",
-	"pgpcertid", "pgpuserid", "pgpkeyid", "pgprevoked", "pgpdisabled",
-	"pgpkeycreatetime", "modifytimestamp", "pgpkeysize", "pgpkeytype",
- "gpgfingerprint",
-	NULL
- };
- /* 1 if we want just attribute types; 0 if we want both attribute
- * types and values. */
- int attrsonly = 0;
- int count;
+ while (ctrl->ks_get_state->msg_iter)
+ {
+ npth_unprotect ();
+ ctrl->ks_get_state->msg_iter
+ = get_first? ldap_first_entry (ctrl->ks_get_state->ldap_conn,
+ ctrl->ks_get_state->msg_iter)
+ /* */ : ldap_next_entry (ctrl->ks_get_state->ldap_conn,
+ ctrl->ks_get_state->msg_iter);
+ npth_protect ();
+ get_first = 0;
+ if (ctrl->ks_get_state->msg_iter)
+ {
+ err = return_one_keyblock (ctrl->ks_get_state->ldap_conn,
+ ctrl->ks_get_state->msg_iter,
+ ctrl->ks_get_state->serverinfo,
+ &fp, NULL);
+ if (!err)
+ break; /* Found. */
+ else if (gpg_err_code (err) == GPG_ERR_NO_DATA)
+ err = 0; /* Skip empty attributes. */
+ else
+ goto leave;
+ }
+ }
 
- /* Replace "dummy". */
- attrs0 = (serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2" : "pgpKey";
+ if (!ctrl->ks_get_state->msg_iter || !fp)
+ {
+ ctrl->ks_get_state->msg_iter = NULL;
+ if (ctrl->ks_get_state->more_pages)
+ goto next_again;
+ err = gpg_error (GPG_ERR_NO_DATA);
+ }
 
- 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);
+ }
+ else /* Not in --next mode. */
+ {
+ /* Make sure we are talking to an OpenPGP LDAP server. */
+ err = my_ldap_connect (uri, 0, &ldap_conn,
+ &basedn, &host, &use_tls, &serverinfo);
+ if (err || !basedn)
+ {
+ if (!err)
+ err = gpg_error (GPG_ERR_GENERAL);
+ goto leave;
+ }
 
-	log_error ("ks-ldap: LDAP search error: %s\n",
-		 ldap_err2string (ldap_err));
-	goto out;
- }
+ /* Now that we have information about the server we can construct a
+ * query best suited for the capabilities of the server. */
+ if (first_mode && !*keyspec)
+ {
+ filter = xtrystrdup("(!(|(pgpRevoked=1)(pgpDisabled=1)))");
+ err = filter? 0 : gpg_error_from_syserror ();
+ }
+ else
+ err = keyspec_to_ldap_filter (keyspec, &filter, 1, serverinfo);
+ if (err)
+ goto leave;
 
- count = ldap_count_entries (ldap_conn, message);
- if (count < 1)
- {
-	log_info ("ks-ldap: key %s not found on keyserver\n", keyspec);
+ if (*newer)
+ {
+ char *tstr, *fstr;
+
+ tstr = isotime2rfc4517 (newer);
+ if (!tstr)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ fstr = strconcat ("(&", filter,
+ "(modifyTimestamp>=", tstr, "))", NULL);
+ xfree (tstr);
+ if (!fstr)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ xfree (filter);
+ filter = fstr;
+ }
 
-	if (count == -1)
-	 err = ldap_to_gpg_err (ldap_conn);
-	else
-	 err = gpg_error (GPG_ERR_NO_DATA);
+ if (opt.debug)
+ log_debug ("ks-ldap: using filter: %s\n", filter);
 
-	goto out;
- }
+ /* Replace "dummy". */
+ attrs0 = (serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2" : "pgpKey";
 
- {
- /* There may be more than one unique result for a given keyID,
-	 so we should fetch them all (test this by fetching short key
-	 id 0xDEADBEEF). */
+ err = search_and_parse (ctrl, keyspec, ldap_conn, basedn, scope,
+ filter, attrs, &message);
+ if (err)
+ goto leave;
 
- /* The set of entries that we've seen. */
- strlist_t seen = NULL;
- LDAPMessage *each;
- int anykey = 0;
 
 for (npth_unprotect (),
- each = ldap_first_entry (ldap_conn, message),
+ msg = ldap_first_entry (ldap_conn, message),
 npth_protect ();
-	 each;
+	 msg;
 npth_unprotect (),
- each = ldap_next_entry (ldap_conn, each),
+ msg = ldap_next_entry (ldap_conn, msg),
 npth_protect ())
 	{
-	 char **vals;
-	 char **certid;
-
-	 /* Use the long keyid to remove duplicates. The LDAP
-	 server returns the same keyid more than once if there
-	 are multiple user IDs on the key. Note that this does
-	 NOT mean that a keyid that exists multiple times on the
-	 keyserver will not be fetched. It means that each KEY,
-	 no matter how many user IDs share its keyid, will be
-	 fetched only once. If a keyid that belongs to more
-	 than one key is fetched, the server quite properly
-	 responds with all matching keys. -ds */
-
-	 certid = ldap_get_values (ldap_conn, each, "pgpcertid");
-	 if (certid && certid0)
-	 {
-	 if (! strlist_find (seen, certid0))
-		{
-		 /* It's not a duplicate, add it */
-
-		 add_to_strlist (&seen, certid0);
-
-		 if (! fp)
-		 fp = es_fopenmem(0, "rw");
-
-		 extract_keys (fp, ldap_conn, certid0, each);
-
-		 vals = ldap_get_values (ldap_conn, each, attrs0);
-		 if (! vals)
-		 {
-		 err = ldap_to_gpg_err (ldap_conn);
-		 log_error("ks-ldap: unable to retrieve key %s "
-				"from keyserver\n", certid0);
-		 goto out;
-		 }
-		 else
-		 {
-		 /* We should strip the new lines. */
-		 es_fprintf (fp, "KEY 0x%s BEGIN\n", certid0);
-		 es_fputs (vals0, fp);
-		 es_fprintf (fp, "\nKEY 0x%s END\n", certid0);
-
-		 ldap_value_free (vals);
- anykey = 1;
-		 }
-		}
-	 }
-
- my_ldap_value_free (certid);
+ err = return_one_keyblock (ldap_conn, msg, serverinfo,
+ &fp, first_mode? NULL : &seen);
+ if (!err)
+ {
+ anykey = 1;
+ if (first_mode)
+ break;
+ }
+ else if (gpg_err_code (err) == GPG_ERR_NO_DATA)
+ err = 0; /* Skip empty/duplicate attributes. */
+ else
+ goto leave;
 	}
 
- free_strlist (seen);
+ if (ctrl->ks_get_state) /* Save the iterator. */
+ ctrl->ks_get_state->msg_iter = msg;
 
- if (! fp)
+ if (!fp) /* Nothing was found. */
 	err = gpg_error (GPG_ERR_NO_DATA);
 
 if (!err && anykey)
@@ -1030,25 +1793,46 @@
 use_tls? "ldaps" : "ldap",
 host? host:"");
 }
- }
 
- out:
+
+ leave:
+ /* Store our state if needed. */
+ if (!err && (ks_get_flags & KS_GET_FLAG_FIRST))
+ {
+ log_assert (!ctrl->ks_get_state->ldap_conn);
+ ctrl->ks_get_state->ldap_conn = ldap_conn;
+ ldap_conn = NULL;
+ log_assert (!ctrl->ks_get_state->message);
+ ctrl->ks_get_state->message = message;
+ message = NULL;
+ ctrl->ks_get_state->serverinfo = serverinfo;
+ ctrl->ks_get_state->scope = scope;
+ ctrl->ks_get_state->basedn = basedn;
+ basedn = NULL;
+ ctrl->ks_get_state->keyspec = keyspec? xtrystrdup (keyspec) : NULL;
+ ctrl->ks_get_state->filter = filter;
+ filter = NULL;
+ }
+ if ((ks_get_flags & KS_GET_FLAG_NEXT))
+ {
+ /* Keep the state in --next mode even with errors. */
+ ldap_conn = NULL;
+ message = NULL;
+ }
+
 if (message)
 ldap_msgfree (message);
 
 if (err)
- {
- if (fp)
-	es_fclose (fp);
- }
+ es_fclose (fp);
 else
 {
 if (fp)
 	es_fseek (fp, 0, SEEK_SET);
-
 *r_fp = fp;
 }
 
+ free_strlist (seen);
 xfree (basedn);
 xfree (host);
 
@@ -1083,7 +1867,7 @@
 }
 
 /* Make sure we are talking to an OpenPGP LDAP server. */
- err = my_ldap_connect (uri, &ldap_conn, &basedn, NULL, NULL, &serverinfo);
+ err = my_ldap_connect (uri, 0, &ldap_conn, &basedn, NULL, NULL, &serverinfo);
 if (err || !basedn)
 {
 if (!err)
@@ -1119,7 +1903,7 @@
 char *attrs =
 {
 	"pgpcertid", "pgpuserid", "pgprevoked", "pgpdisabled",
-	"pgpkeycreatetime", "pgpkeyexpiretime", "modifytimestamp",
+	"pgpkeycreatetime", "pgpkeyexpiretime", "modifyTimestamp",
 	"pgpkeysize", "pgpkeytype", "gpgfingerprint",
 NULL
 };
@@ -1273,19 +2057,17 @@
 		 }
 my_ldap_value_free (vals);
 
-#if 0
-		/* This is not yet specified in the keyserver
-		 protocol, but may be someday. */
 		es_fputc (':', fp);
 
-		vals = ldap_get_values (ldap_conn, each, "modifytimestamp");
-		if(vals && vals0 strlen (vals0) == 15)
+		vals = ldap_get_values (ldap_conn, each, "modifyTimestamp");
+		if(vals && vals0)
 		 {
-		 es_fprintf (fp, "%u",
-				(unsigned int) ldap2epochtime (vals0));
+ gnupg_isotime_t atime;
+ if (rfc4517toisotime (atime, vals0))
+ *atime = 0;
+ es_fprintf (fp, "%s", atime);
 		 }
 my_ldap_value_free (vals);
-#endif
 
 		es_fprintf (fp, "\n");
 
@@ -1972,7 +2754,7 @@
 return no_ldap_due_to_tor (ctrl);
 }
 
- err = my_ldap_connect (uri, &ldap_conn, &basedn, NULL, NULL, &serverinfo);
+ err = my_ldap_connect (uri, 0, &ldap_conn, &basedn, NULL, NULL, &serverinfo);
 if (err || !basedn)
 {
 if (!err)
@@ -2198,3 +2980,265 @@
 
 return err;
 }
+
+
+&#xc;
+/* Get the data described by FILTER_ARG from URI. On success R_FP has
+ * an open stream to read the data. KS_GET_FLAGS conveys flags from
+ * the client. ATTRS is a NULL terminated list of attributes to
+ * return or NULL for all. */
+gpg_error_t
+ks_ldap_query (ctrl_t ctrl, parsed_uri_t uri, unsigned int ks_get_flags,
+ const char *filter_arg, char **attrs,
+ gnupg_isotime_t newer, estream_t *r_fp)
+{
+ gpg_error_t err;
+ unsigned int serverinfo;
+ char *host = NULL;
+ int use_tls;
+ LDAP *ldap_conn = NULL;
+ char *basedn = NULL;
+ estream_t fp = NULL;
+ char *filter_arg_buffer = NULL;
+ char *filter = NULL;
+ int scope = LDAP_SCOPE_SUBTREE;
+ LDAPMessage *message = NULL;
+ LDAPMessage *msg;
+ int anydata = 0;
+ int first_mode = 0;
+ int next_mode = 0;
+ int get_first;
+
+ if (dirmngr_use_tor ())
+ return no_ldap_due_to_tor (ctrl);
+
+ if ((!filter_arg || !*filter_arg) && (ks_get_flags & KS_GET_FLAG_ROOTDSE))
+ filter_arg = "^&base&(objectclass=*)";
+
+ if ((ks_get_flags & KS_GET_FLAG_SUBST)
+ && filter_arg && strchr (filter_arg, '$'))
+ {
+ filter_arg_buffer = substitute_vars (filter_arg, getval_for_filter, ctrl);
+ if (!filter_arg_buffer)
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("substituting filter variables failed: %s\n",
+ gpg_strerror (err));
+ goto leave;
+ }
+ filter_arg = filter_arg_buffer;
+ }
+
+ err = ks_ldap_prepare_my_state (ctrl, ks_get_flags, &first_mode, &next_mode);
+ if (err)
+ goto leave;
+
+ if (!next_mode) /* (In --next mode the filter is ignored.) */
+ {
+ if (!filter_arg || !*filter_arg)
+ {
+ err = gpg_error (GPG_ERR_LDAP_FILTER);
+ goto leave;
+ }
+ err = ldap_parse_extfilter (filter_arg, 0, &basedn, &scope, &filter);
+ if (err)
+ goto leave;
+ if (newer && *newer)
+ {
+ char *tstr, *fstr;
+
+ tstr = isotime2rfc4517 (newer);
+ if (!tstr)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ if (filter && *filter)
+ fstr = strconcat ("(&", filter,
+ "(modifyTimestamp>=", tstr, "))", NULL);
+ else
+ fstr = strconcat ("(modifyTimestamp>=", tstr, ")", NULL);
+ xfree (tstr);
+ if (!fstr)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ xfree (filter);
+ filter = fstr;
+ }
+ }
+
+
+ if (next_mode)
+ {
+ next_again:
+ if (!ctrl->ks_get_state->msg_iter && ctrl->ks_get_state->more_pages)
+ {
+ /* Get the next page of results. */
+ if (ctrl->ks_get_state->message)
+ {
+ ldap_msgfree (ctrl->ks_get_state->message);
+ ctrl->ks_get_state->message = NULL;
+ }
+ err = search_and_parse (ctrl, ctrl->ks_get_state->keyspec,
+ ctrl->ks_get_state->ldap_conn,
+ ctrl->ks_get_state->basedn,
+ ctrl->ks_get_state->scope,
+ ctrl->ks_get_state->filter,
+ attrs,
+ &ctrl->ks_get_state->message);
+ if (err)
+ goto leave;
+ ctrl->ks_get_state->msg_iter = ctrl->ks_get_state->message;
+ get_first = 1;
+ }
+ else
+ get_first = 0;
+
+ while (ctrl->ks_get_state->msg_iter)
+ {
+ npth_unprotect ();
+ ctrl->ks_get_state->msg_iter
+ = get_first? ldap_first_entry (ctrl->ks_get_state->ldap_conn,
+ ctrl->ks_get_state->msg_iter)
+ /* */ : ldap_next_entry (ctrl->ks_get_state->ldap_conn,
+ ctrl->ks_get_state->msg_iter);
+ npth_protect ();
+ get_first = 0;
+ if (ctrl->ks_get_state->msg_iter)
+ {
+ err = return_all_attributes (ctrl->ks_get_state->ldap_conn,
+ ctrl->ks_get_state->msg_iter,
+ &fp);
+ if (!err)
+ break; /* Found. */
+ else if (gpg_err_code (err) == GPG_ERR_NO_DATA)
+ err = 0; /* Skip empty attributes. */
+ else
+ goto leave;
+ }
+ }
+
+ if (!ctrl->ks_get_state->msg_iter || !fp)
+ {
+ ctrl->ks_get_state->msg_iter = NULL;
+ if (ctrl->ks_get_state->more_pages)
+ goto next_again;
+ err = gpg_error (GPG_ERR_NO_DATA);
+ }
+
+ }
+ else /* Not in --next mode. */
+ {
+ /* Connect to the LDAP server in generic mode. */
+ char *tmpbasedn;
+
+ err = my_ldap_connect (uri, 1 /*generic*/, &ldap_conn,
+ &tmpbasedn, &host, &use_tls, &serverinfo);
+ if (err)
+ goto leave;
+ if (basedn)
+ xfree (tmpbasedn); /* Extended syntax overrides. */
+ else if (tmpbasedn)
+ basedn = tmpbasedn;
+ else if (!(ks_get_flags & KS_GET_FLAG_ROOTDSE))
+ {
+ /* No BaseDN known - get one. */
+ basedn = basedn_from_rootdse (ctrl, uri);
+ }
+
+ if (opt.debug)
+ {
+ log_debug ("ks-ldap: using basedn: %s\n", basedn);
+ log_debug ("ks-ldap: using filter: %s\n", filter);
+ }
+
+ err = search_and_parse (ctrl, filter, ldap_conn, basedn, scope, filter,
+ attrs, &message);
+ if (err)
+ goto leave;
+
+
+ for (npth_unprotect (),
+ msg = ldap_first_entry (ldap_conn, message),
+ npth_protect ();
+	 msg;
+ npth_unprotect (),
+ msg = ldap_next_entry (ldap_conn, msg),
+ npth_protect ())
+	{
+ err = return_all_attributes (ldap_conn, msg, &fp);
+ if (!err)
+ {
+ anydata = 1;
+ if (first_mode)
+ break;
+ }
+ else if (gpg_err_code (err) == GPG_ERR_NO_DATA)
+ err = 0; /* Skip empty/duplicate attributes. */
+ else
+ goto leave;
+	}
+
+ if (ctrl->ks_get_state) /* Save the iterator. */
+ ctrl->ks_get_state->msg_iter = msg;
+
+ if (!fp) /* Nothing was found. */
+	err = gpg_error (GPG_ERR_NO_DATA);
+
+ if (!err && anydata)
+ err = dirmngr_status_printf (ctrl, "SOURCE", "%s://%s",
+ use_tls? "ldaps" : "ldap",
+ host? host:"");
+ }
+
+
+ leave:
+ /* Store our state if needed. */
+ if (!err && (ks_get_flags & KS_GET_FLAG_FIRST))
+ {
+ log_assert (!ctrl->ks_get_state->ldap_conn);
+ ctrl->ks_get_state->ldap_conn = ldap_conn;
+ ldap_conn = NULL;
+ log_assert (!ctrl->ks_get_state->message);
+ ctrl->ks_get_state->message = message;
+ message = NULL;
+ ctrl->ks_get_state->serverinfo = serverinfo;
+ ctrl->ks_get_state->scope = scope;
+ ctrl->ks_get_state->basedn = basedn;
+ basedn = NULL;
+ ctrl->ks_get_state->keyspec = filter? xtrystrdup (filter) : NULL;
+ ctrl->ks_get_state->filter = filter;
+ filter = NULL;
+ }
+ if ((ks_get_flags & KS_GET_FLAG_NEXT))
+ {
+ /* Keep the state in --next mode even with errors. */
+ ldap_conn = NULL;
+ message = NULL;
+ }
+
+ if (message)
+ ldap_msgfree (message);
+
+ if (err)
+ es_fclose (fp);
+ else
+ {
+ if (fp)
+	es_fseek (fp, 0, SEEK_SET);
+ *r_fp = fp;
+ }
+
+ xfree (basedn);
+ xfree (host);
+
+ if (ldap_conn)
+ ldap_unbind (ldap_conn);
+
+ xfree (filter);
+ xfree (filter_arg_buffer);
+
+ return err;
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ks-engine.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ks-engine.h Changed

@@ -23,6 +23,15 @@
 
 #include "http.h"
 
+/* Flags for engine functions.  */
+#define KS_GET_FLAG_ONLY_LDAP 1
+#define KS_GET_FLAG_FIRST     2
+#define KS_GET_FLAG_NEXT      4
+#define KS_GET_FLAG_ONLY_AD   8  /* Do this only if we have an AD.  */
+#define KS_GET_FLAG_ROOTDSE  16  /* Get the rootDSE.  */
+#define KS_GET_FLAG_SUBST    32  /* Substiture variables.  */
+
+
 /*-- ks-action.c --*/
 gpg_error_t ks_print_help (ctrl_t ctrl, const char *text);
 gpg_error_t ks_printf_help (ctrl_t ctrl, const char *format,
@@ -62,14 +71,21 @@
 gpg_error_t ks_kdns_fetch (ctrl_t ctrl, parsed_uri_t uri, estream_t *r_fp);
 
 /*-- ks-engine-ldap.c --*/
+void ks_ldap_help_variables (ctrl_t ctrl);
 gpg_error_t ks_ldap_help (ctrl_t ctrl, parsed_uri_t uri);
+void ks_ldap_free_state (struct ks_engine_ldap_local_s *state);
 gpg_error_t ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 			    estream_t *r_fp);
 gpg_error_t ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri,
-			 const char *keyspec, estream_t *r_fp);
+			 const char *keyspec, unsigned int ks_get_flags,
+                         gnupg_isotime_t newer, estream_t *r_fp);
 gpg_error_t ks_ldap_put (ctrl_t ctrl, parsed_uri_t uri,
 			 void *data, size_t datalen,
 			 void *info, size_t infolen);
+gpg_error_t ks_ldap_query (ctrl_t ctrl, parsed_uri_t uri,
+                           unsigned int ks_get_flags,
+                           const char *filter, char **attrs,
+                           gnupg_isotime_t newer, estream_t *r_fp);
 
 
 #endif /*DIRMNGR_KS_ENGINE_H*/

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ldap-misc.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ldap-misc.c Changed

@@ -332,3 +332,90 @@
 }
 return err;
 }
+
+
+
+/* Scan an ISO timestamp and return a Generalized Time according to
+ * RFC-4517. The only supported format is "yyyymmddThhmmssZ"
+ * delimited by white space, nul, a colon or a comma. Returns a
+ * malloced string or NULL for an invalid string or on memory
+ * error. */
+char *
+isotime2rfc4517 (const char *string)
+{
+ int year, month, day, hour, minu, sec;
+
+ if (!isotime_p (string))
+ {
+ errno = 0;
+ return NULL;
+ }
+
+ year = atoi_4 (string);
+ month = atoi_2 (string + 4);
+ day = atoi_2 (string + 6);
+ hour = atoi_2 (string + 9);
+ minu = atoi_2 (string + 11);
+ sec = atoi_2 (string + 13);
+
+ /* Basic checks (1600 due to the LDAP time format base) */
+ if (year < 1600 || month < 1 || month > 12 || day < 1 || day > 31
+ || hour > 23 || minu > 59 || sec > 61 )
+ {
+ errno = 0;
+ return NULL;
+ }
+
+ return gpgrt_bsprintf ("%04d%02d%02d%02d%02d%02d.0Z",
+ year, month, day, hour, minu, sec);
+}
+
+
+/* Parse an LDAP Generalized Time string and update the provided
+ * isotime buffer. On error return and error code. */
+gpg_error_t
+rfc4517toisotime (gnupg_isotime_t timebuf, const char *string)
+{
+ int i;
+ int year, month, day, hour, minu, sec;
+ const char *s;
+
+ for (i=0, s=string; i < 10; i++, s++) /* Need yyyymmddhh */
+ if (!digitp (s))
+ return gpg_error (GPG_ERR_INV_TIME);
+ year = atoi_4 (string);
+ month = atoi_2 (string + 4);
+ day = atoi_2 (string + 6);
+ hour = atoi_2 (string + 9);
+ minu = 0;
+ sec = 0;
+ if (digitp (s) && digitp (s+1))
+ {
+ minu = atoi_2 (s);
+ s += 2;
+ if (digitp (s) && digitp (s+1))
+ {
+ sec = atoi_2 (s);
+ s += 2;
+ }
+ }
+ if (*s == '.' || *s == ',')
+ {
+ s++;
+ if (!digitp (s)) /* At least one digit of the fraction required. */
+ return gpg_error (GPG_ERR_INV_TIME);
+ s++;
+ while (digitp (s))
+ s++;
+ }
+ if (*s == 'Z' && (!s1 || spacep (s+1)))
+ ; /* stop here. */
+ else if (*s == '-' || *s == '+')
+ return gpg_error (GPG_ERR_NOT_IMPLEMENTED); /* FIXME */
+ else
+ return gpg_error (GPG_ERR_INV_TIME);
+
+ snprintf (timebuf, sizeof (gnupg_isotime_t), "%04d%02d%02dT%02d%02d%02d",
+ year, month, day, hour, minu, sec);
+ return 0;
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ldap-misc.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ldap-misc.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ldap-wrapper.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ldap-wrapper.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ldap.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ldap.c Changed

@@ -119,13 +119,14 @@
                   int multi_mode,
                   int tls_mode,
                   int ntds,
+                  int areconly,
                   const char *proxy,
                   const char *host, int port,
                   const char *user, const char *pass,
                   const char *base, const char *filter, const char *attr,
                   ksba_reader_t *reader)
 {
-  const char *argv50;
+  const char *argv51;
   int argc;
   char portbuf30, timeoutbuf30;
 
@@ -156,6 +157,9 @@
   if (ntds)
     argvargc++ = "--ntds";
 
+  if (areconly)
+    argvargc++ = "--areconly";
+
   if (opt.ldaptimeout)
     {
       snprintf (timeoutbuf, sizeof timeoutbuf, "%u", opt.ldaptimeout);
@@ -262,6 +266,7 @@
                           0, /* No Multi-mode.  */
                           tls_mode,
                           0, /* No AD authentication.  */
+                          0, /* No areconly.  */
                           opt.ldap_proxy,
                           ludp->lud_host, ludp->lud_port,
                           NULL, NULL,  /* user, password */
@@ -308,6 +313,7 @@
                                   0, /* No Multi-mode */
                                   tls_mode,
                                   server->ntds,
+                                  server->areconly,
                                   NULL,
                                   server->host, server->port,
                                   server->user, server->pass,
@@ -358,6 +364,7 @@
                               0,
                               tls_mode,
                               server->ntds,
+                              server->areconly,
                               opt.ldap_proxy,
                               server->host, server->port,
                               server->user, server->pass,
@@ -518,7 +525,7 @@
         {
           /* We need just the BaseDN.  This assumes that the Subject
            * is correcly stored in the DT.  This is however not always
-           * the case and the actual DN is different ffrom the
+           * the case and the actual DN is different from the
            * subject.  In this case we won't find anything.  */
           if (extfilt_need_escape (pattern)
               && !(pattern = pattern_buffer = extfilt_escape (pattern)))
@@ -625,6 +632,7 @@
                               1,  /* --multi (record format) */
                               0, /* No TLS */
                               0, /* No AD authentication.  */
+                              server->areconly,
                               opt.ldap_proxy,
                               server->host, server->port,
                               server->user, server->pass,

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ldapserver.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ldapserver.c Changed

@@ -64,22 +64,22 @@
  *   plain     := Switch to plain unsecured LDAP.
  *   (The last of these 3 flags is the effective one)
  *   ntds      := Use Active Directory authentication
+ *   areconly  := Use option LDAP_OPT_AREC_EXCLUSIVE
  *
  * FILENAME and LINENO are used for diagnostic purposes only.
  */
 ldap_server_t
-ldapserver_parse_one (char *line,
+ldapserver_parse_one (const char *line,
 		      const char *filename, unsigned int lineno)
 {
   char *p;
-  char *endp;
   const char *s;
   ldap_server_t server;
   int fieldno;
   int fail = 0;
   int i;
+  char **fields = NULL;
 
-  /* Parse the colon separated fields.  */
   server = xtrycalloc (1, sizeof *server);
   if (!server)
     {
@@ -87,32 +87,35 @@
       goto leave;
     }
 
-  for (fieldno = 1, p = line; p; p = endp, fieldno++ )
+  fields = strtokenize (line, ":");
+  if (!fields)
+    {
+      fail = 1;
+      goto leave;
+    }
+
+  for (fieldno=0; (p = fieldsfieldno); fieldno++)
     {
-      endp = strchr (p, ':');
-      if (endp)
-	*endp++ = '\0';
-      trim_spaces (p);
       switch (fieldno)
 	{
-	case 1:
+	case 0:
           server->host = xtrystrdup (p);
           if (!server->host)
             fail = 1;
 	  break;
 
-	case 2:
+	case 1:
 	  if (*p)
 	    server->port = atoi (p);
 	  break;
 
-	case 3:
+	case 2:
           server->user = xtrystrdup (p);
           if (!server->user)
             fail = 1;
 	  break;
 
-	case 4:
+	case 3:
 	  if (*p && !server->user)
 	    {
               if (filename)
@@ -130,7 +133,7 @@
             }
 	  break;
 
-	case 5:
+	case 4:
 	  if (*p)
             {
               server->base = xtrystrdup (p);
@@ -139,7 +142,7 @@
             }
 	  break;
 
-        case 6:
+        case 5:
           {
             char **flags = NULL;
 
@@ -175,6 +178,10 @@
                   {
                     server->ntds = 1;
                   }
+                else if (!ascii_strcasecmp (s, "areconly"))
+                  {
+                    server->areconly = 1;
+                  }
                 else
                   {
                     if (filename)
@@ -206,6 +213,7 @@
       ldapserver_list_free (server);
       server = NULL;
     }
+  xfree (fields);
 
   return server;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ldapserver.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ldapserver.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ocsp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ocsp.c Changed

@@ -504,8 +504,11 @@
       goto leave;
     }
 
-  gcry_log_debugsxp ("sig ", s_sig);
-  gcry_log_debugsxp ("hash", s_hash);
+  if (DBG_CRYPTO)
+    {
+      gcry_log_debugsxp ("sig ", s_sig);
+      gcry_log_debugsxp ("hash", s_hash);
+    }
 
   err = gcry_pk_verify (s_sig, s_hash, s_pkey);
   if (err)
@@ -577,8 +580,11 @@
           /* dump_cert ("from ocsp response", cert); */
           cref = xtrymalloc (sizeof *cref);
           if (!cref)
-            log_error (_("allocating list item failed: %s\n"),
-                       gcry_strerror (err));
+            {
+              err = gpg_error_from_syserror ();
+              log_error (_("allocating list item failed: %s\n"),
+                         gpg_strerror (err));
+            }
           else if (!cache_cert_silent (cert, &cref->fpr))
             {
               cref->next = ctrl->ocsp_certs;
@@ -644,10 +650,13 @@
 /* Check whether the certificate either given by fingerprint CERT_FPR
    or directly through the CERT object is valid by running an OCSP
    transaction.  With FORCE_DEFAULT_RESPONDER set only the configured
-   default responder is used. */
+   default responder is used.  If R_REVOKED_AT or R_REASON are not
+   NULL and the certificat has been revoked the revocation time and
+   the reasons are stored there. */
 gpg_error_t
 ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr,
-              int force_default_responder)
+              int force_default_responder, ksba_isotime_t r_revoked_at,
+              const char **r_reason)
 {
   gpg_error_t err;
   ksba_ocsp_t ocsp = NULL;
@@ -666,6 +675,12 @@
   char *oid;
   ksba_name_t name;
   fingerprint_list_t default_signer = NULL;
+  const char *sreason;
+
+  if (r_revoked_at)
+    *r_revoked_at = 0;
+  if (r_reason)
+    *r_reason = NULL;
 
   /* Get the certificate.  */
   if (cert)
@@ -836,8 +851,36 @@
                       more important message than the failure of our
                       cache. */
         }
-    }
 
+      switch (reason)
+        {
+        case KSBA_CRLREASON_UNSPECIFIED:
+          sreason = "unspecified"; break;
+        case KSBA_CRLREASON_KEY_COMPROMISE:
+          sreason = "key compromise"; break;
+        case KSBA_CRLREASON_CA_COMPROMISE:
+          sreason = "CA compromise"; break;
+        case KSBA_CRLREASON_AFFILIATION_CHANGED:
+          sreason = "affiliation changed"; break;
+        case KSBA_CRLREASON_SUPERSEDED:
+          sreason = "superseded"; break;
+        case KSBA_CRLREASON_CESSATION_OF_OPERATION:
+          sreason = "cessation of operation"; break;
+        case KSBA_CRLREASON_CERTIFICATE_HOLD:
+          sreason = "certificate on hold"; break;
+        case KSBA_CRLREASON_REMOVE_FROM_CRL:
+          sreason = "removed from CRL"; break;
+        case KSBA_CRLREASON_PRIVILEGE_WITHDRAWN:
+          sreason = "privilege withdrawn"; break;
+        case KSBA_CRLREASON_AA_COMPROMISE:
+          sreason = "AA compromise"; break;
+        case KSBA_CRLREASON_OTHER:
+          sreason = "other"; break;
+        default: sreason = "?"; break;
+        }
+    }
+  else
+    sreason = "";
 
   if (opt.verbose)
     {
@@ -849,29 +892,19 @@
                 this_update, next_update);
       if (status == KSBA_STATUS_REVOKED)
         log_info (_("certificate has been revoked at: %s due to: %s\n"),
-                  revocation_time,
-                  reason == KSBA_CRLREASON_UNSPECIFIED?   "unspecified":
-                  reason == KSBA_CRLREASON_KEY_COMPROMISE? "key compromise":
-                  reason == KSBA_CRLREASON_CA_COMPROMISE?   "CA compromise":
-                  reason == KSBA_CRLREASON_AFFILIATION_CHANGED?
-                                                      "affiliation changed":
-                  reason == KSBA_CRLREASON_SUPERSEDED?   "superseded":
-                  reason == KSBA_CRLREASON_CESSATION_OF_OPERATION?
-                                                  "cessation of operation":
-                  reason == KSBA_CRLREASON_CERTIFICATE_HOLD?
-                                                  "certificate on hold":
-                  reason == KSBA_CRLREASON_REMOVE_FROM_CRL?
-                                                  "removed from CRL":
-                  reason == KSBA_CRLREASON_PRIVILEGE_WITHDRAWN?
-                                                  "privilege withdrawn":
-                  reason == KSBA_CRLREASON_AA_COMPROMISE? "AA compromise":
-                  reason == KSBA_CRLREASON_OTHER?   "other":"?");
+                  revocation_time, sreason);
 
     }
 
 
   if (status == KSBA_STATUS_REVOKED)
-    err = gpg_error (GPG_ERR_CERT_REVOKED);
+    {
+      err = gpg_error (GPG_ERR_CERT_REVOKED);
+      if (r_revoked_at)
+        gnupg_copy_time (r_revoked_at, revocation_time);
+      if (r_reason)
+        *r_reason = sreason;
+    }
   else if (status == KSBA_STATUS_UNKNOWN)
     err = gpg_error (GPG_ERR_NO_DATA);
   else if (status != KSBA_STATUS_GOOD)

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/ocsp.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/ocsp.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/server.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/server.c Changed

@@ -32,6 +32,13 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
+#ifdef HAVE_W32_SYSTEM
+# ifndef WINVER
+# define WINVER 0x0500 /* Same as in common/sysutils.c */
+# endif
+# include <winsock2.h>
+# include <sddl.h>
+#endif
 
 #include "dirmngr.h"
 #include <assuan.h>
@@ -49,7 +56,7 @@
 # include "ldap-wrapper.h"
 #endif
 #include "ks-action.h"
-#include "ks-engine.h" /* (ks_hkp_print_hosttable) */
+#include "ks-engine.h"
 #if USE_LDAP
 # include "ldap-parse-uri.h"
 #endif
@@ -146,7 +153,7 @@
 }
 
 /* Release an uri_item_t list. */
-static void
+void
 release_uri_item_list (uri_item_t list)
 {
 while (list)
@@ -1310,6 +1317,9 @@
 again:
 if (ocsp_mode)
 {
+ gnupg_isotime_t revoked_at;
+ const char *reason;
+
 /* Note, that we currently ignore the supplied fingerprint FPR;
 * instead ocsp_isvalid does an inquire to ask for the cert.
 * The fingerprint may eventually be used to lookup the
@@ -1317,7 +1327,12 @@
 if (!opt.allow_ocsp)
 err = gpg_error (GPG_ERR_NOT_SUPPORTED);
 else
- err = ocsp_isvalid (ctrl, NULL, NULL, force_default_responder);
+ err = ocsp_isvalid (ctrl, NULL, NULL, force_default_responder,
+ revoked_at, &reason);
+
+ if (gpg_err_code (err) == GPG_ERR_CERT_REVOKED)
+ dirmngr_status_printf (ctrl, "REVOCATIONINFO", "%s %s",
+ revoked_at, reason);
 
 if (gpg_err_code (err) == GPG_ERR_CONFIGURATION
 && gpg_err_source (err) == GPG_ERR_SOURCE_DIRMNGR)
@@ -1331,6 +1346,10 @@
 }
 else if (only_ocsp)
 err = gpg_error (GPG_ERR_NO_CRL_KNOWN);
+ else if (opt.fake_crl && (err = fakecrl_isvalid (ctrl, issuerhash, serialno)))
+ {
+ /* We already got the error code. */
+ }
 else
 {
 switch (crl_cache_isvalid (ctrl,
@@ -1352,8 +1371,11 @@
 goto again;
 }
 break;
+ case CRL_CACHE_NOTTRUSTED:
+ err = gpg_error (GPG_ERR_NOT_TRUSTED);
+ break;
 case CRL_CACHE_CANTUSE:
- err = gpg_error (GPG_ERR_NO_CRL_KNOWN);
+ err = gpg_error (GPG_ERR_INV_CRL_OBJ);
 break;
 default:
 log_fatal ("crl_cache_isvalid returned invalid code\n");
@@ -1366,7 +1388,7 @@
 
 
 /* If the line contains a SHA-1 fingerprint as the first argument,
- return the FPR vuffer on success. The function checks that the
+ return the FPR buffer on success. The function checks that the
 fingerprint consists of valid characters and prints and error
 message if it does not and returns NULL. Fingerprints are
 considered optional and thus no explicit error is returned. NULL is
@@ -1461,7 +1483,7 @@
 goto leave;
 }
 
- assert (cert);
+ log_assert (cert);
 
 err = crl_cache_cert_isvalid (ctrl, cert, ctrl->force_crl_refresh);
 if (gpg_err_code (err) == GPG_ERR_NO_CRL_KNOWN)
@@ -1512,6 +1534,8 @@
 unsigned char fprbuffer20, *fpr;
 ksba_cert_t cert;
 int force_default_responder;
+ gnupg_isotime_t revoked_at;
+ const char *reason;
 
 force_default_responder = has_option (line, "--force-default-responder");
 line = skip_options (line);
@@ -1547,12 +1571,18 @@
 goto leave;
 }
 
- assert (cert);
+ log_assert (cert);
 
 if (!opt.allow_ocsp)
 err = gpg_error (GPG_ERR_NOT_SUPPORTED);
 else
- err = ocsp_isvalid (ctrl, cert, NULL, force_default_responder);
+ err = ocsp_isvalid (ctrl, cert, NULL, force_default_responder,
+ revoked_at, &reason);
+
+ if (gpg_err_code (err) == GPG_ERR_CERT_REVOKED)
+ dirmngr_status_printf (ctrl, "REVOCATIONINFO", "%s %s",
+ revoked_at, reason);
+
 
 leave:
 ksba_cert_release (cert);
@@ -2124,13 +2154,6 @@
 static gpg_error_t
 make_keyserver_item (const char *uri, uri_item_t *r_item)
 {
- gpg_error_t err;
- uri_item_t item;
- const char *s;
- char *tmpstr = NULL;
-
- *r_item = NULL;
-
 /* We used to have DNS CNAME redirection from the URLs below to
 * sks-keyserver. pools. The idea was to allow for a quick way to
 * switch to a different set of pools. The problem with that
@@ -2162,78 +2185,7 @@
 else if (!strcmp (uri, "http://http-keys.gnupg.net"))
 uri = "hkp://keyserver.ubuntu.com:80";
 
- item = xtrymalloc (sizeof *item + strlen (uri));
- if (!item)
- return gpg_error_from_syserror ();
-
- item->next = NULL;
- item->parsed_uri = NULL;
- strcpy (item->uri, uri);
-
-#if USE_LDAP
- if (!strncmp (uri, "ldap:", 5) && !(uri5 == '/' && uri6 == '/'))
- {
- /* Special ldap scheme given. This differs from a valid ldap
- * scheme in that no double slash follows.. Use http_parse_uri
- * to put it as opaque value into parsed_uri. */
- tmpstr = strconcat ("opaque:", uri+5, NULL);
- if (!tmpstr)
- err = gpg_error_from_syserror ();
- else
- err = http_parse_uri (&item->parsed_uri, tmpstr, 0);
- }
- else if ((s=strchr (uri, ':')) && !(s1 == '/' && s2 == '/'))
- {
- /* No valid scheme given. Use http_parse_uri to put the string
- * as opaque value into parsed_uri. */
- tmpstr = strconcat ("opaque:", uri, NULL);
- if (!tmpstr)
- err = gpg_error_from_syserror ();
- else
- err = http_parse_uri (&item->parsed_uri, tmpstr, 0);
- }
- else if (ldap_uri_p (uri))
- {
- int fixup = 0;
- /* Fixme: We should get rid of that parser and replace it with
- * our generic (http) URI parser. */
-
- /* If no port has been specified and the scheme ist ldaps we use
- * our idea of the default port because the standard LDAP URL
- * parser would use 636 here. This is because we redefined
- * ldaps to mean starttls. */
-#ifdef HAVE_W32_SYSTEM
- if (!strcmp (uri, "ldap:///"))
- fixup = 1;
- else
-#endif
- if (!http_parse_uri (&item->parsed_uri,uri,HTTP_PARSE_NO_SCHEME_CHECK))
- {
- if (!item->parsed_uri->port
- && !strcmp (item->parsed_uri->scheme, "ldaps"))
- fixup = 2;
- http_release_parsed_uri (item->parsed_uri);
- item->parsed_uri = NULL;
- }
-
- err = ldap_parse_uri (&item->parsed_uri, uri);
- if (!err && fixup == 1)
- item->parsed_uri->ad_current = 1;
- else if (!err && fixup == 2)
- item->parsed_uri->port = 389;
- }
- else
-#endif /* USE_LDAP */
- {
- err = http_parse_uri (&item->parsed_uri, uri, HTTP_PARSE_NO_SCHEME_CHECK);
- }
-
- xfree (tmpstr);
- if (err)
- xfree (item);
- else
- *r_item = item;
- return err;
+ return ks_action_parse_uri (uri, r_item);
 }
 
 
@@ -2516,32 +2468,49 @@
 
 &#xc;
 static const char hlp_ks_get =
- "KS_GET --quick --ldap {<pattern>}\n"
+ "KS_GET --quick --newer=TIME --ldap --first|--next {<pattern>}\n"
 "\n"
 "Get the keys matching PATTERN from the configured OpenPGP keyservers\n"
 "(see command KEYSERVER). Each pattern should be a keyid, a fingerprint,\n"
 "or an exact name indicated by the '=' prefix. Option --quick uses a\n"
- "shorter timeout; --ldap will use only ldap servers";
+ "shorter timeout; --ldap will use only ldap servers. With --first only\n"
+ "the first item is returned; --next is used to return the next item\n"
+ "Option --newer works only with certain LDAP servers.";
 static gpg_error_t
 cmd_ks_get (assuan_context_t ctx, char *line)
 {
 ctrl_t ctrl = assuan_get_pointer (ctx);
 gpg_error_t err;
- strlist_t list, sl;
+ strlist_t list = NULL;
+ strlist_t sl;
+ const char *s;
 char *p;
 estream_t outfp;
- int ldap_only;
+ unsigned int flags = 0;
+ gnupg_isotime_t opt_newer;
+
+ *opt_newer = 0;
 
 if (has_option (line, "--quick"))
 ctrl->timeout = opt.connect_quick_timeout;
- ldap_only = has_option (line, "--ldap");
+ if (has_option (line, "--ldap"))
+ flags |= KS_GET_FLAG_ONLY_LDAP;
+ if (has_option (line, "--first"))
+ flags |= KS_GET_FLAG_FIRST;
+ if (has_option (line, "--next"))
+ flags |= KS_GET_FLAG_NEXT;
+ if ((s = option_value (line, "--newer"))
+ && !string2isotime (opt_newer, s))
+ {
+ err = set_error (GPG_ERR_SYNTAX, "invalid time format");
+ goto leave;
+ }
 line = skip_options (line);
 
 /* Break the line into a strlist. Each pattern is by
 definition percent-plus escaped. However we only support keyids
 and fingerprints and thus the client has no need to apply the
 escaping. */
- list = NULL;
 for (p=line; *p; line = p)
 {
 while (*p && *p != ' ')
@@ -2563,6 +2532,47 @@
 }
 }
 
+ if ((flags & KS_GET_FLAG_FIRST) && !(flags & KS_GET_FLAG_ONLY_LDAP))
+ {
+ err = PARM_ERROR ("--first is only supported with --ldap");
+ goto leave;
+ }
+
+ if (list && list->next && (flags & KS_GET_FLAG_FIRST))
+ {
+ /* ks_action_get loops over the pattern and we can't easily keep
+ * this state. */
+ err = PARM_ERROR ("Only one pattern allowed with --first");
+ goto leave;
+ }
+
+ if (!list && (flags & KS_GET_FLAG_FIRST))
+ {
+ /* Need to add a dummy pattern if no pattern is given. */
+ if (!add_to_strlist_try (&list, ""))
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ }
+
+
+ if ((flags & KS_GET_FLAG_NEXT))
+ {
+ if (list || (flags & ~KS_GET_FLAG_NEXT))
+ {
+ err = PARM_ERROR ("No pattern or other options allowed with --next");
+ goto leave;
+ }
+ /* Add a dummy pattern. */
+ if (!add_to_strlist_try (&list, ""))
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ }
+
+
 err = ensure_keyserver (ctrl);
 if (err)
 goto leave;
@@ -2577,7 +2587,7 @@
 ctrl->server_local->inhibit_data_logging_now = 0;
 ctrl->server_local->inhibit_data_logging_count = 0;
 err = ks_action_get (ctrl, ctrl->server_local->keyservers,
- list, ldap_only, outfp);
+ list, flags, opt_newer, outfp);
 es_fclose (outfp);
 ctrl->server_local->inhibit_data_logging = 0;
 }
@@ -2697,6 +2707,114 @@
 
 
 &#xc;
+static const char hlp_ad_query =
+ "AD_QUERY --first|--next -- <filter> \n"
+ "\n"
+ "Query properties from a Windows Active Directory.\n"
+ "Options:\n"
+ "\n"
+ " --rootdse - Query the root using serverless binding,\n"
+ " --subst - Substitute variables in the filter\n"
+ " --attr=<attribs> - Comma delimited list of attributes\n"
+ " to return.\n"
+ " --help - List supported variables\n"
+ "\n"
+ "Extended filter syntax is allowed:\n"
+ " ^<base>&<scope>&<filter>\n"
+ "Usual escaping rules apply. An ampersand in <base> must\n"
+ "doubled. <scope> may be \"base\", \"one\", or \"sub\"."
+ ;
+static gpg_error_t
+cmd_ad_query (assuan_context_t ctx, char *line)
+{
+ ctrl_t ctrl = assuan_get_pointer (ctx);
+ gpg_error_t err;
+ unsigned int flags = 0;
+ const char *filter;
+ estream_t outfp = NULL;
+ char *p;
+ char **opt_attr = NULL;
+ const char *s;
+ gnupg_isotime_t opt_newer;
+ int opt_help = 0;
+
+ *opt_newer = 0;
+
+ /* No options for now. */
+ if (has_option (line, "--first"))
+ flags |= KS_GET_FLAG_FIRST;
+ if (has_option (line, "--next"))
+ flags |= KS_GET_FLAG_NEXT;
+ if (has_option (line, "--rootdse"))
+ flags |= KS_GET_FLAG_ROOTDSE;
+ if (has_option (line, "--subst"))
+ flags |= KS_GET_FLAG_SUBST;
+ if (has_option (line, "--help"))
+ opt_help = 1;
+ if ((s = option_value (line, "--newer"))
+ && !string2isotime (opt_newer, s))
+ {
+ err = set_error (GPG_ERR_SYNTAX, "invalid time format");
+ goto leave;
+ }
+ err = get_option_value (line, "--attr", &p);
+ if (err)
+ goto leave;
+ if (p)
+ {
+ opt_attr = strtokenize (p, ",");
+ if (!opt_attr)
+ {
+ err = gpg_error_from_syserror ();
+ xfree (p);
+ goto leave;
+ }
+ xfree (p);
+ }
+ line = skip_options (line);
+ filter = line;
+
+ if (opt_help)
+ {
+ ks_ldap_help_variables (ctrl);
+ err = 0;
+ goto leave;
+ }
+
+ if ((flags & KS_GET_FLAG_NEXT))
+ {
+ if (*filter || (flags & ~KS_GET_FLAG_NEXT))
+ {
+ err = PARM_ERROR ("No filter or other options allowed with --next");
+ goto leave;
+ }
+ }
+
+ /* Setup an output stream and perform the get. */
+ outfp = es_fopencookie (ctx, "w", data_line_cookie_functions);
+ if (!outfp)
+ {
+ err = set_error (GPG_ERR_ASS_GENERAL, "error setting up a data stream");
+ goto leave;
+ }
+
+ ctrl->server_local->inhibit_data_logging = 1;
+ ctrl->server_local->inhibit_data_logging_now = 0;
+ ctrl->server_local->inhibit_data_logging_count = 0;
+
+ err = ks_action_query (ctrl,
+ (flags & KS_GET_FLAG_ROOTDSE)? NULL : "ldap:///",
+ flags, filter, opt_attr, opt_newer, outfp);
+
+ leave:
+ es_fclose (outfp);
+ xfree (opt_attr);
+ ctrl->server_local->inhibit_data_logging = 0;
+ return leave_cmd (ctx, err);
+}
+
+
+&#xc;
 static const char hlp_loadswdb =
 "LOADSWDB --force\n"
 "\n"
@@ -2720,13 +2838,14 @@
 "Multi purpose command to return certain information. \n"
 "Supported values of WHAT are:\n"
 "\n"
- "version - Return the version of the program.\n"
- "pid - Return the process id of the server.\n"
+ "version - Return the version of the program\n"
+ "pid - Return the process id of the server\n"
 "tor - Return OK if running in Tor mode\n"
 "dnsinfo - Return info about the DNS resolver\n"
- "socket_name - Return the name of the socket.\n"
- "session_id - Return the current session_id.\n"
+ "socket_name - Return the name of the socket\n"
+ "session_id - Return the current session_id\n"
 "workqueue - Inspect the work queue\n"
+ "stats - Print stats\n"
 "getenv NAME - Return value of envvar NAME\n";
 static gpg_error_t
 cmd_getinfo (assuan_context_t ctx, char *line)
@@ -2795,6 +2914,12 @@
 workqueue_dump_queue (ctrl);
 err = 0;
 }
+ else if (!strcmp (line, "stats"))
+ {
+ cert_cache_print_stats (ctrl);
+ domaininfo_print_stats (ctrl);
+ err = 0;
+ }
 else if (!strncmp (line, "getenv", 6)
 && (line6 == ' ' || line6 == '\t' || !line6))
 {
@@ -2807,14 +2932,39 @@
 {
 const char *s = getenv (line);
 if (!s)
- err = set_error (GPG_ERR_NOT_FOUND, "No such envvar");
- else
- err = assuan_send_data (ctx, s, strlen (s));
+ {
+ err = set_error (GPG_ERR_NOT_FOUND, "No such envvar");
+ goto leave;
+ }
+ err = assuan_send_data (ctx, s, strlen (s));
 }
 }
+#ifdef HAVE_W32_SYSTEM
+ else if (!strcmp (line, "sid"))
+ {
+ PSID mysid;
+ char *sidstr;
+
+ mysid = w32_get_user_sid ();
+ if (!mysid)
+ {
+ err = set_error (GPG_ERR_NOT_FOUND, "Error getting my SID");
+ goto leave;
+ }
+
+ if (!ConvertSidToStringSid (mysid, &sidstr))
+ {
+ err = set_error (GPG_ERR_BUG, "Error converting SID to a string");
+ goto leave;
+ }
+ err = assuan_send_data (ctx, sidstr, strlen (sidstr));
+ LocalFree (sidstr);
+ }
+#endif /*HAVE_W32_SYSTEM*/
 else
 err = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
 
+ leave:
 return leave_cmd (ctx, err);
 }
 
@@ -2894,6 +3044,7 @@
 { "KS_GET", cmd_ks_get, hlp_ks_get },
 { "KS_FETCH", cmd_ks_fetch, hlp_ks_fetch },
 { "KS_PUT", cmd_ks_put, hlp_ks_put },
+ { "AD_QUERY", cmd_ad_query, hlp_ad_query },
 { "GETINFO", cmd_getinfo, hlp_getinfo },
 { "LOADSWDB", cmd_loadswdb, hlp_loadswdb },
 { "KILLDIRMNGR",cmd_killdirmngr,hlp_killdirmngr },
@@ -3088,6 +3239,10 @@
 ctrl->refcount);
 else
 {
+#if USE_LDAP
+ ks_ldap_free_state (ctrl->ks_get_state);
+ ctrl->ks_get_state = NULL;
+#endif
 release_ctrl_ocsp_certs (ctrl);
 xfree (ctrl->server_local);
 dirmngr_deinit_default_ctrl (ctrl);
@@ -3149,7 +3304,8 @@
 
 
 /* Print a help status line using a printf like format. The function
- * splits text at LFs. */
+ * splits text at LFs. With CTRL beeing NULL, the function behaves
+ * like log_info. */
 gpg_error_t
 dirmngr_status_helpf (ctrl_t ctrl, const char *format, ...)
 {
@@ -3158,12 +3314,20 @@
 char *buf;
 
 va_start (arg_ptr, format);
- buf = es_vbsprintf (format, arg_ptr);
- err = buf? 0 : gpg_error_from_syserror ();
+ if (ctrl)
+ {
+ buf = es_vbsprintf (format, arg_ptr);
+ err = buf? 0 : gpg_error_from_syserror ();
+ if (!err)
+ err = dirmngr_status_help (ctrl, buf);
+ es_free (buf);
+ }
+ else
+ {
+ log_logv (GPGRT_LOGLVL_INFO, format, arg_ptr);
+ err = 0;
+ }
 va_end (arg_ptr);
- if (!err)
- err = dirmngr_status_help (ctrl, buf);
- es_free (buf);
 return err;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/t-http-basic.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/t-http-basic.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/validate.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/validate.c Changed

@@ -255,6 +255,7 @@
   int any_revoked = 0;
   int any_no_crl = 0;
   int any_crl_too_old = 0;
+  int any_not_trusted = 0;
   chain_item_t ci;
 
   log_assert (ctrl->check_revocations_nest_level >= 0);
@@ -266,7 +267,8 @@
       return gpg_error(GPG_ERR_BAD_CERT_CHAIN);
     }
   ctrl->check_revocations_nest_level++;
-
+  if (opt.verbose)
+    log_info ("%d start checking CRLs\n", ctrl->check_revocations_nest_level);
 
   for (ci=chain; ci; ci = ci->next)
     {
@@ -293,17 +295,19 @@
           if (!err)
             err = crl_cache_cert_isvalid (ctrl, ci->cert, 0);
         }
+      if (opt.verbose)
+        log_info ("%d result of checking this CRL: %s\n",
+                  ctrl->check_revocations_nest_level, gpg_strerror (err));
       switch (gpg_err_code (err))
         {
         case 0: err = 0; break;
         case GPG_ERR_CERT_REVOKED: any_revoked = 1; err = 0; break;
         case GPG_ERR_NO_CRL_KNOWN: any_no_crl = 1; err = 0; break;
+        case GPG_ERR_NOT_TRUSTED:  any_not_trusted = 1; err = 0; break;
         case GPG_ERR_CRL_TOO_OLD: any_crl_too_old = 1; err = 0; break;
         default: break;
         }
     }
-  ctrl->check_revocations_nest_level--;
-
 
   if (err)
     ;
@@ -311,10 +315,16 @@
     err = gpg_error (GPG_ERR_CERT_REVOKED);
   else if (any_no_crl)
     err = gpg_error (GPG_ERR_NO_CRL_KNOWN);
+  else if (any_not_trusted)
+    err = gpg_error (GPG_ERR_NOT_TRUSTED);
   else if (any_crl_too_old)
     err = gpg_error (GPG_ERR_CRL_TOO_OLD);
   else
     err = 0;
+  if (opt.verbose)
+    log_info ("%d result of checking all CRLs: %s\n",
+              ctrl->check_revocations_nest_level, gpg_strerror (err));
+  ctrl->check_revocations_nest_level--;
   return err;
 }
 
@@ -950,12 +960,13 @@
   int algo;
   ksba_sexp_t p;
   size_t n;
-  gcry_sexp_t s_sig, s_hash, s_pkey;
+  gcry_sexp_t s_sig, s_pkey;
+  gcry_sexp_t s_hash = NULL;
   const char *algo_name; /* hash algorithm name converted to lower case. */
   int digestlen;
   unsigned char *digest;
   int use_pss = 0;
-  unsigned int saltlen;  /* (use is controlled by use_pss) */
+  unsigned int saltlen = 0;  /* (use is actually controlled by use_pss) */
 
   /* Hash the target certificate using the algorithm from that certificate.  */
   algoid = ksba_cert_get_digest_algo (cert);
@@ -1163,7 +1174,7 @@
   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));
+    log_debug ("%s: gcry_pk_verify: %s\n", __func__, gpg_strerror (err));
 
  leave:
   gcry_md_close (md);

_service:tar_scm:gnupg-2.3.6.tar.bz2/dirmngr/workqueue.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/dirmngr/workqueue.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/DETAILS -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/DETAILS Changed

@@ -193,6 +193,9 @@
 - s :: Sign
 - c :: Certify
 - a :: Authentication
+ - r :: Restricted encryption (subkey only use)
+ - t :: Timestamping
+ - g :: Group key
 - ? :: Unknown capability
 
 A key may have any combination of them in any order. In addition
@@ -519,6 +522,11 @@
 Epoch or an ISO 8601 string which can be detected by the presence
 of the letter 'T'.
 
+*** ASSERT_SIGNER <fingerprint>
+ This is emitted for the matching <fingerprint> when option
+ --assert-signer is used. The fingerprint is printed with
+ uppercase hex digits.
+
 *** SIG_ID <radix64_string> <sig_creation_date> <sig-timestamp>
 This is emitted only for signatures of class 0 or 1 which have
 been verified okay. The string is a signature id and may be used
@@ -1148,7 +1156,13 @@
 - 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
+ - scd_locked :: Waiting for other clients to unlock the
+ scdaemon
+ - gpgtar :: Here <char> has a special meaning: 's'
+ indicates total size and 'c' file count. A
+ <total> of zero indicates that gpgtar is in the
+ scanning phase. A positive <total> is used in
+ the writing phase.
 
 When <what> refers to a file path, it may be truncated.
 
@@ -1174,6 +1188,17 @@
 send to the client instead of this status line. Such an inquiry
 may be used to sync with Pinentry
 
+*** GPGTAR_EXTRACT <tot> <skp> <bad> <sus> <sym> <hrd> <oth>
+ This status line is emitted after gpgtar has extracted files.
+
+ - tot :: Total number of files extracted and stored
+ - skp :: Total number of files skipped during extraction
+ - bad :: Number of files skipped due to a bad file name
+ - sus :: Number of files skipped due to a suspicious file name
+ - sym :: Number of symlinks not restored
+ - hrd :: Number of hard links not restored
+ - oth :: Number of files not extracted due to other reasons.
+
 ** Obsolete status codes
 *** SIGEXPIRED
 Removed on 2011-02-04. This is deprecated in favor of KEYEXPIRED.
@@ -1501,6 +1526,14 @@
 - One octet with the length of the following serial number.
 - The serial number. Regardless of what the length octet
 indicates no more than 16 octets are stored.
+ - 3 :: The internal representation of a private key: For v4 keys we
+ first write 4 octets big endian length of the following
+ s-expression with the protected or unprotected private key;
+ for v5 keys this is not necessarily because that length
+ header is always there. The actual data are N octets of
+ s-expression. Any protection (including the real S2K) is
+ part of that data. Note that the public key aparemters are
+ repeated in th s-expression.
 
 Note that gpg stores the GNU S2K Extension Number internally as an
 S2K Specifier with an offset of 1000.
@@ -1662,24 +1695,48 @@
 
 
 * Miscellaneous notes
-** List of useful RFCs
+** List of useful RFCs and I-D.
+ - RFC-1423 :: PEM, Part III: Algorithms, Modes, and Identifiers
+ - RFC-1750 :: Randomness Recommendations for Security
+ - RFC-1991 :: PGP Message Exchange Formats (obsolete)
+ - RFC-2144 :: The CAST-128 Encryption Algorithm
+ - RFC-2253 :: UTF-8 String Representation of Distinguished Names.
+ - RFC-2279 :: UTF-8, a transformation format of ISO 10646
+ - RFC-2440 :: OpenPGP (obsolete).
+ - RFC-3156 :: MIME Security with Pretty Good Privacy (PGP).
 - RFC-3447 :: PKCS #1: RSA Cryptography Specifications Version 2.1
 - RFC-4880 :: OpenPGP
 - RFC-5083 :: CMS - Authenticated-Enveloped-Data
 - RFC-5084 :: CMS - AES-GCM
 - RFC-5280 :: X.509 PKI Certificate and CRL Profile
+ - RFC-5480 :: ECC Subject Public Key Information
+ - RFC-5639 :: ECC Brainpool Standard Curves
 - RFC-5652 :: CMS (STD0070)
+ - RFC-5753 :: ECC in CMS
+ - RFC-5758 :: CMS - Additional Algorithms for DSA and ECDSA
 - RFC-6818 :: Updates to the X.509 PKI Certificate and CRL Profile
 - RFC-6960 :: Online Certificate Status Protocol - OCSP
 - RFC-8954 :: Online Certificate Status Protocol (OCSP) Nonce Extension
- - RFC-8398 :: Internationalized Email Addresses in X.509 Certificates.
+ - RFC-8398 :: Internationalized Email Addresses in X.509 Certificates
 - RFC-8399 :: Internationalization Updates to RFC 5280
- - RFC-5480 :: ECC Subject Public Key Information
 - RFC-8813 :: Clarifications for ECC Subject Public Key
- - RFC-5915 :: Elliptic Curve Private Key Structure
+ - RFC-5915 :: ECC Private Key Structure
 - RFC-5958 :: Asymmetric Key Packages
+ - RFC-6337 :: ECC in OpenPGP
+ - RFC-7748 :: Elliptic Curves for Security (X25519 and X448)
+ - RFC-8410 :: Algorithm Identifiers for Ed25519, Ed448, X25519, and X448
 - RFC-7292 :: PKCS #12: Personal Information Exchange Syntax v1.1
 - RFC-8351 :: The PKCS #8 EncryptedPrivateKeyInfo Media Type
+ - RFC-8550 :: S/MIME Version 4.0 Certificate Handling
+ - RFC-8551 :: S/MIME Version 4.0 Message Specification
+ - RFC-2634 :: Enhanced Security Services for S/MIME
+ - RFC-5035 :: Enhanced Security Services (ESS) Update
+ - RFC-7253 :: The OCB Authenticated-Encryption Algorithm
+
+ - draft-koch-openpgp-2015-rfc4880bis :: Updates to RFC-4880
+
+ - T6390 :: Notes on use of X25519 in GnuPG (https://dev.gnupg.org/T6390)
+
 
 ** v3 fingerprints
 For packet version 3 we calculate the keyids this way:
@@ -1688,6 +1745,13 @@
 calculate a RMD160 hash value from it. This is used
 as the fingerprint and the low 64 bits are the keyid.
 
+** gnupg.org notations
+
+ - rem@gnupg.org :: Used by Kleopatra to implement the tag feature.
+ These tags are used to mark keys for easier
+ searching and grouping.
+
+
 ** Simplified revocation certificates
 Revocation certificates consist only of the signature packet;
 "--import" knows how to handle this. The rationale behind it is to
@@ -1755,3 +1819,27 @@
 it is also possible to set them direct: Use a "=" character
 directly followed by a combination of "a" (for authentication), "s"
 (for signing), or "c" (for certification).
+
+** extendedKeyUsage and keyUsage in gpgsm
+
+This table describes how the extended KeyUsage masks the KeyUsage.
+
+ | ExtKeyUsage | Valid KeyUsages |
+ |-----------------+------------------|
+ | serverAuth | digitalSignature |
+ | | keyEncipherment |
+ | | keyAgreement |
+ |-----------------+------------------|
+ | clientAuth | digitalSignature |
+ | | keyAgreement |
+ |-----------------+------------------|
+ | codeSigning | digitalSignature |
+ |-----------------+------------------|
+ | emailProtection | digitalSignature |
+ | | nonRepudiation |
+ | | keyEncipherment |
+ | | keyAgreement |
+ |-----------------+------------------|
+ | timeStamping | digitalSignature |
+ | | nonRepudiation |
+ |-----------------+------------------|

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/HACKING -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/HACKING Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/Makefile.am Changed

@@ -22,18 +22,10 @@
 include $(top_srcdir)/am/cmacros.am
 
 examples = examples/README examples/scd-event examples/trustlist.txt	\
-	   examples/VS-NfD.prf examples/Automatic.prf                   \
-           examples/debug.prf  examples/qualified.txt                   \
+           examples/qualified.txt                                       \
 	   examples/common.conf                                         \
-	   examples/systemd-user/README 				\
-	   examples/systemd-user/dirmngr.service 			\
-	   examples/systemd-user/dirmngr.socket				\
-	   examples/systemd-user/gpg-agent.service 			\
-	   examples/systemd-user/gpg-agent.socket 			\
-	   examples/systemd-user/gpg-agent-ssh.socket 			\
-	   examples/systemd-user/gpg-agent-browser.socket		\
-	   examples/systemd-user/gpg-agent-extra.socket 		\
-	   examples/gpgconf.conf examples/pwpattern.list
+           examples/gpgconf.rnames examples/gpgconf.conf                \
+	   examples/pwpattern.list
 
 helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.da.txt help.de.txt help.el.txt help.eo.txt		\
@@ -43,8 +35,6 @@
             help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt		\
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
-profiles =
-
 EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem \
 	     gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png \
 	     gnupg-module-overview.png gnupg-module-overview.pdf \
@@ -60,7 +50,7 @@
 
 info_TEXINFOS = gnupg.texi
 
-dist_pkgdata_DATA =  $(helpfiles) $(profiles)
+dist_pkgdata_DATA =  $(helpfiles)
 
 nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \
                        $(examples)
@@ -84,7 +74,7 @@
 AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
 
 YAT2M_OPTIONS = -I $(srcdir) \
-        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.3"
+        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.4"
 
 myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
 	        dirmngr.texi scdaemon.texi tools.texi wks.texi \

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/Makefile.in Changed

@@ -464,16 +464,6 @@
 	$(am__append_2) $(am__append_3) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
 	$(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx.  WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library.  We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc.  256k is the largest stack
-# we use with pth.
-@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 = 
 
 # Convenience macros
@@ -482,18 +472,10 @@
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
 examples = examples/README examples/scd-event examples/trustlist.txt	\
-	   examples/VS-NfD.prf examples/Automatic.prf                   \
-           examples/debug.prf  examples/qualified.txt                   \
+           examples/qualified.txt                                       \
 	   examples/common.conf                                         \
-	   examples/systemd-user/README 				\
-	   examples/systemd-user/dirmngr.service 			\
-	   examples/systemd-user/dirmngr.socket				\
-	   examples/systemd-user/gpg-agent.service 			\
-	   examples/systemd-user/gpg-agent.socket 			\
-	   examples/systemd-user/gpg-agent-ssh.socket 			\
-	   examples/systemd-user/gpg-agent-browser.socket		\
-	   examples/systemd-user/gpg-agent-extra.socket 		\
-	   examples/gpgconf.conf examples/pwpattern.list
+           examples/gpgconf.rnames examples/gpgconf.conf                \
+	   examples/pwpattern.list
 
 helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.da.txt help.de.txt help.el.txt help.eo.txt		\
@@ -503,7 +485,6 @@
             help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt		\
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
-profiles = 
 EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem \
 	     gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png \
 	     gnupg-module-overview.png gnupg-module-overview.pdf \
@@ -518,7 +499,7 @@
                 defsincdate defs.inc
 
 info_TEXINFOS = gnupg.texi
-dist_pkgdata_DATA = $(helpfiles) $(profiles)
+dist_pkgdata_DATA = $(helpfiles)
 nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \
                        $(examples)
 
@@ -535,7 +516,7 @@
 DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
 AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
 YAT2M_OPTIONS = -I $(srcdir) \
-        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.3"
+        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.4"
 
 myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
 	        dirmngr.texi scdaemon.texi tools.texi wks.texi \

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/defsincdate -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/defsincdate Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/dirmngr.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/dirmngr.texi Changed

@@ -167,6 +167,14 @@
 seeing what the agent actually does.  Use @file{socket://} to log to
 socket.
 
+@item --compatibility-flags @var{flags}
+@opindex compatibility-flags
+Set compatibility flags to work around certain problems or to emulate
+bugs.  The @var{flags} are given as a comma separated list of flag
+names and are OR-ed together.  The special flag "none" clears the list
+and allows to start over with an empty list.  To get a list of
+available flags the sole word "help" can be used.
+
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems.  @var{level} may be a
@@ -311,16 +319,16 @@
 communicates with to receive keys, send keys, and search for
 keys.  The format of the @var{name} is a URI:
 `scheme://keyservername:port' The scheme is the type of keyserver:
-"hkp" for the HTTP (or compatible) keyservers, "ldap" for the LDAP
-keyservers, or "mailto" for the Graff email keyserver. Note that your
-particular installation of GnuPG may have other keyserver types
-available as well. Keyserver schemes are case-insensitive. After the
-keyserver name, optional keyserver configuration options may be
-provided.  These are the same as the @option{--keyserver-options} of
-@command{gpg}, but apply only to this particular keyserver.
-
-Most keyservers synchronize with each other, so there is generally no
-need to send keys to more than one server. Somes keyservers use round
+"hkp" for the HTTP (or compatible) keyservers or "ldap" for the LDAP
+keyservers. Note that your particular installation of GnuPG may have
+other keyserver types available as well. Keyserver schemes are
+case-insensitive. After the keyserver name, optional keyserver
+configuration options may be provided.  These are the same as the
+@option{--keyserver-options} of @command{gpg}, but apply only to this
+particular keyserver.
+
+Some keyservers synchronize with each other, so there is not always a
+need to send keys to more than one server. Some keyservers use round
 robin DNS to give a different keyserver each time you use it.
 
 If exactly two keyservers are configured and only one is a Tor hidden
@@ -484,6 +492,9 @@
 @item ntds
 On Windows authenticate the LDAP connection using the Active Directory
 with the current user.
+@item areconly
+On Windows use only the A or AAAA record when resolving the LDAP
+server name.
 @end table
 
 Note that in an URL style specification the scheme @code{ldaps://}
@@ -587,6 +598,15 @@
 option with care because extensions are usually flagged as critical
 for a reason.
 
+@item --ignore-crl-extension @var{oid}
+@opindex ignore-crl-extension
+Add @var{oid} to the list of ignored CRL extensions.  The @var{oid} is
+expected to be in dotted decimal form.  Critical flagged CRL
+extensions matching one of the OIDs in the list are treated as if they
+are actually handled and thus the certificate won't be rejected due to
+an unknown critical extension.  Use this option with care because
+extensions are usually flagged as critical for a reason.
+
 @item --ignore-cert @var{fpr}|@var{file}
 @opindex ignore-cert
 Entirely ignore certificates with the fingerprint @var{fpr}.  As an
@@ -748,7 +768,7 @@
 To make sure that new options are read or that after the installation
 of a new GnuPG versions the right dirmngr version is running, you
 should kill an existing dirmngr so that a new instance is started as
-needed by the otehr components:
+needed by the other components:
 
 @example
 gpgconf --kill dirmngr

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/README -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/examples/README Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/examples/gpgconf.conf -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/examples/gpgconf.conf Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/doc/examples/gpgconf.rnames Added

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg-card-architecture.pdf -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg-card-architecture.pdf Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg-card-architecture.png -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg-card-architecture.png Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg-module-overview.pdf -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg-module-overview.pdf Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg-module-overview.png -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg-module-overview.png Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg.info -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg.info Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg.info-1 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg.info-1 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg.info-2 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg.info-2 Changed

@@ -1,7 +1,7 @@
-This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
+This is gnupg.info, produced by makeinfo version 6.7 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.6-beta7, April
-2022).
+This is the 'The GNU Privacy Guard Manual' (version 2.4.3-beta30, June
+2023).
 
 (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -22,6 +22,311 @@
 END-INFO-DIR-ENTRY
 
 &#x1f;
+File: gnupg.info, Node: CMS Options, Next: Esoteric Options, Prev: Input and Output, Up: GPGSM Options
+
+5.2.4 How to change how the CMS is created
+------------------------------------------
+
+'--include-certs N'
+ Using N of -2 includes all certificate except for the root cert, -1
+ includes all certs, 0 does not include any certs, 1 includes only
+ the signers cert and all other positive values include up to N
+ certificates starting with the signer cert. The default is -2.
+
+'--cipher-algo OID'
+ Use the cipher algorithm with the ASN.1 object identifier OID for
+ encryption. For convenience the strings '3DES', 'AES' and 'AES256'
+ may be used instead of their OIDs. The default is 'AES'
+ (2.16.840.1.101.3.4.1.2).
+
+'--digest-algo name'
+ Use 'name' as the message digest algorithm. Usually this algorithm
+ is deduced from the respective signing certificate. This option
+ forces the use of the given algorithm and may lead to severe
+ interoperability problems.
+
+&#x1f;
+File: gnupg.info, Node: Esoteric Options, Prev: CMS Options, Up: GPGSM Options
+
+5.2.5 Doing things one usually do not want to do
+------------------------------------------------
+
+'--chuid UID'
+ Change the current user to UID which may either be a number or a
+ name. This can be used from the root account to run gpgsm for
+ another user. If UID is not the current UID a standard PATH is set
+ and the envvar GNUPGHOME is unset. To override the latter the
+ option '--homedir' can be used. This option has only an effect
+ when used on the command line. This option has currently no effect
+ at all on Windows.
+
+'--extra-digest-algo NAME'
+ Sometimes signatures are broken in that they announce a different
+ digest algorithm than actually used. 'gpgsm' uses a one-pass data
+ processing model and thus needs to rely on the announced digest
+ algorithms to properly hash the data. As a workaround this option
+ may be used to tell 'gpgsm' to also hash the data using the
+ algorithm NAME; this slows processing down a little bit but allows
+ verification of such broken signatures. If 'gpgsm' prints an error
+ like "digest algo 8 has not been enabled" you may want to try this
+ option, with 'SHA256' for NAME.
+
+'--compliance STRING'
+ Set the compliance mode. Valid values are shown when using "help"
+ for STRING.
+
+'--min-rsa-length N'
+ This option adjusts the compliance mode "de-vs" for stricter key
+ size requirements. For example, a value of 3000 turns rsa2048 and
+ dsa2048 keys into non-VS-NfD compliant keys.
+
+'--require-compliance'
+ To check that data has been encrypted according to the rules of the
+ current compliance mode, a gpgsm user needs to evaluate the status
+ lines. This is allows frontends to handle compliance check in a
+ more flexible way. However, for scripted use the required
+ evaluation of the status-line requires quite some effort; this
+ option can be used instead to make sure that the gpgsm process
+ exits with a failure if the compliance rules are not fulfilled.
+ Note that this option has currently an effect only in "de-vs" mode.
+
+'--ignore-cert-with-oid OID'
+ Add OID to the list of OIDs to be checked while reading
+ certificates from smartcards. The OID is expected to be in dotted
+ decimal form, like '2.5.29.3'. This option may be used more than
+ once. As of now certificates with an extended key usage matching
+ one of those OIDs are ignored during a '--learn-card' operation and
+ not imported. This option can help to keep the local key database
+ clear of unneeded certificates stored on smartcards.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970. Alternatively EPOCH may be given as a full ISO time
+ string (e.g. "20070924T154812").
+
+'--with-ephemeral-keys'
+ Include ephemeral flagged keys in the output of key listings. Note
+ that they are included anyway if the key specification for a
+ listing is given as fingerprint or keygrip.
+
+'--compatibility-flags FLAGS'
+ Set compatibility flags to work around problems due to
+ non-compliant certificates or data. The FLAGS are given as a comma
+ separated list of flag names and are OR-ed together. The special
+ flag "none" clears the list and allows to start over with an empty
+ list. To get a list of available flags the sole word "help" can be
+ used.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ Set debug flags. All flags are or-ed and FLAGS may be given in C
+ syntax (e.g. 0x0042) or as a comma separated list of flag names.
+ To get a list of all supported flags the single word "help" can be
+ used. This option is only useful for debugging and the behavior
+ may change at any time without notice.
+
+ Note, that all flags set using this option may get overridden by
+ '--debug-level'.
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--debug-allow-core-dump'
+ Usually 'gpgsm' tries to avoid dumping core by well written code
+ and by disabling core dumps for security reasons. However, bugs
+ are pretty durable beasts and to squash them it is sometimes useful
+ to have a core dump. This option enables core dumps unless the Bad
+ Thing happened before the option parsing.
+
+'--debug-no-chain-validation'
+ This is actually not a debugging option but only useful as such.
+ It lets 'gpgsm' bypass all certificate chain validation checks.
+
+'--debug-ignore-expiration'
+ This is actually not a debugging option but only useful as such.
+ It lets 'gpgsm' ignore all notAfter dates, this is used by the
+ regression tests.
+
+'--passphrase-fd n'
+ Read the passphrase from file descriptor 'n'. Only the first line
+ will be read from file descriptor 'n'. If you use 0 for 'n', the
+ passphrase will be read from STDIN. This can only be used if only
+ one passphrase is supplied.
+
+ Note that this passphrase is only used if the option '--batch' has
+ also been given.
+
+'--pinentry-mode mode'
+ Set the pinentry mode to 'mode'. Allowed values for 'mode' are:
+ default
+ Use the default of the agent, which is 'ask'.
+ ask
+ Force the use of the Pinentry.
+ cancel
+ Emulate use of Pinentry's cancel button.
+ error
+ Return a Pinentry error ("No Pinentry").
+ loopback
+ Redirect Pinentry queries to the caller. Note that in
+ contrast to Pinentry the user is not prompted again if he
+ enters a bad password.
+
+'--request-origin ORIGIN'
+ Tell gpgsm to assume that the operation ultimately originated at
+ ORIGIN. Depending on the origin certain restrictions are applied
+ and the Pinentry may include an extra note on the origin.
+ Supported values for ORIGIN are: 'local' which is the default,
+ 'remote' to indicate a remote origin or 'browser' for an operation
+ requested by a web browser.
+
+'--no-common-certs-import'
+ Suppress the import of common certificates on keybox creation.
+
+ All the long options may also be given in the configuration file
+after stripping off the two leading dashes.
+
+&#x1f;
+File: gnupg.info, Node: GPGSM Configuration, Next: GPGSM Examples, Prev: GPGSM Options, Up: Invoking GPGSM
+
+5.3 Configuration files
+=======================
+
+There are a few configuration files to control certain aspects of
+'gpgsm''s operation. Unless noted, they are expected in the current
+home directory (*note option --homedir::).
+
+'gpgsm.conf'
+ This is the standard configuration file read by 'gpgsm' on startup.
+ It may contain any valid long option; the leading two dashes may
+ not be entered and the option may not be abbreviated. This default
+ name may be changed on the command line (*note gpgsm-option
+ --options::). You should backup this file.
+
+'common.conf'
+ This is an optional configuration file read by 'gpgsm' on startup.
+ It may contain options pertaining to all components of GnuPG. Its
+ current main use is for the "use-keyboxd" option.
+
+'policies.txt'
+ This is a list of allowed CA policies. This file should list the
+ object identifiers of the policies line by line. Empty lines and
+ lines starting with a hash mark are ignored. Policies missing in
+ this file and not marked as critical in the certificate will print
+ only a warning; certificates with policies marked as critical and
+ not listed in this file will fail the signature verification. You
+ should backup this file.
+
+ For example, to allow only the policy 2.289.9.9, the file should
+ look like this:
+
+ # Allowed policies
+ 2.289.9.9
+
+'qualified.txt'
+ This is the list of root certificates used for qualified
+ certificates. They are defined as certificates capable of creating
+ legally binding signatures in the same way as handwritten
+ signatures are. Comments start with a hash mark and empty lines
+ are ignored. Lines do have a length limit but this is not a
+ serious limitation as the format of the entries is fixed and
+ checked by 'gpgsm': A non-comment line starts with optional
+ whitespace, followed by exactly 40 hex characters, white space and
+ a lowercased 2 letter country code. Additional data delimited with
+ by a white space is current ignored but might late be used for
+ other purposes.
+
+ Note that even if a certificate is listed in this file, this does
+ not mean that the certificate is trusted; in general the
+ certificates listed in this file need to be listed also in
+ 'trustlist.txt'. This is a global file an installed in the sysconf
+ directory (e.g. '/usr/local/etc/gnupg/qualified.txt').
+
+ Every time 'gpgsm' uses a certificate for signing or verification
+ this file will be consulted to check whether the certificate under
+ question has ultimately been issued by one of these CAs. If this
+ is the case the user will be informed that the verified signature
+ represents a legally binding ("qualified") signature. When
+ creating a signature using such a certificate an extra prompt will
+ be issued to let the user confirm that such a legally binding
+ signature shall really be created.
+
+ Because this software has not yet been approved for use with such
+ certificates, appropriate notices will be shown to indicate this
+ fact.
+
+'help.txt'
+ This is plain text file with a few help entries used with
+ 'pinentry' as well as a large list of help items for 'gpg' and
+ 'gpgsm'. The standard file has English help texts; to install
+ localized versions use filenames like 'help.LL.txt' with LL
+ denoting the locale. GnuPG comes with a set of predefined help
+ files in the data directory (e.g.
+ '/usr/local/share/gnupg/gnupg/help.de.txt') and allows overriding
+ of any help item by help files stored in the system configuration
+ directory (e.g. '/usr/local/etc/gnupg/help.de.txt'). For a
+ reference of the help file's syntax, please see the installed
+ 'help.txt' file.
+
+'com-certs.pem'
+ This file is a collection of common certificates used to populated
+ a newly created 'pubring.kbx'. An administrator may replace this
+ file with a custom one. The format is a concatenation of PEM
+ encoded X.509 certificates. This global file is installed in the
+ data directory (e.g. '/usr/local/share/gnupg/com-certs.pem').
+
+ Note that on larger installations, it is useful to put predefined
+files into the directory '/etc/skel/.gnupg/' so that newly created users
+start up with a working configuration. For existing users a small
+helper script is provided to create these files (*note addgnupghome::).
+
+ For internal purposes 'gpgsm' creates and maintains a few other
+files; they all live in the current home directory (*note option
+--homedir::). Only 'gpgsm' may modify these files.
+
+'pubring.kbx'
+ This a database file storing the certificates as well as meta
+ information. For debugging purposes the tool 'kbxutil' may be used
+ to show the internal structure of this file. You should backup
+ this file.
+
+'random_seed'
+ This content of this file is used to maintain the internal state of
+ the random number generator across invocations. The same file is
+ used by other programs of this software too.
+
+'S.gpg-agent'
+ If this file exists 'gpgsm' will first try to connect to this
+ socket for accessing 'gpg-agent' before starting a new 'gpg-agent'
+ instance. Under Windows this socket (which in reality be a plain
+ file describing a regular TCP listening port) is the standard way
+ of connecting the 'gpg-agent'.
+
+&#x1f;
 File: gnupg.info, Node: GPGSM Examples, Next: Unattended Usage, Prev: GPGSM Configuration, Up: Invoking GPGSM
 
 5.4 Examples
@@ -651,6 +956,9 @@
 disabled for this session. This is the same as the command line
 option '--disable-dirmngr'.
 
+'input-size-hint'
+ This is the same as the '--input-size-hint' command line option.
+
 &#x1f;
 File: gnupg.info, Node: Invoking SCDAEMON, Next: Specify a User ID, Prev: Invoking GPGSM, Up: Top
 
@@ -836,10 +1144,11 @@
 this option only if you know what you are doing.
 
 '--pcsc-driver LIBRARY'
- Use LIBRARY to access the smartcard reader. The current default is
- 'libpcsclite.so'. Instead of using this option you might also want
- to install a symbolic link to the default file name (e.g. from
- 'libpcsclite.so.1').
+ Use LIBRARY to access the smartcard reader. The current default on
+ Unix is 'libpcsclite.so' and on Windows 'winscard.dll'. Instead of
+ using this option you might also want to install a symbolic link to
+ the default file name (e.g. from 'libpcsclite.so.1'). A Unicode
+ file name may not be used on Windows.
 
 '--ctapi-driver LIBRARY'
 Use LIBRARY to access the smartcard reader. The current default is
@@ -1026,7 +1335,8 @@
 'scd-event'
 If this file is present and executable, it will be called on every
 card reader's status change. An example of this script is provided
- with the distribution
+ with the source code distribution. This option is deprecated in
+ favor of the 'DEVINFO --watch'.
 
 'reader_N.status'
 This file is created by 'scdaemon' to let other applications now
@@ -1054,7 +1364,7 @@
 
 A client connects to the SC-Daemon by connecting to the socket named
 '/usr/local/var/run/gnupg/scdaemon/socket', configuration information is
-read from /ETC/GNUPG/SCDAEMON.CONF
+read from /USR/LOCAL/ETC/GNUPG/SCDAEMON.CONF
 
 Each connection acts as one session, SC-Daemon takes care of
 synchronizing access to a token between sessions.
@@ -1599,9 +1909,9 @@
 
 'AUTHENTICATE --setkey --raw < FILE|KEY'
 'AUTH'
- Authenticate to the card. Perform a mutual autentication either by
- reading the key from FILE or by taking it from the command line as
- KEY. Without the option '--raw' the key is expected to be hex
+ Authenticate to the card. Perform a mutual authentication either
+ by reading the key from FILE or by taking it from the command line
+ as KEY. Without the option '--raw' the key is expected to be hex
 encoded. To install a new administration key '--setkey' is used;
 this requires a prior authentication with the old key. This is
 used with PIV cards.
@@ -1673,7 +1983,7 @@
 non-interactive mode and without a PINREF a default value i used
 for these cards. The option '--reset' is used with TCOS cards to
 reset the PIN using the PUK or vice versa; the option -NULLPIN is
- used for these cards to set the intial PIN.
+ used for these cards to set the initial PIN.
 
 'PRIVATEDO --clear N < FILE'
 Change the private data object N of an OpenPGP card. N must be in
@@ -3555,6 +3865,11 @@
 Decode data lines. That is to remove percent escapes but make sure
 that a new line always starts with a D and a space.
 
+'-u'
+'--unbuffered'
+ Set stdin and stdout into unbuffered I/O mode. This this sometimes
+ useful for scripting.
+
 &#x1f;
 File: gnupg.info, Node: Controlling gpg-connect-agent, Prev: Invoking gpg-connect-agent, Up: gpg-connect-agent
 
@@ -3884,7 +4199,8 @@
 Put given files and directories into a vanilla "ustar" archive.
 
 '--extract'
- Extract all files from a vanilla "ustar" archive.
+ Extract all files from a vanilla "ustar" archive. If no file name
+ is given (or it is "-") the archive is taken from stdin.
 
 '--encrypt'
 '-e'
@@ -3894,7 +4210,8 @@
 
 '--decrypt'
 '-d'
- Extract all files from an encrypted archive.
+ Extract all files from an encrypted archive. If no file name is
+ given (or it is "-") the archive is taken from stdin.
 
 '--sign'
 '-s'
@@ -3904,7 +4221,8 @@
 
 '--list-archive'
 '-t'
- List the contents of the specified archive.
+ List the contents of the specified archive. If no file name is
+ given (or it is "-") the archive is taken from stdin.
 
 '--symmetric'
 '-c'
@@ -3999,6 +4317,11 @@
 no input filename is known a directory named 'GPGARCH' is used.
 This option is deprecated in favor of option '--directory'.
 
+'--no-compress'
+ This option tells gpg to disable compression (i.e. using option
+ -z0). It is useful for archiving only large files which are are
+ already compressed (e.g. a set of videos).
+
 '--gpg GPGCMD'
 Use the specified command GPGCMD instead of 'gpg'.
 
@@ -4153,6 +4476,13 @@
 mailbox separated by a space. The command '--remove-key' removes a key
 from that directory, its only argument is a user-id.
 
+ The command '--mirror' is similar to '--install-key' but takes the
+keys from the the LDAP server configured for Dirmngr. If no arguments
+are given all keys and user ids are installed. If arguments are given
+they are taken as domain names to limit the to be installed keys. The
+option '--blacklist' may be used to further limit the to be installed
+keys.
+
 The command '--print-wkd-hash' prints the WKD user-id identifiers and
 the corresponding mailboxes from the user-ids given on the command line
 or via stdin (one user-id per line).
@@ -4204,7 +4534,9 @@
 '--output FILE'
 '-o'
 Write the created mail to FILE instead of stdout. Note that the
- value '-' for FILE is the same as writing to stdout.
+ value '-' for FILE is the same as writing to stdout. If this
+ option is used with the '--check' command and a key was found it is
+ written to the given file.
 
 '--status-fd N'
 Write special status strings to the file descriptor N. This
@@ -4214,8 +4546,22 @@
 
 '-C DIR'
 '--directory DIR'
- Use DIR as top level directory for the commands '--install-key' and
- '--remove-key'. The default is 'openpgpkey'.
+ Use DIR as top level directory for the commands '--mirror',
+ '--install-key' and '--remove-key'. The default is 'openpgpkey'.
+
+'--blacklist FILE'
+ This option is used to exclude certain mail addresses from a mirror
+ operation. The format of FILE is one mail address (just the
+ addrspec, e.g. "postel@isi.edu") per line. Empty lines and lines
+ starting with a '#' are ignored.
+
+'--add-revocs'
+'--no-add-revocs'
+ If enabled append revocation certificates for the same addrspec as
+ used in the WKD to the key. Modern gpg version are able to import
+ and apply them for existing keys. Note that when used with the
+ '--mirror' command the revocation are searched in the local keyring
+ and not in an LDAP directory. The default is '--add-revocs'.
 
 '--verbose'
 Enable extra informational output.
@@ -5634,15 +5980,15 @@
 David Shaw, Matthew Skala, Michael Roth, Niklas Hernaeus, Nils
 Ellmenreich, Rémi Guyomarch, Stefan Bellon, Timo Schulz and Werner Koch
 wrote the code. Birger Langkjer, Daniel Resare, Dokianakis Theofanis,
-Edmund GRIMLEY EVANS, Gaël Quéri, Gregory Steuck, Nagy Ferenc
-László, Ivo Timmermans, Jacobo Tarri'o Barreiro, Janusz Aleksander
-Urbanowicz, Jedi Lin, Jouni Hiltunen, Laurentiu Buzdugan, Magda
-Procha'zkova', Michael Anckaert, Michal Majer, Marco d'Itri, Nilgun
-Belma Buguner, Pedro Morais, Tedi Heriyanto, Thiago Jung Bauermann,
-Rafael Caetano dos Santos, Toomas Soome, Urko Lusa, Walter Koch, Yosiaki
-IIDA did the official translations. Mike Ashley wrote and maintains the
-GNU Privacy Handbook. David Scribner is the current FAQ editor.
-Lorenzo Cappelletti maintains the web site.
+Edmund GRIMLEY EVANS, Gaël Quéri, Gregory Steuck, Nagy Ferenc László,
+Ivo Timmermans, Jacobo Tarri'o Barreiro, Janusz Aleksander Urbanowicz,
+Jedi Lin, Jouni Hiltunen, Laurentiu Buzdugan, Magda Procha'zkova',
+Michael Anckaert, Michal Majer, Marco d'Itri, Nilgun Belma Buguner,
+Pedro Morais, Tedi Heriyanto, Thiago Jung Bauermann, Rafael Caetano dos
+Santos, Toomas Soome, Urko Lusa, Walter Koch, Yosiaki IIDA did the
+official translations. Mike Ashley wrote and maintains the GNU Privacy
+Handbook. David Scribner is the current FAQ editor. Lorenzo
+Cappelletti maintains the web site.
 
 The new modularized architecture of gnupg 1.9 as well as the
 X.509/CMS part has been developed as part of the Ägypten project.
@@ -5800,75 +6146,78 @@
 * --no-history: gpg-card. (line 59)
 * --no-history <1>: Invoking gpg-connect-agent.
 (line 82)
-* --override-compliance-check: GPG Esoteric Options.
- (line 460)
-* add-servers: Dirmngr Options. (line 310)
-* aead-algo: GPG Esoteric Options.
- (line 223)
+* add-desig-revoker: GPG Configuration Options.
+ (line 430)
+* add-revocs: gpg-wks-client. (line 128)
+* add-servers: Dirmngr Options. (line 319)
 * agent-program: GPG Configuration Options.
- (line 741)
+ (line 788)
 * agent-program <1>: Configuration Options.
 (line 55)
 * agent-program <2>: gpg-card. (line 64)
 * agent-program <3>: Invoking gpg-connect-agent.
 (line 87)
-* allow-admin: Scdaemon Options. (line 175)
-* allow-emacs-pinentry: Agent Options. (line 178)
+* allow-admin: Scdaemon Options. (line 176)
+* allow-emacs-pinentry: Agent Options. (line 189)
 * allow-freeform-uid: GPG Esoteric Options.
- (line 395)
-* allow-loopback-pinentry: Agent Options. (line 160)
+ (line 401)
+* allow-loopback-pinentry: Agent Options. (line 171)
 * allow-non-selfsigned-uid: GPG Esoteric Options.
- (line 390)
-* allow-ocsp: Dirmngr Options. (line 331)
+ (line 396)
+* allow-ocsp: Dirmngr Options. (line 340)
 * allow-old-cipher-algos: GPG Esoteric Options.
- (line 431)
-* allow-preset-passphrase: Agent Options. (line 155)
+ (line 437)
+* allow-preset-passphrase: Agent Options. (line 166)
 * allow-secret-key-import: GPG Esoteric Options.
- (line 601)
-* allow-version-check: Dirmngr Options. (line 138)
+ (line 602)
+* allow-version-check: Dirmngr Options. (line 145)
 * allow-weak-digest-algos: GPG Esoteric Options.
- (line 439)
+ (line 445)
 * allow-weak-key-signatures: GPG Esoteric Options.
- (line 455)
-* always-trust: Deprecated Options. (line 21)
-* application-priority: Scdaemon Options. (line 190)
+ (line 461)
+* always-trust: GPG Configuration Options.
+ (line 537)
+* application-priority: Scdaemon Options. (line 191)
 * armor: GPG Input and Output.
 (line 8)
 * armor <1>: Input and Output. (line 8)
 * ask-cert-expire: GPG Esoteric Options.
- (line 561)
+ (line 562)
 * ask-cert-level: GPG Configuration Options.
- (line 358)
+ (line 378)
 * ask-sig-expire: GPG Esoteric Options.
- (line 547)
+ (line 548)
+* assert-signer: GPG Configuration Options.
+ (line 540)
 * assume-armor: Input and Output. (line 14)
 * assume-base64: Input and Output. (line 18)
 * assume-binary: Input and Output. (line 21)
 * attribute-fd: GPG Esoteric Options.
- (line 107)
+ (line 122)
 * attribute-file: GPG Esoteric Options.
- (line 113)
+ (line 128)
 * authenticate: gpg-card. (line 94)
 * auto-check-trustdb: GPG Configuration Options.
- (line 728)
-* auto-expand-secmem: Agent Options. (line 426)
+ (line 775)
+* auto-expand-secmem: Agent Options. (line 461)
 * auto-issuer-key-retrieve: Certificate Options. (line 62)
 * auto-key-import: GPG Configuration Options.
- (line 573)
+ (line 620)
 * auto-key-locate: GPG Configuration Options.
- (line 507)
+ (line 554)
 * auto-key-retrieve: GPG Configuration Options.
- (line 585)
+ (line 632)
 * base64: Input and Output. (line 11)
 * batch: Agent Options. (line 48)
 * batch <1>: GPG Configuration Options.
 (line 45)
-* batch <2>: gpgtar. (line 104)
+* batch <2>: gpgtar. (line 107)
+* blacklist: gpg-wks-client. (line 121)
 * bzip2-compress-level: GPG Configuration Options.
- (line 332)
+ (line 341)
 * bzip2-decompress-lowmem: GPG Configuration Options.
- (line 342)
-* c: Dirmngr Options. (line 87)
+ (line 362)
+* c: Dirmngr Options. (line 94)
 * cache-cert: dirmngr-client. (line 72)
 * cafpr: gpg-card. (line 102)
 * call-dirmngr: Operational GPGSM Commands.
@@ -5876,33 +6225,33 @@
 * call-protect-tool: Operational GPGSM Commands.
 (line 41)
 * card-edit: Operational GPG Commands.
- (line 210)
+ (line 211)
 * card-status: Operational GPG Commands.
- (line 216)
-* card-timeout: Scdaemon Options. (line 159)
+ (line 220)
+* card-timeout: Scdaemon Options. (line 160)
 * cert-digest-algo: GPG Esoteric Options.
- (line 263)
+ (line 269)
 * cert-notation: GPG Esoteric Options.
- (line 139)
+ (line 154)
 * cert-policy-url: GPG Esoteric Options.
- (line 175)
+ (line 190)
 * change-passphrase: OpenPGP Key Management.
- (line 472)
+ (line 501)
 * change-passphrase <1>: Certificate Management.
 (line 120)
 * change-pin: Operational GPG Commands.
- (line 219)
+ (line 223)
 * check: gpg-check-pattern. (line 56)
-* check-passphrase-pattern: Agent Options. (line 232)
+* check-passphrase-pattern: Agent Options. (line 243)
 * check-signatures: Operational GPG Commands.
- (line 140)
-* check-sigs: Operational GPG Commands.
 (line 141)
-* check-sym-passphrase-pattern: Agent Options. (line 232)
+* check-sigs: Operational GPG Commands.
+ (line 142)
+* check-sym-passphrase-pattern: Agent Options. (line 243)
 * check-trustdb: Operational GPG Commands.
- (line 349)
+ (line 353)
 * chuid: GPG Esoteric Options.
- (line 653)
+ (line 654)
 * chuid <1>: Esoteric Options. (line 7)
 * chuid <2>: gpg-card. (line 75)
 * chuid <3>: Invoking gpgconf. (line 141)
@@ -5911,74 +6260,80 @@
 * chunk-size: GPG Input and Output.
 (line 29)
 * cipher-algo: GPG Esoteric Options.
- (line 214)
+ (line 229)
 * cipher-algo <1>: CMS Options. (line 13)
 * clear-sign: Operational GPG Commands.
 (line 17)
 * clearsign: Operational GPG Commands.
 (line 18)
-* cms: gpgtar. (line 99)
+* cms: gpgtar. (line 102)
 * command-fd: GPG Esoteric Options.
- (line 378)
+ (line 384)
 * command-file: GPG Esoteric Options.
- (line 385)
+ (line 391)
 * comment: GPG Esoteric Options.
- (line 118)
+ (line 133)
+* compatibility-flags: Dirmngr Options. (line 34)
+* compatibility-flags <1>: GPG Esoteric Options.
+ (line 22)
+* compatibility-flags <2>: Esoteric Options. (line 66)
 * compliance: Compliance Options. (line 60)
 * compliance <1>: Esoteric Options. (line 27)
 * compliant-needed: GPG Configuration Options.
- (line 703)
+ (line 750)
 * compress-algo: GPG Esoteric Options.
- (line 240)
+ (line 246)
 * compress-level: GPG Configuration Options.
- (line 332)
-* connect-quick-timeout: Dirmngr Options. (line 125)
-* connect-timeout: Dirmngr Options. (line 125)
+ (line 341)
+* connect-quick-timeout: Dirmngr Options. (line 132)
+* connect-timeout: Dirmngr Options. (line 132)
 * create: gpgtar. (line 16)
 * create-socketdir: Invoking gpgconf. (line 96)
 * csh: Agent Options. (line 129)
-* csh <1>: Dirmngr Options. (line 87)
-* ctapi-driver: Scdaemon Options. (line 136)
+* csh <1>: Dirmngr Options. (line 94)
+* ctapi-driver: Scdaemon Options. (line 137)
 * daemon: Agent Commands. (line 27)
 * daemon <1>: Dirmngr Commands. (line 27)
 * daemon <2>: Scdaemon Commands. (line 31)
 * dearmor: Operational GPG Commands.
- (line 403)
+ (line 408)
 * debug: Agent Options. (line 82)
-* debug <1>: Dirmngr Options. (line 59)
+* debug <1>: Dirmngr Options. (line 66)
 * debug <2>: GPG Esoteric Options.
- (line 47)
-* debug <3>: Esoteric Options. (line 91)
+ (line 55)
+* debug <3>: Esoteric Options. (line 99)
 * debug <4>: Scdaemon Options. (line 69)
 * debug-all: Agent Options. (line 89)
-* debug-all <1>: Dirmngr Options. (line 66)
+* debug-all <1>: Dirmngr Options. (line 73)
 * debug-all <2>: GPG Esoteric Options.
- (line 54)
-* debug-all <3>: Esoteric Options. (line 101)
+ (line 62)
+* debug-all <3>: Esoteric Options. (line 109)
 * debug-all <4>: Scdaemon Options. (line 76)
-* debug-allow-core-dump: Esoteric Options. (line 104)
+* debug-allow-core-dump: Esoteric Options. (line 112)
 * debug-allow-core-dump <1>: Scdaemon Options. (line 93)
 * debug-allow-large-chunks: GPG Esoteric Options.
- (line 66)
+ (line 74)
 * debug-assuan-log-cats: Scdaemon Options. (line 102)
 * debug-disable-ticker: Scdaemon Options. (line 89)
-* debug-ignore-expiration: Esoteric Options. (line 115)
+* debug-ignore-expiration: GPG Esoteric Options.
+ (line 78)
+* debug-ignore-expiration <1>: Esoteric Options. (line 123)
 * debug-iolbf: GPG Esoteric Options.
- (line 57)
+ (line 65)
 * debug-iolbf <1>: GPG Esoteric Options.
- (line 61)
+ (line 69)
 * debug-level: Agent Options. (line 57)
-* debug-level <1>: Dirmngr Options. (line 34)
+* debug-level <1>: Dirmngr Options. (line 41)
 * debug-level <2>: GPG Esoteric Options.
- (line 22)
-* debug-level <3>: Esoteric Options. (line 66)
+ (line 30)
+* debug-level <3>: Esoteric Options. (line 74)
 * debug-level <4>: Scdaemon Options. (line 40)
 * debug-log-tid: Scdaemon Options. (line 99)
-* debug-no-chain-validation: Esoteric Options. (line 111)
+* debug-no-chain-validation: Esoteric Options. (line 119)
 * debug-pinentry: Agent Options. (line 109)
 * debug-quick-random: Agent Options. (line 97)
 * debug-wait: Agent Options. (line 92)
-* debug-wait <1>: Dirmngr Options. (line 74)
+* debug-wait <1>: Dirmngr Options. (line 81)
 * debug-wait <2>: Scdaemon Options. (line 79)
 * debug-wait <3>: Scdaemon Options. (line 84)
 * decode: Invoking gpg-connect-agent.
@@ -5987,97 +6342,97 @@
 (line 59)
 * decrypt <1>: Operational GPGSM Commands.
 (line 11)
-* decrypt <2>: gpgtar. (line 29)
+* decrypt <2>: gpgtar. (line 30)
 * decrypt-files: Operational GPG Commands.
- (line 114)
-* default-cache-ttl: Agent Options. (line 189)
-* default-cache-ttl <1>: Agent Options. (line 198)
+ (line 115)
+* default-cache-ttl: Agent Options. (line 200)
+* default-cache-ttl <1>: Agent Options. (line 209)
 * default-cert-expire: GPG Esoteric Options.
- (line 567)
+ (line 568)
 * default-cert-level: GPG Configuration Options.
- (line 366)
+ (line 386)
 * default-key: GPG Configuration Options.
 (line 10)
-* default-key <1>: Input and Output. (line 34)
+* default-key <1>: Input and Output. (line 40)
 * default-keyserver-url: GPG Esoteric Options.
- (line 627)
+ (line 628)
 * default-new-key-algo STRING: GPG Esoteric Options.
- (line 574)
+ (line 575)
 * default-preference-list: GPG Esoteric Options.
- (line 622)
+ (line 623)
 * default-recipient: GPG Configuration Options.
 (line 19)
 * default-recipient-self: GPG Configuration Options.
 (line 23)
 * default-sig-expire: GPG Esoteric Options.
- (line 553)
+ (line 554)
 * delete-keys: Operational GPG Commands.
- (line 224)
+ (line 228)
 * delete-keys <1>: Certificate Management.
 (line 71)
 * delete-secret-and-public-key: Operational GPG Commands.
- (line 244)
+ (line 248)
 * delete-secret-keys: Operational GPG Commands.
- (line 233)
-* deny-admin: Scdaemon Options. (line 175)
+ (line 237)
+* deny-admin: Scdaemon Options. (line 176)
 * desig-revoke: OpenPGP Key Management.
- (line 134)
+ (line 142)
 * detach-sign: Operational GPG Commands.
 (line 28)
 * digest-algo: GPG Esoteric Options.
- (line 232)
-* directory: gpgtar. (line 76)
-* directory <1>: gpg-wks-client. (line 108)
+ (line 238)
+* directory: gpgtar. (line 79)
+* directory <1>: gpg-wks-client. (line 117)
 * directory <2>: gpg-wks-server. (line 50)
 * dirmngr: Invoking gpg-connect-agent.
 (line 13)
 * dirmngr-program: GPG Configuration Options.
- (line 748)
+ (line 795)
 * dirmngr-program <1>: Configuration Options.
 (line 61)
 * dirmngr-program <2>: Invoking gpg-connect-agent.
 (line 94)
-* disable-application: Scdaemon Options. (line 185)
-* disable-ccid: Scdaemon Options. (line 141)
-* disable-check-own-socket: Agent Options. (line 314)
-* disable-check-own-socket <1>: Dirmngr Options. (line 79)
+* disable-application: Scdaemon Options. (line 186)
+* disable-ccid: Scdaemon Options. (line 142)
+* disable-check-own-socket: Agent Options. (line 325)
+* disable-check-own-socket <1>: Dirmngr Options. (line 86)
 * disable-cipher-algo: GPG Esoteric Options.
- (line 274)
+ (line 280)
 * disable-crl-checks: Certificate Options. (line 13)
 * disable-dsa2: GPG Configuration Options.
- (line 190)
-* disable-extended-key-format: Agent Options. (line 360)
-* disable-http: Dirmngr Options. (line 217)
-* disable-ipv4: Dirmngr Options. (line 211)
-* disable-ipv6: Dirmngr Options. (line 211)
+ (line 198)
+* disable-extended-key-format: Agent Options. (line 371)
+* disable-http: Dirmngr Options. (line 223)
+* disable-ipv4: Dirmngr Options. (line 217)
+* disable-ipv6: Dirmngr Options. (line 217)
 * disable-large-rsa: GPG Configuration Options.
- (line 181)
-* disable-ldap: Dirmngr Options. (line 214)
-* disable-mdc: OpenPGP Options. (line 30)
+ (line 189)
+* disable-ldap: Dirmngr Options. (line 220)
+* disable-mdc: OpenPGP Options. (line 32)
 * disable-ocsp: Certificate Options. (line 53)
-* disable-pinpad: Scdaemon Options. (line 172)
+* disable-pinpad: Scdaemon Options. (line 173)
 * disable-policy-checks: Certificate Options. (line 8)
 * disable-pubkey-algo: GPG Esoteric Options.
- (line 279)
-* disable-scdaemon: Agent Options. (line 308)
-* disable-signer-uid: OpenPGP Options. (line 37)
+ (line 285)
+* disable-scdaemon: Agent Options. (line 319)
+* disable-signer-uid: OpenPGP Options. (line 39)
 * disable-trusted-cert-crl-check: Certificate Options. (line 24)
-* display: Agent Options. (line 332)
+* display: Agent Options. (line 343)
 * display-charset: GPG Configuration Options.
- (line 279)
+ (line 287)
 * display-charset:iso-8859-1: GPG Configuration Options.
- (line 289)
+ (line 297)
 * display-charset:iso-8859-15: GPG Configuration Options.
- (line 295)
+ (line 303)
 * display-charset:iso-8859-2: GPG Configuration Options.
- (line 292)
+ (line 300)
 * display-charset:koi8-r: GPG Configuration Options.
- (line 298)
+ (line 306)
 * display-charset:utf-8: GPG Configuration Options.
- (line 301)
+ (line 309)
 * dry-run: GPG Esoteric Options.
 (line 8)
-* dry-run <1>: gpgtar. (line 72)
+* dry-run <1>: gpgtar. (line 75)
 * dump-cert: Certificate Management.
 (line 36)
 * dump-chain: Certificate Management.
@@ -6096,62 +6451,62 @@
 * dump-secret-keys: Certificate Management.
 (line 43)
 * edit-card: Operational GPG Commands.
- (line 209)
+ (line 210)
 * edit-key: OpenPGP Key Management.
- (line 139)
+ (line 147)
 * emit-version: GPG Esoteric Options.
- (line 129)
+ (line 144)
 * enable-crl-checks: Certificate Options. (line 13)
 * enable-dsa2: GPG Configuration Options.
- (line 190)
-* enable-extended-key-format: Agent Options. (line 360)
+ (line 198)
+* enable-extended-key-format: Agent Options. (line 371)
 * enable-issuer-based-crl-check: Certificate Options. (line 45)
 * enable-large-rsa: GPG Configuration Options.
- (line 181)
+ (line 189)
 * enable-ocsp: Certificate Options. (line 53)
-* enable-passphrase-history: Agent Options. (line 255)
-* enable-pinpad-varlen: Scdaemon Options. (line 164)
+* enable-passphrase-history: Agent Options. (line 266)
+* enable-pinpad-varlen: Scdaemon Options. (line 165)
 * enable-policy-checks: Certificate Options. (line 8)
 * enable-progress-filter: GPG Esoteric Options.
- (line 86)
-* enable-putty-support: Agent Options. (line 372)
+ (line 98)
+* enable-putty-support: Agent Options. (line 378)
 * enable-special-filenames: GPG Esoteric Options.
- (line 609)
+ (line 610)
 * enable-special-filenames <1>: gpgv. (line 97)
-* enable-ssh-support: Agent Options. (line 372)
+* enable-ssh-support: Agent Options. (line 378)
 * enable-trusted-cert-crl-check: Certificate Options. (line 24)
 * enarmor: Operational GPG Commands.
- (line 403)
+ (line 408)
 * encrypt: Operational GPG Commands.
 (line 32)
 * encrypt <1>: Operational GPGSM Commands.
 (line 7)
-* encrypt <2>: gpgtar. (line 23)
+* encrypt <2>: gpgtar. (line 24)
 * encrypt-files: Operational GPG Commands.
- (line 111)
+ (line 112)
 * encrypt-to: GPG Key related Options.
 (line 35)
-* enforce-passphrase-constraints: Agent Options. (line 216)
+* enforce-passphrase-constraints: Agent Options. (line 227)
 * escape-from-lines: GPG Esoteric Options.
- (line 304)
+ (line 310)
 * exec: Invoking gpg-connect-agent.
 (line 28)
 * exec-path: GPG Configuration Options.
- (line 219)
+ (line 227)
 * exit-on-status-write-error: GPG Configuration Options.
- (line 777)
+ (line 824)
 * expert: GPG Configuration Options.
- (line 832)
+ (line 879)
 * export: Operational GPG Commands.
- (line 250)
+ (line 254)
 * export <1>: Certificate Management.
 (line 80)
 * export-filter: GPG Input and Output.
 (line 143)
 * export-options: GPG Input and Output.
- (line 232)
+ (line 267)
 * export-ownertrust: Operational GPG Commands.
- (line 364)
+ (line 368)
 * export-secret-key-p12: Certificate Management.
 (line 93)
 * export-secret-key-p8: Certificate Management.
@@ -6159,81 +6514,82 @@
 * export-secret-key-raw: Certificate Management.
 (line 102)
 * export-secret-keys: Operational GPG Commands.
- (line 268)
+ (line 272)
 * export-secret-subkeys: Operational GPG Commands.
- (line 268)
+ (line 272)
 * export-ssh-key: Operational GPG Commands.
- (line 290)
+ (line 294)
 * extra-digest-algo: Esoteric Options. (line 16)
-* extra-socket: Agent Options. (line 346)
+* extra-socket: Agent Options. (line 357)
 * extract: gpgtar. (line 19)
 * factory-reset: gpg-card. (line 107)
 * faked-system-time: Agent Options. (line 52)
 * faked-system-time <1>: GPG Esoteric Options.
- (line 70)
+ (line 82)
 * faked-system-time <2>: Esoteric Options. (line 55)
 * fast-list-mode: GPG Esoteric Options.
- (line 502)
+ (line 503)
 * fetch: gpg-card. (line 112)
 * fetch-crl: Dirmngr Commands. (line 50)
 * fetch-keys: Operational GPG Commands.
- (line 333)
+ (line 337)
 * fingerprint: Operational GPG Commands.
- (line 194)
+ (line 195)
 * fixed-list-mode: GPG Input and Output.
- (line 290)
+ (line 340)
 * flush: Dirmngr Commands. (line 60)
 * for-your-eyes-only: GPG Esoteric Options.
- (line 200)
+ (line 215)
 * forbid-gen-key: GPG Esoteric Options.
- (line 596)
-* force: Dirmngr Options. (line 93)
+ (line 597)
+* force: Dirmngr Options. (line 100)
 * force <1>: watchgnupg. (line 31)
-* force-aead: OpenPGP Options. (line 24)
+* force-aead: OpenPGP Options. (line 25)
 * force-crl-refresh: Certificate Options. (line 35)
 * force-default-responder: dirmngr-client. (line 64)
-* force-mdc: OpenPGP Options. (line 30)
+* force-mdc: OpenPGP Options. (line 32)
+* force-ocb: OpenPGP Options. (line 25)
 * force-sign-key: GPG Esoteric Options.
- (line 590)
+ (line 591)
 * forcesig: gpg-card. (line 116)
 * forget: Invoking gpg-preset-passphrase.
 (line 26)
 * from: gpg-wks-server. (line 54)
 * full-gen-key: OpenPGP Key Management.
- (line 111)
+ (line 119)
 * full-generate-key: OpenPGP Key Management.
- (line 110)
+ (line 118)
 * full-timestrings: GPG Esoteric Options.
- (line 79)
+ (line 91)
 * gen-key: OpenPGP Key Management.
- (line 104)
+ (line 112)
 * gen-key <1>: Certificate Management.
 (line 8)
 * gen-prime: Operational GPG Commands.
- (line 398)
+ (line 403)
 * gen-random: Operational GPG Commands.
- (line 391)
+ (line 395)
 * gen-revoke: OpenPGP Key Management.
- (line 120)
+ (line 128)
 * generate: gpg-card. (line 119)
 * generate-designated-revocation: OpenPGP Key Management.
- (line 133)
+ (line 141)
 * generate-key: OpenPGP Key Management.
- (line 103)
+ (line 111)
 * generate-key <1>: Certificate Management.
 (line 7)
 * generate-revocation: OpenPGP Key Management.
- (line 119)
+ (line 127)
 * gnupg: Compliance Options. (line 12)
-* gpg: gpgtar. (line 135)
+* gpg: gpgtar. (line 143)
 * gpg-agent-info: GPG Configuration Options.
- (line 738)
-* gpg-args: gpgtar. (line 138)
+ (line 785)
+* gpg-args: gpgtar. (line 146)
 * gpg-program: gpg-card. (line 69)
 * gpgconf-list: GPG Esoteric Options.
- (line 643)
+ (line 644)
 * gpgconf-test: GPG Esoteric Options.
- (line 647)
+ (line 648)
 * gpgsm-program: gpg-card. (line 72)
 * grab: Agent Options. (line 136)
 * group: GPG Key related Options.
@@ -6249,8 +6605,8 @@
 * help <5>: gpg-card. (line 50)
 * help <6>: watchgnupg. (line 55)
 * help <7>: dirmngr-client. (line 44)
-* help <8>: gpgtar. (line 153)
-* help <9>: gpg-wks-client. (line 121)
+* help <8>: gpgtar. (line 161)
+* help <9>: gpg-wks-client. (line 144)
 * help <10>: gpg-wks-server. (line 87)
 * hex: Invoking gpg-connect-agent.
 (line 114)
@@ -6262,7 +6618,7 @@
 (line 29)
 * homedir: Agent Options. (line 17)
 * homedir <1>: GPG Configuration Options.
- (line 258)
+ (line 266)
 * homedir <2>: Configuration Options.
 (line 16)
 * homedir <3>: Scdaemon Options. (line 13)
@@ -6270,27 +6626,28 @@
 * homedir <5>: Invoking gpgconf. (line 120)
 * homedir <6>: Invoking gpg-connect-agent.
 (line 43)
-* honor-http-proxy: Dirmngr Options. (line 236)
-* http-proxy: Dirmngr Options. (line 240)
-* ignore-cache-for-signing: Agent Options. (line 183)
-* ignore-cert: Dirmngr Options. (line 390)
-* ignore-cert-extension: Dirmngr Options. (line 380)
-* ignore-cert-extension <1>: Certificate Options. (line 82)
+* honor-http-proxy: Dirmngr Options. (line 242)
+* http-proxy: Dirmngr Options. (line 246)
+* ignore-cache-for-signing: Agent Options. (line 194)
+* ignore-cert: Dirmngr Options. (line 407)
+* ignore-cert-extension: Dirmngr Options. (line 389)
+* ignore-cert-extension <1>: Certificate Options. (line 84)
 * ignore-cert-with-oid: Esoteric Options. (line 46)
 * ignore-crc-error: GPG Esoteric Options.
- (line 415)
-* ignore-http-dp: Dirmngr Options. (line 220)
-* ignore-ldap-dp: Dirmngr Options. (line 227)
+ (line 421)
+* ignore-crl-extension: Dirmngr Options. (line 399)
+* ignore-http-dp: Dirmngr Options. (line 226)
+* ignore-ldap-dp: Dirmngr Options. (line 233)
 * ignore-mdc-error: GPG Esoteric Options.
- (line 422)
-* ignore-ocsp-service-url: Dirmngr Options. (line 232)
+ (line 428)
+* ignore-ocsp-service-url: Dirmngr Options. (line 238)
 * ignore-time-conflict: GPG Esoteric Options.
- (line 401)
+ (line 407)
 * ignore-time-conflict <1>: gpgv. (line 63)
 * ignore-valid-from: GPG Esoteric Options.
- (line 408)
+ (line 414)
 * import: Operational GPG Commands.
- (line 304)
+ (line 308)
 * import <1>: Certificate Management.
 (line 110)
 * import-filter: GPG Input and Output.
@@ -6298,16 +6655,17 @@
 * import-options: GPG Input and Output.
 (line 53)
 * import-ownertrust: Operational GPG Commands.
- (line 370)
+ (line 374)
 * include-certs: CMS Options. (line 7)
-* include-key-block: OpenPGP Options. (line 45)
+* include-key-block: OpenPGP Options. (line 47)
 * input-size-hint: GPG Input and Output.
 (line 37)
+* input-size-hint <1>: Input and Output. (line 24)
 * interactive: GPG Esoteric Options.
 (line 19)
 * kdf-setup: gpg-card. (line 126)
-* keep-display: Agent Options. (line 337)
-* keep-tty: Agent Options. (line 337)
+* keep-display: Agent Options. (line 348)
+* keep-tty: Agent Options. (line 348)
 * key-origin: GPG Input and Output.
 (line 45)
 * keyboxd: Invoking gpg-connect-agent.
@@ -6316,126 +6674,130 @@
 (line 99)
 * keydb-clear-some-cert-flags: Certificate Management.
 (line 63)
+* keyedit:addadsk: OpenPGP Key Management.
+ (line 367)
 * keyedit:addcardkey: OpenPGP Key Management.
- (line 281)
+ (line 292)
 * keyedit:addkey: OpenPGP Key Management.
- (line 278)
+ (line 289)
 * keyedit:addphoto: OpenPGP Key Management.
- (line 201)
+ (line 210)
 * keyedit:addrevoker: OpenPGP Key Management.
- (line 350)
+ (line 361)
 * keyedit:adduid: OpenPGP Key Management.
- (line 198)
+ (line 207)
 * keyedit:bkuptocard: OpenPGP Key Management.
- (line 295)
+ (line 306)
 * keyedit:change-usage: OpenPGP Key Management.
- (line 377)
+ (line 397)
 * keyedit:check: OpenPGP Key Management.
- (line 194)
+ (line 203)
 * keyedit:clean: OpenPGP Key Management.
- (line 363)
+ (line 383)
 * keyedit:cross-certify: OpenPGP Key Management.
- (line 386)
+ (line 406)
 * keyedit:delkey: OpenPGP Key Management.
- (line 326)
+ (line 337)
 * keyedit:delsig: OpenPGP Key Management.
- (line 184)
+ (line 193)
 * keyedit:deluid: OpenPGP Key Management.
- (line 211)
+ (line 220)
 * keyedit:disable: OpenPGP Key Management.
- (line 346)
+ (line 357)
 * keyedit:enable: OpenPGP Key Management.
- (line 346)
+ (line 357)
 * keyedit:expire: OpenPGP Key Management.
- (line 335)
+ (line 346)
 * keyedit:key: OpenPGP Key Management.
- (line 148)
+ (line 156)
 * keyedit:keyserver: OpenPGP Key Management.
- (line 228)
+ (line 237)
 * keyedit:keytocard: OpenPGP Key Management.
- (line 284)
+ (line 295)
 * keyedit:keytotpm: OpenPGP Key Management.
- (line 306)
+ (line 317)
 * keyedit:lsign: OpenPGP Key Management.
- (line 159)
+ (line 167)
 * keyedit:minimize: OpenPGP Key Management.
- (line 372)
+ (line 392)
 * keyedit:notation: OpenPGP Key Management.
- (line 235)
+ (line 244)
 * keyedit:nrsign: OpenPGP Key Management.
- (line 164)
+ (line 172)
 * keyedit:passwd: OpenPGP Key Management.
- (line 356)
+ (line 376)
 * keyedit:pref: OpenPGP Key Management.
- (line 243)
+ (line 252)
 * keyedit:primary: OpenPGP Key Management.
- (line 220)
+ (line 229)
 * keyedit:quit: OpenPGP Key Management.
- (line 397)
+ (line 417)
 * keyedit:revkey: OpenPGP Key Management.
- (line 332)
+ (line 343)
 * keyedit:revsig: OpenPGP Key Management.
- (line 189)
+ (line 198)
 * keyedit:revuid: OpenPGP Key Management.
- (line 217)
+ (line 226)
 * keyedit:save: OpenPGP Key Management.
- (line 394)
+ (line 414)
 * keyedit:setpref: OpenPGP Key Management.
- (line 255)
+ (line 264)
 * keyedit:showphoto: OpenPGP Key Management.
- (line 208)
+ (line 217)
 * keyedit:showpref: OpenPGP Key Management.
- (line 247)
+ (line 256)
 * keyedit:sign: OpenPGP Key Management.
- (line 152)
+ (line 160)
 * keyedit:toggle: OpenPGP Key Management.
- (line 359)
+ (line 379)
 * keyedit:trust: OpenPGP Key Management.
- (line 341)
+ (line 352)
 * keyedit:tsign: OpenPGP Key Management.
- (line 168)
+ (line 176)
 * keyedit:uid: OpenPGP Key Management.
- (line 144)
+ (line 152)
 * keyid-format: GPG Configuration Options.
- (line 619)
+ (line 666)
 * keyring: GPG Configuration Options.
- (line 223)
+ (line 231)
 * keyring <1>: gpgv. (line 38)
-* keyserver: Dirmngr Options. (line 148)
+* keyserver: Dirmngr Options. (line 155)
 * keyserver <1>: GPG Configuration Options.
- (line 628)
+ (line 675)
 * keyserver <2>: Configuration Options.
 (line 43)
 * keyserver-options: GPG Configuration Options.
- (line 647)
+ (line 694)
 * kill: Invoking gpgconf. (line 89)
 * known-notation: GPG Esoteric Options.
- (line 166)
+ (line 181)
 * lang: gpg-card. (line 129)
 * launch: Invoking gpgconf. (line 80)
-* lc-ctype: Agent Options. (line 332)
-* lc-messages: Agent Options. (line 332)
-* ldap-proxy: Dirmngr Options. (line 245)
-* ldapserver: Dirmngr Options. (line 275)
-* ldapserverlist-file: Dirmngr Options. (line 256)
-* ldaptimeout: Dirmngr Options. (line 306)
+* lc-ctype: Agent Options. (line 343)
+* lc-messages: Agent Options. (line 343)
+* ldap-proxy: Dirmngr Options. (line 251)
+* ldapserver: Dirmngr Options. (line 281)
+* ldapserverlist-file: Dirmngr Options. (line 262)
+* ldaptimeout: Dirmngr Options. (line 315)
 * learn-card: Certificate Management.
 (line 115)
 * legacy-list-mode: GPG Input and Output.
- (line 296)
+ (line 346)
 * limit-card-insert-tries: GPG Configuration Options.
- (line 786)
+ (line 833)
 * list: gpg-card. (line 136)
-* list-archive: gpgtar. (line 39)
+* list-archive: gpgtar. (line 41)
 * list-chain: Certificate Management.
 (line 32)
 * list-config: GPG Esoteric Options.
- (line 632)
+ (line 633)
 * list-crls: Dirmngr Commands. (line 38)
+* list-filter: GPG Configuration Options.
+ (line 71)
 * list-gcrypt-config: GPG Esoteric Options.
- (line 640)
+ (line 641)
 * list-keys: Operational GPG Commands.
- (line 119)
+ (line 120)
 * list-keys <1>: Certificate Management.
 (line 17)
 * list-keys <2>: Certificate Management.
@@ -6443,120 +6805,127 @@
 * list-only: GPG Esoteric Options.
 (line 11)
 * list-options: GPG Configuration Options.
- (line 71)
+ (line 76)
 * list-options:show-keyring: GPG Configuration Options.
- (line 119)
+ (line 127)
 * list-options:show-keyserver-urls: GPG Configuration Options.
- (line 103)
+ (line 108)
 * list-options:show-notations: GPG Configuration Options.
- (line 99)
+ (line 104)
 * list-options:show-only-fpr-mbox: GPG Configuration Options.
- (line 134)
+ (line 142)
 * list-options:show-photos: GPG Configuration Options.
- (line 79)
+ (line 84)
 * list-options:show-policy-urls: GPG Configuration Options.
- (line 93)
+ (line 98)
 * list-options:show-sig-expire: GPG Configuration Options.
- (line 123)
+ (line 131)
 * list-options:show-sig-subpackets: GPG Configuration Options.
- (line 127)
+ (line 135)
 * list-options:show-std-notations: GPG Configuration Options.
- (line 99)
+ (line 104)
 * list-options:show-uid-validity: GPG Configuration Options.
- (line 107)
+ (line 112)
+* list-options:show-unusable-sigs: GPG Configuration Options.
+ (line 124)
 * list-options:show-unusable-subkeys: GPG Configuration Options.
- (line 115)
+ (line 120)
 * list-options:show-unusable-uids: GPG Configuration Options.
- (line 111)
+ (line 116)
 * list-options:show-usage: GPG Configuration Options.
- (line 87)
+ (line 92)
 * list-options:show-user-notations: GPG Configuration Options.
- (line 99)
+ (line 104)
 * list-options:sort-sigs: GPG Configuration Options.
- (line 138)
+ (line 146)
 * list-packets: Operational GPG Commands.
- (line 203)
+ (line 204)
 * list-secret-keys: Operational GPG Commands.
- (line 130)
+ (line 131)
 * list-secret-keys <1>: Certificate Management.
 (line 24)
 * list-signatures: GPG Esoteric Options.
- (line 490)
-* list-sigs: GPG Esoteric Options.
 (line 491)
-* listen-backlog: Agent Options. (line 342)
-* listen-backlog <1>: Dirmngr Options. (line 134)
+* list-sigs: GPG Esoteric Options.
+ (line 492)
+* listen-backlog: Agent Options. (line 353)
+* listen-backlog <1>: Dirmngr Options. (line 141)
 * listen-backlog <2>: Scdaemon Options. (line 115)
 * load-crl: Dirmngr Commands. (line 42)
 * load-crl <1>: dirmngr-client. (line 80)
 * local-user: GPG Key related Options.
 (line 77)
-* local-user <1>: Input and Output. (line 41)
-* local-user <2>: gpgtar. (line 53)
+* local-user <1>: Input and Output. (line 47)
+* local-user <2>: gpgtar. (line 56)
 * locate-external-keys: Operational GPG Commands.
- (line 170)
+ (line 171)
 * locate-keys: Operational GPG Commands.
- (line 170)
+ (line 171)
 * lock-multiple: GPG Configuration Options.
- (line 766)
+ (line 813)
 * lock-never: GPG Configuration Options.
- (line 770)
+ (line 817)
 * lock-once: GPG Configuration Options.
- (line 762)
+ (line 809)
 * log-file: Agent Options. (line 142)
 * log-file <1>: Dirmngr Options. (line 30)
 * log-file <2>: GPG Esoteric Options.
- (line 103)
+ (line 115)
 * log-file <3>: Configuration Options.
 (line 82)
 * log-file <4>: Scdaemon Options. (line 120)
 * log-file <5>: gpgv. (line 59)
+* log-time: GPG Esoteric Options.
+ (line 119)
+* log-time <1>: Configuration Options.
+ (line 86)
 * logger-fd: GPG Esoteric Options.
- (line 99)
+ (line 111)
 * logger-fd <1>: gpgv. (line 56)
 * login: gpg-card. (line 153)
 * lookup: dirmngr-client. (line 86)
 * lsign-key: OpenPGP Key Management.
- (line 412)
+ (line 432)
 * mangle-dos-filenames: GPG Configuration Options.
- (line 350)
+ (line 370)
 * marginals-needed: GPG Configuration Options.
- (line 707)
-* max-cache-ttl: Agent Options. (line 204)
-* max-cache-ttl-ssh: Agent Options. (line 210)
+ (line 754)
+* max-cache-ttl: Agent Options. (line 215)
+* max-cache-ttl-ssh: Agent Options. (line 221)
 * max-cert-depth: GPG Configuration Options.
- (line 715)
+ (line 762)
 * max-output: GPG Input and Output.
 (line 19)
-* max-passphrase-days: Agent Options. (line 250)
-* max-replies: Dirmngr Options. (line 377)
+* max-passphrase-days: Agent Options. (line 261)
+* max-replies: Dirmngr Options. (line 386)
 * min-cert-level: GPG Configuration Options.
- (line 395)
-* min-passphrase-len: Agent Options. (line 220)
-* min-passphrase-nonalpha: Agent Options. (line 225)
+ (line 415)
+* min-passphrase-len: Agent Options. (line 231)
+* min-passphrase-nonalpha: Agent Options. (line 236)
 * min-rsa-length: Compliance Options. (line 65)
 * min-rsa-length <1>: Esoteric Options. (line 31)
 * multi-server: Scdaemon Commands. (line 26)
 * multifile: Operational GPG Commands.
- (line 100)
+ (line 101)
 * name: gpg-card. (line 159)
-* nameserver: Dirmngr Options. (line 203)
+* nameserver: Dirmngr Options. (line 209)
 * no: GPG Configuration Options.
 (line 67)
-* no <1>: gpgtar. (line 113)
-* no-allow-external-cache: Agent Options. (line 168)
-* no-allow-loopback-pinentry: Agent Options. (line 160)
+* no <1>: gpgtar. (line 116)
+* no-add-revocs: gpg-wks-client. (line 128)
+* no-allow-external-cache: Agent Options. (line 179)
+* no-allow-loopback-pinentry: Agent Options. (line 171)
 * no-allow-mark-trusted: Agent Options. (line 150)
 * no-armor: GPG Input and Output.
 (line 12)
 * no-auto-key-import: GPG Configuration Options.
- (line 573)
+ (line 620)
 * no-auto-key-retrieve: GPG Configuration Options.
- (line 585)
+ (line 632)
 * no-auto-trust-new-key: GPG Esoteric Options.
- (line 585)
+ (line 586)
 * no-autostart: GPG Configuration Options.
- (line 755)
+ (line 802)
 * no-autostart <1>: Configuration Options.
 (line 71)
 * no-autostart <2>: gpg-card. (line 53)
@@ -6564,9 +6933,12 @@
 (line 78)
 * no-batch: GPG Configuration Options.
 (line 45)
-* no-common-certs-import: Esoteric Options. (line 152)
+* no-common-certs-import: Esoteric Options. (line 160)
+* no-compress: GPG Configuration Options.
+ (line 341)
+* no-compress <1>: gpgtar. (line 138)
 * no-default-keyring: GPG Esoteric Options.
- (line 468)
+ (line 469)
 * no-default-recipient: GPG Configuration Options.
 (line 29)
 * no-detach: Agent Options. (line 114)
@@ -6574,85 +6946,87 @@
 * no-encrypt-to: GPG Key related Options.
 (line 51)
 * no-expensive-trust-checks: GPG Esoteric Options.
- (line 614)
+ (line 615)
 * no-ext-connect: Invoking gpg-connect-agent.
 (line 73)
 * no-grab: Agent Options. (line 136)
 * no-greeting: GPG Configuration Options.
- (line 800)
+ (line 847)
 * no-groups: GPG Key related Options.
 (line 73)
-* no-include-key-block: OpenPGP Options. (line 45)
+* no-include-key-block: OpenPGP Options. (line 47)
 * no-keyring: GPG Esoteric Options.
- (line 478)
+ (line 479)
 * no-literal: GPG Esoteric Options.
- (line 510)
+ (line 511)
 * no-mangle-dos-filenames: GPG Configuration Options.
- (line 350)
+ (line 370)
 * no-options: GPG Configuration Options.
- (line 325)
+ (line 333)
+* no-pretty-dn: Input and Output. (line 88)
 * no-random-seed-file: GPG Configuration Options.
- (line 794)
+ (line 841)
 * no-secmem-warning: GPG Configuration Options.
- (line 803)
+ (line 850)
 * no-secmem-warning <1>: Configuration Options.
 (line 78)
 * no-sig-cache: GPG Configuration Options.
- (line 718)
+ (line 765)
 * no-skip-hidden-recipients: GPG Key related Options.
 (line 127)
 * no-symkey-cache: GPG Esoteric Options.
- (line 365)
+ (line 371)
 * no-tty: GPG Configuration Options.
 (line 58)
-* no-use-standard-socket: Agent Options. (line 322)
-* no-use-tor: Dirmngr Options. (line 98)
+* no-use-standard-socket: Agent Options. (line 333)
+* no-use-tor: Dirmngr Options. (line 105)
+* no-user-trustlist: Agent Options. (line 155)
 * no-verbose: GPG Configuration Options.
 (line 37)
 * not-dash-escaped: GPG Esoteric Options.
- (line 294)
-* null: gpgtar. (line 86)
+ (line 300)
+* null: gpgtar. (line 89)
 * null <1>: gpg-check-pattern. (line 59)
 * ocsp: dirmngr-client. (line 61)
-* ocsp-current-period: Dirmngr Options. (line 372)
-* ocsp-max-clock-skew: Dirmngr Options. (line 364)
-* ocsp-max-period: Dirmngr Options. (line 368)
-* ocsp-responder: Dirmngr Options. (line 338)
-* ocsp-signer: Dirmngr Options. (line 343)
-* only-ldap-proxy: Dirmngr Options. (line 251)
+* ocsp-current-period: Dirmngr Options. (line 381)
+* ocsp-max-clock-skew: Dirmngr Options. (line 373)
+* ocsp-max-period: Dirmngr Options. (line 377)
+* ocsp-responder: Dirmngr Options. (line 347)
+* ocsp-signer: Dirmngr Options. (line 352)
+* only-ldap-proxy: Dirmngr Options. (line 257)
 * openpgp: Compliance Options. (line 20)
-* openpgp <1>: gpgtar. (line 95)
+* openpgp <1>: gpgtar. (line 98)
 * options: Agent Options. (line 10)
 * options <1>: Dirmngr Options. (line 11)
 * options <2>: Dirmngr Options. (line 16)
 * options <3>: GPG Configuration Options.
- (line 320)
+ (line 328)
 * options <4>: Configuration Options.
 (line 10)
 * options <5>: Scdaemon Options. (line 7)
 * output: GPG Input and Output.
 (line 16)
-* output <1>: Input and Output. (line 51)
+* output <1>: Input and Output. (line 57)
 * output <2>: gpgv. (line 45)
-* output <3>: gpgtar. (line 57)
-* output <4>: gpg-wks-client. (line 97)
+* output <3>: gpgtar. (line 60)
+* output <4>: gpg-wks-client. (line 104)
 * output <5>: gpg-wks-server. (line 65)
 * override-session-key: GPG Esoteric Options.
- (line 534)
-* p12-charset: Input and Output. (line 24)
+ (line 535)
+* p12-charset: Input and Output. (line 30)
 * passphrase: GPG Esoteric Options.
- (line 340)
+ (line 346)
 * passphrase <1>: Invoking gpg-preset-passphrase.
 (line 36)
 * passphrase-fd: GPG Esoteric Options.
- (line 319)
-* passphrase-fd <1>: Esoteric Options. (line 120)
+ (line 325)
+* passphrase-fd <1>: Esoteric Options. (line 128)
 * passphrase-file: GPG Esoteric Options.
- (line 329)
+ (line 335)
 * passphrase-repeat: GPG Esoteric Options.
- (line 311)
+ (line 317)
 * passwd: OpenPGP Key Management.
- (line 473)
+ (line 502)
 * passwd <1>: Certificate Management.
 (line 121)
 * passwd <2>: gpg-card. (line 163)
@@ -6660,61 +7034,65 @@
 * pcsc-shared: Scdaemon Options. (line 124)
 * pem: dirmngr-client. (line 58)
 * permission-warning: GPG Configuration Options.
- (line 806)
-* personal-aead-preferences: OpenPGP Options. (line 66)
-* personal-cipher-preferences: OpenPGP Options. (line 57)
-* personal-compress-preferences: OpenPGP Options. (line 84)
-* personal-digest-preferences: OpenPGP Options. (line 75)
+ (line 853)
+* personal-aead-preferences: Deprecated Options. (line 37)
+* personal-cipher-preferences: OpenPGP Options. (line 59)
+* personal-compress-preferences: OpenPGP Options. (line 77)
+* personal-digest-preferences: OpenPGP Options. (line 68)
 * pgp6: Compliance Options. (line 43)
 * pgp7: Compliance Options. (line 46)
 * pgp8: Compliance Options. (line 53)
 * photo-viewer: GPG Configuration Options.
- (line 196)
-* pinentry-formatted-passphrase: Agent Options. (line 269)
-* pinentry-invisible-char: Agent Options. (line 258)
+ (line 204)
+* pinentry-formatted-passphrase: Agent Options. (line 280)
+* pinentry-invisible-char: Agent Options. (line 269)
 * pinentry-mode: GPG Esoteric Options.
- (line 350)
-* pinentry-mode <1>: Esoteric Options. (line 129)
-* pinentry-program: Agent Options. (line 282)
-* pinentry-timeout: Agent Options. (line 263)
-* pinentry-touch-file: Agent Options. (line 295)
+ (line 356)
+* pinentry-mode <1>: Esoteric Options. (line 137)
+* pinentry-program: Agent Options. (line 293)
+* pinentry-timeout: Agent Options. (line 274)
+* pinentry-touch-file: Agent Options. (line 306)
 * ping: dirmngr-client. (line 69)
 * policy-file: Configuration Options.
 (line 51)
 * prefer-system-dirmngr: Configuration Options.
 (line 65)
 * preserve-permissions: GPG Esoteric Options.
- (line 617)
+ (line 618)
 * preset: Invoking gpg-preset-passphrase.
 (line 22)
 * primary-keyring: GPG Configuration Options.
- (line 241)
+ (line 249)
 * print-md: Operational GPG Commands.
- (line 386)
+ (line 390)
 * privatedo: gpg-card. (line 171)
 * q: gpg-card. (line 177)
 * q <1>: Invoking gpg-connect-agent.
 (line 40)
+* quick-add-adsk: OpenPGP Key Management.
+ (line 103)
 * quick-add-key: OpenPGP Key Management.
 (line 69)
 * quick-add-uid: OpenPGP Key Management.
- (line 440)
+ (line 460)
 * quick-gen-key: OpenPGP Key Management.
 (line 10)
 * quick-generate-key: OpenPGP Key Management.
 (line 10)
 * quick-lsign-key: OpenPGP Key Management.
- (line 418)
+ (line 438)
 * quick-revoke-sig: OpenPGP Key Management.
- (line 455)
+ (line 475)
 * quick-revoke-uid: OpenPGP Key Management.
- (line 447)
+ (line 467)
 * quick-set-expire: OpenPGP Key Management.
 (line 60)
 * quick-set-primary-uid: OpenPGP Key Management.
- (line 465)
+ (line 485)
 * quick-sign-key: OpenPGP Key Management.
- (line 418)
+ (line 438)
+* quick-update-pref: OpenPGP Key Management.
+ (line 492)
 * quiet: Agent Options. (line 45)
 * quiet <1>: GPG Configuration Options.
 (line 40)
@@ -6724,66 +7102,66 @@
 * quiet <5>: Invoking gpg-connect-agent.
 (line 40)
 * quiet <6>: dirmngr-client. (line 48)
-* quiet <7>: gpgtar. (line 65)
-* quiet <8>: gpg-wks-client. (line 115)
+* quiet <7>: gpgtar. (line 68)
+* quiet <8>: gpg-wks-client. (line 138)
 * quiet <9>: gpg-wks-server. (line 81)
 * quit: gpg-card. (line 177)
 * raw-socket: Invoking gpg-connect-agent.
 (line 22)
 * readcert: gpg-card. (line 180)
-* reader-port: Scdaemon Options. (line 147)
+* reader-port: Scdaemon Options. (line 148)
 * rebuild-keydb-caches: Operational GPG Commands.
- (line 380)
+ (line 384)
 * receive-keys: Operational GPG Commands.
- (line 313)
+ (line 317)
 * recipient: GPG Key related Options.
 (line 8)
-* recipient <1>: Input and Output. (line 46)
-* recipient <2>: gpgtar. (line 49)
+* recipient <1>: Input and Output. (line 52)
+* recipient <2>: gpgtar. (line 52)
 * recipient-file: GPG Key related Options.
 (line 22)
-* recursive-resolver: Dirmngr Options. (line 117)
+* recursive-resolver: Dirmngr Options. (line 124)
 * recv-keys: Operational GPG Commands.
- (line 314)
+ (line 318)
 * refresh-keys: Operational GPG Commands.
- (line 317)
+ (line 321)
 * reload: Invoking gpgconf. (line 74)
 * remove-socketdir: Invoking gpgconf. (line 102)
 * request-origin: GPG Esoteric Options.
- (line 370)
-* request-origin <1>: Esoteric Options. (line 144)
+ (line 376)
+* request-origin <1>: Esoteric Options. (line 152)
 * require-compliance: Compliance Options. (line 70)
 * require-compliance <1>: Esoteric Options. (line 36)
-* require-compliance <2>: gpgtar. (line 117)
+* require-compliance <2>: gpgtar. (line 120)
 * require-cross-certification: GPG Configuration Options.
- (line 825)
+ (line 872)
 * require-secmem: GPG Configuration Options.
- (line 820)
+ (line 867)
 * reset: gpg-card. (line 187)
-* resolver-timeout: Dirmngr Options. (line 120)
+* resolver-timeout: Dirmngr Options. (line 127)
 * rfc2440: Compliance Options. (line 36)
 * rfc4880: Compliance Options. (line 27)
 * rfc4880bis: Compliance Options. (line 32)
 * run: Invoking gpg-connect-agent.
 (line 105)
-* s: Dirmngr Options. (line 87)
-* s2k-calibration: Agent Options. (line 435)
-* s2k-cipher-algo: OpenPGP Options. (line 94)
-* s2k-count: Agent Options. (line 442)
-* s2k-count <1>: OpenPGP Options. (line 110)
-* s2k-digest-algo: OpenPGP Options. (line 99)
-* s2k-mode: OpenPGP Options. (line 103)
+* s: Dirmngr Options. (line 94)
+* s2k-calibration: Agent Options. (line 470)
+* s2k-cipher-algo: OpenPGP Options. (line 87)
+* s2k-count: Agent Options. (line 477)
+* s2k-count <1>: OpenPGP Options. (line 103)
+* s2k-digest-algo: OpenPGP Options. (line 92)
+* s2k-mode: OpenPGP Options. (line 96)
 * salut: gpg-card. (line 191)
 * salutation: gpg-card. (line 191)
-* scdaemon-program: Agent Options. (line 304)
+* scdaemon-program: Agent Options. (line 315)
 * search-keys: Operational GPG Commands.
- (line 323)
+ (line 327)
 * secret-keyring: GPG Configuration Options.
- (line 246)
-* send: gpg-wks-client. (line 58)
+ (line 254)
+* send: gpg-wks-client. (line 65)
 * send <1>: gpg-wks-server. (line 60)
 * send-keys: Operational GPG Commands.
- (line 257)
+ (line 261)
 * sender: GPG Key related Options.
 (line 81)
 * server: Agent Commands. (line 23)
@@ -6792,56 +7170,56 @@
 (line 24)
 * server <3>: Scdaemon Commands. (line 22)
 * set-filename: GPG Esoteric Options.
- (line 193)
-* set-filename <1>: gpgtar. (line 129)
+ (line 208)
+* set-filename <1>: gpgtar. (line 132)
 * set-filesize: GPG Esoteric Options.
- (line 514)
+ (line 515)
 * set-notation: GPG Esoteric Options.
- (line 139)
+ (line 154)
 * set-policy-url: GPG Esoteric Options.
- (line 175)
+ (line 190)
 * sh: Agent Options. (line 129)
-* sh <1>: Dirmngr Options. (line 87)
+* sh <1>: Dirmngr Options. (line 94)
 * show-certs: Certificate Management.
 (line 52)
 * show-keyring: Deprecated Options. (line 16)
 * show-keys: Operational GPG Commands.
- (line 185)
-* show-notation: Deprecated Options. (line 25)
+ (line 186)
+* show-notation: Deprecated Options. (line 22)
 * show-photos: Deprecated Options. (line 8)
-* show-policy-url: Deprecated Options. (line 33)
+* show-policy-url: Deprecated Options. (line 30)
 * show-session-key: GPG Esoteric Options.
- (line 518)
+ (line 519)
 * shutdown: Dirmngr Commands. (line 56)
 * sig-keyserver-url: GPG Esoteric Options.
- (line 185)
+ (line 200)
 * sig-notation: GPG Esoteric Options.
- (line 139)
+ (line 154)
 * sig-policy-url: GPG Esoteric Options.
- (line 175)
+ (line 190)
 * sign: Operational GPG Commands.
 (line 8)
 * sign <1>: Operational GPGSM Commands.
 (line 16)
 * sign-key: OpenPGP Key Management.
- (line 408)
-* skip-crypto: gpgtar. (line 68)
+ (line 428)
+* skip-crypto: gpgtar. (line 71)
 * skip-hidden-recipients: GPG Key related Options.
 (line 127)
 * skip-verify: GPG Esoteric Options.
- (line 482)
+ (line 483)
 * squid-mode: dirmngr-client. (line 101)
-* ssh-fingerprint-digest: Agent Options. (line 420)
-* standard-resolver: Dirmngr Options. (line 110)
+* ssh-fingerprint-digest: Agent Options. (line 455)
+* standard-resolver: Dirmngr Options. (line 117)
 * status-fd: GPG Esoteric Options.
- (line 91)
+ (line 103)
 * status-fd <1>: gpg-card. (line 35)
 * status-fd <2>: gpgv. (line 52)
 * status-fd <3>: Invoking gpgconf. (line 167)
-* status-fd <4>: gpgtar. (line 120)
-* status-fd <5>: gpg-wks-client. (line 101)
+* status-fd <4>: gpgtar. (line 123)
+* status-fd <5>: gpg-wks-client. (line 110)
 * status-file: GPG Esoteric Options.
- (line 95)
+ (line 107)
 * steal-socket: Agent Options. (line 118)
 * store: Operational GPG Commands.
 (line 55)
@@ -6851,71 +7229,74 @@
 * supervised <1>: Dirmngr Commands. (line 33)
 * symmetric: Operational GPG Commands.
 (line 42)
-* tar: gpgtar. (line 147)
-* tar-args: gpgtar. (line 141)
+* sys-trustlist-name: Agent Options. (line 160)
+* tar: gpgtar. (line 155)
+* tar-args: gpgtar. (line 149)
 * textmode: OpenPGP Options. (line 8)
 * throw-keyids: GPG Esoteric Options.
- (line 285)
+ (line 291)
 * time-only: watchgnupg. (line 46)
-* tls-debug: Dirmngr Options. (line 69)
+* tls-debug: Dirmngr Options. (line 76)
 * tofu-default-policy: GPG Configuration Options.
- (line 711)
+ (line 758)
 * tofu-policy: Operational GPG Commands.
- (line 417)
+ (line 422)
 * trust-model: GPG Configuration Options.
- (line 410)
+ (line 441)
 * trust-model:always: GPG Configuration Options.
- (line 491)
+ (line 522)
 * trust-model:auto: GPG Configuration Options.
- (line 500)
+ (line 531)
 * trust-model:classic: GPG Configuration Options.
- (line 418)
+ (line 449)
 * trust-model:direct: GPG Configuration Options.
- (line 483)
+ (line 514)
 * trust-model:pgp: GPG Configuration Options.
- (line 413)
+ (line 444)
 * trust-model:tofu: GPG Configuration Options.
- (line 421)
+ (line 452)
 * trust-model:tofu+pgp: GPG Configuration Options.
- (line 471)
+ (line 502)
 * trustdb-name: GPG Configuration Options.
- (line 251)
+ (line 259)
 * trusted-key: GPG Configuration Options.
- (line 401)
+ (line 421)
 * try-all-secrets: GPG Key related Options.
 (line 119)
 * try-secret-key: GPG Key related Options.
 (line 108)
-* ttyname: Agent Options. (line 332)
-* ttytype: Agent Options. (line 332)
+* ttyname: Agent Options. (line 343)
+* ttytype: Agent Options. (line 343)
 * uif: gpg-card. (line 196)
 * unblock: gpg-card. (line 202)
+* unbuffered: Invoking gpg-connect-agent.
+ (line 123)
 * ungroup: GPG Key related Options.
 (line 70)
 * unwrap: Operational GPG Commands.
- (line 409)
+ (line 414)
 * update-trustdb: Operational GPG Commands.
- (line 339)
+ (line 343)
 * url: gpg-card. (line 207)
 * url <1>: dirmngr-client. (line 94)
 * url <2>: dirmngr-client. (line 98)
 * use-agent: GPG Configuration Options.
- (line 735)
+ (line 782)
 * use-embedded-filename: GPG Esoteric Options.
- (line 209)
-* use-standard-socket: Agent Options. (line 322)
-* use-standard-socket-p: Agent Options. (line 322)
-* use-tor: Dirmngr Options. (line 98)
+ (line 224)
+* use-standard-socket: Agent Options. (line 333)
+* use-standard-socket-p: Agent Options. (line 333)
+* use-tor: Dirmngr Options. (line 105)
 * utf8-strings: GPG Configuration Options.
- (line 306)
-* utf8-strings <1>: gpgtar. (line 90)
+ (line 314)
+* utf8-strings <1>: gpgtar. (line 93)
 * 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 73)
+* validation-model: Certificate Options. (line 75)
 * verbose: Agent Options. (line 39)
 * verbose <1>: Dirmngr Options. (line 25)
 * verbose <2>: GPG Configuration Options.
@@ -6931,9 +7312,9 @@
 * verbose <9>: Invoking gpg-connect-agent.
 (line 36)
 * verbose <10>: dirmngr-client. (line 53)
-* verbose <11>: gpgtar. (line 61)
+* verbose <11>: gpgtar. (line 64)
 * verbose <12>: gpg-check-pattern. (line 53)
-* verbose <13>: gpg-wks-client. (line 112)
+* verbose <13>: gpg-wks-client. (line 135)
 * verbose <14>: gpg-wks-server. (line 78)
 * verify: Operational GPG Commands.
 (line 67)
@@ -6941,27 +7322,27 @@
 (line 20)
 * verify <2>: gpg-card. (line 212)
 * verify-files: Operational GPG Commands.
- (line 108)
+ (line 109)
 * verify-options: GPG Configuration Options.
- (line 144)
+ (line 152)
 * verify-options:show-keyserver-urls: GPG Configuration Options.
- (line 163)
+ (line 171)
 * verify-options:show-notations: GPG Configuration Options.
- (line 159)
+ (line 167)
 * verify-options:show-photos: GPG Configuration Options.
- (line 149)
+ (line 157)
 * verify-options:show-policy-urls: GPG Configuration Options.
- (line 153)
+ (line 161)
 * verify-options:show-primary-uid-only: GPG Configuration Options.
- (line 175)
+ (line 183)
 * verify-options:show-std-notations: GPG Configuration Options.
- (line 159)
-* verify-options:show-uid-validity: GPG Configuration Options.
 (line 167)
+* verify-options:show-uid-validity: GPG Configuration Options.
+ (line 175)
 * verify-options:show-unusable-uids: GPG Configuration Options.
- (line 171)
+ (line 179)
 * verify-options:show-user-notations: GPG Configuration Options.
- (line 159)
+ (line 167)
 * version: Agent Commands. (line 10)
 * version <1>: Dirmngr Commands. (line 10)
 * version <2>: General GPG Commands.
@@ -6972,48 +7353,48 @@
 * version <5>: gpg-card. (line 47)
 * version <6>: watchgnupg. (line 52)
 * version <7>: dirmngr-client. (line 40)
-* version <8>: gpgtar. (line 150)
-* version <9>: gpg-wks-client. (line 118)
+* version <8>: gpgtar. (line 158)
+* version <9>: gpg-wks-client. (line 141)
 * version <10>: gpg-wks-server. (line 84)
 * warranty: General GPG Commands.
 (line 17)
 * warranty <1>: General GPGSM Commands.
 (line 15)
 * weak-digest: GPG Esoteric Options.
- (line 447)
+ (line 453)
 * weak-digest <1>: gpgv. (line 90)
 * with-colons: GPG Input and Output.
- (line 282)
+ (line 332)
 * with-colons <1>: gpg-card. (line 32)
-* with-colons <2>: gpg-wks-client. (line 62)
+* with-colons <2>: gpg-wks-client. (line 69)
 * with-dir: gpg-wks-server. (line 69)
 * with-ephemeral-keys: Esoteric Options. (line 61)
 * with-file: gpg-wks-server. (line 73)
 * with-fingerprint: GPG Input and Output.
- (line 302)
+ (line 352)
 * with-icao-spelling: GPG Input and Output.
- (line 313)
+ (line 363)
 * with-key-data: GPG Esoteric Options.
- (line 486)
-* with-key-data <1>: Input and Output. (line 54)
+ (line 487)
+* with-key-data <1>: Input and Output. (line 60)
 * with-key-origin: GPG Input and Output.
- (line 321)
+ (line 371)
 * with-keygrip: GPG Input and Output.
- (line 317)
-* with-log: gpgtar. (line 124)
+ (line 367)
+* with-log: gpgtar. (line 127)
 * with-secret: GPG Input and Output.
- (line 332)
-* with-secret <1>: Input and Output. (line 78)
+ (line 382)
+* with-secret <1>: Input and Output. (line 84)
 * with-subkey-fingerprint: GPG Input and Output.
- (line 306)
-* with-validation: Input and Output. (line 60)
+ (line 356)
+* with-validation: Input and Output. (line 66)
 * with-wkd-hash: GPG Input and Output.
- (line 327)
+ (line 377)
 * writecert: gpg-card. (line 217)
 * writekey: gpg-card. (line 224)
-* xauthority: Agent Options. (line 332)
+* xauthority: Agent Options. (line 343)
 * yes: GPG Configuration Options.
 (line 63)
-* yes <1>: gpgtar. (line 108)
+* yes <1>: gpgtar. (line 111)
 * yubikey: gpg-card. (line 229)

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg.info-3 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg.info-3 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gnupg7.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gnupg7.texi Changed

@@ -11,19 +11,18 @@
 @ifset isman
 GnuPG is a set of programs for public key encryption and digital
 signatures.  The program most users will want to use is the OpenPGP
-command line tool, named @command{gpg2}.  @command{gpgv}is a stripped
-down version of @command{gpg2} with no encryption functionality, used
+command line tool, named @command{gpg}.  @command{gpgv}is a stripped
+down version of @command{gpg} with no encryption functionality, used
 only to verify signatures against a trusted keyring.  @command{gpgsm} is
 the X.509/CMS (for S/MIME) counterpart of
-@command{gpg2}. @command{gpg-agent} is a passphrase and private key
+@command{gpg}. @command{gpg-agent} is a passphrase and private key
 daemon which may also emulate the @command{ssh-agent}.
 @mansect see also
-@command{gpg}(1), 
-@command{gpg2}(1), 
-@command{gpgv}(1), 
-@command{gpgsm}(1), 
-@command{gpg-agent}(1), 
-@command{dirmngr}(8), 
+@command{gpg}(1),
+@command{gpgv}(1),
+@command{gpgsm}(1),
+@command{gpg-agent}(1),
+@command{dirmngr}(8),
 @command{scdaemon}(1)
 @include see-also-note.texi
 @end ifset

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gpg-agent.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gpg-agent.texi Changed

@@ -174,6 +174,9 @@
 listening sockets.  This option is deprecated and not supported on
 Windows.
 
+If in @file{common.conf} the option @option{no-autostart} is set, any
+start attempts will be ignored.
+
 In --supervised mode, different file descriptors can be provided for
 use as different socket types (e.g. ssh, extra) as long as they are
 identified in the environment variable @code{LISTEN_FDNAMES} (see
@@ -346,6 +349,21 @@
 @file{trustlist.txt} file.  This makes it harder for users to inadvertently
 accept Root-CA keys.
 
+
+@anchor{option --no-user-trustlist}
+@item --no-user-trustlist
+@opindex no-user-trustlist
+Entirely ignore the user trust list and consider only the global
+trustlist (@file{@value{SYSCONFDIR}/trustlist.txt}).  This
+implies the @ref{option --no-allow-mark-trusted}.
+
+@item --sys-trustlist-name @var{file}
+@opindex sys-trustlist-name
+Changes the default name for the global trustlist from "trustlist.txt"
+to @var{file}.  If @var{file} does not contain any slashes and does
+not start with "~/" it is searched in the system configuration
+directory (@file{@value{SYSCONFDIR}}).
+
 @anchor{option --allow-preset-passphrase}
 @item --allow-preset-passphrase
 @opindex allow-preset-passphrase
@@ -597,15 +615,11 @@
 @itemx --disable-extended-key-format
 @opindex enable-extended-key-format
 @opindex disable-extended-key-format
-Since version 2.3 keys are created in the extended private key format.
-Changing the passphrase of a key will also convert the key to that new
-format.  This new key format is supported since GnuPG version 2.1.12
-and thus there should be no need to disable it.  The disable option
-allows to revert to the old behavior for new keys; be aware that keys
-are never migrated back to the old format.  However 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.
+These options are obsolete and have no effect.  The extended key format
+is used for years now and has been supported since 2.1.12.  Existing
+keys in the old format are migrated to the new format as soon as they
+are touched.
+
 
 @anchor{option --enable-ssh-support}
 @item --enable-ssh-support
@@ -661,6 +675,39 @@
 @command{putty}.  This is similar to the regular ssh-agent support but
 makes use of Windows message queue as required by @command{putty}.
 
+
+The order in which keys are presented to ssh are:
+@table @code
+
+@item Negative Use-for-ssh values
+      If a key file has the attribute "Use-for-ssh" and its value is
+      negative, these keys are presented first to ssh.  The negative
+      values are capped at -999 with -999 beeing lower ranked than -1.
+      These values can be used to prefer on-disk keys over keys taken
+      from active cards.
+
+@item Active cards
+      Active cards (inserted into a card reader or plugged in tokens)
+      are always tried; they are ordered by their serial numbers.
+
+@item Keys listed in the sshcontrol file
+      Non-disabled keys from the sshcontrol file are presented in the
+      order they appear in this file.  Note that the sshcontrol file
+      is deprecated.
+
+@item Positive Use-for-ssh values
+      If a key file has the attribute "Use-for-ssh" and its value is
+      "yes", "true", or any positive number the key is presented in
+      the order of their values.  "yes" and "true" have a value of 1;
+      other values are capped at 99999.
+
+@end table
+
+Editing the "Use-for-ssh" values can be done with an editor or using
+@command{gpg-connect-agent} and "KEYATTR" (Remember to append a colon
+to the key; i.e. use "Use-for-ssh:").
+
+
 @anchor{option --ssh-fingerprint-digest}
 @item --ssh-fingerprint-digest
 @opindex ssh-fingerprint-digest
@@ -773,7 +820,9 @@
 
 As a special feature a line @code{include-default} will include a global
 list of trusted certificates (e.g. @file{@value{SYSCONFDIR}/trustlist.txt}).
-This global list is also used if the local list is not available.
+This global list is also used if the local list is not available;
+the @ref{option --no-user-trustlist} enforces the use of only
+this global list.
 
 It is possible to add further flags after the @code{S} for use by the
 caller:
@@ -797,6 +846,11 @@
 the preferred way to mark such CA; the old way of having a separate
 file @file{qualified.txt} is still supported.
 
+@item de-vs
+The CA is part of an approved PKI for the German classification level
+VS-NfD.  It is only valid in the global trustlist.  As of now this is
+used only for documentation purpose.
+
 @end table
 
 
@@ -806,6 +860,9 @@
 been enabled (@pxref{option --enable-ssh-support}). Only keys present in
 this file are used in the SSH protocol.  You should backup this file.
 
+This file is deprecated in favor of the "Use-for-ssh" attribute in the
+key files.
+
 The @command{ssh-add} tool may be used to add new entries to this file;
 you may also add them manually.  Comment lines, indicated by a leading
 hash mark, as well as empty lines are ignored.  An entry starts with
@@ -851,7 +908,6 @@
 a small helper script is provided to create these files (@pxref{addgnupghome}).
 
 
-
 @c
 @c Agent Signals
 @c

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gpg-card.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gpg-card.texi Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gpg.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gpg.texi Changed

@@ -264,11 +264,11 @@
 format as well. It is suggested to avoid cleartext signatures in
 favor of detached signatures.
 
-Note: Sometimes the use of the @command{gpgv} tool is easier than
-using the full-fledged @command{gpg} with this option. @command{gpgv}
-is designed to compare signed data against a list of trusted keys and
-returns with success only for a good signature. It has its own manual
-page.
+Note: To check whether a file was signed by a certain key the option
+@option{--assert-signer} can be used. As an alternative the
+@command{gpgv} tool can be used. @command{gpgv} is designed to
+compare signed data against a list of trusted keys and returns with
+success only for a good signature. It has its own manual page.
 
 
 @item --multifile
@@ -399,10 +399,13 @@
 @opindex edit-card
 @itemx --card-edit
 @opindex card-edit
-Present a menu to work with a smartcard. The subcommand "help" provides
-an overview on available commands. For a detailed description, please
-see the Card HOWTO at
-https://gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO .
+Present a menu to work with a smartcard. The subcommand "help"
+provides an overview on available commands. For a detailed
+description, please see the Card HOWTO at
+https://gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO . Please
+note that the command "openpgp" can be used to switch to the OpenPGP
+application of cards which by default are presenting another
+application (e.g. PIV).
 
 @item --card-status
 @opindex card-status
@@ -610,18 +613,19 @@
 With the second form (or a deprecated "*" for @var{algo}) digests for all
 available algorithms are printed.
 
-@item --gen-random @var{0|1|2} @var{count}
+@item --gen-random @var{0|1|2|16|30} @var{count}
 @opindex gen-random
 Emit @var{count} random bytes of the given quality level 0, 1 or 2. If
 @var{count} is not given or zero, an endless sequence of random bytes
 will be emitted. If used with @option{--armor} the output will be
-base64 encoded. PLEASE, don't use this command unless you know what
-you are doing; it may remove precious entropy from the system!
+base64 encoded. The special level 16 uses a quality level of 1 and
+outputs an endless stream of hex-encoded octets. The special level
+30 outputs random as 30 zBase-32 characters.
 
 @item --gen-prime @var{mode} @var{bits}
 @opindex gen-prime
 Use the source, Luke :-). The output format is subject to change
-with ant release.
+with any release.
 
 
 @item --enarmor
@@ -634,11 +638,11 @@
 
 @item --unwrap
 @opindex unwrap
-This command is similar to @option{--decrypt} with the change that the
+This command is similar to @option{--decrypt} with the difference that the
 output is not the usual plaintext but the original message with the
-decryption layer removed. Thus the output will be an OpenPGP data
+encryption layer removed. Thus the output will be an OpenPGP data
 structure which often means a signed OpenPGP message. Note that this
-command may or may not remove a compression layer which is often found
+option may or may not remove a compression layer which is often found
 beneath the encryption layer.
 
 @item --tofu-policy @{auto|good|unknown|bad|ask@} @var{keys}
@@ -769,6 +773,15 @@
 reasonable default interval. The values ``never'', ``none'' can be
 used for no expiration date.
 
+@item --quick-add-adsk @var{fpr} @var{adskfpr}
+@opindex quick-add-adsk
+Directly add an Additional Decryption Subkey to the key identified by
+the fingerprint @var{fpr}. @var{adskfpr} is the fingerprint of
+another key's encryption subkey. A subkey is commonly used here
+because by default a primary key has no encryption capability. Use
+the option @option{--with-subkey-fingerprint} with a list command to
+display the subkey fingerprints.
+
 @item --generate-key
 @opindex generate-key
 @itemx --gen-key
@@ -859,9 +872,10 @@
 @opindex keyedit:tsign
 Make a trust signature. This is a signature that combines the notions
 of certification (like a regular signature), and trust (like the
- "trust" command). It is generally only useful in distinct communities
- or groups. For more information please read the sections
- ``Trust Signature'' and ``Regular Expression'' in RFC-4880.
+ "trust" command). It is generally useful in distinct communities
+ or groups to implement the concept of a Trusted Introducer. For
+ more information please read the sections ``Trust Signature'' and
+ ``Regular Expression'' in RFC-4880.
 @end table
 
 @c man:.RS
@@ -967,7 +981,8 @@
 --version} to get a list of available algorithms. Note that while you
 can change the preferences on an attribute user ID (aka "photo ID"),
 GnuPG does not select keys via attribute user IDs so these preferences
- will not be used by GnuPG.
+ will not be used by GnuPG. Note that an unattended version of this
+ command is available as @option{--quick-update-pref}.
 
 When setting preferences, you should list the algorithms in the order
 which you'd like to see them used by someone else when encrypting a
@@ -1064,6 +1079,15 @@
 "sensitive". If a designated revoker is marked as sensitive, it will
 not be exported by default (see export-options).
 
+ @item addadsk
+ @opindex keyedit:addadsk
+ Add an Additional Decryption Subkey. The user is asked to enter the
+ fingerprint of another encryption subkey. Note that the exact
+ fingerprint of another key's encryption subkey needs to be entered.
+ This is because commonly the primary key has no encryption
+ capability. Use the option @option{--with-subkey-fingerprint} with
+ a list command to display the subkey fingerprints.
+
 @item passwd
 @opindex keyedit:passwd
 Change the passphrase of the secret key.
@@ -1195,6 +1219,16 @@
 user ID flag is removed from all other user ids and the timestamp of
 all affected self-signatures is set one second ahead.
 
+@item --quick-update-pref @var{user-id}
+@opindex quick-update-pref
+This command updates the preference list of the key to the current
+default value (either built-in or set via
+@option{--default-preference-list}). This is the unattended version
+of of using "setpref" in the @option{--key-edit} menu without giving a
+list. Note that you can show the preferences in a key listing by
+using @option{--list-options show-pref} or @option{--list-options
+show-pref-verbose}. You should also re-distribute updated keys to
+your peers.
 
 @item --change-passphrase @var{user-id}
 @opindex change-passphrase
@@ -1326,6 +1360,13 @@
 Assume "no" on most questions. Should not be used in an option file.
 
 
+@item --list-filter @{select=@var{expr}@}
+@opindex list-filter
+A list filter can be used to output only certain keys during key
+listing commands. For the available property names, see the description
+of @option{--import-filter}.
+
+
 @item --list-options @var{parameters}
 @opindex list-options
 This is a space or comma delimited string that gives options used when
@@ -1385,6 +1426,10 @@
 @opindex list-options:show-unusable-subkeys
 Show revoked and expired subkeys in key listings. Defaults to no.
 
+ @item show-unusable-sigs
+ @opindex list-options:show-unusable-sigs
+ Show key signature made using weak or unsupported algorithms.
+
 @item show-keyring
 @opindex list-options:show-keyring
 Display the keyring name at the head of key listings to show which
@@ -1630,15 +1675,30 @@
 @item -z @var{n}
 @itemx --compress-level @var{n}
 @itemx --bzip2-compress-level @var{n}
+@itemx --no-compress
 @opindex compress-level
 @opindex bzip2-compress-level
+@opindex no-compress
 Set compression level to @var{n} for the ZIP and ZLIB compression
 algorithms. The default is to use the default compression level of zlib
 (normally 6). @option{--bzip2-compress-level} sets the compression level
 for the BZIP2 compression algorithm (defaulting to 6 as well). This is a
 different option from @option{--compress-level} since BZIP2 uses a
 significant amount of memory for each additional compression level.
-@option{-z} sets both. A value of 0 for @var{n} disables compression.
+
+Option @option{-z} sets both. A value of 0 for @var{n} disables
+compression. A value of -1 forces compression using the default
+level. Option @option{--no-compress} is identical to @option{-z0}.
+
+Except for the @option{--store} command compression is always used
+unless @command{gpg} detects that the input is already compressed. To
+inhibit the use of compression use @option{-z0} or
+@option{--no-compress}; to force compression use @option{-z-1} or
+option @option{z} with another compression level than the default as
+indicated by -1. Note that this overriding of the default deection
+works only with @option{z} and not with the long variant of this
+option.
+
 
 @item --bzip2-decompress-lowmem
 @opindex bzip2-decompress-lowmem
@@ -1716,6 +1776,19 @@
 available but an LDAP keyserver is configured the missing key is
 imported from that server.
 
+@item --add-desig-revoker sensitive:@var{fingerprint}
+@opindex add-desig-revoker
+Add the key specified by @var{fingerprint} as a designated revoker to
+newly created keys. If the fingerprint is prefixed with the keyword
+``sensitive:'' that info is normally not exported wit the key. This
+option may be given several time to add more than one designated
+revoker. If the keyword ``clear'' is used instead of a fingerprint,
+all designated options previously encountered are discarded.
+Designated revokers are marked on the key as non-revocable. Note that
+a designated revoker specified using a parameter file will also be
+added to the key.
+
+
 @item --trust-model @{pgp|classic|tofu|tofu+pgp|direct|always|auto@}
 @opindex trust-model
 Set what trust model GnuPG should follow. The models are:
@@ -1735,7 +1808,8 @@
 @item tofu
 @opindex trust-model:tofu
 @anchor{trust-model-tofu}
- TOFU stands for Trust On First Use. In this trust model, the first
+ TOFU stands for Trust On First Use. In this experimental trust
+ model, the first
 time a key is seen, it is memorized. If later another key with a
 user id with the same email address is seen, both keys are marked as
 suspect. In that case, the next time either is used, a warning is
@@ -1784,7 +1858,8 @@
 
 @item tofu+pgp
 @opindex trust-model:tofu+pgp
- This trust model combines TOFU with the Web of Trust. This is done
+ This experimental trust model combines TOFU with the Web of Trust.
+ This is done
 by computing the trust level for each model and then taking the
 maximum trust level where the trust levels are ordered as follows:
 @code{unknown < undefined < marginal < fully < ultimate < expired <
@@ -1822,6 +1897,24 @@
 must be enabled explicitly.
 @end table
 
+@item --always-trust
+@opindex always-trust
+Identical to @option{--trust-model always}.
+
+@item --assert-signer @var{fpr_or_file}
+@opindex assert-signer
+This option checks whether at least one valid signature on a file has
+been made with the specified key. The key is either specified as a
+fingerprint or a file listing fingerprints. The fingerprint must be
+given or listed in compact format (no colons or spaces in between).
+This option can be given multiple times and each fingerprint is
+checked against the signing key as well as the corresponding primary
+key. If @var{fpr_or_file} specifies a file, empty lines are ignored
+as well as all lines starting with a hash sign. With this option gpg
+is guaranteed to return with an exit code of 0 if and only if a
+signature has been encountered, is valid, and the key matches one of
+the fingerprints given by this option.
+
 
 @item --auto-key-locate @var{mechanisms}
 @itemx --no-auto-key-locate
@@ -2029,7 +2122,7 @@
 The default list of options is: "self-sigs-only, import-clean,
 repair-keys, repair-pks-subkey-bug, export-attributes". However, if
 the actual used source is an LDAP server "no-self-sigs-only" is
-assumed unless "self-sigs-only" has been explictly configured.
+assumed unless "self-sigs-only" has been explicitly configured.
 
 
 @item --completes-needed @var{n}
@@ -2538,11 +2631,21 @@
 Self-signatures are not considered.
 Currently only implemented for --import-filter.
 
+ @item select
+ This filter is only implemented by @option{--list-filter}. All
+ property names may be used.
+
 @end table
 
 For the syntax of the expression see the chapter "FILTER EXPRESSIONS".
 The property names for the expressions depend on the actual filter
-type and are indicated in the following table.
+type and are indicated in the following table. Note that all property
+names may also be used by @option{--list-filter}.
+
+Property names may be prefix with a scope delimited by a slash. Valid
+scopes are "pub" for public and secret primary keys, "sub" for public
+and secret subkeys, "uid" for for user-ID packets, and "sig" for
+signature packets. Invalid scopes are currently ignored.
 
 The available properties are:
 
@@ -2555,16 +2658,30 @@
 The addr-spec part of a user id with mailbox or the empty string.
 (keep-uid)
 
+ @item algostr
+ A string with the key algorithm description. For example "rsa3072"
+ or "ed25519".
+
 @item key_algo
 A number with the public key algorithm of a key or subkey packet.
 (drop-subkey)
 
+ @item key_size
+ A number with the effective key size of a key or subkey packet.
+ (drop-subkey)
+
 @item key_created
 @itemx key_created_d
 The first is the timestamp a public key or subkey packet was
 created. The second is the same but given as an ISO string,
 e.g. "2016-08-17". (drop-subkey)
 
+ @item key_expires
+ @itemx key_expires_d
+ The expiration time of a public key or subkey or 0 if it does not
+ expire. The second is the same but given as an ISO date string or
+ an empty string e.g. "2038-01-19".
+
 @item fpr
 The hexified fingerprint of the current subkey or primary key.
 (drop-subkey)
@@ -2581,7 +2698,7 @@
 been revoked.
 
 @item disabled
- Boolean indicating whether a primary key is disabled. (not used)
+ Boolean indicating whether a primary key is disabled.
 
 @item secret
 Boolean indicating whether a key or subkey is a secret one.
@@ -2604,6 +2721,18 @@
 @item sig_digest_algo
 A number with the digest algorithm of a signature packet. (drop-sig)
 
+ @item origin
+ A string with the key origin or a question mark. For example the
+ string ``wkd'' is used if a key originated from a Web Key Directory
+ lookup.
+
+ @item lastupd
+ The timestamp the key was last updated from a keyserver or the Web
+ Key Directory.
+
+ @item url
+ A string with the the URL associated wit the last key lookup.
+
 @end table
 
 @item --export-options @var{parameters}
@@ -2661,12 +2790,27 @@
 running the @option{--edit-key} command "minimize" before export except
 that the local copy of the key is not modified. Defaults to no.
 
+ @item export-revocs
+ Export only standalone revocation certificates of the key. This
+ option does not export revocations of 3rd party certificate
+ revocations.
+
 @item export-dane
 Instead of outputting the key material output OpenPGP DANE records
 suitable to put into DNS zone files. An ORIGIN line is printed before
 each record to allow diverting the records to the corresponding zone
 file.
 
+ @item mode1003
+ Enable the use of a new secret key export format. This format
+ avoids the re-encryption as required with the current OpenPGP format
+ and also improves the security of the secret key if it has been
+ protected with a passphrase. Note that an unprotected key is
+ exported as-is and thus not secure; the general rule to convey
+ secret keys in an OpenPGP encrypted file still applies with this
+ mode. Versions of GnuPG before 2.4.0 are not able to import such a
+ secret file.
+
 @end table
 
 @item --with-colons
@@ -2759,12 +2903,14 @@
 @itemx --no-force-v4-certs
 These options are obsolete and have no effect since GnuPG 2.1.
 
-@item --force-aead
+@item --force-ocb
+@itemx --force-aead
+@opindex force-ocb
 @opindex force-aead
 Force the use of AEAD encryption over MDC encryption. AEAD is a
 modern and faster way to do authenticated encryption than the old MDC
-method. See also options @option{--aead-algo} and
-@option{--chunk-size}.
+method. @option{--force-aead} is an alias and deprecated. See also
+option @option{--chunk-size}.
 
 @item --force-mdc
 @itemx --disable-mdc
@@ -2809,16 +2955,6 @@
 all recipients. The most highly ranked cipher in this list is also
 used for the @option{--symmetric} encryption command.
 
-@item --personal-aead-preferences @var{string}
-@opindex personal-aead-preferences
-Set the list of personal AEAD preferences to @var{string}. Use
-@command{@gpgname --version} to get a list of available algorithms,
-and use @code{none} to set no preference at all. This allows the user
-to safely override the algorithm chosen by the recipient key
-preferences, as GPG will only select an algorithm that is usable by
-all recipients. The most highly ranked cipher in this list is also
-used for the @option{--symmetric} encryption command.
-
 @item --personal-digest-preferences @var{string}
 @opindex personal-digest-preferences
 Set the list of personal digest preferences to @var{string}. Use
@@ -2996,6 +3132,14 @@
 @opindex interactive
 Prompt before overwriting any files.
 
+@item --compatibility-flags @var{flags}
+@opindex compatibility-flags
+Set compatibility flags to work around problems due to non-compliant
+keys or data. The @var{flags} are given as a comma separated
+list of flag names and are OR-ed together. The special flag "none"
+clears the list and allows to start over with an empty list. To get a
+list of available flags the sole word "help" can be used.
+
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems. @var{level} may be
@@ -3052,12 +3196,17 @@
 To facilitate software tests and experiments this option allows to
 specify a limit of up to 4 EiB (@code{--chunk-size 62}).
 
+@item --debug-ignore-expiration
+@opindex debug-ignore-expiration
+This option tries to override certain key expiration dates. It is
+only useful for certain regression tests.
+
 @item --faked-system-time @var{epoch}
 @opindex faked-system-time
-This option is only useful for testing; it sets the system time back or
-forth to @var{epoch} which is the number of seconds elapsed since the year
-1970. Alternatively @var{epoch} may be given as a full ISO time string
-(e.g. "20070924T154812").
+This option is only useful for testing; it sets the system time back
+or forth to @var{epoch} which is the number of seconds elapsed since
+the year 1970. Alternatively @var{epoch} may be given as a full ISO
+time string (e.g. "20070924T154812").
 
 If you suffix @var{epoch} with an exclamation mark (!), the system time
 will appear to be frozen at the specified time.
@@ -3096,6 +3245,10 @@
 Same as @option{--logger-fd}, except the logger data is written to
 file @var{file}. Use @file{socket://} to log to s socket.
 
+@item --log-time
+@opindex log-time
+Prefix all log output with a timestamp even if no log file is used.
+
 @item --attribute-fd @var{n}
 @opindex attribute-fd
 Write attribute subpackets to the file descriptor @var{n}. This is most
@@ -3224,16 +3377,6 @@
 @option{--personal-cipher-preferences} is the safe way to accomplish the
 same thing.
 
-@item --aead-algo @var{name}
-@opindex aead-algo
-Specify that the AEAD algorithm @var{name} is to be used. This is
-useful for symmetric encryption where no key preference are available
-to select the AEAD algorithm. Running @command{@gpgname} with option
-@option{--version} shows the available AEAD algorithms. In general,
-you do not want to use this option as it allows you to violate the
-OpenPGP standard. The option @option{--personal-aead-preferences} is
-the safe way to accomplish the same thing.
-
 @item --digest-algo @var{name}
 @opindex digest-algo
 Use @var{name} as the message digest algorithm. Running the program
@@ -3492,13 +3635,7 @@
 invalid. This options allows to override this restriction.
 
 @item --override-compliance-check
-@opindex --override-compliance-check
-The signature verification only allows the use of keys suitable in the
-current compliance mode. If the compliance mode has been forced by a
-global option, there might be no way to check certain signature. This
-option allows to override this and prints an extra warning in such a
-case. This option is ignored in --batch mode so that no accidental
-unattended verification may happen.
+This was a temporary introduced option and has no more effect.
 
 @item --no-default-keyring
 @opindex no-default-keyring
@@ -3756,10 +3893,6 @@
 keyring a given key resides on. This option is deprecated: use
 @option{--list-options no-show-keyring} instead.
 
-@item --always-trust
-@opindex always-trust
-Identical to @option{--trust-model always}. This option is deprecated.
-
 @item --show-notation
 @itemx --no-show-notation
 @opindex show-notation
@@ -3777,6 +3910,13 @@
 no-show-policy-url} and/or @option{--verify-options
 no-show-policy-url} instead.
 
+@item --personal-aead-preferences @var{string}
+@opindex personal-aead-preferences
+This option is deprecated and has no more effect since version 2.3.9.
+
+@item --aead-algo @var{name}
+This option is deprecated and has no more effect since version 2.3.9.
+
 
 @end table
 
@@ -3808,7 +3948,9 @@
 @efindex common.conf
 This is an optional configuration file read by @command{@gpgname} on
 startup. It may contain options pertaining to all components of
- GnuPG. Its current main use is for the "use-keyboxd" option.
+ GnuPG. Its current main use is for the "use-keyboxd" option. If
+ the default home directory @file{~/.gnupg} does not exist, GnuPG creates
+ this directory and a @file{common.conf} file with "use_keyboxd".
 
 @end table
 
@@ -3865,7 +4007,7 @@
 $ cd ~/.gnupg
 $ gpg --export-ownertrust >otrust.lst
 $ mv pubring.gpg publickeys.backup
- $ gpg --import-options restore --import publickeys.backups
+ $ gpg --import-options restore --import publickeys.backup
 $ gpg --import-ownertrust otrust.lst
 @end example
 
@@ -3953,6 +4095,12 @@
 under operating systems without proper support to figure out the
 name of a process' text file.
 
+ @item GNUPG_EXEC_DEBUG_FLAGS
+ @efindex GNUPG_EXEC_DEBUG_FLAGS
+ This variable allows to enable diagnostics for process management.
+ A numeric decimal value is expected. Bit 0 enables general
+ diagnostics, bit 1 enables certain warnings on Windows.
+
 @end table
 
 When calling the gpg-agent component @command{@gpgname} sends a set of
@@ -4253,7 +4401,7 @@
 @c *************** UNATTENDED **************
 @c *************** **************
 @c *******************************************
-@manpause
+@mansect notes
 @node Unattended Usage of GPG
 @section Unattended Usage
 
@@ -4324,32 +4472,21 @@
 
 The parameters for the key are either read from stdin or given as a
 file on the command line. The format of the parameter file is as
-follows:
-
-@itemize @bullet
- @item Text only, line length is limited to about 1000 characters.
- @item UTF-8 encoding must be used to specify non-ASCII characters.
- @item Empty lines are ignored.
- @item Leading and trailing white space is ignored.
- @item A hash sign as the first non white space character indicates
- a comment line.
- @item Control statements are indicated by a leading percent sign, the
- arguments are separated by white space from the keyword.
- @item Parameters are specified by a keyword, followed by a colon. Arguments
- are separated by white space.
- @item
- The first parameter must be @samp{Key-Type}; control statements may be
- placed anywhere.
- @item
- The order of the parameters does not matter except for @samp{Key-Type}
- which must be the first parameter. The parameters are only used for
- the generated keyblock (primary and subkeys); parameters from previous
- sets are not used. Some syntactically checks may be performed.
- @item
- Key generation takes place when either the end of the parameter file
- is reached, the next @samp{Key-Type} parameter is encountered or at the
- control statement @samp{%commit} is encountered.
-@end itemize
+follows: Text only, line length is limited to about 1000 characters.
+UTF-8 encoding must be used to specify non-ASCII characters. Empty
+lines are ignored. Leading and trailing white space is ignored. A
+hash sign as the first non white space character indicates a comment
+line. Control statements are indicated by a leading percent sign,
+their arguments are separated by white space from the keyword.
+Parameters are specified by a keyword, followed by a colon; arguments
+are separated by white space. The first parameter must be
+@samp{Key-Type} but control statements may be placed anywhere. The
+order of the parameters does not matter except for @samp{Key-Type}.
+The parameters are only used for the generated keyblock (primary and
+subkeys); parameters from previous sets are not used. Some syntax
+checks may be performed. Key commences when either the end of the
+parameter file is reached, the next @samp{Key-Type} parameter is
+encountered, or the control statement @samp{%commit} is encountered.
 
 @noindent
 Control statements:
@@ -4385,7 +4522,7 @@
 
 @item %ask-passphrase
 @itemx %no-ask-passphrase
-This option is a no-op for GnuPG 2.1 and later.
+This option is a no-op since GnuPG version 2.1.
 
 @item %no-protection
 Using this option allows the creation of keys without any passphrase

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/gpgsm.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/gpgsm.texi Changed

@@ -408,6 +408,10 @@
 When running in server mode, append all logging output to @var{file}.
 Use @file{socket://} to log to socket.
 
+@item --log-time
+@opindex log-time
+Prefix all log output with a timestamp even if no log file is used.
+
 @end table
 
 
@@ -492,8 +496,10 @@
 certificate.  Note that this option makes a "web bug" like behavior
 possible.  LDAP server operators can see which keys you request, so by
 sending you a message signed by a brand new key (which you naturally
-will not have on your local keybox), the operator can tell both your IP
-address and the time when you verified the signature.
+will not have on your local keybox), the operator can tell both your
+IP address and the time when you verified the signature.  Note that if
+CRL checking is not disabled issuer certificates are retrieved in any
+case using the caIssuers authorityInfoAccess method.
 
 
 @anchor{gpgsm-option --validation-model}
@@ -548,6 +554,13 @@
 @opindex assume-binary
 Assume the input data is binary encoded.
 
+@item --input-size-hint @var{n}
+@opindex input-size-hint
+This option can be used to tell GPGSM the size of the input data in
+bytes.  @var{n} must be a positive base-10 number.  It is used by the
+@option{--status-fd} line ``PROGRESS'' to provide a value for
+``total'' if that is not available by other means.
+
 @anchor{option --p12-charset}
 @item --p12-charset @var{name}
 @opindex p12-charset
@@ -623,6 +636,15 @@
 Include info about the presence of a secret key in public key listings
 done with @code{--with-colons}.
 
+@item --no-pretty-dn
+@opindex no-pretty-dn
+By default gpgsm prints distinguished names (DNs) like the Issuer or
+Subject in a more readable format (e.g. using a well defined order of
+the parts).  However, this format can't be used as input strings.
+This option reverts printing to standard RFC-2253 format and thus
+avoids the need to use --dump-cert or --with-colons to get the
+``real'' name.
+
 @end table
 
 @c *******************************************
@@ -733,6 +755,14 @@
 that they are included anyway if the key specification for a listing
 is given as fingerprint or keygrip.
 
+@item --compatibility-flags @var{flags}
+@opindex compatibility-flags
+Set compatibility flags to work around problems due to non-compliant
+certificates or data.  The @var{flags} are given as a comma separated
+list of flag names and are OR-ed together.  The special flag "none"
+clears the list and allows to start over with an empty list.  To get a
+list of available flags the sole word "help" can be used.
+
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems. @var{level} may be
@@ -1698,11 +1728,14 @@
 is disabled for this session.  This is the same as the command line
 option @option{--disable-dirmngr}.
 
+@item input-size-hint
+This is the same as the @option{--input-size-hint} command line option.
+
 @end table
 
 @mansect see also
 @ifset isman
-@command{gpg2}(1),
+@command{gpg}(1),
 @command{gpg-agent}(1)
 @end ifset
 @include see-also-note.texi

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/scdaemon.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/scdaemon.texi Changed

@@ -236,9 +236,10 @@
 @item --pcsc-driver @var{library}
 @opindex pcsc-driver
 Use @var{library} to access the smartcard reader.  The current default
-is @file{libpcsclite.so}.  Instead of using this option you might also
-want to install a symbolic link to the default file name
-(e.g. from @file{libpcsclite.so.1}).
+on Unix is @file{libpcsclite.so} and on Windows @file{winscard.dll}.
+Instead of using this option you might also want to install a symbolic
+link to the default file name (e.g. from @file{libpcsclite.so.1}).
+A Unicode file name may not be used on Windows.
 
 @item --ctapi-driver @var{library}
 @opindex ctapi-driver
@@ -432,7 +433,8 @@
 @cindex scd-event
 If this file is present and executable, it will be called on every card
 reader's status change.  An example of this script is provided with the
-distribution
+source code distribution.  This option is deprecated in favor of the
+@command{DEVINFO --watch}.
 
 @item reader_@var{n}.status
 This file is created by @command{scdaemon} to let other applications now
@@ -755,6 +757,6 @@
 @ifset isman
 @command{gpg-agent}(1),
 @command{gpgsm}(1),
-@command{gpg2}(1)
+@command{gpg}(1)
 @end ifset
 @include see-also-note.texi

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/tools.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/tools.texi Changed

@@ -1451,6 +1451,13 @@
 Decode data lines.  That is to remove percent escapes but make sure that
 a new line always starts with a D and a space.
 
+@item -u
+@itemx --unbuffered
+@opindex unbuffered
+Set stdin and stdout into unbuffered I/O mode.  This this sometimes
+useful for scripting.
+
+
 @end table
 
 @mansect control commands
@@ -1900,6 +1907,8 @@
 @item --extract
 @opindex extract
 Extract all files from a vanilla ``ustar'' archive.
+If no file name is given (or it is "-") the archive is taken from
+stdin.
 
 @item --encrypt
 @itemx -e
@@ -1911,7 +1920,8 @@
 @item --decrypt
 @itemx -d
 @opindex decrypt
-Extract all files from an encrypted archive.
+Extract all files from an encrypted archive.   If no file name is given
+(or it is "-") the archive is taken from stdin.
 
 @item --sign
 @itemx -s
@@ -1922,7 +1932,8 @@
 @item --list-archive
 @itemx -t
 @opindex list-archive
-List the contents of the specified archive.
+List the contents of the specified archive.  If no file name is given
+(or it is "-") the archive is taken from stdin.
 
 @item --symmetric
 @itemx -c
@@ -2038,6 +2049,12 @@
 input filename is known a directory named @file{GPGARCH} is used.
 This option is deprecated in favor of option @option{--directory}.
 
+@item --no-compress
+@opindex no-compress
+This option tells gpg to disable compression (i.e. using option -z0).
+It is useful for archiving only large files which are are already
+compressed (e.g. a set of videos).
+
 @item --gpg @var{gpgcmd}
 @opindex gpg
 Use the specified command @var{gpgcmd} instead of @command{gpg}.

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/wks.texi -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/wks.texi Changed

@@ -53,6 +53,26 @@
 .B gpg-wks-client
 .RI  options 
 .B \-\-read
+.br
+.B gpg-wks-client
+.RI  options 
+.B \-\-mirror
+.br
+.B gpg-wks-client
+.RI  options 
+.B \-\-install-key
+.br
+.B gpg-wks-client
+.RI  options 
+.B \-\-remove-key
+.br
+.B gpg-wks-client
+.RI  options 
+.B \-\-print-wkd-hash
+.br
+.B gpg-wks-client
+.RI  options 
+.B \-\-print-wkd-url
 @end ifset
 
 @mansect description
@@ -101,6 +121,13 @@
 @option{--remove-key} removes a key from that directory, its only
 argument is a user-id.
 
+The command @option{--mirror} is similar to @option{--install-key} but
+takes the keys from the the LDAP server configured for Dirmngr.  If no
+arguments are given all keys and user ids are installed.  If arguments
+are given they are taken as domain names to limit the to be installed
+keys.  The option @option{--blacklist} may be used to further limit
+the to be installed keys.
+
 The command @option{--print-wkd-hash} prints the WKD user-id identifiers
 and the corresponding mailboxes from the user-ids given on the command
 line or via stdin (one user-id per line).
@@ -162,7 +189,9 @@
 @itemx -o
 @opindex output
 Write the created mail to @var{file} instead of stdout.  Note that the
-value @code{-} for @var{file} is the same as writing to stdout.
+value @code{-} for @var{file} is the same as writing to stdout.  If
+this option is used with the @option{--check} command and a key was
+found it is written to the given file.
 
 @item --status-fd @var{n}
 @opindex status-fd
@@ -175,8 +204,26 @@
 @itemx --directory @var{dir}
 @opindex directory
 Use @var{dir} as top level directory for the commands
-@option{--install-key} and @option{--remove-key}.  The default is
-@file{openpgpkey}.
+@option{--mirror}, @option{--install-key} and @option{--remove-key}.
+The default is @file{openpgpkey}.
+
+
+@item --blacklist @var{file}
+@opindex blacklist
+This option is used to exclude certain mail addresses from a mirror
+operation.  The format of @var{file} is one mail address (just the
+addrspec, e.g. "postel@@isi.edu") per line.  Empty lines and lines
+starting with a '#' are ignored.
+
+@item --add-revocs
+@itemx --no-add-revocs
+@opindex add-revocs
+@opindex no-add-revocs
+If enabled append revocation certificates for the same addrspec as
+used in the WKD to the key.  Modern gpg version are able to import and
+apply them for existing keys.  Note that when used with the
+@option{--mirror} command the revocation are searched in the local
+keyring and not in an LDAP directory.  The default is @option{--add-revocs}.
 
 @item --verbose
 @opindex verbose

_service:tar_scm:gnupg-2.3.6.tar.bz2/doc/yat2m.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/doc/yat2m.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/ChangeLog-2011 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/ChangeLog-2011 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/Makefile.am Changed

@@ -1,3 +1,4 @@
+# Makefile.am - g10
 # Copyright (C) 1998, 1999, 2000, 2001, 2002,
 #               2003, 2006, 2010  Free Software Foundation, Inc.
 #
@@ -19,8 +20,9 @@
 ## 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 \
+             gpg-w32info.rc  gpg.w32-manifest.in \
+	     gpgv-w32info.rc gpgv.w32-manifest.in \
+	     ChangeLog-2011 test.c t-keydb-keyring.kbx \
 	     t-keydb-get-keyblock.gpg t-stutter-data.asc \
 	     all-tests.scm
 
@@ -47,9 +49,7 @@
 # NB: We use noinst_ for gpg and gpgv so that we can install them with
 # the install-hook target under the name gpg2/gpgv2.
 noinst_PROGRAMS = gpg
-if !HAVE_W32CE_SYSTEM
 noinst_PROGRAMS += gpgv
-endif
 noinst_PROGRAMS += $(module_tests)
 if DISABLE_TESTS
 TESTS =
@@ -85,10 +85,11 @@
 
 
 if HAVE_W32_SYSTEM
-resource_objs += gpg-w32info.o
-
-gpg-w32info.o : gpg.w32-manifest
+gpg_rc_objs = gpg-w32info.o
+gpgv_rc_objs = gpgv-w32info.o
 
+gpg-w32info.o  : gpg.w32-manifest   ../common/w32info-rc.h
+gpgv-w32info.o : gpgv.w32-manifest  ../common/w32info-rc.h
 endif
 
 common_source =  \
@@ -170,15 +171,15 @@
 	      verify.c
 
 LDADD =  $(needed_libs) ../common/libgpgrl.a \
-         $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
+         $(ZLIBS) $(LIBINTL) $(CAPLIBS)
 gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
-             $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
-	     $(LIBICONV) $(resource_objs) $(extra_sys_libs)
-gpg_LDFLAGS = $(extra_bin_ldflags)
+             $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
+	     $(LIBICONV) $(gpg_rc_objs)
+gpg_LDFLAGS =
 gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
-	      $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
-	      $(LIBICONV) $(resource_objs) $(extra_sys_libs)
-gpgv_LDFLAGS = $(extra_bin_ldflags)
+	      $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
+	      $(LIBICONV) $(gpgv_rc_objs)
+gpgv_LDFLAGS =
 
 
 t_common_ldadd =
@@ -187,17 +188,17 @@
 t_rmd160_LDADD = $(t_common_ldadd)
 t_keydb_SOURCES = t-keydb.c test-stubs.c $(common_source)
 t_keydb_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
-              $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
+              $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	      $(LIBICONV) $(t_common_ldadd)
 t_keydb_get_keyblock_SOURCES = t-keydb-get-keyblock.c test-stubs.c \
 	      $(common_source)
 t_keydb_get_keyblock_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
-              $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
+              $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	      $(LIBICONV) $(t_common_ldadd)
 t_stutter_SOURCES = t-stutter.c test-stubs.c \
 	      $(common_source)
 t_stutter_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
-	      $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
+	      $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	      $(LIBICONV) $(t_common_ldadd)

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/Makefile.in Changed

@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+# Makefile.am - g10
 # Copyright (C) 1998, 1999, 2000, 2001, 2002,
 # 2003, 2006, 2010 Free Software Foundation, Inc.
 #
@@ -142,10 +143,8 @@
 @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@\""
-noinst_PROGRAMS = gpg$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
-@HAVE_W32CE_SYSTEM_FALSE@am__append_9 = gpgv
-@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_2)
-@HAVE_W32_SYSTEM_TRUE@am__append_10 = gpg-w32info.o
+noinst_PROGRAMS = gpg$(EXEEXT) gpgv$(EXEEXT) $(am__EXEEXT_1)
+@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_1)
 subdir = g10
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -165,10 +164,9 @@
 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)
-am__EXEEXT_2 = t-rmd160$(EXEEXT) t-keydb$(EXEEXT) \
+am__EXEEXT_1 = t-rmd160$(EXEEXT) t-keydb$(EXEEXT) \
 	t-keydb-get-keyblock$(EXEEXT) t-stutter$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am__gpg_SOURCES_DIST = gpg.c keyedit.c keyedit.h server.c gpg.h dek.h \
@@ -217,13 +215,12 @@
 gpg_OBJECTS = $(am_gpg_OBJECTS)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(needed_libs) ../common/libgpgrl.a \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 gpg_DEPENDENCIES = $(am__DEPENDENCIES_2) $(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_1) \
+	$(am__DEPENDENCIES_1) $(gpg_rc_objs)
 gpg_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpg_LDFLAGS) $(LDFLAGS) -o \
 	$@
 am__gpgv_SOURCES_DIST = gpgv.c gpg.h dek.h build-packet.c compress.c \
@@ -238,8 +235,8 @@
 gpgv_OBJECTS = $(am_gpgv_OBJECTS)
 gpgv_DEPENDENCIES = $(am__DEPENDENCIES_2) $(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) \
+	$(am__DEPENDENCIES_1) $(gpgv_rc_objs)
 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 \
@@ -256,7 +253,7 @@
 t_keydb_DEPENDENCIES = $(am__DEPENDENCIES_2) $(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__t_keydb_get_keyblock_SOURCES_DIST = t-keydb-get-keyblock.c \
 	test-stubs.c gpg.h dek.h build-packet.c compress.c \
 	compress-bz2.c filter.h free-packet.c getkey.c expand-group.c \
@@ -272,7 +269,8 @@
 t_keydb_get_keyblock_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(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_t_rmd160_OBJECTS = t-rmd160.$(OBJEXT) rmd160.$(OBJEXT)
 t_rmd160_OBJECTS = $(am_t_rmd160_OBJECTS)
 t_rmd160_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -290,7 +288,7 @@
 t_stutter_DEPENDENCIES = $(am__DEPENDENCIES_2) $(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_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -408,7 +406,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@
@@ -603,8 +602,9 @@
 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 \
+ gpg-w32info.rc gpg.w32-manifest.in \
+	 gpgv-w32info.rc gpgv.w32-manifest.in \
+	 ChangeLog-2011 test.c t-keydb-keyring.kbx \
 	 t-keydb-get-keyblock.gpg t-stutter-data.asc \
 	 all-tests.scm
 
@@ -615,17 +615,7 @@
 	$(am__append_2) $(am__append_3) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
 	$(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx. WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library. We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc. 256k is the largest stack
-# we use with pth.
-@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
@@ -655,6 +645,8 @@
 @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_TRUE@gpg_rc_objs = gpg-w32info.o
+@HAVE_W32_SYSTEM_TRUE@gpgv_rc_objs = gpgv-w32info.o
 common_source = \
 	 gpg.h \
 	 dek.h \
@@ -734,39 +726,39 @@
 	 verify.c
 
 LDADD = $(needed_libs) ../common/libgpgrl.a \
- $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
+ $(ZLIBS) $(LIBINTL) $(CAPLIBS)
 
 gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
- $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
-	 $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+ $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
+	 $(LIBICONV) $(gpg_rc_objs)
 
-gpg_LDFLAGS = $(extra_bin_ldflags)
+gpg_LDFLAGS = 
 gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
-	 $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
-	 $(LIBICONV) $(resource_objs) $(extra_sys_libs)
+	 $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
+	 $(LIBICONV) $(gpgv_rc_objs)
 
-gpgv_LDFLAGS = $(extra_bin_ldflags)
+gpgv_LDFLAGS = 
 t_common_ldadd = 
 module_tests = t-rmd160 t-keydb t-keydb-get-keyblock t-stutter
 t_rmd160_SOURCES = t-rmd160.c rmd160.c
 t_rmd160_LDADD = $(t_common_ldadd)
 t_keydb_SOURCES = t-keydb.c test-stubs.c $(common_source)
 t_keydb_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
- $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	 $(LIBICONV) $(t_common_ldadd)
 
 t_keydb_get_keyblock_SOURCES = t-keydb-get-keyblock.c test-stubs.c \
 	 $(common_source)
 
 t_keydb_get_keyblock_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
- $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
+ $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	 $(LIBICONV) $(t_common_ldadd)
 
 t_stutter_SOURCES = t-stutter.c test-stubs.c \
 	 $(common_source)
 
 t_stutter_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
-	 $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
+	 $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	 $(LIBICONV) $(t_common_ldadd)
 
 all: all-am
@@ -805,6 +797,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)
@@ -1373,7 +1367,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@gpg-w32info.o : gpg.w32-manifest ../common/w32info-rc.h
+@HAVE_W32_SYSTEM_TRUE@gpgv-w32info.o : gpgv.w32-manifest ../common/w32info-rc.h
 
 $(PROGRAMS): $(needed_libs) ../common/libgpgrl.a

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/all-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/all-tests.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/armor.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/armor.c Changed

@@ -247,6 +247,7 @@
       case PKT_COMPRESSED:
       case PKT_ENCRYPTED:
       case PKT_ENCRYPTED_MDC:
+      case PKT_ENCRYPTED_AEAD:
       case PKT_PLAINTEXT:
       case PKT_OLD_COMMENT:
       case PKT_COMMENT:
@@ -649,6 +650,7 @@
     byte *p;
     byte tempbufPARTIAL_CHUNK;
     size_t tempbuf_len=0;
+    int this_truncated;
 
     while( !rc && size-len>=(PARTIAL_CHUNK+1)) {
 	/* copy what we have in the line buffer */
@@ -683,7 +685,13 @@
 	    continue;
 	}
 	if( !maxlen )
+          {
 	    afx->truncated++;
+            this_truncated = 1;
+          }
+        else
+          this_truncated = 0;
+
 
 	p = afx->buffer;
 	n = afx->buffer_len;
@@ -736,7 +744,7 @@
 	  }
 
 	/* Now handle the end-of-line canonicalization */
-	if( !afx->not_dash_escaped )
+	if( !afx->not_dash_escaped || this_truncated)
 	  {
 	    int crlf = n > 1 && pn-2 == '\r' && pn-1=='\n';
 
@@ -753,10 +761,17 @@
 	     * or calculate the hash here in this module and somehow find
 	     * a way to send the hash down the processing line (well, a special
 	     * faked packet could do the job).
+             *
+             * To make sure that a truncated line triggers a bad
+             * signature error we replace a removed LF by a FF or
+             * append a FF.  Right, this is a hack but better than a
+             * global variable and way easier than to introduce a new
+             * control packet or insert a line like "truncated\n"
+             * into the filter output.
 	     */
 	    if( crlf )
 	      afx->bufferafx->buffer_len++ = '\r';
-	    afx->bufferafx->buffer_len++ = '\n';
+	    afx->bufferafx->buffer_len++ = this_truncated? '\f':'\n';
 	    afx->bufferafx->buffer_len = '\0';
 	  }
     }
@@ -1125,11 +1140,11 @@
 		    rc = 0;
 		else if( rc == 2 ) {
 		    log_error(_("premature eof (in trailer)\n"));
-		    rc = GPG_ERR_INVALID_ARMOR;
+		    rc = GPG_ERR_INV_ARMOR;
 		}
 		else {
 		    log_error(_("error in trailer line\n"));
-		    rc = GPG_ERR_INVALID_ARMOR;
+		    rc = GPG_ERR_INV_ARMOR;
 		}
 #endif
 	    }
@@ -1277,7 +1292,7 @@
 
     if( !fp ) {
 	fp = fopen("armor.out", "w");
-	assert(fp);
+	log_assert(fp);
     }
 #endif
 
@@ -1538,6 +1553,11 @@
 	    afx->no_openpgp_data = 1;
 	    write_status_text( STATUS_NODATA, "1" );
 	}
+        /* Note that in a cleartext signature truncated lines in the
+         * plaintext are detected and propagated to the signature
+         * checking code by inserting a \f into the plaintext.  We do
+         * not use log_info here because some of the truncated lines
+         * are harmless.  */
 	if( afx->truncated )
 	    log_info(_("invalid armor: line longer than %d characters\n"),
 		      MAX_LINELEN );

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/build-packet.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/build-packet.c Changed

@@ -674,7 +674,8 @@
 count += 8; /* Salt. */
 if (ski->s2k.mode == 3)
 count++; /* S2K.COUNT */
- if (ski->s2k.mode != 1001 && ski->s2k.mode != 1002)
+ if (ski->s2k.mode != 1001 && ski->s2k.mode != 1002
+ && ski->s2k.mode != 1003)
 count += ski->ivlen;
 
 iobuf_put (a, count);
@@ -704,8 +705,9 @@
 if (ski->s2k.mode == 3)
 iobuf_put (a, ski->s2k.count);
 
- /* For our special modes 1001, 1002 we do not need an IV. */
- if (ski->s2k.mode != 1001 && ski->s2k.mode != 1002)
+ /* For our special modes 1001..1003 we do not need an IV. */
+ if (ski->s2k.mode != 1001 && ski->s2k.mode != 1002
+ && ski->s2k.mode != 1003)
 iobuf_write (a, ski->iv, ski->ivlen);
 
 }
@@ -733,6 +735,22 @@
 /* The serial number gets stored in the IV field. */
 iobuf_write (a, ski->iv, ski->ivlen);
 }
+ else if (ski->s2k.mode == 1003)
+ {
+ /* GnuPG extension - Store raw s-expression. */
+ byte *p;
+ unsigned int ndatabits;
+
+ log_assert (gcry_mpi_get_flag (pk->pkeynpkey, GCRYMPI_FLAG_OPAQUE));
+
+ p = gcry_mpi_get_opaque (pk->pkeynpkey, &ndatabits);
+ /* For v5 keys we first write the number of octets of the
+ * following key material. */
+ if (is_v5)
+ write_32 (a, p? (ndatabits+7)/8 : 0);
+ if (p)
+ iobuf_write (a, p, (ndatabits+7)/8 );
+ }
 else if (ski->is_protected)
 {
 /* The secret key is protected - write it out as it is. */
@@ -970,12 +988,23 @@
 if (pt->buf)
 {
 nbytes = iobuf_copy (out, pt->buf);
+ if (nbytes == (size_t)(-1)
+ && (iobuf_error (out) || iobuf_error (pt->buf)))
+ return iobuf_error (out)? iobuf_error (out):iobuf_error (pt->buf);
+ /* Always get the error to catch write errors because
+ * iobuf_copy does not reliable return (-1) in that case. */
+ rc = iobuf_error (out);
 if(ctb_new_format_p (ctb) && !pt->len)
 /* Turn off partial body length mode. */
 iobuf_set_partial_body_length_mode (out, 0);
- if( pt->len && nbytes != pt->len )
- log_error("do_plaintext(): wrote %lu bytes but expected %lu bytes\n",
- (ulong)nbytes, (ulong)pt->len );
+ if (pt->len && nbytes != pt->len)
+ {
+ log_error ("do_plaintext(): wrote %lu bytes"
+ " but expected %lu bytes\n",
+ (ulong)nbytes, (ulong)pt->len );
+ if (!rc) /* Just in case no error was set */
+ rc = gpg_error (GPG_ERR_EIO);
+ }
 }
 
 return rc;
@@ -1324,19 +1353,23 @@
 
 /*
 * Put all the required stuff from SIG into subpackets of sig.
- * PKSK is the signing key.
+ * PKSK is the signing key. SIGNHINTS are various flags like
+ * SIGNHINT_ADSK.
 * Hmmm, should we delete those subpackets which are in a wrong area?
 */
 void
-build_sig_subpkt_from_sig (PKT_signature *sig, PKT_public_key *pksk)
+build_sig_subpkt_from_sig (PKT_signature *sig, PKT_public_key *pksk,
+ unsigned int signhints)
 {
 u32 u;
 byte buf1+MAX_FINGERPRINT_LEN;
 size_t fprlen;
 
 /* For v4 keys we need to write the ISSUER subpacket. We do not
- * want that for a future v5 format. */
- if (pksk->version < 5)
+ * want that for a future v5 format. We also don't write it if
+ * only the new RENC keyflag is set (implementations with support
+ * for this key flag should understand the ISSUER_FPR). */
+ if (pksk->version < 5 && !(signhints & SIGNHINT_ADSK))
 {
 u = sig->keyid0;
 buf0 = (u >> 24) & 0xff;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/call-agent.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/call-agent.c Changed

@@ -1096,7 +1096,8 @@
  */
 int
 agent_keytocard (const char *hexgrip, int keyno, int force,
-                 const char *serialno, const char *timestamp)
+                 const char *serialno, const char *timestamp,
+                 const char *ecdh_param_str)
 {
   int rc;
   char lineASSUAN_LINELENGTH;
@@ -1104,8 +1105,9 @@
 
   memset (&parm, 0, sizeof parm);
 
-  snprintf (line, DIM(line), "KEYTOCARD %s%s %s OPENPGP.%d %s",
-            force?"--force ": "", hexgrip, serialno, keyno, timestamp);
+  snprintf (line, DIM(line), "KEYTOCARD %s%s %s OPENPGP.%d %s%s%s",
+            force?"--force ": "", hexgrip, serialno, keyno, timestamp,
+            ecdh_param_str? " ":"", ecdh_param_str? ecdh_param_str:"");
 
   rc = start_agent (NULL, 1);
   if (rc)
@@ -1114,9 +1116,7 @@
 
   rc = assuan_transact (agent_ctx, line, NULL, NULL, default_inq_cb, &parm,
                         NULL, NULL);
-  if (rc)
-    return rc;
-
+  status_sc_op_failure (rc);
   return rc;
 }
 
@@ -1702,6 +1702,30 @@
 }
 
 
+/* Make the app APPNAME the one on the card.  This is sometimes
+ * required to make sure no other process has switched a card to
+ * another application.  The only useful APPNAME is "openpgp".  */
+gpg_error_t
+agent_scd_switchapp (const char *appname)
+{
+  int err;
+  char lineASSUAN_LINELENGTH;
+
+  if (appname && !*appname)
+    appname = NULL;
+
+  err = start_agent (NULL, (1 | FLAG_FOR_CARD_SUPPRESS_ERRORS));
+  if (err)
+    return err;
+
+  snprintf (line, DIM(line), "SCD SWITCHAPP --%s%s",
+            appname? " ":"", appname? appname:"");
+  return assuan_transact (agent_ctx, line,
+                          NULL, NULL, NULL, NULL,
+                          NULL, NULL);
+}
+
+
 &#xc;
 struct card_keyinfo_parm_s {
   int error;
@@ -2999,13 +3023,15 @@
    keygrip, DESC a prompt to be displayed with the agent's passphrase
    question (needs to be plus+percent escaped).  if OPENPGP_PROTECTED
    is not zero, ensure that the key material is returned in RFC
-   4880-compatible passphrased-protected form.  If CACHE_NONCE_ADDR is
-   not NULL the agent is advised to first try a passphrase associated
-   with that nonce.  On success the key is stored as a canonical
-   S-expression at R_RESULT and R_RESULTLEN.  */
+   4880-compatible passphrased-protected form; if instead MODE1003 is
+   not zero the raw gpg-agent private key format is requested (either
+   protected or unprotected).  If CACHE_NONCE_ADDR is not NULL the
+   agent is advised to first try a passphrase associated with that
+   nonce.  On success the key is stored as a canonical S-expression at
+   R_RESULT and R_RESULTLEN.  */
 gpg_error_t
 agent_export_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
-                  int openpgp_protected, char **cache_nonce_addr,
+                  int openpgp_protected, int mode1003, char **cache_nonce_addr,
                   unsigned char **r_result, size_t *r_resultlen,
 		  u32 *keyid, u32 *mainkeyid, int pubkey_algo)
 {
@@ -3030,6 +3056,12 @@
     return err;
   dfltparm.ctx = agent_ctx;
 
+  /* Check that the gpg-agent supports the --mode1003 option.  */
+  if (mode1003 && assuan_transact (agent_ctx,
+                                   "GETINFO cmd_has_option EXPORT_KEY mode1003",
+                                   NULL, NULL, NULL, NULL, NULL, NULL))
+    return gpg_error (GPG_ERR_NOT_SUPPORTED);
+
   if (desc)
     {
       snprintf (line, DIM(line), "SETKEYDESC %s", desc);
@@ -3040,7 +3072,7 @@
     }
 
   snprintf (line, DIM(line), "EXPORT_KEY %s%s%s %s",
-            openpgp_protected ? "--openpgp ":"",
+            mode1003? "--mode1003" : openpgp_protected ? "--openpgp ":"",
             cache_nonce_addr && *cache_nonce_addr? "--cache-nonce=":"",
             cache_nonce_addr && *cache_nonce_addr? *cache_nonce_addr:"",
             hexkeygrip);

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/call-agent.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/call-agent.h Changed

@@ -108,6 +108,9 @@
 /* Return list of cards.  */
 int agent_scd_cardlist (strlist_t *result);
 
+/* Switch/assure a certain application. */
+gpg_error_t agent_scd_switchapp (const char *appname);
+
 /* Free a keypair info list.  */
 void free_keypair_info (keypair_info_t l);
 
@@ -132,7 +135,8 @@
 
 /* Send the KEYTOCARD command. */
 int agent_keytocard (const char *hexgrip, int keyno, int force,
-                     const char *serialno, const char *timestamp);
+                     const char *serialno, const char *timestamp,
+                     const char *ecdh_param_str);
 
 /* Send a SETATTR command to the SCdaemon. */
 gpg_error_t agent_scd_setattr (const char *name,
@@ -231,7 +235,7 @@
 /* Receive a key from the agent.  */
 gpg_error_t agent_export_key (ctrl_t ctrl, const char *keygrip,
                               const char *desc, int openpgp_protected,
-                              char **cache_nonce_addr,
+                              int mode1003, char **cache_nonce_addr,
                               unsigned char **r_result, size_t *r_resultlen,
                               u32 *keyid, u32 *mainkeyid, int pubkey_algo);

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/call-dirmngr.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/call-dirmngr.c Changed

@@ -365,6 +365,7 @@
   const char *s, *s2;
   const char *warn = NULL;
   int is_note = 0;
+  char *p;
 
   if ((s = has_leading_keyword (line, parm->keyword? parm->keyword : "SOURCE")))
     {
@@ -374,6 +375,30 @@
           parm->source = xtrystrdup (s);
           if (!parm->source)
             err = gpg_error_from_syserror ();
+          else
+            {
+              p = strchr (parm->source, ':');
+              if (p && p1 == '/' && p2 == '/')
+                {
+                  /* This is a real URL like "ldap://foo:389/bla,bla"
+                   * Strip off the local part.  */
+                  if ((p = strchr (p+3, '/')))
+                    *p = 0;
+                }
+              else
+                {
+                  /* This is an LDAP config entry like
+                   * "foo:389:user:pass:base:flags"
+                   * we strip off everything beyound the port.  */
+                  if ((p = strchr (p+1, ':')))
+                    {
+                      if (p-1 == ':')
+                        p-1 = 0;  /* No port given.  */
+                      else
+                        *p = 0;
+                    }
+                }
+            }
         }
     }
   else if ((s = has_leading_keyword (line, "WARNING"))

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/call-keyboxd.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/call-keyboxd.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/card-util.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/card-util.c Changed

@@ -410,29 +410,29 @@
       || strlen (info.serialno) != 32 )
     {
       const char *name1, *name2;
-      if (info.apptype && !strcmp (info.apptype, "openpgp"))
+      if (info.apptype && !ascii_strcasecmp (info.apptype, "openpgp"))
         goto openpgp;
-      else if (info.apptype && !strcmp (info.apptype, "NKS"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "NKS"))
         {
           name1 = "netkey";
           name2 = "NetKey";
         }
-      else if (info.apptype && !strcmp (info.apptype, "DINSIG"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "DINSIG"))
         {
           name1 = "dinsig";
           name2 = "DINSIG";
         }
-      else if (info.apptype && !strcmp (info.apptype, "P15"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "P15"))
         {
           name1 = "pkcs15";
           name2 = "PKCS#15";
         }
-      else if (info.apptype && !strcmp (info.apptype, "GELDKARTE"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "GELDKARTE"))
         {
           name1 = "geldkarte";
           name2 = "Geldkarte";
         }
-      else if (info.apptype && !strcmp (info.apptype, "PIV"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "PIV"))
         {
           name1 = "piv";
           name2 = "PIV";
@@ -705,6 +705,14 @@
         }
       else
         tty_fprintf (fp, "none\n");
+
+      if (!info.manufacturer_name)
+        {
+          tty_fprintf (fp, "\n");
+          tty_fprintf (fp, _("Please try command \"%s\""
+                             " if the listing does not look correct\n"),
+                       "openpgp");
+        }
     }
 
   release_kbnode (keyblock);
@@ -843,7 +851,6 @@
     {
       tty_printf (_("Error: Combined name too long "
                     "(limit is %d characters).\n"), 39);
-      xfree (isoname);
       rc = gpg_error (GPG_ERR_TOO_LARGE);
       goto leave;
     }
@@ -1290,6 +1297,7 @@
   int rc;
 
   memset (info, 0, sizeof *info);
+  agent_scd_switchapp ("openpgp");
   rc = agent_scd_getattr ("SERIALNO", info);
   if (rc || !info->serialno || strncmp (info->serialno, "D27600012401", 12)
       || strlen (info->serialno) != 32 )
@@ -1782,12 +1790,13 @@
 }
 
 
-/* Store the key at NODE into the smartcard and modify NODE to
-   carry the serialno stuff instead of the actual secret key
-   parameters.  USE is the usage for that key; 0 means any
-   usage. */
+/* Store the key at NODE into the smartcard and modify NODE to carry
+   the serialno stuff instead of the actual secret key parameters.
+   USE is the usage for that key; 0 means any usage.  If
+   PROCESSED_KEYS is not NULL it is a poiter to an strlist which will
+   be filled with the keygrips of successfully stored keys.  */
 int
-card_store_subkey (KBNODE node, int use)
+card_store_subkey (KBNODE node, int use, strlist_t *processed_keys)
 {
   struct agent_card_info_s info;
   int okay = 0;
@@ -1796,8 +1805,9 @@
   int  keyno;
   PKT_public_key *pk;
   gpg_error_t err;
-  char *hexgrip;
+  char *hexgrip = NULL;
   int rc;
+  char *ecdh_param_str = NULL;
   gnupg_isotime_t timebuf;
 
   log_assert (node->pkt->pkttype == PKT_PUBLIC_KEY
@@ -1871,15 +1881,31 @@
     goto leave;
 
   epoch2isotime (timebuf, (time_t)pk->timestamp);
-  rc = agent_keytocard (hexgrip, keyno, rc, info.serialno, timebuf);
 
+  if (pk->pubkey_algo == PUBKEY_ALGO_ECDH)
+    {
+      ecdh_param_str = ecdh_param_str_from_pk (pk);
+      if (!ecdh_param_str)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+    }
+
+  rc = agent_keytocard (hexgrip, keyno, rc, info.serialno,
+                        timebuf, ecdh_param_str);
   if (rc)
     log_error (_("KEYTOCARD failed: %s\n"), gpg_strerror (rc));
   else
-    okay = 1;
-  xfree (hexgrip);
+    {
+      okay = 1;
+      if (processed_keys)
+        add_to_strlist (processed_keys, hexgrip);
+    }
 
  leave:
+  xfree (hexgrip);
+  xfree (ecdh_param_str);
   agent_release_card_info (&info);
   return okay;
 }
@@ -2238,7 +2264,7 @@
     cmdNAME, cmdURL, cmdFETCH, cmdLOGIN, cmdLANG, cmdSEX, cmdCAFPR,
     cmdFORCESIG, cmdGENERATE, cmdPASSWD, cmdPRIVATEDO, cmdWRITECERT,
     cmdREADCERT, cmdUNBLOCK, cmdFACTORYRESET, cmdKDFSETUP,
-    cmdKEYATTR, cmdUIF,
+    cmdKEYATTR, cmdUIF, cmdOPENPGP,
     cmdINVCMD
   };
 
@@ -2276,6 +2302,7 @@
       N_("setup KDF for PIN authentication (on/single/off)")},
     { "key-attr", cmdKEYATTR, 1, N_("change the key attribute")},
     { "uif", cmdUIF, 1, N_("change the User Interaction Flag")},
+    { "openpgp", cmdOPENPGP, 0, N_("switch to the OpenPGP app")},
     /* Note, that we do not announce these command yet. */
     { "privatedo", cmdPRIVATEDO, 0, NULL },
     { "readcert", cmdREADCERT, 0, NULL },
@@ -2575,6 +2602,11 @@
             uif (arg_number, arg_rest);
           break;
 
+        case cmdOPENPGP:
+          agent_scd_switchapp ("openpgp");
+          redisplay = 1;
+          break;
+
         case cmdQUIT:
           goto leave;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/cipher-aead.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/cipher-aead.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/cpr.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/cpr.c Changed

@@ -128,7 +128,7 @@
 
 
 int
-is_status_enabled ()
+is_status_enabled (void)
 {
 return !!statusfp;
 }
@@ -372,20 +372,15 @@
 }
 first = 0;
 }
- for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
+ for (esc=0, s=buffer, n=len; n; s++, n--)
 {
 if (*s == '%' || *(const byte*)s <= lower_limit
 || *(const byte*)s == 127 )
 esc = 1;
 if (wrap && ++count > wrap)
- {
- dowrap=1;
- break;
- }
- }
- if (esc)
- {
- s--; n++;
+ dowrap=1;
+ if (esc || dowrap)
+ break;
 }
 if (s != buffer)
 es_fwrite (buffer, s-buffer, 1, statusfp);
@@ -465,9 +460,7 @@
 else /* Ctrl-D not caught - do something reasonable */
 {
 #ifdef HAVE_DOSISH_SYSTEM
-#ifndef HAVE_W32CE_SYSTEM
 raise (SIGINT); /* Nothing to hangup under DOS. */
-#endif
 #else
 raise (SIGHUP); /* No more input data. */
 #endif
@@ -539,7 +532,7 @@
 
 
 int
-cpr_enabled()
+cpr_enabled(void)
 {
 if( opt.command_fd != -1 )
 	return 1;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/decrypt-data.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/decrypt-data.c Changed

@@ -675,8 +675,10 @@
 /* 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=%"PRIu64" total=%"PRIu64" size=%zu len=%zu%s\n",
- dfx->chunklen, dfx->total, size, len,
+ log_debug ("decrypt: chunklen=%llu total=%llu size=%zu len=%zu%s\n",
+ (unsigned long long)dfx->chunklen,
+ (unsigned long long)dfx->total,
+ size, len,
 dfx->eof_seen? " eof":"");
 
 while (len && dfx->chunklen + len >= dfx->chunksize)
@@ -712,8 +714,8 @@
 len -= n;
 
 if (DBG_FILTER)
- log_debug ("ndecrypted: %zu (nchunk=%"PRIu64") bytes left: %zu at off=%zu\n",
- totallen, dfx->chunklen, len, off);
+ log_debug ("ndecrypted: %zu (nchunk=%llu) bytes left: %zu at off=%zu\n",
+ totallen, (unsigned long long)dfx->chunklen, len, off);
 
 /* Check the tag. */
 if (len < 16)
@@ -794,8 +796,8 @@
 dfx->chunklen += len;
 dfx->total += len;
 if (DBG_FILTER)
- log_debug ("ndecrypted: %zu (nchunk=%"PRIu64")\n",
- totallen, dfx->chunklen);
+ log_debug ("ndecrypted: %zu (nchunk=%llu)\n",
+ totallen, (unsigned long long)dfx->chunklen);
 }
 
 if (dfx->eof_seen)

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/decrypt.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/decrypt.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/ecdh.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/ecdh.c Changed

@@ -189,6 +189,28 @@
             const unsigned char *kdf_params, size_t kdf_params_size)
 {
   gpg_error_t err;
+#if 0 /* GCRYPT_VERSION_NUMBER >= 0x010b00 */
+  /*
+   * Experimental: We will remove this if/endif-conditional
+   * compilation when we update NEED_LIBGCRYPT_VERSION to 1.11.0.
+   */
+  gcry_kdf_hd_t hd;
+  unsigned long param1;
+
+  param0 = kek_size;
+  err = gcry_kdf_open (&hd, GCRY_KDF_ONESTEP_KDF, kdf_hash_algo,
+                       param, 1,
+                       secret_x, secret_x_size, NULL, 0, NULL, 0,
+                       kdf_params, kdf_params_size);
+  if (!err)
+    {
+      gcry_kdf_compute (hd, NULL);
+      gcry_kdf_final (hd, kek_size, secret_x);
+      gcry_kdf_close (hd);
+      /* Clean the tail before returning.  */
+      memset (secret_x+kek_size, 0, secret_x_size - kek_size);
+    }
+#else
   gcry_md_hd_t h;
 
   log_assert( gcry_md_get_algo_dlen (kdf_hash_algo) >= 32 );
@@ -208,6 +230,7 @@
   gcry_md_close (h);
   /* Clean the tail before returning.  */
   memset (secret_x+kek_size, 0, secret_x_size - kek_size);
+#endif
   if (DBG_CRYPTO)
     log_printhex (secret_x, kek_size, "ecdh KEK is:");
   return err;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/encrypt.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/encrypt.c Changed

@@ -1,7 +1,7 @@
 /* encrypt.c - Main encryption driver
 * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 * 2006, 2009 Free Software Foundation, Inc.
- * Copyright (C) 2016 g10 Code GmbH
+ * Copyright (C) 2016, 2023 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>
@@ -67,6 +68,148 @@
 }
 
 
+/* Create and setup a DEK structure and print approriate warnings.
+ * PK_LIST gives the list of public keys. Always returns a DEK. The
+ * actual session needs to be added later. */
+static DEK *
+create_dek_with_warnings (pk_list_t pk_list)
+{
+ DEK *dek;
+
+ dek = xmalloc_secure_clear (sizeof *dek);
+ if (!opt.def_cipher_algo)
+ {
+ /* Try to get it from the prefs. */
+ dek->algo = select_algo_from_prefs (pk_list, PREFTYPE_SYM, -1, NULL);
+ if (dek->algo == -1)
+ {
+ /* If does not make sense to fallback to the rfc4880
+ * required 3DES if we will reject that algo later. Thus we
+ * fallback to AES anticipating RFC4880bis rules. */
+ if (opt.flags.allow_old_cipher_algos)
+ dek->algo = CIPHER_ALGO_3DES;
+ else
+ dek->algo = CIPHER_ALGO_AES;
+ }
+
+ /* In case 3DES has been selected, print a warning if any key
+ * does not have a preference for AES. This should help to
+ * indentify why encrypting to several recipients falls back to
+ * 3DES. */
+ if (opt.verbose && dek->algo == CIPHER_ALGO_3DES)
+ warn_missing_aes_from_pklist (pk_list);
+ }
+ else
+ {
+ if (!opt.expert
+ && (select_algo_from_prefs (pk_list, PREFTYPE_SYM,
+ opt.def_cipher_algo, NULL)
+ != opt.def_cipher_algo))
+ {
+ log_info(_("WARNING: forcing symmetric cipher %s (%d)"
+ " violates recipient preferences\n"),
+ openpgp_cipher_algo_name (opt.def_cipher_algo),
+ opt.def_cipher_algo);
+ }
+
+ dek->algo = opt.def_cipher_algo;
+ }
+
+ return dek;
+}
+
+
+/* Check whether all encryption keys are compliant with the current
+ * mode and issue respective status lines. DEK has the info about the
+ * session key and PK_LIST the list of public keys. */
+static gpg_error_t
+check_encryption_compliance (DEK *dek, pk_list_t pk_list)
+{
+ gpg_error_t err = 0;
+ pk_list_t pkr;
+ int compliant;
+
+ /* First check whether we should use the algo at all. */
+ if (openpgp_cipher_blocklen (dek->algo) < 16
+ && !opt.flags.allow_old_cipher_algos)
+ {
+ log_error (_("cipher algorithm '%s' may not be used for encryption\n"),
+		 openpgp_cipher_algo_name (dek->algo));
+ if (!opt.quiet)
+ log_info (_("(use option \"%s\" to override)\n"),
+ "--allow-old-cipher-algos");
+ err = gpg_error (GPG_ERR_CIPHER_ALGO);
+ goto leave;
+ }
+
+ /* Now check the compliance. */
+ if (! gnupg_cipher_is_allowed (opt.compliance, 1, dek->algo,
+ GCRY_CIPHER_MODE_CFB))
+ {
+ log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
+		 openpgp_cipher_algo_name (dek->algo),
+		 gnupg_compliance_option_string (opt.compliance));
+ err = gpg_error (GPG_ERR_CIPHER_ALGO);
+ goto leave;
+ }
+
+ if (!gnupg_rng_is_compliant (opt.compliance))
+ {
+ err = gpg_error (GPG_ERR_FORBIDDEN);
+ log_error (_("%s is not compliant with %s mode\n"),
+ "RNG",
+ gnupg_compliance_option_string (opt.compliance));
+ write_status_error ("random-compliance", err);
+ goto leave;
+ }
+
+ /* From here on we only test for CO_DE_VS - if we ever want to
+ * return other compliance mode values we need to change this to
+ * loop over all those values. */
+ compliant = gnupg_gcrypt_is_compliant (CO_DE_VS);
+
+ if (!gnupg_cipher_is_compliant (CO_DE_VS, dek->algo, GCRY_CIPHER_MODE_CFB))
+ compliant = 0;
+
+ for (pkr = pk_list; pkr; pkr = pkr->next)
+ {
+ PKT_public_key *pk = pkr->pk;
+ unsigned int nbits = nbits_from_pk (pk);
+
+ 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, 0, pk->pkey,
+ nbits, NULL))
+ compliant = 0; /* Not compliant - reset flag. */
+ }
+
+ /* If we are compliant print the status for de-vs compliance. */
+ if (compliant)
+ write_status_strings (STATUS_ENCRYPTION_COMPLIANCE_MODE,
+ gnupg_status_compliance_flag (CO_DE_VS),
+ NULL);
+
+ /* Check whether we should fail the operation. */
+ if (opt.flags.require_compliance
+ && opt.compliance == CO_DE_VS
+ && !compliant)
+ {
+ compliance_failure ();
+ err = gpg_error (GPG_ERR_FORBIDDEN);
+ goto leave;
+ }
+
+ leave:
+ return err;
+}
+
+
 /* Encrypt a session key using DEK and store a pointer to the result
 * at R_ENCKEY and its length at R_ENCKEYLEN.
 *
@@ -77,7 +220,7 @@
 * stored at R_SESKEY. If AEAD_ALGO is not 0 the given AEAD algorithm
 * is used for encryption.
 */
-gpg_error_t
+static gpg_error_t
 encrypt_seskey (DEK *dek, aead_algo_t aead_algo,
 DEK **r_seskey, void **r_enckey, size_t *r_enckeylen)
 {
@@ -202,14 +345,6 @@
 {
 int can_use;
 
- if (!opt.flags.rfc4880bis)
- {
- if (opt.force_aead)
- log_info ("Warning: Option %s currently requires option '%s'\n",
- "--force-aead", "--rfc4880bis");
- return 0;
- }
-
 can_use = openpgp_cipher_get_algo_blklen (algo) == 16;
 
 /* With --force-aead we want AEAD. */
@@ -217,11 +352,11 @@
 {
 if (!can_use)
 {
- log_info ("Warning: request to use AEAD ignored for cipher '%s'\n",
+ log_info ("Warning: request to use OCB ignored for cipher '%s'\n",
 openpgp_cipher_algo_name (algo));
 return 0;
 }
- return default_aead_algo ();
+ return AEAD_ALGO_OCB;
 }
 
 /* AEAD does only work with 128 bit cipher blocklength. */
@@ -275,6 +410,8 @@
 text_filter_context_t tfx;
 progress_filter_context_t *pfx;
 int do_compress = !!default_compress_algo();
+ char peekbuf32;
+ int peekbuflen;
 
 if (!gnupg_rng_is_compliant (opt.compliance))
 {
@@ -311,6 +448,14 @@
 return rc;
 }
 
+ peekbuflen = iobuf_ioctl (inp, IOBUF_IOCTL_PEEK, sizeof peekbuf, peekbuf);
+ if (peekbuflen < 0)
+ {
+ peekbuflen = 0;
+ if (DBG_FILTER)
+ log_debug ("peeking at input failed\n");
+ }
+
 handle_progress (pfx, inp, filename);
 
 if (opt.textmode)
@@ -336,8 +481,7 @@
 if (use_seskey && s2k->mode != 1 && s2k->mode != 3)
 {
 use_seskey = 0;
- log_info (_("can't use a symmetric ESK packet "
- "due to the S2K mode\n"));
+ log_info (_("can't use a SKESK packet due to the S2K mode\n"));
 }
 
 /* See whether we want to use AEAD. */
@@ -376,10 +520,11 @@
 if (do_compress
 && cfx.dek
 && (cfx.dek->use_mdc || cfx.dek->use_aead)
- && is_file_compressed(filename, &rc))
+ && !opt.explicit_compress_option
+ && is_file_compressed (peekbuf, peekbuflen))
 {
 if (opt.verbose)
- log_info(_("'%s' already compressed\n"), filename);
+ log_info(_("'%s' already compressed\n"), filename? filename: "stdin");
 do_compress = 0;
 }
 
@@ -435,12 +580,12 @@
 
 if ( !iobuf_is_pipe_filename (filename) && *filename && !opt.textmode )
 {
- off_t tmpsize;
- int overflow;
+ uint64_t tmpsize;
 
- if ( !(tmpsize = iobuf_get_filelength(inp, &overflow))
- && !overflow && opt.verbose)
+ tmpsize = iobuf_get_filelength(inp);
+ if (!tmpsize && opt.verbose)
 log_info(_("WARNING: '%s' is an empty file\n"), filename );
+
 /* We can't encode the length of very large files because
 OpenPGP uses only 32 bit for file sizes. So if the
 size of a file is larger than 2^32 minus some bytes for
@@ -647,7 +792,8 @@
 progress_filter_context_t *pfx;
 PK_LIST pk_list;
 int do_compress;
- int compliant;
+ char peekbuf32;
+ int peekbuflen;
 
 if (filefd != -1 && filename)
 return gpg_error (GPG_ERR_INV_ARG); /* Both given. */
@@ -688,10 +834,10 @@
 gpg_err_set_errno (ENOSYS);
 }
 #else
- if (filefd == GNUPG_INVALID_FD)
+ if (filefd == -1)
 inp = iobuf_open (filename);
 else
- inp = iobuf_fdopen_nc (FD2INT(filefd), "rb");
+ inp = iobuf_fdopen_nc (filefd, "rb");
 #endif
 if (inp)
 iobuf_ioctl (inp, IOBUF_IOCTL_NO_CACHE, 1, NULL);
@@ -720,6 +866,14 @@
 if (opt.verbose)
 log_info (_("reading from '%s'\n"), iobuf_get_fname_nonnull (inp));
 
+ peekbuflen = iobuf_ioctl (inp, IOBUF_IOCTL_PEEK, sizeof peekbuf, peekbuf);
+ if (peekbuflen < 0)
+ {
+ peekbuflen = 0;
+ if (DBG_FILTER)
+ log_debug ("peeking at input failed\n");
+ }
+
 handle_progress (pfx, inp, filename);
 
 if (opt.textmode)
@@ -736,127 +890,11 @@
 }
 
 /* Create a session key. */
- cfx.dek = xmalloc_secure_clear (sizeof *cfx.dek);
- if (!opt.def_cipher_algo)
- {
- /* Try to get it from the prefs. */
- cfx.dek->algo = select_algo_from_prefs (pk_list, PREFTYPE_SYM, -1, NULL);
- /* The only way select_algo_from_prefs can fail here is when
- mixing v3 and v4 keys, as v4 keys have an implicit preference
- entry for 3DES, and the pk_list cannot be empty. In this
- case, use 3DES anyway as it's the safest choice - perhaps the
- v3 key is being used in an OpenPGP implementation and we know
- that the implementation behind any v4 key can handle 3DES.
- Note that we do not support v3 keys since version 2.2 so the
- above description gives only historical background. */
- if (cfx.dek->algo == -1)
- {
- /* If does not make sense to fallback to the rfc4880
- * required 3DES if we will reject that algo later. Thus we
- * fallback to AES anticipating RFC4880bis rules. */
- if (opt.flags.allow_old_cipher_algos)
- cfx.dek->algo = CIPHER_ALGO_3DES;
- else
- cfx.dek->algo = CIPHER_ALGO_AES;
- }
-
- /* In case 3DES has been selected, print a warning if any key
- does not have a preference for AES. This should help to
- identify why encrypting to several recipients falls back to
- 3DES. */
- if (opt.verbose && cfx.dek->algo == CIPHER_ALGO_3DES)
- warn_missing_aes_from_pklist (pk_list);
- }
- else
- {
- if (!opt.expert
- && (select_algo_from_prefs (pk_list, PREFTYPE_SYM,
- opt.def_cipher_algo, NULL)
- != opt.def_cipher_algo))
- {
- log_info(_("WARNING: forcing symmetric cipher %s (%d)"
- " violates recipient preferences\n"),
- openpgp_cipher_algo_name (opt.def_cipher_algo),
- opt.def_cipher_algo);
- }
-
- cfx.dek->algo = opt.def_cipher_algo;
- }
-
- if (openpgp_cipher_blocklen (cfx.dek->algo) < 16
- && !opt.flags.allow_old_cipher_algos)
- {
- log_error (_("cipher algorithm '%s' may not be used for encryption\n"),
-		 openpgp_cipher_algo_name (cfx.dek->algo));
- if (!opt.quiet)
- log_info (_("(use option \"%s\" to override)\n"),
- "--allow-old-cipher-algos");
- rc = gpg_error (GPG_ERR_CIPHER_ALGO);
- goto leave;
- }
-
- /* Check compliance. */
- if (! gnupg_cipher_is_allowed (opt.compliance, 1, cfx.dek->algo,
- GCRY_CIPHER_MODE_CFB))
- {
- log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
-		 openpgp_cipher_algo_name (cfx.dek->algo),
-		 gnupg_compliance_option_string (opt.compliance));
- rc = gpg_error (GPG_ERR_CIPHER_ALGO);
- goto leave;
- }
+ cfx.dek = create_dek_with_warnings (pk_list);
 
- if (!gnupg_rng_is_compliant (opt.compliance))
- {
- rc = gpg_error (GPG_ERR_FORBIDDEN);
- log_error (_("%s is not compliant with %s mode\n"),
- "RNG",
- gnupg_compliance_option_string (opt.compliance));
- write_status_error ("random-compliance", rc);
- goto leave;
- }
-
- compliant = gnupg_cipher_is_compliant (CO_DE_VS, cfx.dek->algo,
- GCRY_CIPHER_MODE_CFB);
-
- {
- pk_list_t pkr;
-
- for (pkr = pk_list; pkr; pkr = pkr->next)
- {
- PKT_public_key *pk = pkr->pk;
- unsigned int nbits = nbits_from_pk (pk);
-
- 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, 0, pk->pkey,
- nbits, NULL))
- compliant = 0;
- }
-
- }
-
- if (compliant)
- write_status_strings (STATUS_ENCRYPTION_COMPLIANCE_MODE,
- gnupg_status_compliance_flag (CO_DE_VS),
- NULL);
-
- if (opt.flags.require_compliance
- && opt.compliance == CO_DE_VS
- && !compliant)
- {
- log_error (_("operation forced to fail due to"
- " unfulfilled compliance rules\n"));
- rc = gpg_error (GPG_ERR_FORBIDDEN);
- g10_errors_seen = 1;
- goto leave;
- }
+ rc = check_encryption_compliance (cfx.dek, pk_list);
+ if (rc)
+ goto leave;
 
 cfx.dek->use_aead = use_aead (pk_list, cfx.dek->algo);
 if (!cfx.dek->use_aead)
@@ -868,10 +906,11 @@
 * ciphertext attacks. */
 if (do_compress
 && (cfx.dek->use_mdc || cfx.dek->use_aead)
- && is_file_compressed (filename, &rc2))
+ && !opt.explicit_compress_option
+ && is_file_compressed (peekbuf, peekbuflen))
 {
 if (opt.verbose)
- log_info(_("'%s' already compressed\n"), filename);
+ log_info(_("'%s' already compressed\n"), filename? filename: "stdin");
 do_compress = 0;
 }
 if (rc2)
@@ -903,11 +942,10 @@
 if (filename && *filename
 && !iobuf_is_pipe_filename (filename) && !opt.textmode )
 {
- off_t tmpsize;
- int overflow;
+ uint64_t tmpsize;
 
- if ( !(tmpsize = iobuf_get_filelength(inp, &overflow))
- && !overflow && opt.verbose)
+ tmpsize = iobuf_get_filelength (inp);
+ if (!tmpsize && opt.verbose)
 log_info(_("WARNING: '%s' is an empty file\n"), filename );
 /* We can't encode the length of very large files because
 OpenPGP uses only 32 bit for file sizes. So if the size
@@ -1040,41 +1078,13 @@
 {
 if ( !efx->header_okay )
 {
- efx->cfx.dek = xmalloc_secure_clear ( sizeof *efx->cfx.dek );
- if ( !opt.def_cipher_algo )
- {
- /* Try to get it from the prefs. */
- efx->cfx.dek->algo =
- select_algo_from_prefs (efx->pk_list, PREFTYPE_SYM, -1, NULL);
- if (efx->cfx.dek->algo == -1 )
- {
- /* Because 3DES is implicitly in the prefs, this can
- only happen if we do not have any public keys in
- the list. */
- efx->cfx.dek->algo = DEFAULT_CIPHER_ALGO;
- }
-
- /* In case 3DES has been selected, print a warning if
- any key does not have a preference for AES. This
- should help to identify why encrypting to several
- recipients falls back to 3DES. */
- if (opt.verbose
- && efx->cfx.dek->algo == CIPHER_ALGO_3DES)
- warn_missing_aes_from_pklist (efx->pk_list);
-	 }
- else
- {
-	 if (!opt.expert
- && select_algo_from_prefs (efx->pk_list,PREFTYPE_SYM,
- opt.def_cipher_algo,
- NULL) != opt.def_cipher_algo)
-		log_info(_("forcing symmetric cipher %s (%d) "
-			 "violates recipient preferences\n"),
-			 openpgp_cipher_algo_name (opt.def_cipher_algo),
-			 opt.def_cipher_algo);
-
-	 efx->cfx.dek->algo = opt.def_cipher_algo;
-	 }
+ efx->header_okay = 1;
+
+ efx->cfx.dek = create_dek_with_warnings (efx->pk_list);
+
+ rc = check_encryption_compliance (efx->cfx.dek, efx->pk_list);
+ if (rc)
+ return rc;
 
 efx->cfx.dek->use_aead = use_aead (efx->pk_list, efx->cfx.dek->algo);
 if (!efx->cfx.dek->use_aead)
@@ -1102,7 +1112,6 @@
 /**/ : cipher_filter_cfb,
 &efx->cfx);
 
- efx->header_okay = 1;
 }
 rc = iobuf_write (a, buf, size);
 
@@ -1161,6 +1170,12 @@
 if ( opt.verbose )
 {
 char *ustr = get_user_id_string_native (ctrl, enc->keyid);
+ if ((pk->pubkey_usage & PUBKEY_USAGE_RENC))
+ {
+ char *tmpustr = xstrconcat (ustr, " ADSK", NULL);
+ xfree (ustr);
+ ustr = tmpustr;
+ }
 log_info (_("%s/%s.%s encrypted for: \"%s\"\n"),
 openpgp_pk_algo_name (enc->pubkey_algo),
 openpgp_cipher_algo_name (dek->algo),

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/exec.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/exec.c Changed

@@ -19,12 +19,6 @@
 
 #include <config.h>
 #include <stdlib.h>
-#ifdef HAVE_DOSISH_SYSTEM
-# ifdef HAVE_WINSOCK2_H
-# include <winsock2.h>
-# endif
-# include <windows.h>
-#endif
 #include <string.h>
 
 #include "gpg.h"
@@ -35,122 +29,10 @@
 #ifdef NO_EXEC
 int set_exec_path(const char *path) { return GPG_ERR_GENERAL; }
 #else
-#if defined (_WIN32)
-/* This is a nicer system() for windows that waits for programs to
- return before returning control to the caller. I hate helpful
- computers. */
-int
-w32_system(const char *command)
-{
- if (!strncmp (command, "!ShellExecute ", 14))
- {
- SHELLEXECUTEINFOW see;
- wchar_t *wname;
- int waitms;
-
- command = command + 14;
- while (spacep (command))
- command++;
- waitms = atoi (command);
- if (waitms < 0)
- waitms = 0;
- else if (waitms > 60*1000)
- waitms = 60000;
- while (*command && !spacep (command))
- command++;
- while (spacep (command))
- command++;
-
- wname = utf8_to_wchar (command);
- if (!wname)
- return -1;
-
- memset (&see, 0, sizeof see);
- see.cbSize = sizeof see;
- see.fMask = (SEE_MASK_NOCLOSEPROCESS
- | SEE_MASK_NOASYNC
- | SEE_MASK_FLAG_NO_UI
- | SEE_MASK_NO_CONSOLE);
- see.lpVerb = L"open";
- see.lpFile = (LPCWSTR)wname;
- see.nShow = SW_SHOW;
-
- if (DBG_EXTPROG)
- log_debug ("running ShellExecuteEx(open,'%s')\n", command);
- if (!ShellExecuteExW (&see))
- {
- if (DBG_EXTPROG)
- log_debug ("ShellExecuteEx failed: rc=%d\n", (int)GetLastError ());
- xfree (wname);
- return -1;
- }
- if (DBG_EXTPROG)
- log_debug ("ShellExecuteEx succeeded (hProcess=%p,hInstApp=%d)\n",
- see.hProcess, (int)see.hInstApp);
-
- if (!see.hProcess)
- {
- gnupg_usleep (waitms*1000);
- if (DBG_EXTPROG)
- log_debug ("ShellExecuteEx ready (wait=%dms)\n", waitms);
- }
- else
- {
- WaitForSingleObject (see.hProcess, INFINITE);
- if (DBG_EXTPROG)
- log_debug ("ShellExecuteEx ready\n");
- }
- CloseHandle (see.hProcess);
-
- xfree (wname);
- }
- else
- {
- char *string;
- wchar_t *wstring;
- PROCESS_INFORMATION pi;
- STARTUPINFOW si;
-
- /* We must use a copy of the command as CreateProcess modifies
- * this argument. */
- string = xstrdup (command);
- wstring = utf8_to_wchar (string);
- xfree (string);
- if (!wstring)
- return -1;
-
- memset (&pi, 0, sizeof(pi));
- memset (&si, 0, sizeof(si));
- si.cb = sizeof (si);
-
- if (!CreateProcessW (NULL, wstring, NULL, NULL, FALSE,
- DETACHED_PROCESS,
- NULL, NULL, &si, &pi))
- {
- xfree (wstring);
- return -1;
- }
-
- /* Wait for the child to exit */
- WaitForSingleObject (pi.hProcess, INFINITE);
-
- CloseHandle (pi.hProcess);
- CloseHandle (pi.hThread);
- xfree (wstring);
- }
-
- return 0;
-}
-#endif /*_W32*/
-
-
 /* Replaces current $PATH */
 int
 set_exec_path(const char *path)
 {
-#ifdef HAVE_W32CE_SYSTEM
-#warning Change this code to use common/exechelp.c
-#else
 char *p;
 
 p=xmalloc(5+strlen(path)+1);
@@ -168,6 +50,5 @@
 return GPG_ERR_GENERAL;
 else
 return 0;
-#endif
 }
 #endif /* ! NO_EXEC */

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/exec.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/exec.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/export.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/export.c Changed

@@ -2,6 +2,7 @@
 * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 * 2005, 2010 Free Software Foundation, Inc.
 * Copyright (C) 1998-2016 Werner Koch
+ * Copyright (C) 2022 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -63,15 +64,17 @@
 };
 
 
-/* A global variable to store the selector created from
+/* Global variables to store the selectors created from
 * --export-filter keep-uid=EXPR.
 * --export-filter drop-subkey=EXPR.
+ * --export-filter select=EXPR.
 *
 * FIXME: We should put this into the CTRL object but that requires a
 * lot more changes right now.
 */
 static recsel_expr_t export_keep_uid;
 static recsel_expr_t export_drop_subkey;
+static recsel_expr_t export_select_filter;
 
 
 /* An object used for a linked list to implement the
@@ -81,6 +84,7 @@
 struct export_filter_attic_s *next;
 recsel_expr_t export_keep_uid;
 recsel_expr_t export_drop_subkey;
+ recsel_expr_t export_select_filter;
 };
 static struct export_filter_attic_s *export_filter_attic;
 
@@ -105,6 +109,8 @@
 export_keep_uid = NULL;
 recsel_release (export_drop_subkey);
 export_drop_subkey = NULL;
+ recsel_release (export_select_filter);
+ export_select_filter = NULL;
 }
 
 
@@ -128,10 +134,16 @@
 
 {"export-dane", EXPORT_DANE_FORMAT, NULL, NULL },
 
+ {"export-revocs", EXPORT_REVOCS, NULL,
+ N_("export only revocation certificates") },
+
 {"backup", EXPORT_BACKUP, NULL,
 N_("use the GnuPG key backup format")},
 {"export-backup", EXPORT_BACKUP, NULL, NULL },
 
+ {"mode1003", EXPORT_MODE1003, NULL,
+ N_("export secret keys using the GnuPG format") },
+
 /* Aliases for backward compatibility */
 {"include-local-sigs",EXPORT_LOCAL_SIGS,NULL,NULL},
 {"include-attributes",EXPORT_ATTRIBUTES,NULL,NULL},
@@ -184,6 +196,8 @@
 *
 * - secret :: 1 for a secret subkey, else 0.
 * - key_algo :: Public key algorithm id
+ *
+ * - select :: The key is only exported if the filter returns true.
 */
 gpg_error_t
 parse_and_set_export_filter (const char *string)
@@ -197,6 +211,8 @@
 err = recsel_parse_expr (&export_keep_uid, string+9);
 else if (!strncmp (string, "drop-subkey=", 12))
 err = recsel_parse_expr (&export_drop_subkey, string+12);
+ else if (!strncmp (string, "select=", 7))
+ err = recsel_parse_expr (&export_select_filter, string+7);
 else
 err = gpg_error (GPG_ERR_INV_NAME);
 
@@ -217,6 +233,8 @@
 export_keep_uid = NULL;
 item->export_drop_subkey = export_drop_subkey;
 export_drop_subkey = NULL;
+ item->export_select_filter = export_select_filter;
+ export_select_filter = NULL;
 item->next = export_filter_attic;
 export_filter_attic = item;
 }
@@ -235,6 +253,7 @@
 cleanup_export_globals ();
 export_keep_uid = item->export_keep_uid;
 export_drop_subkey = item->export_drop_subkey;
+ export_select_filter = item->export_select_filter;
 }
 
 
@@ -624,6 +643,183 @@
 }
 
 
+/* Take an s-expression wit the public and private key and change the
+ * parameter array in PK to include the secret parameters. */
+static gpg_error_t
+secret_key_to_mode1003 (gcry_sexp_t s_key, PKT_public_key *pk)
+{
+ gpg_error_t err;
+ gcry_sexp_t list = NULL;
+ gcry_sexp_t l2;
+ enum gcry_pk_algos pk_algo;
+ struct seckey_info *ski;
+ int idx;
+ char *string;
+ size_t npkey, nskey;
+ gcry_mpi_t pub_params10 = { NULL };
+
+ /* We look for a private-key, then the first element in it tells us
+ the type */
+ list = gcry_sexp_find_token (s_key, "protected-private-key", 0);
+ if (!list)
+ list = gcry_sexp_find_token (s_key, "private-key", 0);
+ if (!list)
+ {
+ err = gpg_error (GPG_ERR_BAD_SECKEY);
+ goto leave;
+ }
+
+ log_assert (!pk->seckey_info);
+
+ /* Parse the gcrypt PK algo and check that it is okay. */
+ l2 = gcry_sexp_cadr (list);
+ if (!l2)
+ {
+ err = gpg_error (GPG_ERR_BAD_SECKEY);
+ goto leave;
+ }
+ gcry_sexp_release (list);
+ list = l2;
+ string = gcry_sexp_nth_string (list, 0);
+ if (!string)
+ {
+ err = gpg_error (GPG_ERR_BAD_SECKEY);
+ goto leave;
+ }
+ pk_algo = gcry_pk_map_name (string);
+ xfree (string); string = NULL;
+ if (gcry_pk_algo_info (pk_algo, GCRYCTL_GET_ALGO_NPKEY, NULL, &npkey)
+ || gcry_pk_algo_info (pk_algo, GCRYCTL_GET_ALGO_NSKEY, NULL, &nskey)
+ || !npkey || npkey >= nskey)
+ {
+ err = gpg_error (GPG_ERR_BAD_SECKEY);
+ goto leave;
+ }
+
+ /* Check that the pubkey algo and the received parameters matches
+ * those from the public key. */
+ switch (canon_pk_algo (pk_algo))
+ {
+ case GCRY_PK_RSA:
+ if (!is_RSA (pk->pubkey_algo) || npkey != 2)
+ err = gpg_error (GPG_ERR_PUBKEY_ALGO); /* Does not match. */
+ else
+ err = gcry_sexp_extract_param (list, NULL, "ne",
+ &pub_params0,
+ &pub_params1,
+ NULL);
+ break;
+
+ case GCRY_PK_DSA:
+ if (!is_DSA (pk->pubkey_algo) || npkey != 4)
+ err = gpg_error (GPG_ERR_PUBKEY_ALGO); /* Does not match. */
+ else
+ err = gcry_sexp_extract_param (list, NULL, "pqgy",
+ &pub_params0,
+ &pub_params1,
+ &pub_params2,
+ &pub_params3,
+ NULL);
+ break;
+
+ case GCRY_PK_ELG:
+ if (!is_ELGAMAL (pk->pubkey_algo) || npkey != 3)
+ err = gpg_error (GPG_ERR_PUBKEY_ALGO); /* Does not match. */
+ else
+ err = gcry_sexp_extract_param (list, NULL, "pgy",
+ &pub_params0,
+ &pub_params1,
+ &pub_params2,
+ NULL);
+ break;
+
+ case GCRY_PK_ECC:
+ err = 0;
+ if (!(pk->pubkey_algo == PUBKEY_ALGO_ECDSA
+ || pk->pubkey_algo == PUBKEY_ALGO_ECDH
+ || pk->pubkey_algo == PUBKEY_ALGO_EDDSA))
+ {
+ err = gpg_error (GPG_ERR_PUBKEY_ALGO); /* Does not match. */
+ goto leave;
+ }
+ npkey = 2;
+ if (pk->pubkey_algo == PUBKEY_ALGO_ECDH)
+ npkey++;
+ /* Dedicated check of the curve. */
+ pub_params0 = NULL;
+ err = match_curve_skey_pk (list, pk);
+ if (err)
+ goto leave;
+ /* ... and of the Q parameter. */
+ err = sexp_extract_param_sos (list, "q", &pub_params1);
+ if (!err && (gcry_mpi_cmp (pk->pkey1, pub_params1)))
+ err = gpg_error (GPG_ERR_BAD_PUBKEY);
+ break;
+
+ default:
+ err = gpg_error (GPG_ERR_PUBKEY_ALGO); /* Unknown. */
+ break;
+ }
+ if (err)
+ goto leave;
+
+ nskey = npkey + 1; /* We only have one skey param. */
+ if (nskey > PUBKEY_MAX_NSKEY)
+ {
+ err = gpg_error (GPG_ERR_BAD_SECKEY);
+ goto leave;
+ }
+
+ /* Check that the public key parameters match. For ECC we already
+ * did this in the switch above. */
+ if (canon_pk_algo (pk_algo) != GCRY_PK_ECC)
+ {
+ for (idx=0; idx < npkey; idx++)
+ if (gcry_mpi_cmp (pk->pkeyidx, pub_paramsidx))
+ {
+ err = gpg_error (GPG_ERR_BAD_PUBKEY);
+ goto leave;
+ }
+ }
+
+ /* Store the maybe protected secret key as an s-expression. */
+ pk->seckey_info = ski = xtrycalloc (1, sizeof *ski);
+ if (!ski)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+
+ pk->seckey_info = ski = xtrycalloc (1, sizeof *ski);
+ if (!ski)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+
+ ski->is_protected = 1;
+ ski->s2k.mode = 1003;
+
+ {
+ unsigned char *buf;
+ size_t buflen;
+
+ err = make_canon_sexp (s_key, &buf, &buflen);
+ if (err)
+ goto leave;
+ pk->pkeynpkey = gcry_mpi_set_opaque (NULL, buf, buflen*8);
+ for (idx=npkey+1; idx < PUBKEY_MAX_NSKEY; idx++)
+ pk->pkeyidx = NULL;
+ }
+
+ leave:
+ gcry_sexp_release (list);
+ for (idx=0; idx < DIM(pub_params); idx++)
+ gcry_mpi_release (pub_paramsidx);
+ return err;
+}
+
+
 /* Take a cleartext dump of a secret key in PK and change the
 * parameter array in PK to include the secret parameters. */
 static gpg_error_t
@@ -1233,29 +1429,51 @@
 * passphrase-protected. Otherwise, store secret key material in the
 * clear.
 *
+ * If MODE1003 is set, the key is requested in raw GnuPG format from
+ * the agent. This usually does not require a passphrase unless the
+ * gpg-agent has not yet used the key and needs to convert it to its
+ * internal format first.
+ *
 * CACHE_NONCE_ADDR is used to share nonce for multiple key retrievals.
+ *
+ * If PK is NULL, the raw key is returned (e.g. for ssh export) at
+ * R_KEY. CLEARTEXT and CACHE_NONCE_ADDR ared ignored in this case.
 */
 gpg_error_t
 receive_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd,
- int cleartext,
+ int cleartext, int mode1003,
 char **cache_nonce_addr, const char *hexgrip,
- PKT_public_key *pk)
+ PKT_public_key *pk, gcry_sexp_t *r_key)
 {
 gpg_error_t err = 0;
 unsigned char *wrappedkey = NULL;
 size_t wrappedkeylen;
 unsigned char *key = NULL;
 size_t keylen, realkeylen;
- gcry_sexp_t s_skey;
+ gcry_sexp_t s_skey = NULL;
 char *prompt;
 
+ if (r_key)
+ *r_key = NULL;
 if (opt.verbose)
 log_info ("key %s: asking agent for the secret parts\n", hexgrip);
 
- prompt = gpg_format_keydesc (ctrl, pk, FORMAT_KEYDESC_EXPORT,1);
- err = agent_export_key (ctrl, hexgrip, prompt, !cleartext, cache_nonce_addr,
- &wrappedkey, &wrappedkeylen,
-			 pk->keyid, pk->main_keyid, pk->pubkey_algo);
+ if (pk)
+ {
+ prompt = gpg_format_keydesc (ctrl, pk, FORMAT_KEYDESC_EXPORT, 1);
+ err = agent_export_key (ctrl, hexgrip, prompt, !cleartext, mode1003,
+ cache_nonce_addr,
+ &wrappedkey, &wrappedkeylen,
+ pk->keyid, pk->main_keyid, pk->pubkey_algo);
+ }
+ else
+ {
+ prompt = gpg_format_keydesc (ctrl, NULL, FORMAT_KEYDESC_KEYGRIP, 1);
+ err = agent_export_key (ctrl, hexgrip, prompt, 0, 0,
+ NULL,
+ &wrappedkey, &wrappedkeylen,
+ NULL, NULL, 0);
+ }
 xfree (prompt);
 
 if (err)
@@ -1282,14 +1500,21 @@
 err = gcry_sexp_sscan (&s_skey, NULL, key, realkeylen);
 if (!err)
 {
- if (cleartext)
+ if (pk && mode1003)
+ err = secret_key_to_mode1003 (s_skey, pk);
+ else if (pk && cleartext)
 err = cleartext_secret_key_to_openpgp (s_skey, pk);
- else
+ else if (pk)
 err = transfer_format_to_openpgp (s_skey, pk);
- gcry_sexp_release (s_skey);
+ else if (r_key)
+ {
+ *r_key = s_skey;
+ s_skey = NULL;
+ }
 }
 
 unwraperror:
+ gcry_sexp_release (s_skey);
 xfree (key);
 xfree (wrappedkey);
 if (err)
@@ -1795,11 +2020,22 @@
 else if (!err)
 {
 err = receive_seckey_from_agent (ctrl, cipherhd,
- cleartext, &cache_nonce,
- hexgrip, pk);
+ cleartext,
+ !!(options & EXPORT_MODE1003),
+ &cache_nonce,
+ hexgrip, pk, NULL);
 if (err)
 {
- if (gpg_err_code (err) == GPG_ERR_FULLY_CANCELED)
+ /* If we receive a fully canceled error we stop
+ * immediately. If we receive a cancel for a public
+ * key we also stop immediately because a
+ * public/secret key is always required first
+ * (right, we could instead write a stub key but
+ * that is also kind of surprising). If we receive
+ * a subkey we skip to the next subkey. */
+ if (gpg_err_code (err) == GPG_ERR_FULLY_CANCELED
+ || (node->pkt->pkttype == PKT_PUBLIC_KEY
+ && gpg_err_code (err) == GPG_ERR_CANCELED))
 goto leave;
 write_status_error ("export_keys.secret", err);
 skip_until_subkey = 1;
@@ -1872,6 +2108,78 @@
 }
 
 
+/* Helper for do_export_stream which writes the own revocations
+ * certificates (if any) from KEYBLOCK to OUT. */
+static gpg_error_t
+do_export_revocs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
+ iobuf_t out, unsigned int options, int *any)
+{
+ gpg_error_t err = 0;
+ kbnode_t kbctx, node;
+ PKT_signature *sig;
+
+ (void)ctrl;
+
+ /* NB: walk_kbnode skips packets marked as deleted. */
+ for (kbctx=NULL; (node = walk_kbnode (keyblock, &kbctx, 0)); )
+ {
+ if (node->pkt->pkttype != PKT_SIGNATURE)
+ continue;
+ sig = node->pkt->pkt.signature;
+
+ /* We are only interested in revocation certifcates. */
+ if (!(IS_KEY_REV (sig) || IS_UID_REV (sig) || IS_SUBKEY_REV (sig)))
+ continue;
+
+ if (!(sig->keyid0 == keyid0 && sig->keyid1 == keyid1))
+ continue; /* Not a self-signature. */
+
+ /* Do not export signature packets which are marked as not
+ * exportable. */
+ if (!(options & EXPORT_LOCAL_SIGS)
+ && !sig->flags.exportable)
+ continue; /* not exportable */
+
+ /* Do not export packets with a "sensitive" revocation key
+ * unless the user wants us to. */
+ if (!(options & EXPORT_SENSITIVE_REVKEYS)
+ && sig->revkey)
+ {
+ int i;
+
+ for (i = 0; i < sig->numrevkeys; i++)
+ if ((sig->revkeyi.class & 0x40))
+ break;
+ if (i < sig->numrevkeys)
+ continue;
+ }
+
+ if (!sig->flags.checked)
+ {
+ log_info ("signature not marked as checked - ignored\n");
+ continue;
+ }
+ if (!sig->flags.valid)
+ {
+ log_info ("signature not not valid - ignored\n");
+ continue;
+ }
+
+ err = build_packet (out, node->pkt);
+ if (err)
+ {
+ log_error ("build_packet(%d) failed: %s\n",
+ node->pkt->pkttype, gpg_strerror (err));
+ goto leave;
+ }
+ *any = 1;
+ }
+
+ leave:
+ return err;
+}
+
+
 /* For secret key export we need to setup a decryption context.
 * Returns 0 and the context at r_cipherhd. */
 static gpg_error_t
@@ -2066,6 +2374,32 @@
 NULL, NULL);
 commit_kbnode (&keyblock);
 }
+ else if (export_keep_uid || export_drop_subkey || export_select_filter)
+ {
+ /* Need to merge so that for example the "usage" property
+ * has been setup. */
+ merge_keys_and_selfsig (ctrl, keyblock);
+ }
+
+
+ if (export_select_filter)
+ {
+ int selected = 0;
+ struct impex_filter_parm_s parm;
+ parm.ctrl = ctrl;
+
+ for (parm.node = keyblock; parm.node; parm.node = parm.node->next)
+ {
+ if (recsel_select (export_select_filter,
+ impex_filter_getval, &parm))
+ {
+ selected = 1;
+ break;
+ }
+ }
+ if (!selected)
+ continue; /* Skip this keyblock. */
+ }
 
 if (export_keep_uid)
 {
@@ -2082,10 +2416,15 @@
 }
 
 /* And write it. */
- err = do_export_one_keyblock (ctrl, keyblock, keyid,
- out_help? out_help : out,
- secret, options, stats, any,
- desc, ndesc, descindex, cipherhd);
+ if ((options & EXPORT_REVOCS))
+ err = do_export_revocs (ctrl, keyblock, keyid,
+ out_help? out_help : out,
+ options, any);
+ else
+ err = do_export_one_keyblock (ctrl, keyblock, keyid,
+ out_help? out_help : out,
+ secret, options, stats, any,
+ desc, ndesc, descindex, cipherhd);
 if (err)
 break;
 
@@ -2125,8 +2464,8 @@
 keydb_release (kdbhd);
 if (err || !keyblock_out)
 release_kbnode( keyblock );
- if( !*any )
- log_info(_("WARNING: nothing exported\n"));
+ if( !*any && !opt.quiet)
+ log_info (_("WARNING: nothing exported\n"));
 return err;
 }
 
@@ -2596,74 +2935,6 @@
 }
 
 
-/* Simplified version of receive_seckey_from_agent used to get the raw
- * key. */
-gpg_error_t
-receive_raw_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd,
- const char *hexgrip, gcry_sexp_t *r_key)
-{
- gpg_error_t err = 0;
- unsigned char *wrappedkey = NULL;
- size_t wrappedkeylen;
- unsigned char *key = NULL;
- size_t keylen, realkeylen;
- gcry_sexp_t s_skey = NULL;
-
- *r_key = NULL;
- if (opt.verbose)
- log_info ("key %s: asking agent for the secret parts\n", hexgrip);
-
- {
- char * prompt = gpg_format_keydesc (ctrl, NULL, FORMAT_KEYDESC_KEYGRIP, 1);
- err = agent_export_key (ctrl, hexgrip, prompt, 0, NULL,
- &wrappedkey, &wrappedkeylen,
- NULL, NULL, 0);
- xfree (prompt);
- }
- if (err)
- goto leave;
-
- if (wrappedkeylen < 24)
- {
- err = gpg_error (GPG_ERR_INV_LENGTH);
- goto leave;
- }
- keylen = wrappedkeylen - 8;
- key = xtrymalloc_secure (keylen);
- if (!key)
- {
- err = gpg_error_from_syserror ();
- goto leave;
- }
- err = gcry_cipher_decrypt (cipherhd, key, keylen, wrappedkey, wrappedkeylen);
- if (err)
- goto leave;
- realkeylen = gcry_sexp_canon_len (key, keylen, NULL, &err);
- if (!realkeylen)
- goto leave; /* Invalid csexp. */
-
- err = gcry_sexp_sscan (&s_skey, NULL, key, realkeylen);
- if (!err)
- {
- gcry_log_debugsxp ("skey", s_skey);
- *r_key = s_skey;
- s_skey = NULL;
- }
-
- leave:
- gcry_sexp_release (s_skey);
- xfree (key);
- xfree (wrappedkey);
- if (err)
- {
- log_error ("key %s: error receiving key from agent:"
- " %s%s\n", hexgrip, gpg_strerror (err),
- "");
- }
- return err;
-}
-
-
 /* Export the key identified by USERID in the SSH secret key format.
 * The USERID must be given in keygrip format (prefixed with a '&')
 * and thus no OpenPGP key is required. The exported key is not
@@ -2709,7 +2980,8 @@
 if ((err = get_keywrap_key (ctrl, &cipherhd)))
 goto leave;
 
- err = receive_raw_seckey_from_agent (ctrl, cipherhd, hexgrip, &skey);
+ err = receive_seckey_from_agent (ctrl, cipherhd, 0, 0, NULL, hexgrip, NULL,
+ &skey);
 if (err)
 goto leave;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/filter.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/filter.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/free-packet.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/free-packet.c Changed

@@ -211,10 +211,10 @@
 
 
 /* Copy the public key S to D. If D is NULL allocate a new public key
- structure. If S has seckret key infos, only the public stuff is
- copied. */
+ * structure. Only the basic stuff is copied; not any ancillary
+ * data. */
 PKT_public_key *
-copy_public_key (PKT_public_key *d, PKT_public_key *s)
+copy_public_key_basics (PKT_public_key *d, PKT_public_key *s)
 {
 int n, i;
 
@@ -222,8 +222,8 @@
 d = xmalloc (sizeof *d);
 memcpy (d, s, sizeof *d);
 d->seckey_info = NULL;
- d->user_id = scopy_user_id (s->user_id);
- d->prefs = copy_prefs (s->prefs);
+ d->user_id = NULL;
+ d->prefs = NULL;
 
 n = pubkey_get_npkey (s->pubkey_algo);
 i = 0;
@@ -237,6 +237,24 @@
 for (; i < PUBKEY_MAX_NSKEY; i++)
 d->pkeyi = NULL;
 
+ d->revkey = NULL;
+ d->serialno = NULL;
+ d->updateurl = NULL;
+
+ return d;
+}
+
+
+/* Copy the public key S to D. If D is NULL allocate a new public key
+ structure. If S has seckret key infos, only the public stuff is
+ copied. */
+PKT_public_key *
+copy_public_key (PKT_public_key *d, PKT_public_key *s)
+{
+ d = copy_public_key_basics (d, s);
+ d->user_id = scopy_user_id (s->user_id);
+ d->prefs = copy_prefs (s->prefs);
+
 if (!s->revkey && s->numrevkeys)
 BUG();
 if (s->numrevkeys)
@@ -244,8 +262,6 @@
 d->revkey = xmalloc(sizeof(struct revocation_key)*s->numrevkeys);
 memcpy(d->revkey,s->revkey,sizeof(struct revocation_key)*s->numrevkeys);
 }
- else
- d->revkey = NULL;
 
 if (s->serialno)
 d->serialno = xstrdup (s->serialno);

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/getkey.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/getkey.c Changed

@@ -260,7 +260,7 @@
    cache_public_key and get_pubkey).  Note: there is currently no way
    to re-enable this cache.  */
 void
-getkey_disable_caches ()
+getkey_disable_caches (void)
 {
 #if MAX_PK_CACHE_ENTRIES
   {
@@ -685,7 +685,7 @@
   pk = keyblock->pkt->pkt.public_key;
 
   /* Is the key revoked or expired?  */
-  if (pk->flags.revoked || pk->has_expired)
+  if (pk->flags.revoked || (pk->has_expired && !opt.ignore_expiration))
     unusable = 1;
 
   /* Is the user ID in question revoked or expired? */
@@ -704,7 +704,8 @@
 	      if (uids_seen != uid_no)
 		continue;
 
-	      if (user_id->flags.revoked || user_id->flags.expired)
+	      if (user_id->flags.revoked
+                  || (user_id->flags.expired && !opt.ignore_expiration))
 		unusable = 1;
 
 	      break;
@@ -1718,7 +1719,8 @@
  *
  * This function returns 0 on success.  Otherwise, an error code is
  * returned.  In particular, GPG_ERR_NO_PUBKEY is returned if the key
- * is not found.
+ * is not found.  If R_KEYBLOCK is not NULL and a key was found the
+ * keyblock is stored there; otherwiese NULL is stored there.
  *
  * The self-signed data has already been merged into the public key
  * using merge_selfsigs.  The caller must release the content of PK by
@@ -1726,13 +1728,17 @@
  * free_public_key).
  */
 gpg_error_t
-get_pubkey_fromfile (ctrl_t ctrl, PKT_public_key *pk, const char *fname)
+get_pubkey_fromfile (ctrl_t ctrl, PKT_public_key *pk, const char *fname,
+                     kbnode_t *r_keyblock)
 {
   gpg_error_t err;
   kbnode_t keyblock;
   kbnode_t found_key;
   unsigned int infoflags;
 
+  if (r_keyblock)
+    *r_keyblock = NULL;
+
   err = read_key_from_file_or_buffer (ctrl, fname, NULL, 0, &keyblock);
   if (!err)
     {
@@ -1747,7 +1753,10 @@
         err = gpg_error (GPG_ERR_UNUSABLE_PUBKEY);
     }
 
-  release_kbnode (keyblock);
+  if (!err && r_keyblock)
+    *r_keyblock = keyblock;
+  else
+    release_kbnode (keyblock);
   return err;
 }
 
@@ -1809,12 +1818,12 @@
  * returned public key may be a subkey rather than the primary key.
  * Note: The self-signed data has already been merged into the public
  * key using merge_selfsigs.  Free *PK by calling
- * release_public_key_parts (or, if PK was allocated using xfree, you
+ * release_public_key_parts (or, if PK was allocated using xmalloc, you
  * can use free_public_key, which calls release_public_key_parts(PK)
  * and then xfree(PK)).
  *
  * If PK->REQ_USAGE is set, it is used to filter the search results.
- * (Thus, if PK is not NULL, PK->REQ_USAGE must be valid!!!)  See the
+ * Thus, if PK is not NULL, PK->REQ_USAGE must be valid!  See the
  * documentation for finish_lookup to understand exactly how this is
  * used.
  *
@@ -2417,7 +2426,8 @@
 }
 
 
-static int
+/* This function parses the key flags and returns PUBKEY_USAGE_ flags.  */
+unsigned int
 parse_key_usage (PKT_signature * sig)
 {
   int key_usage = 0;
@@ -2457,11 +2467,29 @@
 	  flags &= ~0x20;
 	}
 
+      if ((flags & 0x80))
+	{
+	  key_usage |= PUBKEY_USAGE_GROUP;
+	  flags &= ~0x80;
+	}
+
       if (flags)
 	key_usage |= PUBKEY_USAGE_UNKNOWN;
 
+      n--;
+      p++;
+      if (n)
+        {
+          flags = *p;
+          if ((flags & 0x04))
+            key_usage |= PUBKEY_USAGE_RENC;
+          if ((flags & 0x08))
+            key_usage |= PUBKEY_USAGE_TIME;
+        }
+
       if (!key_usage)
 	key_usage |= PUBKEY_USAGE_NONE;
+
     }
   else if (p) /* Key flags of length zero.  */
     key_usage |= PUBKEY_USAGE_NONE;
@@ -2689,7 +2717,7 @@
        * and there was no way to change it, so we start with the one
        * from the key packet.  We do not support v3 keys anymore but
        * we keep the code in case a future key versions introduces a
-       * hadr expire time again. */
+       * hard expire time again. */
       key_expire = pk->max_expiredate;
       key_expire_seen = 1;
     }
@@ -3229,7 +3257,7 @@
  *   has_expired
  *   expired_date
  *
- * On this subkey's most revent valid self-signed packet, the
+ * On this subkey's most recent valid self-signed packet, the
  * following field is set:
  *
  *   flags.chosen_selfsig
@@ -3612,21 +3640,31 @@
   log_assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY);
 
   /* For an exact match mark the primary or subkey that matched the
-     low-level search criteria.  */
-  if (want_exact)
+   * low-level search criteria.  Use this loop also to sort our keys
+   * found using an ADSK fingerprint.  */
+  for (k = keyblock; k; k = k->next)
     {
-      for (k = keyblock; k; k = k->next)
-	{
-	  if ((k->flag & 1))
-	    {
-	      log_assert (k->pkt->pkttype == PKT_PUBLIC_KEY
-                          || k->pkt->pkttype == PKT_PUBLIC_SUBKEY);
-	      foundk = k;
+      if ((k->flag & 1) && (k->pkt->pkttype == PKT_PUBLIC_KEY
+                            || k->pkt->pkttype == PKT_PUBLIC_SUBKEY))
+        {
+          if (want_exact)
+            {
+              if (DBG_LOOKUP)
+                log_debug ("finish_lookup: exact search requested and found\n");
+              foundk = k;
               pk = k->pkt->pkt.public_key;
               pk->flags.exact = 1;
-	      break;
-	    }
-	}
+              break;
+            }
+          else if ((k->pkt->pkt.public_key->pubkey_usage == PUBKEY_USAGE_RENC))
+            {
+              if (DBG_LOOKUP)
+                log_debug ("finish_lookup: found via ADSK - not selected\n");
+              if (r_flags)
+                *r_flags |= LOOKUP_NOT_SELECTED;
+              return NULL; /* Not found.  */
+            }
+        }
     }
 
   /* Get the user id that matched that low-level search criteria.  */
@@ -3709,7 +3747,7 @@
               n_revoked_or_expired++;
 	      continue;
 	    }
-	  if (pk->has_expired)
+	  if (pk->has_expired && !opt.ignore_expiration)
 	    {
 	      if (DBG_LOOKUP)
 		log_debug ("\tsubkey has expired\n");

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/gpg.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/gpg.c Changed

@@ -1,7 +1,7 @@
 /* gpg.c - The GnuPG OpenPGP tool
 * Copyright (C) 1998-2020 Free Software Foundation, Inc.
 * Copyright (C) 1997-2019 Werner Koch
- * Copyright (C) 2015-2021 g10 Code GmbH
+ * Copyright (C) 2015-2022 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -64,9 +64,11 @@
 #include "objcache.h"
 #include "../common/init.h"
 #include "../common/mbox-util.h"
+#include "../common/zb32.h"
 #include "../common/shareddefs.h"
 #include "../common/compliance.h"
 #include "../common/comopt.h"
+#include "../kbx/keybox.h"
 
 #if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__)
 #define MY_O_BINARY O_BINARY
@@ -129,9 +131,11 @@
 aQuickRevSig,
 aQuickAddUid,
 aQuickAddKey,
+ aQuickAddADSK,
 aQuickRevUid,
 aQuickSetExpire,
 aQuickSetPrimaryUid,
+ aQuickUpdatePref,
 aListConfig,
 aListGcryptConfig,
 aGPGConfList,
@@ -230,6 +234,7 @@
 oDebugIOLBF,
 oDebugSetIobufSize,
 oDebugAllowLargeChunks,
+ oDebugIgnoreExpiration,
 oStatusFD,
 oStatusFile,
 oAttributeFD,
@@ -244,7 +249,6 @@
 oGnuPG,
 oRFC2440,
 oRFC4880,
- oRFC4880bis,
 oOpenPGP,
 oPGP7,
 oPGP8,
@@ -253,9 +257,9 @@
 oRFC2440Text,
 oNoRFC2440Text,
 oCipherAlgo,
- oAEADAlgo,
 oDigestAlgo,
 oCertDigestAlgo,
+ oNoCompress,
 oCompressAlgo,
 oCompressLevel,
 oBZ2CompressLevel,
@@ -327,6 +331,7 @@
 oExportOptions,
 oExportFilter,
 oListOptions,
+ oListFilter,
 oVerifyOptions,
 oTempDir,
 oExecPath,
@@ -336,6 +341,7 @@
 oEncryptToDefaultKey,
 oLoggerFD,
 oLoggerFile,
+ oLogTime,
 oUtf8Strings,
 oNoUtf8Strings,
 oDisableCipherAlgo,
@@ -359,7 +365,6 @@
 oShowSessionKey,
 oOverrideSessionKey,
 oOverrideSessionKeyFD,
- oOverrideComplianceCheck,
 oNoRandomSeedFile,
 oAutoKeyRetrieve,
 oNoAutoKeyRetrieve,
@@ -382,7 +387,6 @@
 oDefaultPreferenceList,
 oDefaultKeyserverURL,
 oPersonalCipherPreferences,
- oPersonalAEADPreferences,
 oPersonalDigestPreferences,
 oPersonalCompressPreferences,
 oAgentProgram,
@@ -443,6 +447,10 @@
 oForceSignKey,
 oForbidGenKey,
 oRequireCompliance,
+ oCompatibilityFlags,
+ oAddDesigRevoker,
+ oAssertSigner,
+ oKbxBufferSize,
 
 oNoop
 };
@@ -484,12 +492,14 @@
 ARGPARSE_c (aQuickAddUid, "quick-adduid", "@"),
 ARGPARSE_c (aQuickAddKey, "quick-add-key", "@"),
 ARGPARSE_c (aQuickAddKey, "quick-addkey", "@"),
+ ARGPARSE_c (aQuickAddADSK, "quick-add-adsk", "@"),
 ARGPARSE_c (aQuickRevUid, "quick-revoke-uid",
 N_("quickly revoke a user-id")),
 ARGPARSE_c (aQuickRevUid, "quick-revuid", "@"),
 ARGPARSE_c (aQuickSetExpire, "quick-set-expire",
 N_("quickly set a new expiration date")),
 ARGPARSE_c (aQuickSetPrimaryUid, "quick-set-primary-uid", "@"),
+ ARGPARSE_c (aQuickUpdatePref, "quick-update-pref", "@"),
 ARGPARSE_c (aFullKeygen, "full-generate-key" ,
 N_("full featured key pair generation")),
 ARGPARSE_c (aFullKeygen, "full-gen-key", "@"),
@@ -598,7 +608,7 @@
 ARGPARSE_s_s (oLoggerFile, "log-file",
 N_("|FILE|write server mode logs to FILE")),
 ARGPARSE_s_s (oLoggerFile, "logger-file", "@"), /* 1.4 compatibility. */
- ARGPARSE_s_n (oQuickRandom, "debug-quick-random", "@"),
+ ARGPARSE_s_n (oLogTime, "log-time", "@"),
 
 
 ARGPARSE_header ("Configuration",
@@ -628,7 +638,6 @@
 ARGPARSE_s_n (oGnuPG, "no-pgp8", "@"),
 ARGPARSE_s_n (oRFC2440, "rfc2440", "@"),
 ARGPARSE_s_n (oRFC4880, "rfc4880", "@"),
- ARGPARSE_s_n (oRFC4880bis, "rfc4880bis", "@"),
 ARGPARSE_s_n (oOpenPGP, "openpgp", N_("use strict OpenPGP behavior")),
 ARGPARSE_s_n (oPGP7, "pgp6", "@"),
 ARGPARSE_s_n (oPGP7, "pgp7", "@"),
@@ -673,7 +682,6 @@
 ARGPARSE_s_n (oEnableDSA2, "enable-dsa2", "@"),
 ARGPARSE_s_n (oDisableDSA2, "disable-dsa2", "@"),
 ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-preferences","@"),
- ARGPARSE_s_s (oPersonalAEADPreferences, "personal-aead-preferences","@"),
 ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-preferences","@"),
 ARGPARSE_s_s (oPersonalCompressPreferences,
 "personal-compress-preferences", "@"),
@@ -690,6 +698,7 @@
 ARGPARSE_s_n (oLockOnce, "lock-once", "@"),
 ARGPARSE_s_n (oLockMultiple, "lock-multiple", "@"),
 ARGPARSE_s_n (oLockNever, "lock-never", "@"),
+ ARGPARSE_s_n (oNoCompress, "no-compress", "@"),
 ARGPARSE_s_s (oCompressAlgo,"compress-algo", "@"),
 ARGPARSE_s_s (oCompressAlgo, "compression-algo", "@"), /* Alias */
 ARGPARSE_s_n (oBZ2DecompressLowmem, "bzip2-decompress-lowmem", "@"),
@@ -703,7 +712,8 @@
 ARGPARSE_s_s (oForceOwnertrust, "force-ownertrust", "@"),
 ARGPARSE_s_n (oNoAutoTrustNewKey, "no-auto-trust-new-key", "@"),
 #endif
-
+ ARGPARSE_s_s (oAddDesigRevoker, "add-desig-revoker", "@"),
+ ARGPARSE_s_s (oAssertSigner, "assert-signer", "@"),
 
 ARGPARSE_header ("Input", N_("Options controlling the input")),
 
@@ -795,6 +805,7 @@
 ARGPARSE_header ("Keylist", N_("Options controlling key listings")),
 
 ARGPARSE_s_s (oListOptions, "list-options", "@"),
+ ARGPARSE_s_s (oListFilter, "list-filter", "@"),
 ARGPARSE_s_n (oFullTimestrings, "full-timestrings", "@"),
 ARGPARSE_s_n (oShowPhotos, "show-photos", "@"),
 ARGPARSE_s_n (oNoShowPhotos, "no-show-photos", "@"),
@@ -853,7 +864,8 @@
 ARGPARSE_s_s (oS2KDigest, "s2k-digest-algo", "@"),
 ARGPARSE_s_s (oS2KCipher, "s2k-cipher-algo", "@"),
 ARGPARSE_s_i (oS2KCount, "s2k-count", "@"),
- ARGPARSE_s_n (oForceAEAD, "force-aead", "@"),
+ ARGPARSE_s_n (oForceAEAD, "force-ocb", "@"),
+ ARGPARSE_s_n (oForceAEAD, "force-aead", "@"), /*(old name)*/
 ARGPARSE_s_n (oRequireCrossCert, "require-backsigs", "@"),
 ARGPARSE_s_n (oRequireCrossCert, "require-cross-certification", "@"),
 ARGPARSE_s_n (oNoRequireCrossCert, "no-require-backsigs", "@"),
@@ -874,10 +886,8 @@
 ARGPARSE_s_s (oDisableCipherAlgo, "disable-cipher-algo", "@"),
 ARGPARSE_s_s (oDisablePubkeyAlgo, "disable-pubkey-algo", "@"),
 ARGPARSE_s_s (oCipherAlgo, "cipher-algo", "@"),
- ARGPARSE_s_s (oAEADAlgo, "aead-algo", "@"),
 ARGPARSE_s_s (oDigestAlgo, "digest-algo", "@"),
 ARGPARSE_s_s (oCertDigestAlgo, "cert-digest-algo", "@"),
- ARGPARSE_s_n (oOverrideComplianceCheck, "override-compliance-check", "@"),
 
 
 ARGPARSE_header (NULL, N_("Options for unattended use")),
@@ -913,20 +923,22 @@
 ARGPARSE_s_n (oUseKeyboxd, "use-keyboxd", "@"),
 ARGPARSE_s_n (oForbidGenKey, "forbid-gen-key", "@"),
 ARGPARSE_s_n (oRequireCompliance, "require-compliance", "@"),
+ ARGPARSE_s_s (oCompatibilityFlags, "compatibility-flags", "@"),
 /* Options which can be used in special circumstances. They are not
 * published and we hope they are never required. */
 ARGPARSE_s_n (oUseOnlyOpenPGPCard, "use-only-openpgp-card", "@"),
 /* Esoteric compatibility options. */
 ARGPARSE_s_n (oRFC2440Text, "rfc2440-text", "@"),
 ARGPARSE_s_n (oNoRFC2440Text, "no-rfc2440-text", "@"),
+ ARGPARSE_p_u (oKbxBufferSize, "kbx-buffer-size", "@"),
+ ARGPARSE_s_n (oQuickRandom, "debug-quick-random", "@"),
+ ARGPARSE_s_n (oDebugIgnoreExpiration, "debug-ignore-expiration", "@"),
 
 ARGPARSE_header (NULL, ""), /* Stop the header group. */
 
 /* Aliases. I constantly mistype these, and assume other people do
 as well. */
 ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-prefs", "@"),
- ARGPARSE_s_s (oPersonalAEADPreferences, "personal-aead-prefs", "@"),
- ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-prefs", "@"),
 ARGPARSE_s_s (oPersonalCompressPreferences, "personal-compress-prefs", "@"),
 
 /* These two are aliases to help users of the PGP command line
@@ -969,6 +981,10 @@
 ARGPARSE_s_n (oNoop, "allow-multisig-verification", "@"),
 ARGPARSE_s_n (oNoop, "allow-multiple-messages", "@"),
 ARGPARSE_s_n (oNoop, "no-allow-multiple-messages", "@"),
+ ARGPARSE_s_s (oNoop, "aead-algo", "@"),
+ ARGPARSE_s_s (oNoop, "personal-aead-preferences","@"),
+ ARGPARSE_s_n (oNoop, "rfc4880bis", "@"),
+ ARGPARSE_s_n (oNoop, "override-compliance-check", "@"),
 
 
 ARGPARSE_group (302, N_(
@@ -1008,6 +1024,13 @@
 };
 
 
+/* The list of compatibility flags. */
+static struct compatibility_flags_s compatibility_flags =
+ {
+ { 0, NULL }
+ };
+
+
 #ifdef ENABLE_SELINUX_HACKS
 #define ALWAYS_ADD_KEYRINGS 1
 #else
@@ -1017,8 +1040,12 @@
 /* The list of the default AKL methods. */
 #define DEFAULT_AKL_LIST "local,wkd"
 
-
+/* Can be set to true to force gpg to return with EXIT_FAILURE. */
 int g10_errors_seen = 0;
+/* If opt.assert_signer_list is used and this variabale is not true
+ * gpg will be forced to return EXIT_FAILURE. */
+int assert_signer_true = 0;
+
 
 static int utf8_strings =
 #ifdef HAVE_W32_SYSTEM
@@ -1030,6 +1057,7 @@
 static int maybe_setuid = 1;
 static unsigned int opt_set_iobuf_size;
 static unsigned int opt_set_iobuf_size_used;
+static int opt_log_time;
 
 /* Collection of options used only in this module. */
 static struct {
@@ -1103,18 +1131,6 @@
 }
 
 static int
-build_list_aead_test_algo (int algo)
-{
- return openpgp_aead_test_algo (algo);
-}
-
-static const char *
-build_list_aead_algo_name (int algo)
-{
- return openpgp_aead_algo_name (algo);
-}
-
-static int
 build_list_md_test_algo (int algo)
 {
 /* By default we do not accept MD5 based signatures. To avoid
@@ -1135,7 +1151,7 @@
 static const char *
 my_strusage( int level )
 {
- static char *digests, *pubkeys, *ciphers, *zips, *aeads, *ver_gcry;
+ static char *digests, *pubkeys, *ciphers, *zips, *ver_gcry;
 const char *p;
 
 switch( level ) {
@@ -1197,13 +1213,6 @@
 build_list_cipher_test_algo );
 	p = ciphers;
 	break;
- case 36:
-	if (!aeads)
- aeads = build_list ("AEAD: ", 'A',
- build_list_aead_algo_name,
- build_list_aead_test_algo);
-	p = aeads;
-	break;
 case 37:
 	if( !digests )
 	 digests = build_list(_("Hash: "), 'H',
@@ -2057,6 +2066,8 @@
 char *subpackets=""; /* something that isn't NULL */
 struct parse_options lopts=
 {
+ {"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL,
+ NULL},
 {"show-photos",LIST_SHOW_PHOTOS,NULL,
 N_("display photo IDs during key listings")},
 {"show-usage",LIST_SHOW_USAGE,NULL,
@@ -2079,24 +2090,35 @@
 N_("show revoked and expired user IDs in key listings")},
 {"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS,NULL,
 N_("show revoked and expired subkeys in key listings")},
+ {"show-unusable-sigs",LIST_SHOW_UNUSABLE_SIGS,NULL,
+ N_("show signatures with invalid algorithms during signature listings")},
 {"show-keyring",LIST_SHOW_KEYRING,NULL,
 N_("show the keyring name in key listings")},
 {"show-sig-expire",LIST_SHOW_SIG_EXPIRE,NULL,
 N_("show expiration dates during signature listings")},
- {"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL,
- NULL},
+ {"show-pref", LIST_SHOW_PREF, NULL,
+ N_("show preferences")},
+ {"show-pref-verbose", LIST_SHOW_PREF_VERBOSE, NULL,
+ N_("show preferences")},
 {"show-only-fpr-mbox",LIST_SHOW_ONLY_FPR_MBOX, NULL,
 NULL},
 {"sort-sigs", LIST_SORT_SIGS, NULL,
 NULL},
 {NULL,0,NULL,NULL}
 };
+ int i;
 
 /* C99 allows for non-constant initializers, but we'd like to
 compile everywhere, so fill in the show-sig-subpackets argument
 here. Note that if the parse_options array changes, we'll have
- to change the subscript here. */
- lopts13.value=&subpackets;
+ to change the subscript here. We use a loop here in case the
+ list above is reordered. */
+ for (i=0; loptsi.name; i++)
+ if (loptsi.bit == LIST_SHOW_SIG_SUBPACKETS)
+ {
+ loptsi.value = &subpackets;
+ break;
+ }
 
 if(parse_options(str,&opt.list_options,lopts,1))
 {
@@ -2210,7 +2232,7 @@
 {
 { "gnupg", oGnuPG },
 { "openpgp", oOpenPGP },
- { "rfc4880bis", oRFC4880bis },
+ { "rfc4880bis", oGnuPG },
 { "rfc4880", oRFC4880 },
 { "rfc2440", oRFC2440 },
 { "pgp6", oPGP7 },
@@ -2226,29 +2248,8 @@
 static void
 set_compliance_option (enum cmd_and_opt_values option)
 {
- opt.flags.rfc4880bis = 0; /* Clear because it is initially set. */
-
 switch (option)
 {
- case oRFC4880bis:
- opt.flags.rfc4880bis = 1;
- opt.compliance = CO_RFC4880;
- opt.flags.dsa2 = 1;
- opt.flags.require_cross_cert = 1;
- opt.rfc2440_text = 0;
- opt.allow_non_selfsigned_uid = 1;
- opt.allow_freeform_uid = 1;
- opt.escape_from = 1;
- opt.not_dash_escaped = 0;
- opt.def_cipher_algo = 0;
- opt.def_aead_algo = 0;
- opt.def_digest_algo = 0;
- opt.cert_digest_algo = 0;
- opt.compress_algo = -1;
- opt.s2k_mode = 3; /* iterated+salted */
- opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
- opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
- break;
 case oOpenPGP:
 case oRFC4880:
 /* This is effectively the same as RFC2440, but with
@@ -2263,7 +2264,6 @@
 opt.escape_from = 1;
 opt.not_dash_escaped = 0;
 opt.def_cipher_algo = 0;
- opt.def_aead_algo = 0;
 opt.def_digest_algo = 0;
 opt.cert_digest_algo = 0;
 opt.compress_algo = -1;
@@ -2281,7 +2281,6 @@
 opt.escape_from = 0;
 opt.not_dash_escaped = 0;
 opt.def_cipher_algo = 0;
- opt.def_aead_algo = 0;
 opt.def_digest_algo = 0;
 opt.cert_digest_algo = 0;
 opt.compress_algo = -1;
@@ -2294,13 +2293,11 @@
 case oPGP8: opt.compliance = CO_PGP8; break;
 case oGnuPG:
 opt.compliance = CO_GNUPG;
- opt.flags.rfc4880bis = 1;
 break;
 
 case oDE_VS:
 set_compliance_option (oOpenPGP);
 opt.compliance = CO_DE_VS;
- opt.def_aead_algo = 0;
 /* We divert here from the backward compatible rfc4880 algos. */
 opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
 opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
@@ -2381,14 +2378,12 @@
 const char *trustdb_name = NULL;
 #endif /*!NO_TRUST_MODELS*/
 char *def_cipher_string = NULL;
- char *def_aead_string = NULL;
 char *def_digest_string = NULL;
 char *compress_algo_string = NULL;
 char *cert_digest_string = NULL;
 char *s2k_cipher_string = NULL;
 char *s2k_digest_string = NULL;
 char *pers_cipher_list = NULL;
- char *pers_aead_list = NULL;
 char *pers_digest_list = NULL;
 char *pers_compress_list = NULL;
 int eyes_only=0;
@@ -2454,7 +2449,6 @@
 opt.bz2_compress_level = -1; /* defaults to standard compress level */
 /* note: if you change these lines, look at oOpenPGP */
 opt.def_cipher_algo = 0;
- opt.def_aead_algo = 0;
 opt.def_digest_algo = 0;
 opt.cert_digest_algo = 0;
 opt.compress_algo = -1; /* defaults to DEFAULT_COMPRESS_ALGO */
@@ -2501,7 +2495,6 @@
 opt.emit_version = 0;
 opt.weak_digests = NULL;
 opt.compliance = CO_GNUPG;
- opt.flags.rfc4880bis = 1;
 
 /* Check special options given on the command line. */
 orig_argc = argc;
@@ -2712,9 +2705,11 @@
 	 case aQuickKeygen:
 	 case aQuickAddUid:
 	 case aQuickAddKey:
+	 case aQuickAddADSK:
 	 case aQuickRevUid:
 	 case aQuickSetExpire:
 	 case aQuickSetPrimaryUid:
+	 case aQuickUpdatePref:
 	 case aExportOwnerTrust:
 	 case aImportOwnerTrust:
 case aRebuildKeydbCaches:
@@ -2860,6 +2855,19 @@
 allow_large_chunks = 1;
 break;
 
+ case oDebugIgnoreExpiration:
+ opt.ignore_expiration = 1;
+ break;
+
+ case oCompatibilityFlags:
+ if (parse_compatibility_flags (pargs.r.ret_str, &opt.compat_flags,
+ compatibility_flags))
+ {
+ pargs.r_opt = ARGPARSE_INVALID_ARG;
+ pargs.err = ARGPARSE_PRINT_ERROR;
+ }
+ break;
+
 	 case oStatusFD:
 set_status_fd ( translate_sys2libc_fd_int (pargs.r.ret_int, 1) );
 break;
@@ -2878,6 +2886,9 @@
 case oLoggerFile:
 logfile = pargs.r.ret_str;
 break;
+ case oLogTime:
+ opt_log_time = 1;
+ break;
 
 	 case oWithFingerprint:
 opt.with_fingerprint = 1;
@@ -3030,7 +3041,6 @@
 case oOpenPGP:
 case oRFC2440:
 case oRFC4880:
- case oRFC4880bis:
 case oPGP7:
 case oPGP8:
 case oGnuPG:
@@ -3228,6 +3238,12 @@
 	 case oCompress:
 	 /* this is the -z command line option */
 	 opt.compress_level = opt.bz2_compress_level = pargs.r.ret_int;
+ opt.explicit_compress_option = 1;
+	 break;
+	 case oNoCompress:
+	 /* --no-compress is the same as -z0 */
+	 opt.compress_level = opt.bz2_compress_level = 0;
+ opt.explicit_compress_option = 1;
 	 break;
 	 case oCompressLevel: opt.compress_level = pargs.r.ret_int; break;
 	 case oBZ2CompressLevel: opt.bz2_compress_level = pargs.r.ret_int; break;
@@ -3268,9 +3284,6 @@
 	 case oCipherAlgo:
 def_cipher_string = xstrdup(pargs.r.ret_str);
 break;
-	 case oAEADAlgo:
- def_aead_string = xstrdup (pargs.r.ret_str);
- break;
 	 case oDigestAlgo:
 def_digest_string = xstrdup(pargs.r.ret_str);
 break;
@@ -3387,6 +3400,11 @@
 	 if (rc)
 log_error (_("invalid filter option: %s\n"), gpg_strerror (rc));
 	 break;
+	 case oListFilter:
+	 rc = parse_and_set_list_filter (pargs.r.ret_str);
+	 if (rc)
+ log_error (_("invalid filter option: %s\n"), gpg_strerror (rc));
+	 break;
 	 case oListOptions:
 	 if(!parse_list_options(pargs.r.ret_str))
 	 {
@@ -3488,7 +3506,13 @@
 	 case oAllowFreeformUID: opt.allow_freeform_uid = 1; break;
 	 case oNoAllowFreeformUID: opt.allow_freeform_uid = 0; break;
 	 case oNoLiteral: opt.no_literal = 1; break;
-	 case oSetFilesize: opt.set_filesize = pargs.r.ret_ulong; break;
+
+	 case oSetFilesize:
+ /* There are restricts on the value (e.g. < 2^32); you
+ * need to check the entire code to understand this. */
+ opt.set_filesize = pargs.r.ret_ulong;
+ break;
+
 	 case oFastListMode: opt.fast_list_mode = 1; break;
 	 case oFixedListMode: /* Dummy */ break;
 case oLegacyListMode: opt.legacy_list_mode = 1; break;
@@ -3552,9 +3576,6 @@
 case oPersonalCipherPreferences:
 	 pers_cipher_list=pargs.r.ret_str;
 	 break;
- case oPersonalAEADPreferences:
-	 pers_aead_list = pargs.r.ret_str;
-	 break;
 case oPersonalDigestPreferences:
 	 pers_digest_list=pargs.r.ret_str;
 	 break;
@@ -3691,10 +3712,6 @@
 opt.flags.allow_old_cipher_algos = 1;
 break;
 
- case oOverrideComplianceCheck:
- opt.flags.override_compliance_check = 1;
- break;
-
 case oFakedSystemTime:
 {
 size_t len = strlen (pargs.r.ret_str);
@@ -3737,6 +3754,21 @@
 opt.flags.require_compliance = 1;
 break;
 
+	 case oAddDesigRevoker:
+ if (!strcmp (pargs.r.ret_str, "clear"))
+ FREE_STRLIST (opt.desig_revokers);
+ else
+ append_to_strlist (&opt.desig_revokers, pargs.r.ret_str);
+	 break;
+
+ case oAssertSigner:
+ add_to_strlist (&opt.assert_signer_list, pargs.r.ret_str);
+	 break;
+
+ case oKbxBufferSize:
+ keybox_set_buffersize (pargs.r.ret_ulong, 0);
+ break;
+
 	 case oNoop: break;
 
 	 default:
@@ -3783,6 +3815,8 @@
 comopt.keyboxd_program = NULL;
 }
 
+ if (comopt.no_autostart)
+ opt.autostart = 0;
 
 /* The command --gpgconf-list is pretty simple and may be called
 directly after the option parsing. */
@@ -3839,6 +3873,9 @@
 | GPGRT_LOG_WITH_TIME
 | GPGRT_LOG_WITH_PID ));
 }
+ else if (opt_log_time)
+ log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY
+ |GPGRT_LOG_WITH_TIME));
 
 if (opt.verbose > 2)
 log_info ("using character set '%s'\n", get_native_charset ());
@@ -3846,11 +3883,6 @@
 if( may_coredump && !opt.quiet )
 	log_info(_("WARNING: program may create a core file!\n"));
 
- if (!opt.flags.rfc4880bis)
- {
- opt.mimemode = 0; /* This will use text mode instead. */
- }
-
 if (eyes_only) {
 if (opt.set_filename)
 	 log_info(_("WARNING: %s overrides %s\n"),
@@ -3907,16 +3939,9 @@
 	g10_exit(2);
 }
 
- /* We allow overriding the compliance check only in non-batch mode
- * so that the user has a chance to see the message. */
- if (opt.flags.override_compliance_check && opt.batch)
- {
- opt.flags.override_compliance_check = 0;
- log_info ("Note: '%s' ignored due to batch mode\n",
- "--override-compliance-check");
- }
-
 set_debug (debug_level);
+ if (opt.verbose) /* Print the compatibility flags. */
+ parse_compatibility_flags (NULL, &opt.compat_flags, compatibility_flags);
 gnupg_set_compliance_extra_info (opt.min_rsa_length);
 if (DBG_CLOCK)
 log_clock ("start");
@@ -3941,13 +3966,6 @@
 	if ( openpgp_cipher_test_algo (opt.def_cipher_algo) )
 	 log_error(_("selected cipher algorithm is invalid\n"));
 }
- if (def_aead_string)
- {
-	opt.def_aead_algo = string_to_aead_algo (def_aead_string);
-	xfree (def_aead_string); def_aead_string = NULL;
-	if (openpgp_aead_test_algo (opt.def_aead_algo))
- log_error(_("selected AEAD algorithm is invalid\n"));
- }
 if( def_digest_string ) {
 	opt.def_digest_algo = string_to_digest_algo (def_digest_string);
 	xfree(def_digest_string); def_digest_string = NULL;
@@ -4008,9 +4026,6 @@
 keygen_set_std_prefs(pers_cipher_list,PREFTYPE_SYM))
 log_error(_("invalid personal cipher preferences\n"));
 
- if (pers_aead_list && keygen_set_std_prefs (pers_aead_list, PREFTYPE_AEAD))
- log_error(_("invalid personal AEAD preferences\n"));
-
 if(pers_digest_list &&
 keygen_set_std_prefs(pers_digest_list,PREFTYPE_HASH))
 log_error(_("invalid personal digest preferences\n"));
@@ -4084,7 +4099,7 @@
 /* Check our chosen algorithms against the list of legal
 algorithms. */
 
- if(!GNUPG && !opt.flags.rfc4880bis)
+ if(!GNUPG)
 {
 	const char *badalg=NULL;
 	preftype_t badtype=PREFTYPE_NONE;
@@ -4095,12 +4110,6 @@
 	 badalg = openpgp_cipher_algo_name (opt.def_cipher_algo);
 	 badtype = PREFTYPE_SYM;
 	 }
-	else if(opt.def_aead_algo
-	 && !algo_available(PREFTYPE_AEAD, opt.def_aead_algo, NULL))
-	 {
-	 badalg = openpgp_aead_algo_name (opt.def_aead_algo);
-	 badtype = PREFTYPE_AEAD;
-	 }
 	else if(opt.def_digest_algo
 		&& !algo_available(PREFTYPE_HASH,opt.def_digest_algo,NULL))
 	 {
@@ -4130,12 +4139,6 @@
 			 badalg,
 gnupg_compliance_option_string (opt.compliance));
 		break;
-	 case PREFTYPE_AEAD:
-		log_info (_("AEAD algorithm '%s'"
- " may not be used in %s mode\n"),
- badalg,
- gnupg_compliance_option_string (opt.compliance));
-		break;
 	 case PREFTYPE_HASH:
 		log_info (_("digest algorithm '%s'"
 " may not be used in %s mode\n"),
@@ -4161,7 +4164,6 @@
 * is not. This is us being nice to the user informing her early
 * that the chosen algorithms are not available. We also check
 * and enforce this right before the actual operation. */
- /* FIXME: We also need to check the AEAD algo. */
 if (opt.def_cipher_algo
 	&& ! gnupg_cipher_is_allowed (opt.compliance,
 				 cmd == aEncr
@@ -4220,17 +4222,27 @@
 * need to add the keyrings if we are running under SELinux, this
 * is so that the rings are added to the list of secured files.
 * We do not add any keyring if --no-keyring or --use-keyboxd has
- * been used. */
+ * been used. Note that keydb_add_resource may create a new
+ * homedir and also tries to write a common.conf to enable the use
+ * of the keyboxd - in this case a special error code is returned
+ * and use_keyboxd is then also set. */
 if (!opt.use_keyboxd
 && default_keyring >= 0
 && (ALWAYS_ADD_KEYRINGS
 || (cmd != aDeArmor && cmd != aEnArmor && cmd != aGPGConfTest)))
 {
+ gpg_error_t tmperr = 0;
+
 	if (!nrings || default_keyring > 0) /* Add default ring. */
-	 keydb_add_resource ("pubring" EXTSEP_S GPGEXT_GPG,
- KEYDB_RESOURCE_FLAG_DEFAULT);
-	for (sl = nrings; sl; sl = sl->next )
- keydb_add_resource (sl->d, sl->flags);
+ tmperr = keydb_add_resource ("pubring" EXTSEP_S GPGEXT_GPG,
+ KEYDB_RESOURCE_FLAG_DEFAULT);
+ if (gpg_err_code (tmperr) == GPG_ERR_TRUE && opt.use_keyboxd)
+ ; /* The keyboxd has been enabled. */
+ else
+ {
+ for (sl = nrings; sl; sl = sl->next )
+ keydb_add_resource (sl->d, sl->flags);
+ }
 }
 FREE_STRLIST(nrings);
 
@@ -4338,8 +4350,10 @@
 case aQuickKeygen:
 case aQuickAddUid:
 case aQuickAddKey:
+ case aQuickAddADSK:
 case aQuickRevUid:
 case aQuickSetPrimaryUid:
+ case aQuickUpdatePref:
 case aFullKeygen:
 case aKeygen:
 case aImport:
@@ -4804,6 +4818,17 @@
 }
 	break;
 
+ case aQuickAddADSK:
+ {
+ if (argc != 2)
+ wrong_args ("--quick-add-adsk FINGERPRINT ADSK-FINGERPRINT");
+ if (mopt.forbid_gen_key)
+ gen_key_forbidden ();
+ else
+ keyedit_quick_addadsk (ctrl, argv0, argv1);
+ }
+	break;
+
 case aQuickRevUid:
 {
 const char *uid, *uidtorev;
@@ -4840,6 +4865,14 @@
 }
 	break;
 
+ case aQuickUpdatePref:
+ {
+ if (argc != 1)
+ wrong_args ("--quick-update-pref USER-ID");
+ keyedit_quick_update_pref (ctrl, *argv);
+ }
+	break;
+
 case aFastImport:
 opt.import_options |= IMPORT_FAST; /* fall through */
 case aImport:
@@ -5068,8 +5101,29 @@
 if (hexhack)
 level = 1;
 
+ /* Level 30 uses the same algorithm as our magic wand in
+ * pinentry/gpg-agent. */
+ if (level == 30)
+ {
+ unsigned int nbits = 150;
+ size_t nbytes = (nbits + 7) / 8;
+ void *rand;
+ char *generated;
+
+ rand = gcry_random_bytes_secure (nbytes, GCRY_STRONG_RANDOM);
+ if (!rand)
+ log_fatal ("failed to generate random password\n");
+
+ generated = zb32_encode (rand, nbits);
+ gcry_free (rand);
+ es_fputs (generated, es_stdout);
+ es_putc ('\n', es_stdout);
+ xfree (generated);
+ break;
+ }
+
 if (argc < 1 || argc > 2 || level < 0 || level > 2 || count < 0)
- wrong_args ("--gen-random 0|1|2 count");
+ wrong_args ("--gen-random 0|1|2|16|30 count");
 
 while (endless || count)
 {
@@ -5081,9 +5135,6 @@
 size_t nn;
 
 p = gcry_random_bytes (n, level);
-#ifdef HAVE_DOSISH_SYSTEM
- setmode ( fileno(stdout), O_BINARY );
-#endif
 if (hexhack)
 {
 for (nn = 0; nn < n; nn++)
@@ -5101,6 +5152,7 @@
 }
 else
 {
+ es_set_binary (es_stdout);
 es_fwrite( p, n, 1, es_stdout );
 }
 xfree(p);
@@ -5431,7 +5483,15 @@
 gnupg_block_all_signals ();
 emergency_cleanup ();
 
- rc = rc? rc : log_get_errorcount(0)? 2 : g10_errors_seen? 1 : 0;
+ if (rc)
+ ;
+ else if (log_get_errorcount(0))
+ rc = 2;
+ else if (g10_errors_seen)
+ rc = 1;
+ else if (opt.assert_signer_list && !assert_signer_true)
+ rc = 1;
+
 exit (rc);
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/gpg.w32-manifest.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/gpg.w32-manifest.in Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/g10/gpgv-w32info.rc Added

@@ -0,0 +1,52 @@
+/* gpgv-w32info.rc                                            -*- c -*-
+ * Copyright (C) 2013 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"

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/gpgv.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/gpgv.c Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/g10/gpgv.w32-manifest.in Added

@@ -0,0 +1,25 @@
+<?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="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+</compatibility>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/import.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/import.c Changed

@@ -126,7 +126,8 @@
 static int chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
                           int *non_self);
 static int delete_inv_parts (ctrl_t ctrl, kbnode_t keyblock,
-                             u32 *keyid, unsigned int options);
+                             u32 *keyid, unsigned int options,
+                             kbnode_t *r_otherrevsigs);
 static int any_uid_left (kbnode_t keyblock);
 static void remove_all_non_self_sigs (kbnode_t *keyblock, u32 *keyid);
 static int merge_blocks (ctrl_t ctrl, unsigned int options,
@@ -438,7 +439,7 @@
       goto leave;
     }
 
-  if (!delete_inv_parts (ctrl, keyblock, keyid, 0) )
+  if (!delete_inv_parts (ctrl, keyblock, keyid, 0, NULL) )
     {
       err = gpg_error (GPG_ERR_NO_USER_ID);
       goto leave;
@@ -1429,7 +1430,8 @@
 }
 
 
-/* Helper for apply_*_filter in import.c and export.c.  */
+/* Helper for apply_*_filter in import.c and export.c and also used by
+ * keylist.c.  */
 const char *
 impex_filter_getval (void *cookie, const char *propname)
 {
@@ -1439,11 +1441,32 @@
   kbnode_t node = parm->node;
   static char numbuf20;
   const char *result;
+  const char *s;
+  enum { scpNone = 0, scpPub, scpSub, scpUid, scpSig} scope = 0;
 
   log_assert (ctrl && ctrl->magic == SERVER_CONTROL_MAGIC);
 
-  if (node->pkt->pkttype == PKT_USER_ID
-      || node->pkt->pkttype == PKT_ATTRIBUTE)
+  /* We allow a prefix delimited by a slash to limit the scope of the
+   * keyword.  Note that "pub" also includes "sec" and "sub" includes
+   * "ssb".  */
+  if ((s=strchr (propname, '/')) && s != propname)
+    {
+      size_t n = s - propname;
+      if (!strncmp (propname, "pub", n))
+        scope = scpPub;
+      else if (!strncmp (propname, "sub", n))
+        scope = scpSub;
+      else if (!strncmp (propname, "uid", n))
+        scope = scpUid;
+      else if (!strncmp (propname, "sig", n))
+        scope = scpSig;
+
+      propname = s + 1;
+    }
+
+  if ((node->pkt->pkttype == PKT_USER_ID
+       || node->pkt->pkttype == PKT_ATTRIBUTE)
+      && (!scope || scope == scpUid))
     {
       PKT_user_id *uid = node->pkt->pkt.user_id;
 
@@ -1472,7 +1495,8 @@
       else
         result = NULL;
     }
-  else if (node->pkt->pkttype == PKT_SIGNATURE)
+  else if (node->pkt->pkttype == PKT_SIGNATURE
+           && (!scope || scope == scpSig))
     {
       PKT_signature *sig = node->pkt->pkt.signature;
 
@@ -1502,10 +1526,12 @@
       else
         result = NULL;
     }
-  else if (node->pkt->pkttype == PKT_PUBLIC_KEY
-           || node->pkt->pkttype == PKT_SECRET_KEY
-           || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
-           || node->pkt->pkttype == PKT_SECRET_SUBKEY)
+  else if (((node->pkt->pkttype == PKT_PUBLIC_KEY
+             || node->pkt->pkttype == PKT_SECRET_KEY)
+            && (!scope || scope == scpPub))
+           || ((node->pkt->pkttype == PKT_PUBLIC_SUBKEY
+                || node->pkt->pkttype == PKT_SECRET_SUBKEY)
+               && (!scope || scope == scpSub)))
     {
       PKT_public_key *pk = node->pkt->pkt.public_key;
 
@@ -1519,6 +1545,16 @@
           snprintf (numbuf, sizeof numbuf, "%d", pk->pubkey_algo);
           result = numbuf;
         }
+      else if (!strcmp (propname, "key_size"))
+        {
+          snprintf (numbuf, sizeof numbuf, "%u", nbits_from_pk (pk));
+          result = numbuf;
+        }
+      else if (!strcmp (propname, "algostr"))
+        {
+          pubkey_string (pk, parm->hexfpr, sizeof parm->hexfpr);
+          result = parm->hexfpr;
+        }
       else if (!strcmp (propname, "key_created"))
         {
           snprintf (numbuf, sizeof numbuf, "%lu", (ulong)pk->timestamp);
@@ -1528,6 +1564,20 @@
         {
           result = dateonlystr_from_pk (pk);
         }
+      else if (!strcmp (propname, "key_expires"))
+        {
+          snprintf (numbuf, sizeof numbuf, "%lu", (ulong)pk->expiredate);
+          result = numbuf;
+        }
+      else if (!strcmp (propname, "key_expires_d"))
+        {
+          static char exdatestrMK_DATESTR_SIZE;
+
+          if (pk->expiredate)
+            result = mk_datestr (exdatestr, sizeof exdatestr, pk->expiredate);
+          else
+            result = "";
+        }
       else if (!strcmp (propname, "expired"))
         {
           result = pk->has_expired? "1":"0";
@@ -1555,6 +1605,26 @@
           hexfingerprint (pk, parm->hexfpr, sizeof parm->hexfpr);
           result = parm->hexfpr;
         }
+      else if (!strcmp (propname, "origin"))
+        {
+          result = key_origin_string (pk->keyorg);
+        }
+      else if (!strcmp (propname, "lastupd"))
+        {
+          snprintf (numbuf, sizeof numbuf, "%lu", (ulong)pk->keyupdate);
+          result = numbuf;
+        }
+      else if (!strcmp (propname, "url"))
+        {
+          if (pk->updateurl && *pk->updateurl)
+            {
+              /* Fixme: This might get truncated.  */
+              mem2str (parm->hexfpr, pk->updateurl, sizeof parm->hexfpr);
+              result = parm->hexfpr;
+            }
+          else
+            result = "";
+        }
       else
         result = NULL;
     }
@@ -1871,8 +1941,9 @@
  * even most error messages are suppressed.  ORIGIN is the origin of
  * the key (0 for unknown) and URL the corresponding URL.  FROM_SK
  * indicates that the key has been made from a secret key.  If R_SAVED
- * is not NULL a boolean will be stored indicating whether the keyblock
- * has valid parts.
+ * is not NULL a boolean will be stored indicating whether the
+ * keyblock has valid parts.  Unless OTHERREVSIGS is NULL it is
+ * updated with encountered new revocation signatures.
  */
 static gpg_error_t
 import_one_real (ctrl_t ctrl,
@@ -1880,7 +1951,8 @@
                  unsigned char **fpr, size_t *fpr_len, unsigned int options,
                  int from_sk, int silent,
                  import_screener_t screener, void *screener_arg,
-                 int origin, const char *url, int *r_valid)
+                 int origin, const char *url, int *r_valid,
+                 kbnode_t *otherrevsigs)
 {
   gpg_error_t err = 0;
   PKT_public_key *pk;
@@ -2021,7 +2093,7 @@
     }
 
   /* Delete invalid parts and bail out if there are no user ids left.  */
-  if (!delete_inv_parts (ctrl, keyblock, keyid, options))
+  if (!delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs))
     {
       if (!silent)
         {
@@ -2078,6 +2150,7 @@
       list_keyblock_direct (ctrl, keyblock, from_sk, 0,
                             opt.fingerprint || opt.with_fingerprint, 1);
       es_fflush (es_stdout);
+      no_usable_encr_subkeys_warning (keyblock);
     }
 
   /* Write the keyblock to the output and do not actually import.  */
@@ -2413,10 +2486,12 @@
             int origin, const char *url, int *r_valid)
 {
   gpg_error_t err;
+  kbnode_t otherrevsigs = NULL;
+  kbnode_t node;
 
   err = import_one_real (ctrl, keyblock, stats, fpr, fpr_len, options,
                          from_sk, silent, screener, screener_arg,
-                         origin, url, r_valid);
+                         origin, url, r_valid, &otherrevsigs);
   if (gpg_err_code (err) == GPG_ERR_TOO_LARGE
       && gpg_err_source (err) == GPG_ERR_SOURCE_KEYBOX
       && ((options & (IMPORT_SELF_SIGS_ONLY | IMPORT_CLEAN))
@@ -2432,8 +2507,17 @@
       options |= IMPORT_SELF_SIGS_ONLY | IMPORT_CLEAN;
       err = import_one_real (ctrl, keyblock, stats, fpr, fpr_len, options,
                              from_sk, silent, screener, screener_arg,
-                             origin, url, r_valid);
+                             origin, url, r_valid, &otherrevsigs);
+    }
+
+  /* Finally try to import other revocation certificates.  For example
+   * those of a former key appended to the current key.  */
+  if (!err)
+    {
+      for (node = otherrevsigs; node; node = node->next)
+        import_revoke_cert (ctrl, node, options, stats);
     }
+  release_kbnode (otherrevsigs);
   return err;
 }
 
@@ -2587,6 +2671,7 @@
                    * in case of cv25519.  We have only opaque MPIs here. */
                   if (pk->pubkey_algo == PUBKEY_ALGO_ECDH
                       && !strcmp (curvestr, "1.3.6.1.4.1.3029.1.5.1")
+                      && !gcry_mpi_get_flag (pk->pkeyi, GCRYMPI_FLAG_USER1)
                       && gcry_mpi_get_flag (pk->pkeyi, GCRYMPI_FLAG_OPAQUE))
                     {
                       const unsigned char *pp;
@@ -2885,9 +2970,19 @@
 {
   gpg_error_t err;
   struct import_stats_s subkey_stats = {0};
+  int force = 0;
+  int already_exist = agent_probe_secret_key (ctrl, pk);
+
+  if (already_exist == 2 || already_exist == 4)
+    {
+      if (!opt.quiet)
+        log_info (_("key %s: card reference is overridden by key material\n"),
+                  keystr_from_pk (pk));
+      force = 1;
+    }
 
   err = transfer_secret_keys (ctrl, &subkey_stats, keyblock,
-                              batch, 0, only_marked);
+                              batch, force, only_marked);
   if (gpg_err_code (err) == GPG_ERR_NOT_PROCESSED)
     {
       /* TRANSLATORS: For a smartcard, each private key on host has a
@@ -3422,9 +3517,8 @@
 }
 
 
-/****************
- * Import a revocation certificate; this is a single signature packet.
- */
+/* Import a revocation certificate; only the first packet in the
+ * NODE-list is considered.  */
 static int
 import_revoke_cert (ctrl_t ctrl, kbnode_t node, unsigned int options,
                     struct import_stats_s *stats)
@@ -3441,10 +3535,12 @@
   /* No error output for --show-keys.  */
   silent = (options & (IMPORT_SHOW | IMPORT_DRY_RUN));
 
-  log_assert (!node->next );
   log_assert (node->pkt->pkttype == PKT_SIGNATURE );
   log_assert (IS_KEY_REV (node->pkt->pkt.signature));
 
+  /* FIXME: We can do better here by using the issuer fingerprint if
+   * available.  We should also make use of get_keyblock_byfprint_fast.  */
+
   keyid0 = node->pkt->pkt.signature->keyid0;
   keyid1 = node->pkt->pkt.signature->keyid1;
 
@@ -3788,12 +3884,15 @@
 /* Delete all parts which are invalid and those signatures whose
  * public key algorithm is not available in this implementation; but
  * consider RSA as valid, because parse/build_packets knows about it.
+ * If R_OTHERREVSIGS is not NULL, it is used to return a list of
+ * revocation certificates which have been deleted from KEYBLOCK but
+ * should be handled later.
  *
  * Returns: True if at least one valid user-id is left over.
  */
 static int
 delete_inv_parts (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
-                  unsigned int options)
+                  unsigned int options, kbnode_t *r_otherrevsigs)
 {
   kbnode_t node;
   int nvalid=0, uid_seen=0, subkey_seen=0;
@@ -3883,6 +3982,16 @@
               if(opt.verbose)
                 log_info( _("key %s: revocation certificate"
                             " at wrong place - skipped\n"),keystr(keyid));
+              if (r_otherrevsigs)
+                {
+                  PACKET *pkt;
+
+                  pkt = xcalloc (1, sizeof *pkt);
+                  pkt->pkttype = PKT_SIGNATURE;
+                  pkt->pkt.signature = copy_signature
+                    (NULL, node->pkt->pkt.signature);
+                  *r_otherrevsigs = new_kbnode2 (*r_otherrevsigs, pkt);
+                }
               delete_kbnode( node );
             }
           else
@@ -3905,6 +4014,16 @@
 		      delete_kbnode( node );
 		    }
 		}
+              else if (r_otherrevsigs)
+                {
+                  PACKET *pkt;
+
+                  pkt = xcalloc (1, sizeof *pkt);
+                  pkt->pkttype = PKT_SIGNATURE;
+                  pkt->pkt.signature = copy_signature
+                    (NULL, node->pkt->pkt.signature);
+                  *r_otherrevsigs = new_kbnode2 (*r_otherrevsigs, pkt);
+                }
 	    }
 	}
       else if (node->pkt->pkttype == PKT_SIGNATURE

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/kbnode.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/kbnode.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/key-check.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/key-check.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/key-clean.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/key-clean.c Changed

@@ -35,14 +35,19 @@
 #include "key-clean.h"
 
 
+#define NF_USABLE 8 /* Usable signature and not a revocation. */
+#define NF_CONSIDER 9 /* Internal use. */
+#define NF_PROCESSED 10 /* Internal use. */
+#define NF_REVOC 11 /* Usable revocation. */
+#define NF_NOKEY 12 /* Key not available. */
+
 /*
 * Mark the signature of the given UID which are used to certify it.
 * To do this, we first remove all signatures which are not valid and
 * from the remaining we look for the latest one. If this is not a
 * certification revocation signature we mark the signature by setting
- * node flag bit 8. Revocations are marked with flag 11, and sigs
- * from unavailable keys are marked with flag 12. Note that flag bits
- * 9 and 10 are used for internal purposes.
+ * node flag bit NF_USABLE. Revocations are marked with NF_REVOC, and
+ * sigs from unavailable keys are marked with NF_NOKEY.
 */
 void
 mark_usable_uid_certs (ctrl_t ctrl, kbnode_t keyblock, kbnode_t uidnode,
@@ -57,7 +62,8 @@
 {
 int rc;
 
- node->flag &= ~(1<<8 | 1<<9 | 1<<10 | 1<<11 | 1<<12);
+ node->flag &= ~(1<<NF_USABLE | 1<<NF_CONSIDER
+ | 1<<NF_PROCESSED | 1<<NF_REVOC | 1<<NF_NOKEY);
 if (node->pkt->pkttype == PKT_USER_ID
 || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
 || node->pkt->pkttype == PKT_SECRET_SUBKEY)
@@ -81,19 +87,20 @@
 	 /* we ignore anything that won't verify, but tag the
 	 no_pubkey case */
 	 if (gpg_err_code (rc) == GPG_ERR_NO_PUBKEY)
- node->flag |= 1<<12;
+ node->flag |= 1<<NF_NOKEY;
 continue;
 }
- node->flag |= 1<<9;
+ node->flag |= 1<<NF_CONSIDER;
 }
 /* Reset the remaining flags. */
 for (; node; node = node->next)
- node->flag &= ~(1<<8 | 1<<9 | 1<<10 | 1<<11 | 1<<12);
+ node->flag &= ~(1<<NF_USABLE | 1<<NF_CONSIDER
+ | 1<<NF_PROCESSED | 1<<NF_REVOC | 1<<NF_NOKEY);
 
- /* kbnode flag usage: bit 9 is here set for signatures to consider,
- * bit 10 will be set by the loop to keep track of keyIDs already
- * processed, bit 8 will be set for the usable signatures, and bit
- * 11 will be set for usable revocations. */
+ /* kbnode flag usage: bit NF_CONSIDER is here set for signatures to consider,
+ * bit NF_PROCESSED will be set by the loop to keep track of keyIDs already
+ * processed, bit NF_USABLE will be set for the usable signatures, and bit
+ * NF_REVOC will be set for usable revocations. */
 
 /* For each cert figure out the latest valid one. */
 for (node=uidnode->next; node; node = node->next)
@@ -105,11 +112,11 @@
 if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY
 || node->pkt->pkttype == PKT_SECRET_SUBKEY)
 break;
- if ( !(node->flag & (1<<9)) )
+ if ( !(node->flag & (1<<NF_CONSIDER)) )
 continue; /* not a node to look at */
- if ( (node->flag & (1<<10)) )
+ if ( (node->flag & (1<<NF_PROCESSED)) )
 continue; /* signature with a keyID already processed */
- node->flag |= (1<<10); /* mark this node as processed */
+ node->flag |= (1<<NF_PROCESSED); /* mark this node as processed */
 sig = node->pkt->pkt.signature;
 signode = node;
 sigdate = sig->timestamp;
@@ -121,14 +128,14 @@
 if (n->pkt->pkttype == PKT_PUBLIC_SUBKEY
 || n->pkt->pkttype == PKT_SECRET_SUBKEY)
 break;
- if ( !(n->flag & (1<<9)) )
+ if ( !(n->flag & (1<<NF_CONSIDER)) )
 continue;
- if ( (n->flag & (1<<10)) )
+ if ( (n->flag & (1<<NF_PROCESSED)) )
 continue; /* shortcut already processed signatures */
 sig = n->pkt->pkt.signature;
 if (kid0 != sig->keyid0 || kid1 != sig->keyid1)
 continue;
- n->flag |= (1<<10); /* mark this node as processed */
+ n->flag |= (1<<NF_PROCESSED); /* mark this node as processed */
 
 	 /* If signode is nonrevocable and unexpired and n isn't,
 then take signode (skip). It doesn't matter which is
@@ -197,13 +204,13 @@
 
 if (expire==0 || expire > curtime )
 {
- signode->flag |= (1<<8); /* yeah, found a good cert */
+ signode->flag |= (1<<NF_USABLE); /* yeah, found a good cert */
 if (next_expire && expire && expire < *next_expire)
 *next_expire = expire;
 }
 }
 else
-	signode->flag |= (1<<11);
+	signode->flag |= (1<<NF_REVOC);
 }
 }
 
@@ -231,12 +238,13 @@
 signatures are out, as are any signatures that aren't the last of
 a series of uid sigs or revocations It breaks down like this:
 coming out of mark_usable_uid_certs, if a sig is unflagged, it is
- not even a candidate. If a sig has flag 9 or 10, that means it
- was selected as a candidate and vetted. If a sig has flag 8 it
- is a usable signature. If a sig has flag 11 it is a usable
- revocation. If a sig has flag 12 it was issued by an unavailable
- key. "Usable" here means the most recent valid
- signature/revocation in a series from a particular signer.
+ not even a candidate. If a sig has flag NF_CONSIDER or
+ NF_PROCESSED, that means it was selected as a candidate and
+ vetted. If a sig has flag NF_USABLE it is a usable signature.
+ If a sig has flag NF_REVOC it is a usable revocation. If a sig
+ has flag NF_NOKEY it was issued by an unavailable key. "Usable"
+ here means the most recent valid signature/revocation in a series
+ from a particular signer.
 
 Delete everything that isn't a usable uid sig (which might be
 expired), a usable revocation, or a sig from an unavailable
@@ -252,34 +260,34 @@
 && node->pkt->pkt.signature->keyid1 == keyid1) : 1;
 
 /* Keep usable uid sigs ... */
- if ((node->flag & (1<<8)) && keep)
+ if ((node->flag & (1<<NF_USABLE)) && keep)
 	continue;
 
 /* ... and usable revocations... */
- if ((node->flag & (1<<11)) && keep)
+ if ((node->flag & (1<<NF_REVOC)) && keep)
 	continue;
 
 /* ... and sigs from unavailable keys. */
 /* disabled for now since more people seem to want sigs from
 	 unavailable keys removed altogether. */
 /*
-	if(node->flag & (1<<12))
+	if(node->flag & (1<<NF_NOKEY))
 	continue;
 */
 
 /* Everything else we delete */
 
- /* At this point, if 12 is set, the signing key was unavailable.
-	 If 9 or 10 is set, it's superseded. Otherwise, it's
-	 invalid. */
+ /* At this point, if NF_NOKEY is set, the signing key was
+ * unavailable. If NF_CONSIDER or NF_PROCESSED is set, it's
+ * superseded. Otherwise, it's invalid. */
 
 if (noisy)
 	log_info ("removing signature from key %s on user ID \"%s\": %s\n",
 keystr (node->pkt->pkt.signature->keyid),
 uidnode->pkt->pkt.user_id->name,
- node->flag&(1<<12)? "key unavailable":
- node->flag&(1<<9)? "signature superseded"
- /* */ :"invalid signature" );
+ node->flag&(1<<NF_NOKEY)? "key unavailable":
+ node->flag&(1<<NF_CONSIDER)? "signature superseded"
+ /* */ : "invalid signature" );
 
 delete_kbnode (node);
 deleted++;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/keydb.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/keydb.c Changed

@@ -37,6 +37,7 @@
 #include "../kbx/keybox.h"
 #include "keydb.h"
 #include "../common/i18n.h"
+#include "../common/comopt.h"
 
 #include "keydb-private.h"  /* For struct keydb_handle_s */
 
@@ -265,8 +266,24 @@
           *last_slash_in_filename = save_slash;
           goto leave;
         }
+
+      *last_slash_in_filename = save_slash;
+
+      if (!opt.use_keyboxd
+          && !parse_comopt (GNUPG_MODULE_NAME_GPG, 0)
+          && comopt.use_keyboxd)
+        {
+          /* The above try_make_homedir created a new default hoemdir
+           * and also wrote a new common.conf.  Thus we now see that
+           * use-keyboxd has been set.  Let's set this option and
+           * return a dedicated error code.  */
+          opt.use_keyboxd = comopt.use_keyboxd;
+          rc = gpg_error (GPG_ERR_TRUE);
+          goto leave;
+        }
     }
-  *last_slash_in_filename = save_slash;
+  else
+    *last_slash_in_filename = save_slash;
 
   /* To avoid races with other instances of gpg trying to create or
      update the keyring (it is removed during an update for a short
@@ -555,7 +572,8 @@
  * If KEYDB_RESOURCE_FLAG_READONLY is set and the resource is a
  * keyring (not a keybox), then the keyring is marked as read only and
  * operations just as keyring_insert_keyblock will return
- * GPG_ERR_ACCESS.  */
+ * GPG_ERR_ACCESS.
+ */
 gpg_error_t
 keydb_add_resource (const char *url, unsigned int flags)
 {
@@ -774,9 +792,12 @@
  leave:
   if (err)
     {
-      log_error (_("keyblock resource '%s': %s\n"),
-                 filename, gpg_strerror (err));
-      write_status_error ("add_keyblock_resource", err);
+      if (gpg_err_code (err) != GPG_ERR_TRUE)
+        {
+          log_error (_("keyblock resource '%s': %s\n"),
+                     filename, gpg_strerror (err));
+          write_status_error ("add_keyblock_resource", err);
+        }
     }
   else
     any_registered = 1;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/keydb.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/keydb.h Changed

@@ -391,7 +391,8 @@
 
 /* Get a public key directly from file FNAME.  */
 gpg_error_t get_pubkey_fromfile (ctrl_t ctrl,
-                                 PKT_public_key *pk, const char *fname);
+                                 PKT_public_key *pk, const char *fname,
+                                 kbnode_t *r_keyblock);
 
 /* Get a public key from a buffer.  */
 gpg_error_t get_pubkey_from_buffer (ctrl_t ctrl, PKT_public_key *pkbuf,
@@ -468,6 +469,9 @@
    data structures.  */
 void merge_keys_and_selfsig (ctrl_t ctrl, kbnode_t keyblock);
 
+/* This function parses the key flags and returns PUBKEY_USAGE_ flags.  */
+unsigned int parse_key_usage (PKT_signature *sig);
+
 char *get_user_id_string_native (ctrl_t ctrl, u32 *keyid);
 char *get_long_user_id_string (ctrl_t ctrl, u32 *keyid);
 char *get_user_id (ctrl_t ctrl, u32 *keyid, size_t *rn, int *r_nouid);
@@ -511,11 +515,18 @@
   return 0;
 }
 
+/* Return true if both keyids are equal. */
+static int GPGRT_ATTR_UNUSED
+keyid_eq (const u32 *a, const u32 *b)
+{
+  return a0 == b0 && a1 == b1;
+}
+
 /* Return whether PK is a primary key.  */
 static int GPGRT_ATTR_UNUSED
 pk_is_primary (PKT_public_key *pk)
 {
-  return keyid_cmp (pk_keyid (pk), pk_main_keyid (pk)) == 0;
+  return keyid_eq (pk_keyid (pk), pk_main_keyid (pk));
 }
 
 /* Copy the keyid in SRC to DEST and return DEST.  */
@@ -565,10 +576,12 @@
                              char *buffer, size_t buflen);
 gpg_error_t keygrip_from_pk (PKT_public_key *pk, unsigned char *array);
 gpg_error_t hexkeygrip_from_pk (PKT_public_key *pk, char **r_grip);
+char *ecdh_param_str_from_pk (PKT_public_key *pk);
 
 
 /*-- kbnode.c --*/
 KBNODE new_kbnode( PACKET *pkt );
+kbnode_t new_kbnode2 (kbnode_t list, PACKET *pkt);
 KBNODE clone_kbnode( KBNODE node );
 void release_kbnode( KBNODE n );
 void delete_kbnode( KBNODE node );

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/keyedit.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/keyedit.c Changed

@@ -1,7 +1,7 @@
 /* keyedit.c - Edit properties of a key
 * Copyright (C) 1998-2010 Free Software Foundation, Inc.
 * Copyright (C) 1998-2017 Werner Koch
- * Copyright (C) 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2015, 2016, 2022-2023 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -73,12 +73,15 @@
 static int menu_clean (ctrl_t ctrl, kbnode_t keyblock, int self_only);
 static void menu_delkey (KBNODE pub_keyblock);
 static int menu_addrevoker (ctrl_t ctrl, kbnode_t pub_keyblock, int sensitive);
+static int menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock,
+ const char *adskfpr);
 static gpg_error_t menu_expire (ctrl_t ctrl, kbnode_t pub_keyblock,
 int unattended, u32 newexpiration);
 static int menu_changeusage (ctrl_t ctrl, kbnode_t keyblock);
 static int menu_backsign (ctrl_t ctrl, kbnode_t pub_keyblock);
 static int menu_set_primary_uid (ctrl_t ctrl, kbnode_t pub_keyblock);
-static int menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock);
+static int menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock,
+ int unattended);
 static int menu_set_keyserver_url (ctrl_t ctrl,
 const char *url, kbnode_t pub_keyblock);
 static int menu_set_notation (ctrl_t ctrl,
@@ -1242,7 +1245,7 @@
 cmdREVSIG, cmdREVKEY, cmdREVUID, cmdDELSIG, cmdPRIMARY, cmdDEBUG,
 cmdSAVE, cmdADDUID, cmdADDPHOTO, cmdDELUID, cmdADDKEY, cmdDELKEY,
 cmdADDREVOKER, cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF,
- cmdEXPIRE, cmdCHANGEUSAGE, cmdBACKSIGN,
+ cmdEXPIRE, cmdCHANGEUSAGE, cmdBACKSIGN, cmdADDADSK,
 #ifndef NO_TRUST_MODELS
 cmdENABLEKEY, cmdDISABLEKEY,
 #endif /*!NO_TRUST_MODELS*/
@@ -1307,6 +1310,8 @@
 { "delkey", cmdDELKEY, 0, N_("delete selected subkeys")},
 { "addrevoker", cmdADDREVOKER, KEYEDIT_NEED_SK,
 N_("add a revocation key")},
+ { "addadsk", cmdADDADSK, KEYEDIT_NEED_SK,
+ N_("add an additional decryption subkey")},
 { "delsig", cmdDELSIG, 0,
 N_("delete signatures from the selected user IDs")},
 { "expire", cmdEXPIRE, KEYEDIT_NEED_SK | KEYEDIT_NEED_SUBSK,
@@ -1420,6 +1425,8 @@
 int sec_shadowing = 0;
 int run_subkey_warnings = 0;
 int have_commands = !!commands;
+ strlist_t delseckey_list = NULL;
+ int delseckey_list_warn = 0;
 
 if (opt.command_fd != -1)
 ;
@@ -1494,6 +1501,15 @@
 run_subkey_warnings = 0;
 if (!count_selected_keys (keyblock))
 subkey_expire_warning (keyblock);
+ no_usable_encr_subkeys_warning (keyblock);
+ }
+
+ if (delseckey_list_warn)
+ {
+ delseckey_list_warn = 0;
+ tty_printf
+ (_("Note: the local copy of the secret key"
+ " will only be deleted with \"save\".\n"));
 }
 
 do
@@ -1868,10 +1884,12 @@
 	 if (node)
 	 {
 		PKT_public_key *xxpk = node->pkt->pkt.public_key;
-		if (card_store_subkey (node, xxpk ? xxpk->pubkey_usage : 0))
+		if (card_store_subkey (node, xxpk ? xxpk->pubkey_usage : 0,
+ &delseckey_list))
 		 {
 		 redisplay = 1;
 		 sec_shadowing = 1;
+ delseckey_list_warn = 1;
 		 }
 	 }
 	 }
@@ -1948,7 +1966,7 @@
 pkt->pkttype = PKT_PUBLIC_KEY;
 
 /* Ask gpg-agent to store the secret key to card. */
- if (card_store_subkey (node, 0))
+ if (card_store_subkey (node, 0, NULL))
 {
 redisplay = 1;
 sec_shadowing = 1;
@@ -1999,6 +2017,15 @@
 	 }
 	 break;
 
+	case cmdADDADSK:
+ if (menu_addadsk (ctrl, keyblock, NULL))
+ {
+ redisplay = 1;
+ modified = 1;
+ merge_keys_and_selfsig (ctrl, keyblock);
+ }
+	 break;
+
 	case cmdREVUID:
 	 {
 	 int n1;
@@ -2157,7 +2184,7 @@
 " for the selected user IDs? (y/N) ")
 : _("Really update the preferences? (y/N) ")))
 	 {
-		if (menu_set_preferences (ctrl, keyblock))
+		if (menu_set_preferences (ctrl, keyblock, 0))
 		 {
 		 merge_keys_and_selfsig (ctrl, keyblock);
 		 modified = 1;
@@ -2249,6 +2276,27 @@
 }
 	 }
 
+ if (delseckey_list)
+ {
+ strlist_t sl;
+ for (err = 0, sl = delseckey_list; sl; sl = sl->next)
+ {
+ if (*sl->d)
+ {
+ err = agent_delete_key (ctrl, sl->d, NULL, 1/*force*/);
+ if (err)
+ break;
+ *sl->d = 0; /* Mark deleted. */
+ }
+ }
+ if (err)
+ {
+ log_error (_("deleting copy of secret key failed: %s\n"),
+ gpg_strerror (err));
+ break; /* the "save". */
+ }
+ }
+
 	 if (sec_shadowing)
 	 {
 	 err = agent_scd_learn (NULL, 1);
@@ -2278,6 +2326,7 @@
 } /* End of the main command loop. */
 
 leave:
+ free_strlist (delseckey_list);
 release_kbnode (keyblock);
 keydb_release (kdbhd);
 xfree (answer);
@@ -2447,6 +2496,72 @@
 }
 
 
+/* Helper to find the UID node for namehash. On success, returns the UID node.
+ Otherwise, return NULL. */
+kbnode_t
+find_userid_by_namehash (kbnode_t keyblock, const char *namehash, int want_valid)
+{
+ byte hashNAMEHASH_LEN;
+ kbnode_t node = NULL;
+
+ if (!namehash)
+ goto leave;
+
+ if (strlen (namehash) != NAMEHASH_LEN * 2)
+ goto leave;
+
+ if (hex2bin (namehash, hash, NAMEHASH_LEN) < 0)
+ goto leave;
+
+ for (node = keyblock; node; node = node->next)
+ {
+ if (node->pkt->pkttype == PKT_USER_ID
+ && (!want_valid || (!node->pkt->pkt.user_id->flags.revoked
+ && !node->pkt->pkt.user_id->flags.expired)))
+	{
+	 namehash_from_uid (node->pkt->pkt.user_id);
+	 if (!memcmp (node->pkt->pkt.user_id->namehash, hash, NAMEHASH_LEN))
+	 break;
+ }
+ }
+
+ leave:
+ return node;
+}
+
+
+/* Helper to find the UID node for uid. On success, returns the UID node.
+ Otherwise, return NULL. */
+kbnode_t
+find_userid (kbnode_t keyblock, const char *uid, int want_valid)
+{
+ kbnode_t node = NULL;
+ size_t uidlen;
+
+ if (!keyblock || !uid)
+ goto leave;
+
+ /* First try to find UID by namehash. */
+ node = find_userid_by_namehash (keyblock, uid, want_valid);
+ if (node)
+ goto leave;
+
+ uidlen = strlen (uid);
+ for (node = keyblock; node; node = node->next)
+ {
+ if (node->pkt->pkttype == PKT_USER_ID
+ && (!want_valid || (!node->pkt->pkt.user_id->flags.revoked
+ && !node->pkt->pkt.user_id->flags.expired))
+ && uidlen == node->pkt->pkt.user_id->len
+ && !memcmp (node->pkt->pkt.user_id->name, uid, uidlen))
+ break;
+ }
+
+ leave:
+ return node;
+}
+
+
 /* Unattended revocation of a keyid. USERNAME specifies the
 key. UIDTOREV is the user id revoke from the key. */
 void
@@ -2457,7 +2572,6 @@
 kbnode_t keyblock = NULL;
 kbnode_t node;
 int modified = 0;
- size_t revlen;
 size_t valid_uids;
 
 #ifdef HAVE_W32_SYSTEM
@@ -2470,7 +2584,7 @@
 if (err)
 goto leave;
 
- /* Too make sure that we do not revoke the last valid UID, we first
+ /* To make sure that we do not revoke the last valid UID, we first
 count how many valid UIDs there are. */
 valid_uids = 0;
 for (node = keyblock; node; node = node->next)
@@ -2479,40 +2593,35 @@
 && !node->pkt->pkt.user_id->flags.expired);
 
 /* Find the right UID. */
- revlen = strlen (uidtorev);
- for (node = keyblock; node; node = node->next)
+ node = find_userid (keyblock, uidtorev, 0);
+ if (node)
 {
- if (node->pkt->pkttype == PKT_USER_ID
- && revlen == node->pkt->pkt.user_id->len
- && !memcmp (node->pkt->pkt.user_id->name, uidtorev, revlen))
- {
- struct revocation_reason_info *reason;
-
- /* Make sure that we do not revoke the last valid UID. */
- if (valid_uids == 1
- && ! node->pkt->pkt.user_id->flags.revoked
- && ! node->pkt->pkt.user_id->flags.expired)
- {
- log_error (_("cannot revoke the last valid user ID.\n"));
- err = gpg_error (GPG_ERR_INV_USER_ID);
- goto leave;
- }
+ struct revocation_reason_info *reason;
 
- reason = get_default_uid_revocation_reason ();
- err = core_revuid (ctrl, keyblock, node, reason, &modified);
- release_revocation_reason_info (reason);
- if (err)
- goto leave;
- err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
- if (err)
- {
- log_error (_("update failed: %s\n"), gpg_strerror (err));
- goto leave;
- }
+ /* Make sure that we do not revoke the last valid UID. */
+ if (valid_uids == 1
+ && ! node->pkt->pkt.user_id->flags.revoked
+ && ! node->pkt->pkt.user_id->flags.expired)
+ {
+ log_error (_("cannot revoke the last valid user ID.\n"));
+ err = gpg_error (GPG_ERR_INV_USER_ID);
+ goto leave;
+ }
 
- revalidation_mark (ctrl);
+ reason = get_default_uid_revocation_reason ();
+ err = core_revuid (ctrl, keyblock, node, reason, &modified);
+ release_revocation_reason_info (reason);
+ if (err)
+ goto leave;
+ err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
+ if (err)
+ {
+ log_error (_("update failed: %s\n"), gpg_strerror (err));
 goto leave;
 }
+
+ revalidation_mark (ctrl);
+ goto leave;
 }
 err = gpg_error (GPG_ERR_NO_USER_ID);
 
@@ -2537,9 +2646,8 @@
 gpg_error_t err;
 KEYDB_HANDLE kdbhd = NULL;
 kbnode_t keyblock = NULL;
+ kbnode_t primarynode;
 kbnode_t node;
- size_t primaryuidlen;
- int any;
 
 #ifdef HAVE_W32_SYSTEM
 /* See keyedit_menu for why we need this. */
@@ -2548,28 +2656,25 @@
 
 err = quick_find_keyblock (ctrl, username, 1, &kdbhd, &keyblock);
 if (err)
- goto leave;
-
- /* Find and mark the UID - we mark only the first valid one. */
- primaryuidlen = strlen (primaryuid);
- any = 0;
- for (node = keyblock; node; node = node->next)
 {
- if (node->pkt->pkttype == PKT_USER_ID
- && !any
- && !node->pkt->pkt.user_id->flags.revoked
- && !node->pkt->pkt.user_id->flags.expired
- && primaryuidlen == node->pkt->pkt.user_id->len
- && !memcmp (node->pkt->pkt.user_id->name, primaryuid, primaryuidlen))
- {
- node->flag |= NODFLG_SELUID;
- any = 1;
- }
- else
- node->flag &= ~NODFLG_SELUID;
+ write_status_error ("keyedit.primary", err);
+ goto leave;
 }
 
- if (!any)
+ /* Find the first matching UID that is valid */
+ primarynode = find_userid (keyblock, primaryuid, 1);
+
+ /* and mark it. */
+ if (primarynode)
+ for (node = keyblock; node; node = node->next)
+ {
+ if (node == primarynode)
+ node->flag |= NODFLG_SELUID;
+ else
+ node->flag &= ~NODFLG_SELUID;
+ }
+
+ if (!primarynode)
 err = gpg_error (GPG_ERR_NO_USER_ID);
 else if (menu_set_primary_uid (ctrl, keyblock))
 {
@@ -2586,8 +2691,11 @@
 err = gpg_error (GPG_ERR_GENERAL);
 
 if (err)
- log_error (_("setting the primary user ID failed: %s\n"),
- gpg_strerror (err));
+ {
+ log_error (_("setting the primary user ID failed: %s\n"),
+ gpg_strerror (err));
+ write_status_error ("keyedit.primary", err);
+ }
 
 leave:
 release_kbnode (keyblock);
@@ -2595,6 +2703,45 @@
 }
 
 
+/* Unattended updating of the preference tro the standard preferences.
+ * USERNAME specifies the key. This is basically the same as
+ * gpg --edit-key <<userif> updpref save
+ */
+void
+keyedit_quick_update_pref (ctrl_t ctrl, const char *username)
+{
+ gpg_error_t err;
+ KEYDB_HANDLE kdbhd = NULL;
+ kbnode_t keyblock = NULL;
+
+#ifdef HAVE_W32_SYSTEM
+ /* See keyedit_menu for why we need this. */
+ check_trustdb_stale (ctrl);
+#endif
+
+ err = quick_find_keyblock (ctrl, username, 1, &kdbhd, &keyblock);
+ if (err)
+ goto leave;
+
+ if (menu_set_preferences (ctrl, keyblock, 1))
+ {
+ merge_keys_and_selfsig (ctrl, keyblock);
+ err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
+ if (err)
+ {
+ log_error (_("update failed: %s\n"), gpg_strerror (err));
+ goto leave;
+ }
+ }
+
+ leave:
+ if (err)
+ write_status_error ("keyedit.updpref", err);
+ release_kbnode (keyblock);
+ keydb_release (kdbhd);
+}
+
+
 /* Find a keyblock by fingerprint because only this uniquely
 * identifies a key and may thus be used to select a key for
 * unattended subkey creation os key signing. */
@@ -2663,7 +2810,7 @@
 keyedit_quick_sign (ctrl_t ctrl, const char *fpr, strlist_t uids,
 strlist_t locusr, int local)
 {
- gpg_error_t err;
+ gpg_error_t err = 0;
 kbnode_t keyblock = NULL;
 KEYDB_HANDLE kdbhd = NULL;
 int modified = 0;
@@ -2701,6 +2848,7 @@
 if (!opt.verbose)
 show_key_with_all_names (ctrl, es_stdout, keyblock, 0, 0, 0, 0, 0, 1);
 log_error ("%s%s", _("Key is revoked."), _(" Unable to sign.\n"));
+ err = gpg_error (GPG_ERR_CERT_REVOKED);
 goto leave;
 }
 
@@ -2778,6 +2926,7 @@
 sl->d, gpg_strerror (GPG_ERR_NOT_FOUND));
 }
 log_error ("%s %s", _("No matching user IDs."), _("Nothing to sign.\n"));
+ err = gpg_error (GPG_ERR_NO_USER_ID);
 goto leave;
 }
 
@@ -2800,8 +2949,9 @@
 if (update_trust)
 revalidation_mark (ctrl);
 
-
 leave:
+ if (err)
+ write_status_error ("keyedit.sign-key", err);
 release_kbnode (keyblock);
 keydb_release (kdbhd);
 }
@@ -2817,7 +2967,7 @@
 keyedit_quick_revsig (ctrl_t ctrl, const char *username, const char *sigtorev,
 strlist_t affected_uids)
 {
- gpg_error_t err;
+ gpg_error_t err = 0;
 int no_signing_key = 0;
 KEYDB_HANDLE kdbhd = NULL;
 kbnode_t keyblock = NULL;
@@ -3102,6 +3252,69 @@
 }
 
 
+/* Unattended ADSK setup function.
+ *
+ * FPR is the fingerprint of our key. ADSKFPR is the fingerprint of
+ * another subkey which we want to add as ADSK to our key.
+ */
+void
+keyedit_quick_addadsk (ctrl_t ctrl, const char *fpr, const char *adskfpr)
+{
+ gpg_error_t err;
+ kbnode_t keyblock;
+ KEYDB_HANDLE kdbhd;
+ int modified = 0;
+ PKT_public_key *pk;
+
+#ifdef HAVE_W32_SYSTEM
+ /* See keyedit_menu for why we need this. */
+ check_trustdb_stale (ctrl);
+#endif
+
+ /* We require a fingerprint because only this uniquely identifies a
+ * key and may thus be used to select a key for unattended adsk
+ * adding. */
+ if (find_by_primary_fpr (ctrl, fpr, &keyblock, &kdbhd))
+ goto leave;
+
+ if (fix_keyblock (ctrl, &keyblock))
+ modified++;
+
+ pk = keyblock->pkt->pkt.public_key;
+ if (pk->flags.revoked)
+ {
+ if (!opt.verbose)
+ show_key_with_all_names (ctrl, es_stdout, keyblock, 0, 0, 0, 0, 0, 1);
+ log_error ("%s%s", _("Key is revoked."), "\n");
+ goto leave;
+ }
+
+ /* Locate and add the ADSK. Note that the called function already
+ * prints error messages. */
+ if (menu_addadsk (ctrl, keyblock, adskfpr))
+ modified = 1;
+ else
+ log_inc_errorcount (); /* (We use log_info in menu_adsk) */
+
+ es_fflush (es_stdout);
+
+ /* Store. */
+ if (modified)
+ {
+ err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
+ if (err)
+ {
+ log_error (_("update failed: %s\n"), gpg_strerror (err));
+ goto leave;
+ }
+ }
+
+ leave:
+ release_kbnode (keyblock);
+ keydb_release (kdbhd);
+}
+
+
 /* Unattended expiration setting function for the main key. If
 * SUBKEYFPRS is not NULL and SUBKEYSFPRS0 is neither NULL, it is
 * expected to be an array of fingerprints for subkeys to change. It
@@ -3294,145 +3507,12 @@
 static void
 show_prefs (PKT_user_id * uid, PKT_signature * selfsig, int verbose)
 {
- const prefitem_t fake = { 0, 0 };
- const prefitem_t *prefs;
- int i;
-
 if (!uid)
 return;
 
- if (uid->prefs)
- prefs = uid->prefs;
- else if (verbose)
- prefs = &fake;
- else
- return;
-
 if (verbose)
 {
- int any, des_seen = 0, sha1_seen = 0, uncomp_seen = 0;
-
- tty_printf (" ");
- tty_printf (_("Cipher: "));
- for (i = any = 0; prefsi.type; i++)
-	{
-	 if (prefsi.type == PREFTYPE_SYM)
-	 {
-	 if (any)
-		tty_printf (", ");
-	 any = 1;
-	 /* We don't want to display strings for experimental algos */
-	 if (!openpgp_cipher_test_algo (prefsi.value)
-		 && prefsi.value < 100)
-		tty_printf ("%s", openpgp_cipher_algo_name (prefsi.value));
-	 else
-		tty_printf ("%d", prefsi.value);
-	 if (prefsi.value == CIPHER_ALGO_3DES)
-		des_seen = 1;
-	 }
-	}
- if (!des_seen)
-	{
-	 if (any)
-	 tty_printf (", ");
-	 tty_printf ("%s", openpgp_cipher_algo_name (CIPHER_ALGO_3DES));
-	}
- tty_printf ("\n ");
- tty_printf (_("AEAD: "));
- for (i = any = 0; prefsi.type; i++)
-	{
-	 if (prefsi.type == PREFTYPE_AEAD)
-	 {
-	 if (any)
-		tty_printf (", ");
-	 any = 1;
-	 /* We don't want to display strings for experimental algos */
-	 if (!openpgp_aead_test_algo (prefsi.value)
-		 && prefsi.value < 100)
-		tty_printf ("%s", openpgp_aead_algo_name (prefsi.value));
-	 else
-		tty_printf ("%d", prefsi.value);
-	 }
-	}
- tty_printf ("\n ");
- tty_printf (_("Digest: "));
- for (i = any = 0; prefsi.type; i++)
-	{
-	 if (prefsi.type == PREFTYPE_HASH)
-	 {
-	 if (any)
-		tty_printf (", ");
-	 any = 1;
-	 /* We don't want to display strings for experimental algos */
-	 if (!gcry_md_test_algo (prefsi.value) && prefsi.value < 100)
-		tty_printf ("%s", gcry_md_algo_name (prefsi.value));
-	 else
-		tty_printf ("%d", prefsi.value);
-	 if (prefsi.value == DIGEST_ALGO_SHA1)
-		sha1_seen = 1;
-	 }
-	}
- if (!sha1_seen)
-	{
-	 if (any)
-	 tty_printf (", ");
-	 tty_printf ("%s", gcry_md_algo_name (DIGEST_ALGO_SHA1));
-	}
- tty_printf ("\n ");
- tty_printf (_("Compression: "));
- for (i = any = 0; prefsi.type; i++)
-	{
-	 if (prefsi.type == PREFTYPE_ZIP)
-	 {
-	 const char *s = compress_algo_to_string (prefsi.value);
-
-	 if (any)
-		tty_printf (", ");
-	 any = 1;
-	 /* We don't want to display strings for experimental algos */
-	 if (s && prefsi.value < 100)
-		tty_printf ("%s", s);
-	 else
-		tty_printf ("%d", prefsi.value);
-	 if (prefsi.value == COMPRESS_ALGO_NONE)
-		uncomp_seen = 1;
-	 }
-	}
- if (!uncomp_seen)
-	{
-	 if (any)
-	 tty_printf (", ");
-	 else
-	 {
-	 tty_printf ("%s", compress_algo_to_string (COMPRESS_ALGO_ZIP));
-	 tty_printf (", ");
-	 }
-	 tty_printf ("%s", compress_algo_to_string (COMPRESS_ALGO_NONE));
-	}
- if (uid->flags.mdc || uid->flags.aead || !uid->flags.ks_modify)
-	{
-	 tty_printf ("\n ");
-	 tty_printf (_("Features: "));
-	 any = 0;
-	 if (uid->flags.mdc)
-	 {
-	 tty_printf ("MDC");
-	 any = 1;
-	 }
-	 if (uid->flags.aead)
-	 {
-	 if (any)
-		tty_printf (", ");
-	 tty_printf ("AEAD");
-	 }
-	 if (!uid->flags.ks_modify)
-	 {
-	 if (any)
-		tty_printf (", ");
-	 tty_printf (_("Keyserver no-modify"));
-	 }
-	}
- tty_printf ("\n");
+ show_preferences (uid, 4, -1, 1);
 
 if (selfsig)
 	{
@@ -3459,22 +3539,7 @@
 }
 else
 {
- tty_printf (" ");
- for (i = 0; prefsi.type; i++)
-	{
-	 tty_printf (" %c%d", prefsi.type == PREFTYPE_SYM ? 'S' :
-		 prefsi.type == PREFTYPE_AEAD ? 'A' :
-		 prefsi.type == PREFTYPE_HASH ? 'H' :
-		 prefsi.type == PREFTYPE_ZIP ? 'Z' : '?',
-		 prefsi.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");
+ show_preferences (uid, 4, -1, 0);
 }
 }
 
@@ -3551,6 +3616,12 @@
 	 es_putc ('c', fp);
 	 if ((pk->pubkey_usage & PUBKEY_USAGE_AUTH))
 	 es_putc ('a', fp);
+	 if ((pk->pubkey_usage & PUBKEY_USAGE_RENC))
+	 es_putc ('r', fp);
+	 if ((pk->pubkey_usage & PUBKEY_USAGE_TIME))
+	 es_putc ('t', fp);
+	 if ((pk->pubkey_usage & PUBKEY_USAGE_GROUP))
+	 es_putc ('g', fp);
 	 es_putc ('\n', fp);
 
 	 print_fingerprint (ctrl, fp, pk, 0);
@@ -4004,6 +4075,7 @@
 }
 
 /* The user IDs. */
+ (void)i; /* Counting User IDs */
 for (i = 0, node = keyblock; node; node = node->next)
 {
 if (node->pkt->pkttype == PKT_USER_ID)
@@ -4190,6 +4262,40 @@
 }
 
 
+/* Print a warning if all encryption (sub|primary)keys are expired.
+ * The warning is not printed if there is no encryption
+ * (sub|primary)key at all. This function is called after the expire
+ * data of the primary key has been changed. */
+void
+no_usable_encr_subkeys_warning (kbnode_t keyblock)
+{
+ kbnode_t node;
+ PKT_public_key *pk;
+ int any_encr_key = 0;
+
+ for (node = keyblock; node; node = node->next)
+ {
+ if (node->pkt->pkttype == PKT_PUBLIC_KEY
+ || node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
+ {
+ pk = node->pkt->pkt.public_key;
+ if ((pk->pubkey_usage & PUBKEY_USAGE_ENC))
+ {
+ any_encr_key = 1;
+ if (pk->flags.valid && !pk->has_expired && !pk->flags.revoked
+ && !pk->flags.disabled)
+ {
+ return; /* Key is usable for encryption */
+ }
+ }
+ }
+ }
+
+ if (any_encr_key && !opt.quiet)
+ log_info (_("WARNING: No valid encryption subkey left over.\n"));
+}
+
+
 /*
 * Ask for a new user id, add the self-signature, and update the
 * keyblock. If UIDSTRING is not NULL the user ID is generated
@@ -4685,6 +4791,185 @@
 }
 
 
+/*
+ * Ask for a new additional decryption subkey and add it to the key
+ * block. Returns true if the keyblock was changed and false
+ * otherwise. If ADSKFPR is not NULL, this fucntion has been called
+ * by quick_addadsk and gives the fingerprint of the to be added key.
+ */
+static int
+menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr)
+{
+ PKT_public_key *pk;
+ PKT_public_key *sub_pk;
+ PKT_public_key *main_pk;
+ PKT_public_key *adsk_pk = NULL;
+ kbnode_t adsk_keyblock = NULL;
+ PKT_signature *sig = NULL;
+ char *answer = NULL;
+ gpg_error_t err;
+ KEYDB_SEARCH_DESC desc;
+ byte fprMAX_FINGERPRINT_LEN;
+ size_t fprlen;
+ kbnode_t node, node2;
+ kbnode_t subkeynode = NULL;
+ PACKET *pkt; /* (temp. use; will be put into a kbnode_t) */
+
+ log_assert (pub_keyblock->pkt->pkttype == PKT_PUBLIC_KEY);
+ main_pk = pub_keyblock->pkt->pkt.public_key;
+
+ for (;;)
+ {
+ xfree (answer);
+ if (adskfpr)
+ answer = xstrdup (adskfpr);
+ else
+ {
+ answer = cpr_get_utf8
+ ("keyedit.addadsk",
+ _("Enter the fingerprint of the additional decryption subkey: "));
+ if (answer0 == '\0' || answer0 == CONTROL_D)
+ {
+ err = gpg_error (GPG_ERR_CANCELED);
+ goto leave;
+ }
+ }
+ if (classify_user_id (answer, &desc, 1)
+ || desc.mode != KEYDB_SEARCH_MODE_FPR)
+ {
+ log_info (_("\"%s\" is not a fingerprint\n"), answer);
+ err = gpg_error (GPG_ERR_INV_USER_ID);
+ if (adskfpr)
+ goto leave;
+ continue;
+ }
+
+ /* Force searching for that exact fingerprint and for any key
+ * which has a key with that fingerprint. */
+ if (!strchr (answer, '!'))
+ {
+ char *tmpstr = xstrconcat (answer, "!", NULL);
+ xfree (answer);
+ answer = tmpstr;
+ }
+
+ free_public_key (adsk_pk);
+ adsk_pk = xcalloc (1, sizeof *adsk_pk);
+ adsk_pk->req_usage = PUBKEY_USAGE_ENC;
+ release_kbnode (adsk_keyblock);
+ adsk_keyblock = NULL;
+ err = get_pubkey_byname (ctrl, GET_PUBKEY_NO_AKL,
+ NULL, adsk_pk, answer, &adsk_keyblock, NULL, 1);
+ if (err)
+ {
+ log_info (_("key \"%s\" not found: %s\n"), answer,
+ gpg_strerror (err));
+ if ((!opt.batch || adskfpr) && !opt.quiet
+ && gpg_err_code (err) == GPG_ERR_UNUSABLE_PUBKEY)
+ log_info (_("Did you specify the fingerprint of a subkey?\n"));
+ if (adskfpr)
+ goto leave;
+	 continue;
+	}
+
+ for (node = adsk_keyblock; node; node = node->next)
+ {
+ if (node->pkt->pkttype == PKT_PUBLIC_KEY
+ || node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
+ {
+ pk = node->pkt->pkt.public_key;
+ fingerprint_from_pk (pk, fpr, &fprlen);
+ if (fprlen == desc.fprlen
+ && !memcmp (fpr, desc.u.fpr, fprlen)
+ && (pk->pubkey_usage & PUBKEY_USAGE_ENC))
+ break;
+ }
+ }
+ if (!node)
+ {
+ err = gpg_error (GPG_ERR_WRONG_KEY_USAGE);
+ log_info (_("key \"%s\" not found: %s\n"), answer,
+ gpg_strerror (err));
+ if ((!opt.batch || adskfpr) && !opt.quiet)
+ log_info (_("Did you specify the fingerprint of a subkey?\n"));
+ if (adskfpr)
+ goto leave;
+	 continue;
+ }
+
+ /* Check that the selected subkey is not yet on our keyblock. */
+ for (node2 = pub_keyblock; node2; node2 = node2->next)
+ {
+ if (node2->pkt->pkttype == PKT_PUBLIC_KEY
+ || node2->pkt->pkttype == PKT_PUBLIC_SUBKEY)
+ {
+ pk = node2->pkt->pkt.public_key;
+ fingerprint_from_pk (pk, fpr, &fprlen);
+ if (fprlen == desc.fprlen
+ && !memcmp (fpr, desc.u.fpr, fprlen))
+ break;
+ }
+ }
+ if (node2)
+ {
+ log_info (_("key \"%s\" is already on this keyblock\n"), answer);
+ err = gpg_error (GPG_ERR_DUP_KEY);
+ if (adskfpr)
+ goto leave;
+ continue;
+ }
+
+ break;
+ }
+
+ /* Append the subkey.
+ * Note that we don't use the ADSK_PK directly because this is the
+ * primary key and in general we use a subkey to which NODE points.
+ * ADSK_PK has only been used to pass the requested key usage to
+ * get_pubkey_byname. SUB_PK will point to the actual adsk. */
+ log_assert (node->pkt->pkttype == PKT_PUBLIC_KEY
+ || node->pkt->pkttype == PKT_PUBLIC_SUBKEY);
+ sub_pk = copy_public_key_basics (NULL, node->pkt->pkt.public_key);
+ keyid_from_pk (main_pk, sub_pk->main_keyid); /* Fixup main keyid. */
+ log_assert ((sub_pk->pubkey_usage & PUBKEY_USAGE_ENC));
+ sub_pk->pubkey_usage = PUBKEY_USAGE_RENC; /* 'e' -> 'r' */
+ pkt = xcalloc (1, sizeof *pkt);
+ pkt->pkttype = PKT_PUBLIC_SUBKEY; /* Make sure it is a subkey. */
+ pkt->pkt.public_key = sub_pk;
+ subkeynode = new_kbnode (pkt);
+
+ /* Make the signature. */
+ err = make_keysig_packet (ctrl, &sig, main_pk, NULL, sub_pk, main_pk, 0x18,
+ sub_pk->timestamp, 0,
+ keygen_add_key_flags_and_expire, sub_pk, NULL);
+ if (err)
+ {
+ write_status_error ("keysig", err);
+ log_error ("creating key binding failed: %s\n", gpg_strerror (err));
+ goto leave;
+ }
+
+ /* Append the subkey packet and the binding signature. */
+ add_kbnode (pub_keyblock, subkeynode);
+ subkeynode = NULL;
+ pkt = xcalloc (1, sizeof *pkt);
+ pkt->pkttype = PKT_SIGNATURE;
+ pkt->pkt.signature = sig;
+ add_kbnode (pub_keyblock, new_kbnode (pkt));
+
+ leave:
+ xfree (answer);
+ free_public_key (adsk_pk);
+ release_kbnode (adsk_keyblock);
+ release_kbnode (subkeynode);
+ if (!err)
+ return 1; /* The keyblock was modified. */
+ else
+ return 0; /* Not modified. */
+
+}
+
+
 /* With FORCE_MAINKEY cleared this function handles the interactive
 * menu option "expire". With UNATTENDED set to 1 this function only
 * sets the expiration date of the primary key to NEWEXPIRATION and
@@ -4703,6 +4988,7 @@
 kbnode_t node;
 u32 keyid2;
 
+ (void)signumber;
 if (unattended)
 {
 only_mainkey = (unattended == 1);
@@ -5193,10 +5479,11 @@
 
 
 /*
- * Set preferences to new values for the selected user IDs
+ * Set preferences to new values for the selected user IDs.
+ * --quick-update-pred calls this with UNATTENDED set.
 */
 static int
-menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock)
+menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock, int unattended)
 {
 PKT_public_key *main_pk;
 PKT_user_id *uid;
@@ -5205,9 +5492,10 @@
 int selected, select_all;
 int modified = 0;
 
- no_primary_warning (pub_keyblock);
+ if (!unattended)
+ no_primary_warning (pub_keyblock);
 
- select_all = !count_selected_uids (pub_keyblock);
+ select_all = unattended? 1 : !count_selected_uids (pub_keyblock);
 
 /* Now we can actually change the self signature(s) */
 main_pk = NULL;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/keyedit.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/keyedit.h Changed

@@ -44,6 +44,7 @@
                            const char *newuid);
 void keyedit_quick_addkey (ctrl_t ctrl, const char *fpr, const char *algostr,
                            const char *usagestr, const char *expirestr);
+void keyedit_quick_addadsk (ctrl_t ctrl, const char *fpr, const char *adskfpr);
 void keyedit_quick_revuid (ctrl_t ctrl, const char *username,
                            const char *uidtorev);
 void keyedit_quick_sign (ctrl_t ctrl, const char *fpr,
@@ -55,11 +56,13 @@
                                char **subkeyfprs);
 void keyedit_quick_set_primary (ctrl_t ctrl, const char *username,
                                 const char *primaryuid);
+void keyedit_quick_update_pref (ctrl_t ctrl, const char *username);
 void show_basic_key_info (ctrl_t ctrl, kbnode_t keyblock, int print_sec);
 int keyedit_print_one_sig (ctrl_t ctrl, estream_t fp,
                            int rc, kbnode_t keyblock,
 			   kbnode_t node, int *inv_sigs, int *no_key,
 			   int *oth_err, int is_selfsig,
 			   int print_without_key, int extended);
+void no_usable_encr_subkeys_warning (kbnode_t keyblock);
 
 #endif	/* GNUPG_G10_KEYEDIT_H */

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/keygen.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/keygen.c Changed

@@ -56,7 +56,7 @@
 
 /* When generating keys using the streamlined key generation dialog,
 use this as a default expiration interval. */
-const char *default_expiration_interval = "2y";
+const char *default_expiration_interval = "3y";
 
 /* Flag bits used during key generation. */
 #define KEYGEN_FLAG_NO_PROTECTION 1
@@ -130,12 +130,6 @@
 };
 
 
-struct opaque_data_usage_and_pk {
- unsigned int usage;
- PKT_public_key *pk;
-};
-
-
 /* FIXME: These globals vars are ugly. And using MAX_PREFS even for
 * aeads is useless, given that we don't expects more than a very few
 * algorithms. */
@@ -256,22 +250,27 @@
 static void
 do_add_key_flags (PKT_signature *sig, unsigned int use)
 {
- byte buf1;
+ byte buf2 = { 0, 0 };
 
- buf0 = 0;
+ /* The spec says that all primary keys MUST be able to certify. */
+ if ( sig->sig_class != 0x18 )
+ buf0 |= 0x01;
 
- /* The spec says that all primary keys MUST be able to certify. */
- if(sig->sig_class!=0x18)
- buf0 |= 0x01;
-
- if (use & PUBKEY_USAGE_SIG)
- buf0 |= 0x02;
- if (use & PUBKEY_USAGE_ENC)
- buf0 |= 0x04 | 0x08;
- if (use & PUBKEY_USAGE_AUTH)
- buf0 |= 0x20;
+ if (use & PUBKEY_USAGE_SIG)
+ buf0 |= 0x02;
+ if (use & PUBKEY_USAGE_ENC)
+ buf0 |= 0x04 | 0x08;
+ if (use & PUBKEY_USAGE_AUTH)
+ buf0 |= 0x20;
+ if (use & PUBKEY_USAGE_GROUP)
+ buf0 |= 0x80;
+
+ if (use & PUBKEY_USAGE_RENC)
+ buf1 |= 0x04;
+ if (use & PUBKEY_USAGE_TIME)
+ buf1 |= 0x08;
 
- build_sig_subpkt (sig, SIGSUBPKT_KEY_FLAGS, buf, 1);
+ build_sig_subpkt (sig, SIGSUBPKT_KEY_FLAGS, buf, buf1? 2:1);
 }
 
 
@@ -318,13 +317,11 @@
 }
 
 
-static int
+int
 keygen_add_key_flags_and_expire (PKT_signature *sig, void *opaque)
 {
- struct opaque_data_usage_and_pk *oduap = opaque;
-
- do_add_key_flags (sig, oduap->usage);
- return keygen_add_key_expire (sig, oduap->pk);
+ keygen_add_key_flags (sig, opaque);
+ return keygen_add_key_expire (sig, opaque);
 }
 
 
@@ -407,7 +404,7 @@
 	 strcat(dummy_string,"S7 ");
 	 strcat(dummy_string,"S2 "); /* 3DES */
 
- if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_OCB))
+ if (!openpgp_aead_test_algo (AEAD_ALGO_OCB))
 	 strcat(dummy_string,"A2 ");
 
 if (personal)
@@ -487,7 +484,9 @@
 
 	while((tok=strsep(&prefstring," ,")))
 	 {
-	 if((val=string_to_cipher_algo (tok)))
+ if (!*tok)
+ ;
+	 else if((val=string_to_cipher_algo (tok)))
 	 {
 		if(set_one_pref(val,1,tok,sym,&nsym))
 		 rc=-1;
@@ -507,14 +506,24 @@
 		if (set_one_pref (val, 4, tok, aead, &naead))
 		 rc = -1;
 	 }
-	 else if (ascii_strcasecmp(tok,"mdc")==0)
+	 else if (!ascii_strcasecmp(tok, "mdc")
+ || !ascii_strcasecmp(tok, "mdc"))
 	 mdc=1;
-	 else if (ascii_strcasecmp(tok,"no-mdc")==0)
+	 else if (!ascii_strcasecmp(tok, "no-mdc")
+ || !ascii_strcasecmp(tok, "no-mdc"))
 	 mdc=0;
-	 else if (ascii_strcasecmp(tok,"ks-modify")==0)
+	 else if (!ascii_strcasecmp(tok, "ks-modify")
+ || !ascii_strcasecmp(tok, "ks-modify"))
 	 modify=1;
-	 else if (ascii_strcasecmp(tok,"no-ks-modify")==0)
+	 else if (!ascii_strcasecmp(tok,"no-ks-modify")
+ || !ascii_strcasecmp(tok,"no-ks-modify"))
 	 modify=0;
+	 else if (!ascii_strcasecmp(tok,"aead")
+ || !ascii_strcasecmp(tok,"aead"))
+ {
+ /* Ignore because this is set from the preferences but
+ * shown in the in the preferences/features list. */
+ }
 	 else
 	 {
 		log_info (_("invalid item '%s' in preference string\n"),tok);
@@ -552,29 +561,6 @@
 		 opt.personal_cipher_prefsi.value = 0;
 		 }
 	 }
-	 else if (personal == PREFTYPE_AEAD)
-	 {
-		xfree(opt.personal_aead_prefs);
-
-		if (!naead)
-		 opt.personal_aead_prefs = NULL;
-		else
-		 {
-		 int i;
-
-		 opt.personal_aead_prefs=
-		 xmalloc(sizeof(prefitem_t *)*(naead+1));
-
-		 for (i=0; i<naead; i++)
-		 {
-			opt.personal_aead_prefsi.type = PREFTYPE_AEAD;
-			opt.personal_aead_prefsi.value = symi;
-		 }
-
-		 opt.personal_aead_prefsi.type = PREFTYPE_NONE;
-		 opt.personal_aead_prefsi.value = 0;
-		 }
-	 }
 	 else if(personal==PREFTYPE_HASH)
 	 {
 		xfree(opt.personal_digest_prefs);
@@ -903,7 +889,7 @@
 /* Make sure that the MDC feature flag is set if needed. */
 add_feature_mdc (sig,mdc_available);
 add_feature_aead (sig, aead_available);
- add_feature_v5 (sig, opt.flags.rfc4880bis);
+ add_feature_v5 (sig, 1);
 add_keyserver_modify (sig,ks_modify);
 keygen_add_keyserver_url(sig,NULL);
 
@@ -1226,7 +1212,6 @@
 PKT_signature *sig;
 KBNODE node;
 PKT_public_key *pri_pk, *sub_pk;
- struct opaque_data_usage_and_pk oduap;
 
 if (opt.verbose)
 log_info(_("writing key binding signature\n"));
@@ -1252,11 +1237,10 @@
 BUG();
 
 /* Make the signature. */
- oduap.usage = use;
- oduap.pk = sub_pk;
+ sub_pk->pubkey_usage = use;
 err = make_keysig_packet (ctrl, &sig, pri_pk, NULL, sub_pk, pri_psk, 0x18,
 timestamp, 0,
- keygen_add_key_flags_and_expire, &oduap,
+ keygen_add_key_flags_and_expire, sub_pk,
 cache_nonce);
 if (err)
 {
@@ -2910,7 +2894,7 @@
 }
 
 u32
-ask_expiredate()
+ask_expiredate (void)
 {
 u32 x = ask_expire_interval(0,NULL);
 return x? make_timestamp() + x : 0;
@@ -3398,10 +3382,7 @@
 }
 }
 else if (!ascii_strcasecmp (s, "v5"))
- {
- if (opt.flags.rfc4880bis)
- keyversion = 5;
- }
+ keyversion = 5;
 else if (!ascii_strcasecmp (s, "v4"))
 keyversion = 4;
 else
@@ -3660,7 +3641,7 @@
 * ecdsa := Use algorithm ECDSA.
 * eddsa := Use algorithm EdDSA.
 * ecdh := Use algorithm ECDH.
- * v5 := Create version 5 key (requires option --rfc4880bis)
+ * v5 := Create version 5 key
 *
 * There are several defaults and fallbacks depending on the
 * algorithm. PART can be used to select which part of STRING is
@@ -3806,14 +3787,29 @@
 }
 }
 
+/* Return the N-th parameter of name KEY from PARA. An IDX of 0
+ * returns the first and so on. */
 static struct para_data_s *
-get_parameter( struct para_data_s *para, enum para_name key )
+get_parameter_idx (struct para_data_s *para, enum para_name key,
+ unsigned int idx)
 {
- struct para_data_s *r;
+ struct para_data_s *r;
+
+ for(r = para; r; r = r->next)
+ if (r->key == key)
+ {
+ if (!idx)
+ return r;
+ idx--;
+ }
+ return NULL;
+}
 
- for( r = para; r && r->key != key; r = r->next )
-	;
- return r;
+/* Return the first parameter of name KEY from PARA. */
+static struct para_data_s *
+get_parameter (struct para_data_s *para, enum para_name key)
+{
+ return get_parameter_idx (para, key, 0);
 }
 
 static const char *
@@ -3917,6 +3913,12 @@
 use |= PUBKEY_USAGE_AUTH;
 else if (!ascii_strcasecmp (s, "cert"))
 use |= PUBKEY_USAGE_CERT;
+ else if (!ascii_strcasecmp (s, "renc"))
+ use |= PUBKEY_USAGE_RENC;
+ else if (!ascii_strcasecmp (s, "time"))
+ use |= PUBKEY_USAGE_TIME;
+ else if (!ascii_strcasecmp (s, "group"))
+ use |= PUBKEY_USAGE_GROUP;
 else
 {
 xfree (tokens);
@@ -3955,6 +3957,69 @@
 }
 
 
+/* Parse the revocation key specified by NAME, check that the public
+ * key exists (so that we can get the required public key algorithm),
+ * and return a parameter wit the revocation key information. On
+ * error print a diagnostic and return NULL. */
+static struct para_data_s *
+prepare_desig_revoker (ctrl_t ctrl, const char *name)
+{
+ gpg_error_t err;
+ struct para_data_s *para = NULL;
+ KEYDB_SEARCH_DESC desc;
+ int sensitive = 0;
+ struct revocation_key revkey;
+ PKT_public_key *revoker_pk = NULL;
+ size_t fprlen;
+
+ if (!ascii_strncasecmp (name, "sensitive:", 10) && !spacep (name+10))
+ {
+ name += 10;
+ sensitive = 1;
+ }
+
+ if (classify_user_id (name, &desc, 1)
+ || desc.mode != KEYDB_SEARCH_MODE_FPR)
+ {
+ log_info (_("\"%s\" is not a fingerprint\n"), name);
+ err = gpg_error (GPG_ERR_INV_NAME);
+ goto leave;
+ }
+
+ revoker_pk = xcalloc (1, sizeof *revoker_pk);
+ revoker_pk->req_usage = PUBKEY_USAGE_CERT;
+ err = get_pubkey_byname (ctrl, GET_PUBKEY_NO_AKL,
+ NULL, revoker_pk, name, NULL, NULL, 1);
+ if (err)
+ goto leave;
+
+ fingerprint_from_pk (revoker_pk, revkey.fpr, &fprlen);
+ if (fprlen != 20 && fprlen != 32)
+ {
+ log_info (_("cannot appoint a PGP 2.x style key as a "
+ "designated revoker\n"));
+ err = gpg_error (GPG_ERR_UNUSABLE_PUBKEY);
+ goto leave;
+ }
+ revkey.fprlen = fprlen;
+ revkey.class = 0x80;
+ if (sensitive)
+ revkey.class |= 0x40;
+ revkey.algid = revoker_pk->pubkey_algo;
+
+ para = xcalloc (1, sizeof *para);
+ para->key = pREVOKER;
+ memcpy (&para->u.revkey, &revkey, sizeof revkey);
+
+ leave:
+ if (err)
+ log_error ("invalid revocation key '%s': %s\n", name, gpg_strerror (err));
+ free_public_key (revoker_pk);
+ return para;
+}
+
+
+/* Parse a pREVOKER parameter into its dedicated parts. */
 static int
 parse_revocation_key (const char *fname,
 		 struct para_data_s *para, enum para_name key)
@@ -4038,10 +4103,11 @@
 }
 
 static struct revocation_key *
-get_parameter_revkey( struct para_data_s *para, enum para_name key )
+get_parameter_revkey (struct para_data_s *para, enum para_name key,
+ unsigned int idx)
 {
- struct para_data_s *r = get_parameter( para, key );
- return r? &r->u.revkey : NULL;
+ struct para_data_s *r = get_parameter_idx (para, key, idx);
+ return r? &r->u.revkey : NULL;
 }
 
 static int
@@ -4060,6 +4126,7 @@
 const char *s1, *s2, *s3;
 size_t n;
 char *p;
+ strlist_t sl;
 int is_default = 0;
 int have_user_id = 0;
 int err, algo;
@@ -4205,10 +4272,20 @@
 	}
 }
 
- /* Set revoker, if any. */
+ /* Set revoker from parameter file, if any. Must be done first so
+ * that we don't find a parameter set via prepare_desig_revoker. */
 if (parse_revocation_key (fname, para, pREVOKER))
 return -1;
 
+ /* Check and appened revokers from the config file. */
+ for (sl = opt.desig_revokers; sl; sl = sl->next)
+ {
+ r = prepare_desig_revoker (ctrl, sl->d);
+ if (!r)
+ return -1;
+ append_to_parameter (para, r);
+ }
+
 
 /* Make KEYCREATIONDATE from Creation-Date. We ignore this if the
 * key has been taken from a card and a keycreationtime has already
@@ -4436,9 +4513,9 @@
 	 }
 	}
 
- if (!opt.flags.rfc4880bis && (keywordsi.key == pVERSION
- || keywordsi.key == pSUBVERSION))
- ; /* Ignore version unless --rfc4880bis is active. */
+ if ((keywordsi.key == pVERSION
+ || keywordsi.key == pSUBVERSION))
+ ; /* Ignore version. */
 else
 {
 r = xmalloc_clear( sizeof *r + strlen( value ) );
@@ -4487,14 +4564,17 @@
 {
 struct para_data_s *r;
 
- r = xmalloc_clear (sizeof *r + 30);
+ r = xmalloc_clear (sizeof *r + 50);
 r->key = for_subkey? pSUBKEYUSAGE : pKEYUSAGE;
 if (use)
- snprintf (r->u.value, 30, "%s%s%s%s",
+ snprintf (r->u.value, 30, "%s%s%s%s%s%s%s",
 (use & PUBKEY_USAGE_ENC)? "encr " : "",
 (use & PUBKEY_USAGE_SIG)? "sign " : "",
 (use & PUBKEY_USAGE_AUTH)? "auth " : "",
- (use & PUBKEY_USAGE_CERT)? "cert " : "");
+ (use & PUBKEY_USAGE_CERT)? "cert " : "",
+ (use & PUBKEY_USAGE_RENC)? "renc " : "",
+ (use & PUBKEY_USAGE_TIME)? "time " : "",
+ (use & PUBKEY_USAGE_GROUP)?"group ": "");
 else
 strcpy (r->u.value, for_subkey ? "encr" : "sign");
 r->next = para;
@@ -4530,14 +4610,11 @@
 para = r;
 }
 
- if (opt.flags.rfc4880bis)
- {
- r = xmalloc_clear (sizeof *r + 20);
- r->key = for_subkey? pSUBVERSION : pVERSION;
- snprintf (r->u.value, 20, "%d", version);
- r->next = para;
- para = r;
- }
+ r = xmalloc_clear (sizeof *r + 20);
+ r->key = for_subkey? pSUBVERSION : pVERSION;
+ snprintf (r->u.value, 20, "%d", version);
+ r->next = para;
+ para = r;
 
 if (keytime)
 {
@@ -5250,12 +5327,20 @@
 char *cache_nonce = NULL;
 void *kek = NULL;
 size_t keklen;
+ char *ecdh_param_str = NULL;
 
 sk = copy_public_key (NULL, sub_psk);
 if (!sk)
 return gpg_error_from_syserror ();
 
 epoch2isotime (timestamp, (time_t)sk->timestamp);
+ if (sk->pubkey_algo == PUBKEY_ALGO_ECDH)
+ {
+ ecdh_param_str = ecdh_param_str_from_pk (sk);
+ if (!ecdh_param_str)
+ return gpg_error_from_syserror ();
+ }
+
 err = hexkeygrip_from_pk (sk, &hexgrip);
 if (err)
 goto leave;
@@ -5268,7 +5353,8 @@
 goto leave;
 }
 
- rc = agent_keytocard (hexgrip, 2, 1, info.serialno, timestamp);
+ rc = agent_keytocard (hexgrip, 2, 1, info.serialno,
+ timestamp, ecdh_param_str);
 xfree (info.serialno);
 if (rc)
 {
@@ -5294,8 +5380,8 @@
 goto leave;
 }
 
- err = receive_seckey_from_agent (ctrl, cipherhd, 0,
- &cache_nonce, hexgrip, sk);
+ err = receive_seckey_from_agent (ctrl, cipherhd, 0, 0,
+ &cache_nonce, hexgrip, sk, NULL);
 if (err)
 {
 log_error ("error getting secret key from agent: %s\n",
@@ -5311,6 +5397,7 @@
 agent_scd_learn (NULL, 1);
 
 leave:
+ xfree (ecdh_param_str);
 xfree (cache_nonce);
 gcry_cipher_close (cipherhd);
 xfree (kek);
@@ -5338,6 +5425,7 @@
 const char *key_from_hexgrip = NULL;
 int cardkey;
 unsigned int keygen_flags;
+ unsigned int idx;
 
 if (outctrl->dryrun)
 {
@@ -5472,7 +5560,10 @@
 keyid_copy (pri_psk->main_keyid, pri_psk->keyid);
 }
 
- if (!err && (revkey = get_parameter_revkey (para, pREVOKER)))
+ /* Write all signatures specifying designated revokers. */
+ for (idx=0;
+ !err && (revkey = get_parameter_revkey (para, pREVOKER, idx));
+ idx++)
 err = write_direct_sig (ctrl, pub_root, pri_psk,
 revkey, signtimestamp, cache_nonce);

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/keyid.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/keyid.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/keylist.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/keylist.c Changed

@@ -44,6 +44,8 @@
 #include "../common/mbox-util.h"
 #include "../common/zb32.h"
 #include "tofu.h"
+#include "../common/init.h"
+#include "../common/recsel.h"
 #include "../common/compliance.h"
 #include "../common/pkscreening.h"
 
@@ -64,16 +66,26 @@
 int no_validity; /* Do not show validity. */
 };
 
-
-static void list_keyblock (ctrl_t ctrl,
- kbnode_t keyblock, int secret, int has_secret,
- int fpr, struct keylist_context *listctx);
+/* An object and a global instance to store selectors created from
+ * --list-filter select=EXPR.
+ */
+struct list_filter_s
+{
+ recsel_expr_t selkey;
+};
+struct list_filter_s list_filter;
 
 
 /* The stream used to write attribute packets to. */
 static estream_t attrib_fp;
 
 
+
+&#xc;
+static void list_keyblock (ctrl_t ctrl,
+ kbnode_t keyblock, int secret, int has_secret,
+ int fpr, struct keylist_context *listctx);
+
 /* Release resources from a keylist context. */
 static void
 keylist_context_release (struct keylist_context *listctx)
@@ -82,6 +94,49 @@
 }
 
 
+static void
+release_list_filter (struct list_filter_s *filt)
+{
+ recsel_release (filt->selkey);
+ filt->selkey = NULL;
+}
+
+
+static void
+cleanup_keylist_globals (void)
+{
+ release_list_filter (&list_filter);
+}
+
+
+/* Parse and set an list filter from string. STRING has the format
+ * "NAME=EXPR" with NAME being the name of the filter. Spaces before
+ * and after NAME are not allowed. If this function is all called
+ * several times all expressions for the same NAME are concatenated.
+ * Supported filter names are:
+ *
+ * - select :: If the expression evaluates to true for a certain key
+ * this key will be listed. The expression may use any
+ * variable defined for the export and import filters.
+ *
+ */
+gpg_error_t
+parse_and_set_list_filter (const char *string)
+{
+ gpg_error_t err;
+
+ /* Auto register the cleanup function. */
+ register_mem_cleanup_func (cleanup_keylist_globals);
+
+ if (!strncmp (string, "select=", 7))
+ err = recsel_parse_expr (&list_filter.selkey, string+7);
+ else
+ err = gpg_error (GPG_ERR_INV_NAME);
+
+ return err;
+}
+
+
 /* List the keys. If list is NULL, all available keys are listed.
 * With LOCATE_MODE set the locate algorithm is used to find a key; if
 * in addition NO_LOCAL is set the locate does not look into the local
@@ -306,6 +361,173 @@
 #endif /*ENABLE_CARD_SUPPORT*/
 
 
+/* Print the preferences line. Allowed values for MODE are:
+ * -1 - print to the TTY
+ * 0 - print to stdout.
+ * 1 - use log_info
+ */
+void
+show_preferences (PKT_user_id *uid, int indent, int mode, int verbose)
+{
+ estream_t fp = mode < 0? NULL : mode ? log_get_stream () : es_stdout;
+ const prefitem_t fake = { 0, 0 };
+ const prefitem_t *prefs;
+ int i;
+
+ if (!uid)
+ return;
+
+ if (uid->prefs)
+ prefs = uid->prefs;
+ else if (verbose)
+ prefs = &fake;
+ else
+ return;
+
+ if (verbose)
+ {
+ int any, des_seen = 0, sha1_seen = 0, uncomp_seen = 0;
+
+ tty_fprintf (fp, "%*s %s", indent, "", _("Cipher: "));
+ for (i = any = 0; prefsi.type; i++)
+	{
+	 if (prefsi.type == PREFTYPE_SYM)
+	 {
+	 if (any)
+		tty_fprintf (fp, ", ");
+	 any = 1;
+	 /* We don't want to display strings for experimental algos */
+	 if (!openpgp_cipher_test_algo (prefsi.value)
+		 && prefsi.value < 100)
+		tty_fprintf (fp, "%s", openpgp_cipher_algo_name (prefsi.value));
+	 else
+		tty_fprintf (fp, "%d", prefsi.value);
+	 if (prefsi.value == CIPHER_ALGO_3DES)
+		des_seen = 1;
+	 }
+	}
+ if (!des_seen)
+	{
+	 if (any)
+	 tty_fprintf (fp, ", ");
+	 tty_fprintf (fp, "%s", openpgp_cipher_algo_name (CIPHER_ALGO_3DES));
+	}
+ tty_fprintf (fp, "\n%*s %s", indent, "", _("AEAD: "));
+ for (i = any = 0; prefsi.type; i++)
+	{
+	 if (prefsi.type == PREFTYPE_AEAD)
+	 {
+	 if (any)
+		tty_fprintf (fp, ", ");
+	 any = 1;
+	 /* We don't want to display strings for experimental algos */
+	 if (!openpgp_aead_test_algo (prefsi.value)
+		 && prefsi.value < 100)
+		tty_fprintf (fp, "%s", openpgp_aead_algo_name (prefsi.value));
+	 else
+		tty_fprintf (fp, "%d", prefsi.value);
+	 }
+	}
+ tty_fprintf (fp, "\n%*s %s", indent, "", _("Digest: "));
+ for (i = any = 0; prefsi.type; i++)
+	{
+	 if (prefsi.type == PREFTYPE_HASH)
+	 {
+	 if (any)
+		tty_fprintf (fp, ", ");
+	 any = 1;
+	 /* We don't want to display strings for experimental algos */
+	 if (!gcry_md_test_algo (prefsi.value) && prefsi.value < 100)
+		tty_fprintf (fp, "%s", gcry_md_algo_name (prefsi.value));
+	 else
+		tty_fprintf (fp, "%d", prefsi.value);
+	 if (prefsi.value == DIGEST_ALGO_SHA1)
+		sha1_seen = 1;
+	 }
+	}
+ if (!sha1_seen)
+	{
+	 if (any)
+	 tty_fprintf (fp, ", ");
+	 tty_fprintf (fp, "%s", gcry_md_algo_name (DIGEST_ALGO_SHA1));
+	}
+ tty_fprintf (fp, "\n%*s %s", indent, "", _("Compression: "));
+ for (i = any = 0; prefsi.type; i++)
+	{
+	 if (prefsi.type == PREFTYPE_ZIP)
+	 {
+	 const char *s = compress_algo_to_string (prefsi.value);
+
+	 if (any)
+		tty_fprintf (fp, ", ");
+	 any = 1;
+	 /* We don't want to display strings for experimental algos */
+	 if (s && prefsi.value < 100)
+		tty_fprintf (fp, "%s", s);
+	 else
+		tty_fprintf (fp, "%d", prefsi.value);
+	 if (prefsi.value == COMPRESS_ALGO_NONE)
+		uncomp_seen = 1;
+	 }
+	}
+ if (!uncomp_seen)
+	{
+	 if (any)
+	 tty_fprintf (fp, ", ");
+	 else
+	 {
+	 tty_fprintf (fp, "%s",
+ compress_algo_to_string (COMPRESS_ALGO_ZIP));
+	 tty_fprintf (fp, ", ");
+	 }
+	 tty_fprintf (fp, "%s", compress_algo_to_string (COMPRESS_ALGO_NONE));
+	}
+ if (uid->flags.mdc || uid->flags.aead || !uid->flags.ks_modify)
+	{
+ tty_fprintf (fp, "\n%*s %s", indent, "", _("Features: "));
+	 any = 0;
+	 if (uid->flags.mdc)
+	 {
+	 tty_fprintf (fp, "MDC");
+	 any = 1;
+	 }
+	 if (uid->flags.aead)
+	 {
+	 if (any)
+		tty_fprintf (fp, ", ");
+	 tty_fprintf (fp, "AEAD");
+	 }
+	 if (!uid->flags.ks_modify)
+	 {
+	 if (any)
+		tty_fprintf (fp, ", ");
+	 tty_fprintf (fp, _("Keyserver no-modify"));
+	 }
+	}
+ tty_fprintf (fp, "\n");
+ }
+ else
+ {
+ tty_fprintf (fp, "%*s", indent, "");
+ for (i = 0; prefsi.type; i++)
+ {
+ tty_fprintf (fp, " %c%d", prefsi.type == PREFTYPE_SYM ? 'S' :
+ prefsi.type == PREFTYPE_AEAD ? 'A' :
+ prefsi.type == PREFTYPE_HASH ? 'H' :
+ prefsi.type == PREFTYPE_ZIP ? 'Z' : '?',
+ prefsi.value);
+ }
+ if (uid->flags.mdc)
+ tty_fprintf (fp, " mdc");
+ if (uid->flags.aead)
+ tty_fprintf (fp, " aead");
+ if (!uid->flags.ks_modify)
+ tty_fprintf (fp, " no-ks-modify");
+ tty_fprintf (fp, "\n");
+ }
+}
+
+
 /* Flags = 0x01 hashed 0x02 critical. */
 static void
 status_one_subpacket (sigsubpkttype_t type, size_t len, int flags,
@@ -802,6 +1024,13 @@
 if ((use & PUBKEY_USAGE_AUTH))
 es_putc ('a', es_stdout);
 
+ if (use & PUBKEY_USAGE_RENC)
+ es_putc ('r', es_stdout);
+ if ((use & PUBKEY_USAGE_TIME))
+ es_putc ('t', es_stdout);
+ if ((use & PUBKEY_USAGE_GROUP))
+ es_putc ('g', es_stdout);
+
 if ((use & PUBKEY_USAGE_UNKNOWN))
 es_putc ('?', es_stdout);
 
@@ -987,7 +1216,8 @@
 }
 
 
-/* Helper for list_keyblock_print. */
+/* Helper for list_keyblock_print. The caller must have set
+ * NODFLG_MARK_B to indicate self-signatures. */
 static void
 list_signature_print (ctrl_t ctrl, kbnode_t keyblock, kbnode_t node,
 struct keylist_context *listctx)
@@ -1018,6 +1248,11 @@
 		case GPG_ERR_UNUSABLE_PUBKEY:
 		 listctx->no_key++;
 		 return;
+ case GPG_ERR_DIGEST_ALGO:
+ case GPG_ERR_PUBKEY_ALGO:
+ if (!(opt.list_options & LIST_SHOW_UNUSABLE_SIGS))
+ return;
+ /* fallthru. */
 		default:
 		 listctx->oth_err++;
 		 sigrc = '%';
@@ -1030,6 +1265,15 @@
 	 }
 	 else
 	 {
+ if (!(opt.list_options & LIST_SHOW_UNUSABLE_SIGS)
+ && (gpg_err_code (openpgp_pk_test_algo (sig->pubkey_algo)
+ == GPG_ERR_PUBKEY_ALGO)
+ || gpg_err_code (openpgp_md_test_algo (sig->digest_algo)
+ == GPG_ERR_DIGEST_ALGO)
+ || (sig->digest_algo == DIGEST_ALGO_SHA1
+ && !(node->flag & NODFLG_MARK_B) /*no selfsig*/
+ && !opt.flags.allow_weak_key_signatures)))
+ return;
 	 rc = 0;
 	 sigrc = ' ';
 	 }
@@ -1077,7 +1321,9 @@
 	 es_fprintf (es_stdout, "%s ", gpg_strerror (rc));
 	 else if (sigrc == '?')
 	 ;
-	 else if (!opt.fast_list_mode)
+	 else if ((node->flag & NODFLG_MARK_B))
+ es_fputs (_("self-signature"), es_stdout);
+ else if (!opt.fast_list_mode )
 	 {
 	 size_t n;
 	 char *p = get_user_id (ctrl, sig->keyid, &n, NULL);
@@ -1262,6 +1508,11 @@
 	 print_utf8_buffer (es_stdout, uid->name, uid->len);
 	 es_putc ('\n', es_stdout);
 
+ if ((opt.list_options & LIST_SHOW_PREF_VERBOSE))
+ show_preferences (uid, indent+2, 0, 1);
+ else if ((opt.list_options & LIST_SHOW_PREF))
+ show_preferences (uid, indent+2, 0, 0);
+
 if (opt.with_wkd_hash)
 {
 char *mbox, *hash, *p;
@@ -1351,37 +1602,33 @@
 else if (opt.list_sigs
 	 && node->pkt->pkttype == PKT_SIGNATURE && !skip_sigs)
 	{
- if ((opt.list_options & LIST_SORT_SIGS))
- {
- kbnode_t n;
- unsigned int sigcount = 0;
- kbnode_t *sigarray;
- unsigned int idx;
+ kbnode_t n;
+ unsigned int sigcount = 0;
+ kbnode_t *sigarray;
+ unsigned int idx;
 
- for (n=node; n && n->pkt->pkttype == PKT_SIGNATURE; n = n->next)
- sigcount++;
- sigarray = xcalloc (sigcount, sizeof *sigarray);
+ for (n=node; n && n->pkt->pkttype == PKT_SIGNATURE; n = n->next)
+ sigcount++;
+ sigarray = xcalloc (sigcount, sizeof *sigarray);
 
- sigcount = 0;
- for (n=node; n && n->pkt->pkttype == PKT_SIGNATURE; n = n->next)
- {
- if (!keyid_cmp (mainkid, n->pkt->pkt.signature->keyid))
- n->flag |= NODFLG_MARK_B; /* Is a self-sig. */
- else
- n->flag &= ~NODFLG_MARK_B;
+ sigcount = 0;
+ for (n=node; n && n->pkt->pkttype == PKT_SIGNATURE; n = n->next)
+ {
+ if (keyid_eq (mainkid, n->pkt->pkt.signature->keyid))
+ n->flag |= NODFLG_MARK_B; /* Is a self-sig. */
+ else
+ n->flag &= ~NODFLG_MARK_B;
 
- sigarraysigcount++ = node = n;
- }
- /* Note that NODE is now at the last signature. */
+ sigarraysigcount++ = node = n;
+ }
+ /* Note that NODE is now at the last signature. */
 
- qsort (sigarray, sigcount, sizeof *sigarray, cmp_signodes);
+ if ((opt.list_options & LIST_SORT_SIGS))
+ qsort (sigarray, sigcount, sizeof *sigarray, cmp_signodes);
 
- for (idx=0; idx < sigcount; idx++)
- list_signature_print (ctrl, keyblock, sigarrayidx, listctx);
- xfree (sigarray);
- }
- else
- list_signature_print (ctrl, keyblock, node, listctx);
+ for (idx=0; idx < sigcount; idx++)
+ list_signature_print (ctrl, keyblock, sigarrayidx, listctx);
+ xfree (sigarray);
 	}
 }
 es_putc ('\n', es_stdout);
@@ -1984,6 +2231,7 @@
 do_reorder_keyblock (keyblock, 0);
 }
 
+
 static void
 list_keyblock (ctrl_t ctrl,
 KBNODE keyblock, int secret, int has_secret, int fpr,
@@ -1991,6 +2239,24 @@
 {
 reorder_keyblock (keyblock);
 
+ if (list_filter.selkey)
+ {
+ int selected = 0;
+ struct impex_filter_parm_s parm;
+ parm.ctrl = ctrl;
+
+ for (parm.node = keyblock; parm.node; parm.node = parm.node->next)
+ {
+ if (recsel_select (list_filter.selkey, impex_filter_getval, &parm))
+ {
+ selected = 1;
+ break;
+ }
+ }
+ if (!selected)
+ return; /* Skip this one. */
+ }
+
 if (opt.with_colons)
 list_keyblock_colon (ctrl, keyblock, secret, has_secret);
 else if ((opt.list_options & LIST_SHOW_ONLY_FPR_MBOX))

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/keyserver.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/keyserver.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/main.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/main.h Changed

@@ -41,10 +41,8 @@
 # define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_3DES
 #endif
 
-#define DEFAULT_AEAD_ALGO  AEAD_ALGO_OCB
-
 #define DEFAULT_DIGEST_ALGO     ((GNUPG)? DIGEST_ALGO_SHA256:DIGEST_ALGO_SHA1)
-#define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+#define DEFAULT_S2K_DIGEST_ALGO  DEFAULT_DIGEST_ALGO
 #ifdef HAVE_ZIP
 # define DEFAULT_COMPRESS_ALGO   COMPRESS_ALGO_ZIP
 #else
@@ -85,9 +83,10 @@
 
 /*-- gpg.c --*/
 extern int g10_errors_seen;
+extern int assert_signer_true;
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
-  void g10_exit(int rc) __attribute__ ((noreturn));
+  void g10_exit(int rc) __attribute__ ((__noreturn__));
 #else
   void g10_exit(int rc);
 #endif
@@ -169,7 +168,6 @@
 int string_to_compress_algo(const char *string);
 int check_compress_algo(int algo);
 int default_cipher_algo(void);
-aead_algo_t default_aead_algo(void);
 int default_compress_algo(void);
 void compliance_failure(void);
 
@@ -238,10 +236,8 @@
 /*-- helptext.c --*/
 void display_online_help( const char *keyword );
 
-/*-- encode.c --*/
+/*-- encrypt.c --*/
 gpg_error_t setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek);
-gpg_error_t encrypt_seskey (DEK *dek, aead_algo_t aead_algo, DEK **r_seskey,
-                            void **r_enckey, size_t *r_enckeylen);
 aead_algo_t use_aead (pk_list_t pk_list, int algo);
 int use_mdc (pk_list_t pk_list,int algo);
 int encrypt_symmetric (const char *filename );
@@ -320,6 +316,7 @@
 PKT_user_id *keygen_get_std_prefs (void);
 int keygen_add_key_expire( PKT_signature *sig, void *opaque );
 int keygen_add_key_flags (PKT_signature *sig, void *opaque);
+int keygen_add_key_flags_and_expire (PKT_signature *sig, void *opaque);
 int keygen_add_std_prefs( PKT_signature *sig, void *opaque );
 int keygen_upd_std_prefs( PKT_signature *sig, void *opaque );
 int keygen_add_keyserver_url(PKT_signature *sig, void *opaque);
@@ -436,10 +433,10 @@
                                   void **r_data, size_t *r_datalen);
 
 gpg_error_t receive_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd,
-                                       int cleartext,
+                                       int cleartext, int mode1003,
                                        char **cache_nonce_addr,
                                        const char *hexgrip,
-                                       PKT_public_key *pk);
+                                       PKT_public_key *pk, gcry_sexp_t *r_key);
 
 gpg_error_t write_keyblock_to_output (kbnode_t keyblock,
                                       int with_armor, unsigned int options);
@@ -469,6 +466,7 @@
 void public_key_list (ctrl_t ctrl, strlist_t list,
                       int locate_mode, int no_local);
 void secret_key_list (ctrl_t ctrl, strlist_t list );
+gpg_error_t parse_and_set_list_filter (const char *string);
 void print_subpackets_colon(PKT_signature *sig);
 void reorder_keyblock (KBNODE keyblock);
 void list_keyblock_direct (ctrl_t ctrl, kbnode_t keyblock, int secret,
@@ -477,6 +475,7 @@
 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);
+void show_preferences (PKT_user_id *uid, int indent, int mode, int verbose);
 void show_policy_url(PKT_signature *sig,int indent,int mode);
 void show_keyserver_url(PKT_signature *sig,int indent,int mode);
 void show_notation(PKT_signature *sig,int indent,int mode,int which);
@@ -494,6 +493,7 @@
 int verify_signatures (ctrl_t ctrl, int nfiles, char **files );
 int verify_files (ctrl_t ctrl, int nfiles, char **files );
 int gpg_verify (ctrl_t ctrl, int sig_fd, int data_fd, estream_t out_fp);
+void check_assert_signer_list (const char *mainpkhex, const char *pkhex);
 
 /*-- decrypt.c --*/
 int decrypt_message (ctrl_t ctrl, const char *filename );
@@ -518,7 +518,7 @@
 void card_status (ctrl_t ctrl, estream_t fp, const char *serialno);
 void card_edit (ctrl_t ctrl, strlist_t commands);
 gpg_error_t  card_generate_subkey (ctrl_t ctrl, kbnode_t pub_keyblock);
-int  card_store_subkey (KBNODE node, int use);
+int  card_store_subkey (KBNODE node, int use, strlist_t *processed_keys);
 #endif
 
 /*-- migrate.c --*/

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/mainproc.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/mainproc.c Changed

@@ -47,6 +47,16 @@
 #define MAX_NESTING_DEPTH 32
 
 
+/* An object to build a list of symkey packet info.  */
+struct symlist_item
+{
+  struct symlist_item *next;
+  int cipher_algo;
+  int cfb_mode;
+  int other_error;
+};
+
+
 /*
  * Object to hold the processing context.
  */
@@ -87,6 +97,7 @@
   int trustletter;  /* Temporary usage in list_node. */
   ulong symkeys;    /* Number of symmetrically encrypted session keys.  */
   struct pubkey_enc_list *pkenc_list; /* List of encryption packets. */
+  struct symlist_item *symenc_list;   /* List of sym. encryption packets. */
   int seen_pkt_encrypted_aead; /* PKT_ENCRYPTED_AEAD packet seen. */
   int seen_pkt_encrypted_mdc;  /* PKT_ENCRYPTED_MDC packet seen. */
   struct {
@@ -136,6 +147,13 @@
       c->pkenc_list = tmp;
     }
   c->pkenc_list = NULL;
+  while (c->symenc_list)
+    {
+      struct symlist_item *tmp = c->symenc_list->next;
+      xfree (c->symenc_list);
+      c->symenc_list = tmp;
+    }
+  c->symenc_list = NULL;
   c->list = NULL;
   c->any.data = 0;
   c->any.uncompress_failed = 0;
@@ -460,6 +478,20 @@
     }
 
  leave:
+  /* Record infos from the packet.  */
+  {
+    struct symlist_item  *symitem;
+    symitem = xcalloc (1, sizeof *symitem);
+    if (enc)
+      {
+        symitem->cipher_algo = enc->cipher_algo;
+        symitem->cfb_mode = !enc->aead_algo;
+      }
+    else
+      symitem->other_error = 1;
+    symitem->next = c->symenc_list;
+    c->symenc_list = symitem;
+  }
   c->symkeys++;
   free_packet (pkt, NULL);
 }
@@ -694,9 +726,7 @@
     }
 
   /* Compute compliance with CO_DE_VS.  */
-  if (!result && is_status_enabled ()
-      /* Symmetric encryption and asymmetric encryption voids compliance.  */
-      && (c->symkeys != !!c->pkenc_list )
+  if (!result && (is_status_enabled () || opt.flags.require_compliance)
       /* Overriding session key voids compliance.  */
       && !opt.override_session_key
       /* Check symmetric cipher.  */
@@ -705,21 +735,33 @@
                                     GCRY_CIPHER_MODE_CFB))
     {
       struct pubkey_enc_list *i;
+      struct symlist_item *si;
       int compliant = 1;
       PKT_public_key *pk = xmalloc (sizeof *pk);
 
       if ( !(c->pkenc_list || c->symkeys) )
         log_debug ("%s: where else did the session key come from?\n", __func__);
 
-      /* Now check that every key used to encrypt the session key is
-       * compliant.  */
+      /* Check that all seen symmetric key packets use compliant
+       * algos.  This is so that no non-compliant encrypted session
+       * key can be sneaked in.  */
+      for (si = c->symenc_list; si && compliant; si = si->next)
+        {
+          if (!si->cfb_mode
+              || !gnupg_cipher_is_compliant (CO_DE_VS, si->cipher_algo,
+                                             GCRY_CIPHER_MODE_CFB))
+            compliant = 0;
+        }
+
+      /* Check that every known public key used to encrypt the session key
+       * is compliant.  */
       for (i = c->pkenc_list; i && compliant; i = i->next)
         {
           memset (pk, 0, sizeof *pk);
           pk->pubkey_algo = i->pubkey_algo;
-          if (get_pubkey (c->ctrl, pk, i->keyid) != 0
-              || ! gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, 0,
-                                          pk->pkey, nbits_from_pk (pk), NULL))
+          if (!get_pubkey (c->ctrl, pk, i->keyid)
+              && !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);
         }
@@ -836,7 +878,7 @@
 
 
   /* If we concluded that the decryption was compliant, issue a
-   * compliance status before the thed end of decryption status.  */
+   * compliance status before the end of the decryption status.  */
   if (compliance_de_vs == (4|2|1))
     {
       write_status_strings (STATUS_DECRYPTION_COMPLIANCE_MODE,
@@ -2368,7 +2410,7 @@
         }
 
       /* For good signatures print the VALIDSIG status line.  */
-      if (!rc && is_status_enabled () && pk)
+      if (!rc && (is_status_enabled () || opt.assert_signer_list) && pk)
         {
           char pkhexMAX_FINGERPRINT_LEN*2+1;
           char mainpkhexMAX_FINGERPRINT_LEN*2+1;
@@ -2388,6 +2430,8 @@
                                sig->digest_algo,
                                sig->sig_class,
                                mainpkhex);
+          /* Handle the --assert-signer option.  */
+          check_assert_signer_list (mainpkhex, pkhex);
 	}
 
       /* Print compliance warning for Good signatures.  */
@@ -2468,13 +2512,14 @@
                      is not a detached signature.  */
                   log_info (_("WARNING: not a detached signature; "
                               "file '%s' was NOT verified!\n"), dfile);
+                  assert_signer_true = 0;
                 }
               xfree (dfile);
             }
         }
 
       /* Compute compliance with CO_DE_VS.  */
-      if (pk && is_status_enabled ()
+      if (pk
           && gnupg_gcrypt_is_compliant (CO_DE_VS)
           && gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, 0, pk->pkey,
                                     nbits_from_pk (pk), NULL)

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/misc.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/misc.c Changed

@@ -777,21 +777,21 @@
     switch ( algo ) {
       case PUBKEY_ALGO_RSA:
           use = (PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG
-                 | PUBKEY_USAGE_ENC | PUBKEY_USAGE_AUTH);
+                 | PUBKEY_USAGE_ENC | PUBKEY_USAGE_RENC | PUBKEY_USAGE_AUTH);
           break;
       case PUBKEY_ALGO_RSA_E:
       case PUBKEY_ALGO_ECDH:
-          use = PUBKEY_USAGE_ENC;
+          use = PUBKEY_USAGE_ENC | PUBKEY_USAGE_RENC;
           break;
       case PUBKEY_ALGO_RSA_S:
           use = PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG;
           break;
       case PUBKEY_ALGO_ELGAMAL:
           if (RFC2440)
-             use = PUBKEY_USAGE_ENC;
+             use = PUBKEY_USAGE_ENC | PUBKEY_USAGE_RENC;
           break;
       case PUBKEY_ALGO_ELGAMAL_E:
-          use = PUBKEY_USAGE_ENC;
+          use = PUBKEY_USAGE_ENC | PUBKEY_USAGE_RENC;
           break;
       case PUBKEY_ALGO_DSA:
           use = PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG | PUBKEY_USAGE_AUTH;
@@ -1387,17 +1387,6 @@
 }
 
 
-aead_algo_t
-default_aead_algo(void)
-{
-  if(opt.def_aead_algo)
-    return opt.def_aead_algo;
-  else if(opt.personal_aead_prefs)
-    return opt.personal_aead_prefs0.value;
-  else
-    return DEFAULT_AEAD_ALGO;
-}
-
 /* There is no default_digest_algo function, but see
    sign.c:hash_for() */
 
@@ -1574,9 +1563,10 @@
 {
   char *tok;
 
-  if (str && !strcmp (str, "help"))
+  if (str && (!strcmp (str, "help") || !strcmp (str, "full-help")))
     {
       int i,maxlen=0;
+      int full = *str == 'f';
 
       /* Figure out the longest option name so we can line these up
 	 neatly. */
@@ -1588,6 +1578,10 @@
         if(optsi.help)
 	  es_printf("%s%*s%s\n",optsi.name,
                     maxlen+2-(int)strlen(optsi.name),"",_(optsi.help));
+      if (full)
+        for (i=0; optsi.name; i++)
+          if(!optsi.help)
+            es_printf("%s\n",optsi.name);
 
       g10_exit(0);
     }

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/options.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/options.h Changed

@@ -92,13 +92,13 @@
 int no_armor;
 int list_packets; /* Option --list-packets active. */
 int def_cipher_algo;
- int def_aead_algo;
 int force_mdc;
 int disable_mdc;
 int force_aead;
 int def_digest_algo;
 int cert_digest_algo;
 int compress_algo;
+ int explicit_compress_option; /* A compress option was explicitly given. */
 int compress_level;
 int bz2_compress_level;
 int bz2_decompress_lowmem;
@@ -111,6 +111,9 @@
 * the option --sender. */
 strlist_t sender_list;
 
+ /* A list of fingerprints added as designated revokers to new keys. */
+ strlist_t desig_revokers;
+
 int def_cert_level;
 int min_cert_level;
 int ask_cert_level;
@@ -180,7 +183,6 @@
 const char *def_preference_list;
 const char *def_keyserver_url;
 prefitem_t *personal_cipher_prefs;
- prefitem_t *personal_aead_prefs;
 prefitem_t *personal_digest_prefs;
 prefitem_t *personal_compress_prefs;
 struct weakhash *weak_digests;
@@ -206,6 +208,7 @@
 int ignore_valid_from;
 int ignore_crc_error;
 int ignore_mdc_error;
+ int ignore_expiration;
 int command_fd;
 const char *override_session_key;
 int show_session_key;
@@ -233,6 +236,10 @@
 value. */
 int limit_card_insert_tries;
 
+ /* The list of --assert-signer option values. Note: The values are
+ * modify to be uppercase if they represent a fingerrint */
+ strlist_t assert_signer_list;
+
 struct
 {
 /* If set, require an 0x19 backsig to be present on signatures
@@ -246,7 +253,6 @@
 unsigned int allow_old_cipher_algos:1;
 unsigned int allow_weak_digest_algos:1;
 unsigned int allow_weak_key_signatures:1;
- unsigned int override_compliance_check:1;
 unsigned int large_rsa:1;
 unsigned int disable_signer_uid:1;
 unsigned int include_key_block:1;
@@ -308,6 +314,9 @@
 int no_symkey_cache; /* Disable the cache used for --symmetric. */
 
 int use_keyboxd; /* Use the external keyboxd as storage backend. */
+
+ /* Compatibility flags (COMPAT_FLAG_xxxx). */
+ unsigned int compat_flags;
 } opt;
 
 /* CTRL is used to keep some global variables we currently can't
@@ -363,8 +372,11 @@
 EXTERN_UNLESS_MAIN_MODULE int memory_debug_mode;
 EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
 
+/* Compatibility flags */
+/* #define COMPAT_FOO 1 */
+
 
-/* Compatibility flags. */
+/* Compliance test macors. */
 #define GNUPG (opt.compliance==CO_GNUPG || opt.compliance==CO_DE_VS)
 #define RFC2440 (opt.compliance==CO_RFC2440)
 #define RFC4880 (opt.compliance==CO_RFC4880)
@@ -402,6 +414,8 @@
 #define EXPORT_CLEAN (1<<5)
 #define EXPORT_DANE_FORMAT (1<<7)
 #define EXPORT_BACKUP (1<<10)
+#define EXPORT_REVOCS (1<<11)
+#define EXPORT_MODE1003 (1<<12)
 
 #define LIST_SHOW_PHOTOS (1<<0)
 #define LIST_SHOW_POLICY_URLS (1<<1)
@@ -418,6 +432,9 @@
 #define LIST_SHOW_USAGE (1<<11)
 #define LIST_SHOW_ONLY_FPR_MBOX (1<<12)
 #define LIST_SORT_SIGS (1<<13)
+#define LIST_SHOW_PREF (1<<14)
+#define LIST_SHOW_PREF_VERBOSE (1<<15)
+#define LIST_SHOW_UNUSABLE_SIGS (1<<16)
 
 #define VERIFY_SHOW_PHOTOS (1<<0)
 #define VERIFY_SHOW_POLICY_URLS (1<<1)

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/packet.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/packet.h Changed

@@ -56,6 +56,15 @@
       | GCRY_PK_USAGE_AUTH | GCRY_PK_USAGE_UNKN) >= 256
 # error Please choose another value for PUBKEY_USAGE_NONE
 #endif
+#define PUBKEY_USAGE_GROUP   512                 /* Group flag.  */
+#define PUBKEY_USAGE_RENC    1024                /* Restricted encryption.  */
+#define PUBKEY_USAGE_TIME    2048                /* Timestamp use.  */
+
+/* Bitflags to convey hints on what kind of signature is created.  */
+#define SIGNHINT_KEYSIG  1
+#define SIGNHINT_SELFSIG 2
+#define SIGNHINT_ADSK    4
+
 
 /* Helper macros.  */
 #define is_RSA(a)     ((a)==PUBKEY_ALGO_RSA || (a)==PUBKEY_ALGO_RSA_E \
@@ -284,7 +293,7 @@
   /* The length of ATTRIB_DATA.  */
   unsigned long attrib_len;
   byte *namehash;
-  int help_key_usage;
+  u16 help_key_usage;
   u32 help_key_expire;
   int help_full_count;
   int help_marginal_count;
@@ -385,7 +394,7 @@
   byte    selfsigversion; /* highest version of all of the self-sigs */
   /* The public key algorithm.  (Serialized.)  */
   byte    pubkey_algo;
-  byte    pubkey_usage;   /* for now only used to pass it to getkey() */
+  u16     pubkey_usage;   /* carries the usage info.            */
   byte    req_usage;      /* hack to pass a request to getkey() */
   byte    fprlen;         /* 0 or length of FPR.  */
   u32     has_expired;    /* set to the expiration date if expired */
@@ -858,7 +867,8 @@
 u32 calc_packet_length( PACKET *pkt );
 void build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type,
 			const byte *buffer, size_t buflen );
-void build_sig_subpkt_from_sig (PKT_signature *sig, PKT_public_key *pksk);
+void build_sig_subpkt_from_sig (PKT_signature *sig, PKT_public_key *pksk,
+                                unsigned int signhints);
 int  delete_sig_subpkt(subpktarea_t *buffer, sigsubpkttype_t type );
 void build_attribute_subpkt(PKT_user_id *uid,byte type,
 			    const void *buf,u32 buflen,
@@ -880,6 +890,7 @@
 void free_comment( PKT_comment *rem );
 void free_packet (PACKET *pkt, parse_packet_ctx_t parsectx);
 prefitem_t *copy_prefs (const prefitem_t *prefs);
+PKT_public_key *copy_public_key_basics (PKT_public_key *d, PKT_public_key *s);
 PKT_public_key *copy_public_key( PKT_public_key *d, PKT_public_key *s );
 PKT_signature *copy_signature( PKT_signature *d, PKT_signature *s );
 PKT_user_id *scopy_user_id (PKT_user_id *sd );

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/parse-packet.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/parse-packet.c Changed

@@ -1993,10 +1993,13 @@
 return NULL;	/* End of packets; not found. */
 
 too_short:
- if (opt.verbose && !glo_ctrl.silence_parse_warnings)
- log_printhex (pktbuf->data, pktbuf->len > 16? 16 : pktbuf->len,
- "buffer shorter than subpacket (%zu/%d/%zu); dump:",
- pktbuf->len, buflen, n);
+ if (opt.debug && !glo_ctrl.silence_parse_warnings)
+ {
+ es_fflush (es_stdout);
+ log_printhex (pktbuf->data, pktbuf->len > 16? 16 : pktbuf->len,
+ "buffer shorter than subpacket (%zu/%d/%zu); dump:",
+ pktbuf->len, buflen, n);
+ }
 
 if (start)
 *start = -1;
@@ -2215,8 +2218,8 @@
 if (p)
 	sig->timestamp = buf32_to_u32 (p);
 else if (!(sig->pubkey_algo >= 100 && sig->pubkey_algo <= 110)
-	 && opt.verbose && !glo_ctrl.silence_parse_warnings)
-	log_info ("signature packet without timestamp\n");
+	 && opt.verbose > 1 && !glo_ctrl.silence_parse_warnings)
+ log_info ("signature packet without timestamp\n");
 
 /* Set the key id. We first try the issuer fingerprint and if
 * it is a v4 signature the fallback to the issuer. Note that
@@ -2238,7 +2241,7 @@
 	 sig->keyid1 = buf32_to_u32 (p + 4);
 	}
 else if (!(sig->pubkey_algo >= 100 && sig->pubkey_algo <= 110)
-	 && opt.verbose && !glo_ctrl.silence_parse_warnings)
+	 && opt.verbose > 1 && !glo_ctrl.silence_parse_warnings)
 	log_info ("signature packet without keyid\n");
 
 p = parse_sig_subpkt (sig, 1, SIGSUBPKT_SIG_EXPIRE, NULL);
@@ -2749,11 +2752,15 @@
 		 break;
 		case 1001:
 		 if (list_mode)
-		 es_fprintf (listfp, "\tgnu-dummy S2K");
+		 es_fprintf (listfp, "\tgnu-dummy");
 		 break;
 		case 1002:
 		 if (list_mode)
-		 es_fprintf (listfp, "\tgnu-divert-to-card S2K");
+		 es_fprintf (listfp, "\tgnu-divert-to-card");
+		 break;
+		case 1003:
+		 if (list_mode)
+		 es_fprintf (listfp, "\tgnu-mode1003");
 		 break;
 		default:
 		 if (list_mode)
@@ -2765,7 +2772,7 @@
 		}
 
 /* Print some info. */
-	 if (list_mode)
+	 if (list_mode && ski->s2k.mode != 1003)
 		{
 		 es_fprintf (listfp, ", algo: %d,%s hash: %d",
 ski->algo,
@@ -2776,8 +2783,9 @@
 		 es_fprintf (listfp, ", salt: ");
 es_write_hexstring (listfp, ski->s2k.salt, 8, 0, NULL);
 		 }
-		 es_putc ('\n', listfp);
-		}
+ }
+ if (list_mode)
+ es_putc ('\n', listfp);
 
 /* Read remaining protection parameters. */
 	 if (ski->s2k.mode == 3)
@@ -2835,7 +2843,7 @@
 	 ski->ivlen = openpgp_cipher_blocklen (ski->algo);
 	 log_assert (ski->ivlen <= sizeof (temp));
 
-	 if (ski->s2k.mode == 1001)
+	 if (ski->s2k.mode == 1001 || ski->s2k.mode == 1003)
 	 ski->ivlen = 0;
 	 else if (ski->s2k.mode == 1002)
 	 ski->ivlen = snlen < 16 ? snlen : 16;
@@ -2847,7 +2855,7 @@
 	 }
 	 for (i = 0; i < ski->ivlen; i++, pktlen--)
 	 tempi = iobuf_get_noeof (inp);
-	 if (list_mode)
+	 if (list_mode && ski->s2k.mode != 1003)
 	 {
 	 es_fprintf (listfp,
 ski->s2k.mode == 1002 ? "\tserial-number: "
@@ -2885,6 +2893,35 @@
 						 10 * 8);
 	 pktlen = 0;
 	}
+ else if (ski->s2k.mode == 1003)
+	{
+ void *tmpp;
+
+	 if (pktlen < 2) /* At least two bytes for parenthesis. */
+	 {
+ err = gpg_error (GPG_ERR_INV_PACKET);
+	 goto leave;
+	 }
+
+ tmpp = read_rest (inp, pktlen);
+ if (list_mode)
+ {
+ if (mpi_print_mode)
+ {
+ char *tmpsxp = canon_sexp_to_string (tmpp, pktlen);
+ es_fprintf (listfp, "\tskey%d: %s\n", npkey,
+ tmpsxp? trim_trailing_spaces (tmpsxp)
+ /* */: "invalid S-expression");
+ xfree (tmpsxp);
+ }
+ else
+ es_fprintf (listfp, "\tskey%d: s-expression %lu octets\n",
+ npkey, pktlen);
+ }
+	 pk->pkeynpkey = gcry_mpi_set_opaque (NULL,
+						 tmpp, tmpp? pktlen * 8 : 0);
+ pktlen = 0;
+	}
 else if (ski->is_protected)
 	{
 void *tmpp;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/passphrase.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/passphrase.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/photoid.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/photoid.c Changed

@@ -36,7 +36,6 @@
 #include "../common/util.h"
 #include "packet.h"
 #include "../common/status.h"
-#include "exec.h"
 #include "keydb.h"
 #include "../common/i18n.h"
 #include "../common/iobuf.h"
@@ -46,6 +45,114 @@
 #include "../common/ttyio.h"
 #include "trustdb.h"
 
+#if defined (_WIN32)
+/* This is a nicer system() for windows that waits for programs to
+ return before returning control to the caller. I hate helpful
+ computers. */
+static int
+w32_system (const char *command)
+{
+ if (!strncmp (command, "!ShellExecute ", 14))
+ {
+ SHELLEXECUTEINFOW see;
+ wchar_t *wname;
+ int waitms;
+
+ command = command + 14;
+ while (spacep (command))
+ command++;
+ waitms = atoi (command);
+ if (waitms < 0)
+ waitms = 0;
+ else if (waitms > 60*1000)
+ waitms = 60000;
+ while (*command && !spacep (command))
+ command++;
+ while (spacep (command))
+ command++;
+
+ wname = utf8_to_wchar (command);
+ if (!wname)
+ return -1;
+
+ memset (&see, 0, sizeof see);
+ see.cbSize = sizeof see;
+ see.fMask = (SEE_MASK_NOCLOSEPROCESS
+ | SEE_MASK_NOASYNC
+ | SEE_MASK_FLAG_NO_UI
+ | SEE_MASK_NO_CONSOLE);
+ see.lpVerb = L"open";
+ see.lpFile = (LPCWSTR)wname;
+ see.nShow = SW_SHOW;
+
+ if (DBG_EXTPROG)
+ log_debug ("running ShellExecuteEx(open,'%s')\n", command);
+ if (!ShellExecuteExW (&see))
+ {
+ if (DBG_EXTPROG)
+ log_debug ("ShellExecuteEx failed: rc=%d\n", (int)GetLastError ());
+ xfree (wname);
+ return -1;
+ }
+ if (DBG_EXTPROG)
+ log_debug ("ShellExecuteEx succeeded (hProcess=%p,hInstApp=%d)\n",
+ see.hProcess, (int)see.hInstApp);
+
+ if (!see.hProcess)
+ {
+ gnupg_usleep (waitms*1000);
+ if (DBG_EXTPROG)
+ log_debug ("ShellExecuteEx ready (wait=%dms)\n", waitms);
+ }
+ else
+ {
+ WaitForSingleObject (see.hProcess, INFINITE);
+ if (DBG_EXTPROG)
+ log_debug ("ShellExecuteEx ready\n");
+ }
+ CloseHandle (see.hProcess);
+
+ xfree (wname);
+ }
+ else
+ {
+ char *string;
+ wchar_t *wstring;
+ PROCESS_INFORMATION pi;
+ STARTUPINFOW si;
+
+ /* We must use a copy of the command as CreateProcess modifies
+ * this argument. */
+ string = xstrdup (command);
+ wstring = utf8_to_wchar (string);
+ xfree (string);
+ if (!wstring)
+ return -1;
+
+ memset (&pi, 0, sizeof(pi));
+ memset (&si, 0, sizeof(si));
+ si.cb = sizeof (si);
+
+ if (!CreateProcessW (NULL, wstring, NULL, NULL, FALSE,
+ DETACHED_PROCESS,
+ NULL, NULL, &si, &pi))
+ {
+ xfree (wstring);
+ return -1;
+ }
+
+ /* Wait for the child to exit */
+ WaitForSingleObject (pi.hProcess, INFINITE);
+
+ CloseHandle (pi.hProcess);
+ CloseHandle (pi.hThread);
+ xfree (wstring);
+ }
+
+ return 0;
+}
+#endif /*_W32*/
+
 /* Generate a new photo id packet, or return NULL if canceled.
 FIXME: Should we add a duplicates check similar to generate_user_id? */
 PKT_user_id *
@@ -53,12 +160,11 @@
 {
 PKT_user_id *uid;
 int error=1,i;
- unsigned int len;
+ uint64_t len;
 char *filename;
 byte *photo=NULL;
 byte header16;
 IOBUF file;
- int overflow;
 
 header0=0x10; /* little side of photo header length */
 header1=0; /* big side of photo header length */
@@ -126,11 +232,18 @@
 	}
 
 
- len=iobuf_get_filelength(file, &overflow);
- if(len>6144 || overflow)
+ len = iobuf_get_filelength(file);
+ if(len>6144)
 	{
-	 tty_printf( _("This JPEG is really large (%d bytes) !\n"),len);
-	 if(!cpr_get_answer_is_yes("photoid.jpeg.size",
+ /* We silently skip JPEGs larger than 1MiB because we have a
+ * 2MiB limit on the user ID packets and we need some limit
+ * anyway because the returned u64 is larger than the u32 or
+ * OpenPGP. Note that the diagnostic may print a wrong
+ * value if the value is really large; we don't fix this to
+ * avoid a string change. */
+	 tty_printf( _("This JPEG is really large (%d bytes) !\n"), (int)len);
+	 if(len > 1024*1024
+ || !cpr_get_answer_is_yes("photoid.jpeg.size",
 			 _("Are you sure you want to use it? (y/N) ")))
 	 {
 	 iobuf_close(file);

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/pkclist.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/pkclist.c Changed

@@ -417,7 +417,11 @@
   if(trustlevel & TRUST_FLAG_REVOKED
      || trustlevel & TRUST_FLAG_SUB_REVOKED
      || (trustlevel & TRUST_MASK) == TRUST_EXPIRED)
-    BUG();
+    {
+      if (opt.ignore_expiration)
+        return 0;
+      BUG ();
+    }
 
   if( opt.trust_model==TM_ALWAYS )
     {
@@ -845,7 +849,8 @@
 {
   int rc;
   PKT_public_key *pk;
-  KBNODE keyblock = NULL;
+  kbnode_t keyblock = NULL;
+  kbnode_t node;
 
   if (!name || !*name)
     return gpg_error (GPG_ERR_INV_USER_ID);
@@ -856,7 +861,7 @@
   pk->req_usage = use;
 
   if (from_file)
-    rc = get_pubkey_fromfile (ctrl, pk, name);
+    rc = get_pubkey_fromfile (ctrl, pk, name, &keyblock);
   else
     rc = get_best_pubkey_byname (ctrl, GET_PUBKEY_NORMAL,
                                  NULL, pk, name, &keyblock, 0);
@@ -895,10 +900,10 @@
       int trustlevel;
 
       trustlevel = get_validity (ctrl, keyblock, pk, pk->user_id, NULL, 1);
-      release_kbnode (keyblock);
       if ( (trustlevel & TRUST_FLAG_DISABLED) )
         {
           /* Key has been disabled. */
+          release_kbnode (keyblock);
           send_status_inv_recp (13, name);
           log_info (_("%s: skipped: public key is disabled\n"), name);
           free_public_key (pk);
@@ -908,6 +913,7 @@
       if ( !do_we_trust_pre (ctrl, pk, trustlevel) )
         {
           /* We don't trust this key.  */
+          release_kbnode (keyblock);
           send_status_inv_recp (10, name);
           free_public_key (pk);
           return GPG_ERR_UNUSABLE_PUBKEY;
@@ -926,19 +932,33 @@
     {
       pk_list_t r;
 
-      r = xtrymalloc (sizeof *r);
-      if (!r)
-        {
-          rc = gpg_error_from_syserror ();
-          free_public_key (pk);
-          return rc;
-        }
+      r = xmalloc (sizeof *r);
       r->pk = pk;
       r->next = *pk_list_addr;
       r->flags = mark_hidden? 1:0;
       *pk_list_addr = r;
     }
 
+  for (node = keyblock; node; node = node->next)
+    if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY
+        && ((pk=node->pkt->pkt.public_key)->pubkey_usage & PUBKEY_USAGE_RENC)
+        && pk->flags.valid
+        && !pk->flags.revoked
+        && !pk->flags.disabled
+        && !pk->has_expired
+        && key_present_in_pk_list (*pk_list_addr, pk))
+      {
+        pk_list_t r;
+
+        r = xmalloc (sizeof *r);
+        r->pk = copy_public_key (NULL, pk);
+        r->next = *pk_list_addr;
+        r->flags = mark_hidden? 1:0;  /* FIXME: Use PK_LIST_HIDDEN ? */
+        *pk_list_addr = r;
+      }
+
+
+  release_kbnode (keyblock);
   return 0;
 }
 
@@ -1519,9 +1539,17 @@
 	     code will never even be called.  Even if the hash wasn't
 	     locked at MD5, we don't support sign+encrypt in --pgp2
 	     mode, and that's the only time PREFTYPE_HASH is used
-	     anyway. -dms */
+	     anyway. -dms
+
+             Because "de-vs" compliance does not allow SHA-1 it does
+             not make sense to assign SHA-1 as implicit algorithm.
+             Instead it is better to use SHA-256 as implicit algorithm
+             (which will be the case for rfc4880bis anyway).  */
 
-          implicit=DIGEST_ALGO_SHA1;
+          if (opt.compliance == CO_DE_VS)
+            implicit = DIGEST_ALGO_SHA256;
+          else
+            implicit = DIGEST_ALGO_SHA1;
 
 	  break;
 
@@ -1595,8 +1623,6 @@
       prefs=NULL;
       if(preftype==PREFTYPE_SYM && opt.personal_cipher_prefs)
 	prefs=opt.personal_cipher_prefs;
-      else if(preftype==PREFTYPE_AEAD && opt.personal_aead_prefs)
-	prefs=opt.personal_aead_prefs;
       else if(preftype==PREFTYPE_HASH && opt.personal_digest_prefs)
 	prefs=opt.personal_digest_prefs;
       else if(preftype==PREFTYPE_ZIP && opt.personal_compress_prefs)
@@ -1712,7 +1738,7 @@
         return 0;  /* At least one recipient does not support it. */
     }
 
-  return default_aead_algo (); /* Yes, AEAD can be used. */
+  return AEAD_ALGO_OCB; /* Yes, AEAD can be used. */
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/progress.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/progress.c Changed

@@ -72,13 +72,11 @@
 
 
 static void
-write_status_progress (const char *what,
-                       unsigned long current, unsigned long total_arg)
+write_status_progress (const char *what, uint64_t current, uint64_t total)
 {
   char buffer60;
   char units = "BKMGTPEZY?";
   int unitidx = 0;
-  uint64_t total = total_arg;
 
   /* Although we use an unsigned long for the values, 32 bit
    * applications using GPGME will use an "int" and thus are limited
@@ -91,7 +89,10 @@
    * to display how many percent of the operation has been done and
    * thus scaling CURRENT and TOTAL down before they get to large,
    * should not have a noticeable effect except for rounding
-   * imprecision. */
+   * imprecision.
+   * Update 2023-06-13: We now use uint64_t but to keep the API stable
+   * we still do the scaling.
+   */
 
   if (!total && opt.input_size_hint)
     total = opt.input_size_hint;
@@ -121,7 +122,7 @@
     unitidx = 9;
 
   snprintf (buffer, sizeof buffer, "%.20s ? %lu %lu %c%s",
-            what? what : "?", current, (unsigned long)total,
+            what? what : "?", (unsigned long)current, (unsigned long)total,
             unitsunitidx,
             unitidx? "iB" : "");
   write_status_text (STATUS_PROGRESS, buffer);
@@ -181,7 +182,7 @@
 void
 handle_progress (progress_filter_context_t *pfx, IOBUF inp, const char *name)
 {
-  off_t filesize = 0;
+  uint64_t filesize = 0;
 
   if (!pfx)
     return;
@@ -190,7 +191,7 @@
   log_assert (is_status_enabled ());
 
   if ( !iobuf_is_pipe_filename (name) && *name )
-    filesize = iobuf_get_filelength (inp, NULL);
+    filesize = iobuf_get_filelength (inp);
   else if (opt.set_filesize)
     filesize = opt.set_filesize;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/sig-check.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/sig-check.c Changed

@@ -78,17 +78,10 @@
 NULL))
 {
 /* Compliance failure. */
- log_info (_("key %s may not be used for signing in %s mode\n"),
+ log_error (_("key %s may not be used for signing in %s mode\n"),
 keystr_from_pk (pk),
 gnupg_compliance_option_string (opt.compliance));
- if (opt.flags.override_compliance_check)
- log_info (_("continuing verification anyway due to option %s\n"),
- "--override-compliance-failure");
- else
- {
- log_inc_errorcount (); /* We used log info above. */
- err = gpg_error (GPG_ERR_PUBKEY_ALGO);
- }
+ err = gpg_error (GPG_ERR_PUBKEY_ALGO);
 }
 
 return err;
@@ -370,7 +363,8 @@
 if (r_revoked)
 *r_revoked = 0;
 
- if (pk->timestamp > sig->timestamp )
+ if (pk->timestamp > sig->timestamp
+ && !(parse_key_usage (sig) & PUBKEY_USAGE_RENC))
 {
 ulong d = pk->timestamp - sig->timestamp;
 if ( d < 86400 )
@@ -426,7 +420,7 @@
 char buf11;
 if (opt.verbose)
 log_info (_("Note: signature key %s expired %s\n"),
- keystr_from_pk(pk), asctimestamp( pk->expiredate ) );
+ keystr_from_pk(pk), isotimestamp( pk->expiredate ) );
 snprintf (buf, sizeof buf, "%lu",(ulong)pk->expiredate);
 write_status_text (STATUS_KEYEXPIRED, buf);
 if (r_expired)

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/sign.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/sign.c Changed

@@ -50,11 +50,6 @@
 #endif
 
 
-/* Bitflags to convey hints on what kind of signayire is created. */
-#define SIGNHINT_KEYSIG 1
-#define SIGNHINT_SELFSIG 2
-
-
 /* Hack */
 static int recipient_digest_algo;
 
@@ -416,7 +411,10 @@
 byte *dp;
 char *hexgrip;
 
- if (pksk->timestamp > sig->timestamp )
+ /* An ADSK key commonly has a creation date older than the primary
+ * key. For example because the ADSK is used as an archive key for
+ * a group of users. */
+ if (pksk->timestamp > sig->timestamp && !(signhints & SIGNHINT_ADSK))
 {
 ulong d = pksk->timestamp - sig->timestamp;
 log_info (ngettext("key %s was created %lu second"
@@ -825,11 +823,10 @@
 /* Try to calculate the length of the data. */
 if ( !iobuf_is_pipe_filename (fname) && *fname)
 {
- off_t tmpsize;
- int overflow;
+ uint64_t tmpsize;
 
- if (!(tmpsize = iobuf_get_filelength (inp, &overflow))
- && !overflow && opt.verbose)
+ tmpsize = iobuf_get_filelength (inp);
+ if (!tmpsize && opt.verbose)
 log_info (_("WARNING: '%s' is an empty file\n"), fname);
 
 /* We can't encode the length of very large files because
@@ -964,7 +961,7 @@
 if (gcry_md_copy (&md, hash))
 BUG ();
 
- build_sig_subpkt_from_sig (sig, pk);
+ build_sig_subpkt_from_sig (sig, pk, 0);
 mk_notation_policy_etc (ctrl, sig, NULL, pk);
 if (opt.flags.include_key_block && IS_SIG (sig))
 err = mk_sig_subpkt_key_block (ctrl, sig, pk);
@@ -1037,6 +1034,9 @@
 int multifile = 0;
 u32 duration=0;
 pt_extra_hash_data_t extrahash = NULL;
+ char peekbuf32;
+ int peekbuflen = 0;
+
 
 pfx = new_progress_context ();
 afx = new_armor_context ();
@@ -1095,6 +1095,14 @@
 goto leave;
 	}
 
+ peekbuflen = iobuf_ioctl (inp, IOBUF_IOCTL_PEEK, sizeof peekbuf, peekbuf);
+ if (peekbuflen < 0)
+ {
+ peekbuflen = 0;
+ if (DBG_FILTER)
+ log_debug ("peeking at input failed\n");
+ }
+
 handle_progress (pfx, inp, fname);
 }
 
@@ -1251,8 +1259,14 @@
 {
 int compr_algo = opt.compress_algo;
 
- /* If not forced by user */
- if (compr_algo==-1)
+ if (!opt.explicit_compress_option
+ && is_file_compressed (peekbuf, peekbuflen))
+ {
+ if (opt.verbose)
+ log_info(_("'%s' already compressed\n"), fname? fname: "stdin");
+ compr_algo = 0;
+ }
+ else if (compr_algo==-1)
 {
 /* If we're not encrypting, then select_algo_from_prefs
 * will fail and we'll end up with the default. If we are
@@ -1741,14 +1755,14 @@
 *
 * SIGCLASS is the type of signature to create.
 *
- * DIGEST_ALGO is the digest algorithm. If it is 0 the function
- * selects an appropriate one.
- *
 * TIMESTAMP is the timestamp to use for the signature. 0 means "now"
 *
 * DURATION is the amount of time (in seconds) until the signature
 * expires.
 *
+ * If CACHED_NONCE is not NULL the agent may use it to avoid
+ * additional pinnetry popups for the same keyblock.
+ *
 * This function creates the following subpackets: issuer, created,
 * and expire (if duration is not 0). Additional subpackets can be
 * added using MKSUBPKT, which is called after these subpackets are
@@ -1816,6 +1830,8 @@
 {
 /* Hash the subkey binding/backsig/revocation. */
 hash_public_key (md, subpk);
+ if ((subpk->pubkey_usage & PUBKEY_USAGE_RENC))
+ signhints |= SIGNHINT_ADSK;
 }
 else if (sigclass != 0x1F && sigclass != 0x20)
 {
@@ -1835,7 +1851,7 @@
 sig->expiredate = sig->timestamp + duration;
 sig->sig_class = sigclass;
 
- build_sig_subpkt_from_sig (sig, pksk);
+ build_sig_subpkt_from_sig (sig, pksk, signhints);
 mk_notation_policy_etc (ctrl, sig, pk, pksk);
 
 /* Crucial that the call to mksubpkt comes LAST before the calls
@@ -1959,6 +1975,12 @@
 }
 }
 
+ /* Detect an ADSK key binding signature. */
+ if ((sig->sig_class == 0x18
+ || sig->sig_class == 0x19 || sig->sig_class == 0x28)
+ && (pk->pubkey_usage & PUBKEY_USAGE_RENC))
+ signhints |= SIGNHINT_ADSK;
+
 /* Note that already expired sigs will remain expired (with a
 * duration of 1) since build-packet.c:build_sig_subpkt_from_sig
 * detects this case. */
@@ -1967,7 +1989,7 @@
 * automagically lower any sig expiration dates to correctly
 * correspond to the differences in the timestamps (i.e. the
 * duration will shrink). */
- build_sig_subpkt_from_sig (sig, pksk);
+ build_sig_subpkt_from_sig (sig, pksk, signhints);
 
 if (mksubpkt)
 rc = (*mksubpkt)(sig, opaque);

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/t-keydb-get-keyblock.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/t-keydb-get-keyblock.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/t-keydb.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/t-keydb.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/t-stutter.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/t-stutter.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/tdbio.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/tdbio.c Changed

@@ -48,13 +48,6 @@
 #define MY_O_BINARY  0
 #endif
 
-/* We use ERRNO despite that the cegcc provided open/read/write
-   functions don't set ERRNO - at least show that ERRNO does not make
-   sense.  */
-#ifdef HAVE_W32CE_SYSTEM
-#undef strerror
-#define strerror(a) ("errno not available")
-#endif
 
 /*
  * Yes, this is a very simple implementation. We should really
@@ -422,7 +415,7 @@
 
 /* Return true if the cache is dirty.  */
 int
-tdbio_is_dirty()
+tdbio_is_dirty (void)
 {
   return cache_is_dirty;
 }
@@ -432,7 +425,7 @@
  * Flush the cache.  This cannot be used while in a transaction.
  */
 int
-tdbio_sync()
+tdbio_sync (void)
 {
     CACHE_CTRL r;
     int did_lock = 0;
@@ -730,13 +723,6 @@
       int rc;
       mode_t oldmask;
 
-#ifdef HAVE_W32CE_SYSTEM
-      /* We know how the cegcc implementation of access works ;-). */
-      if (GetLastError () == ERROR_FILE_NOT_FOUND)
-        gpg_err_set_errno (ENOENT);
-      else
-        gpg_err_set_errno (EIO);
-#endif /*HAVE_W32CE_SYSTEM*/
       if (errno && errno != ENOENT)
         log_fatal ( _("can't access '%s': %s\n"), fname, strerror (errno));
 
@@ -779,7 +765,7 @@
  * Return the full name of the trustdb.
  */
 const char *
-tdbio_get_dbname ()
+tdbio_get_dbname (void)
 {
   return db_name;
 }
@@ -791,28 +777,12 @@
  * the trustdb handle (DB_FD) is guaranteed to be open.
  */
 static void
-open_db ()
+open_db (void)
 {
   TRUSTREC rec;
 
   log_assert( db_fd == -1 );
 
-#ifdef HAVE_W32CE_SYSTEM
-  {
-    DWORD prevrc = 0;
-    wchar_t *wname = utf8_to_wchar (db_name);
-    if (wname)
-      {
-        db_fd = (int)CreateFile (wname, GENERIC_READ|GENERIC_WRITE,
-                                 FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
-                                 OPEN_EXISTING, 0, NULL);
-        xfree (wname);
-      }
-    if (db_fd == -1)
-      log_fatal ("can't open '%s': %d, %d\n", db_name,
-                 (int)prevrc, (int)GetLastError ());
-  }
-#else /*!HAVE_W32CE_SYSTEM*/
   db_fd = gnupg_open (db_name, O_RDWR | MY_O_BINARY, 0);
   if (db_fd == -1 && (errno == EACCES
 #ifdef EROFS
@@ -827,7 +797,7 @@
   }
   if ( db_fd == -1 )
     log_fatal( _("can't open '%s': %s\n"), db_name, strerror(errno) );
-#endif /*!HAVE_W32CE_SYSTEM*/
+
   register_secured_file (db_name);
 
   /* Read the version record. */
@@ -889,7 +859,7 @@
  * Return: 1 for yes, 0 for no.
  */
 int
-tdbio_db_matches_options()
+tdbio_db_matches_options (void)
 {
   static int yes_no = -1;
 
@@ -946,7 +916,7 @@
  * problem the process is terminated.
  */
 ulong
-tdbio_read_nextcheck ()
+tdbio_read_nextcheck (void)
 {
   TRUSTREC vr;
   int rc;

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/test-stubs.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/test-stubs.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/trust.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/trust.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/trustdb.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/trustdb.c Changed

@@ -544,7 +544,7 @@
 }
 
 void
-how_to_fix_the_trustdb ()
+how_to_fix_the_trustdb (void)
 {
 const char *name = trustdb_args.dbname;
 
@@ -1707,38 +1707,50 @@
 return new;
 }
 
+
 /* Used by validate_one_keyblock to confirm a regexp within a trust
- signature. Returns 1 for match, and 0 for no match or regex
- error. */
+ * signature. Returns 1 for match, and 0 for no match or regex
+ * error. */
 static int
-check_regexp(const char *expr,const char *string)
+check_regexp (const char *expr,const char *string)
 {
 int ret;
 char *regexp;
+ char *stringbuf = NULL;
+ regex_t pat;
 
- regexp=sanitize_regexp(expr);
-
- {
- regex_t pat;
+ regexp = sanitize_regexp (expr);
 
- ret=regcomp(&pat,regexp,REG_ICASE|REG_EXTENDED);
- if(ret==0)
- {
-	ret=regexec(&pat,string,0,NULL,0);
-	regfree(&pat);
- }
- ret=(ret==0);
- }
+ ret = regcomp (&pat, regexp, (REG_ICASE|REG_EXTENDED));
+ if (!ret)
+ {
+ if (*regexp == '<' && !strchr (string, '<')
+ && is_valid_mailbox (string))
+ {
+ /* The R.E. starts with an angle bracket but STRING seems to
+ * be a plain mailbox (e.g. "foo@example.org"). The
+ * commonly used R.E. pattern "<^>+@.example\.org>$"
+ * won't be able to detect this. Thus we enclose STRING
+ * into angle brackets for checking. */
+ stringbuf = xstrconcat ("<", string, ">", NULL);
+ string = stringbuf;
+ }
+ ret = regexec (&pat, string, 0, NULL, 0);
+ regfree (&pat);
+ }
 
- if(DBG_TRUST)
- log_debug("regexp '%s' ('%s') on '%s': %s\n",
-	 regexp,expr,string,ret?"YES":"NO");
+ ret = !ret;
 
- xfree(regexp);
+ if (DBG_TRUST)
+ log_debug ("regexp '%s' ('%s') on '%s'%s: %s\n",
+ regexp, expr, string, stringbuf? " (fixed)":"", ret? "YES":"NO");
 
+ xfree (regexp);
+ xfree (stringbuf);
 return ret;
 }
 
+
 /*
 * Return true if the key is signed by one of the keys in the given
 * key ID list. User IDs with a valid signature are marked by node

_service:tar_scm:gnupg-2.3.6.tar.bz2/g10/verify.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g10/verify.c Changed

@@ -1,6 +1,8 @@
 /* verify.c - Verify signed data
 * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
 * 2007, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2006-2008, 2010-2011, 2015-2017,
+ * 2020, 2023 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>
@@ -281,3 +284,124 @@
 release_armor_context (afx);
 return rc;
 }
+
+
+static int
+is_fingerprint (const char *string)
+{
+ int n;
+
+ if (!string || !*string)
+ return 0;
+ for (n=0; hexdigitp (string); string++)
+ n++;
+ if (!*string && (n == 40 || n == 64))
+ return 1; /* v4 or v5 fingerprint. */
+
+ return 0;
+}
+
+
+/* This function shall be called with the main and subkey fingerprint
+ * iff a signature is fully valid. If the option --assert-signer is
+ * active it check whether the signing key matches one of the keys
+ * given by this option and if so, sets a global flag. */
+void
+check_assert_signer_list (const char *mainpkhex, const char *pkhex)
+{
+ gpg_error_t err;
+ strlist_t item;
+ const char *fname;
+ estream_t fp = NULL;
+ int lnr;
+ int n, c;
+ char *p, *pend;
+ char line256;
+
+ if (!opt.assert_signer_list)
+ return; /* Nothing to do. */
+ if (assert_signer_true)
+ return; /* Already one valid signature seen. */
+
+ for (item = opt.assert_signer_list; item; item = item->next)
+ {
+ if (is_fingerprint (item->d))
+ {
+ ascii_strupr (item->d);
+ if (!strcmp (item->d, mainpkhex) || !strcmp (item->d, pkhex))
+ {
+ assert_signer_true = 1;
+ write_status_text (STATUS_ASSERT_SIGNER, item->d);
+ if (!opt.quiet)
+ log_info ("signer '%s' matched\n", item->d);
+ goto leave;
+ }
+ }
+ else /* Assume this is a file - read and compare. */
+ {
+ fname = item->d;
+ es_fclose (fp);
+ fp = es_fopen (fname, "r");
+ if (!fp)
+ {
+ err = gpg_error_from_syserror ();
+ log_error (_("error opening '%s': %s\n"),
+ fname, gpg_strerror (err));
+ continue;
+ }
+
+ lnr = 0;
+ err = 0;
+ while (es_fgets (line, DIM(line)-1, fp))
+ {
+ lnr++;
+
+ n = strlen (line);
+ if (!n || linen-1 != '\n')
+ {
+ /* Eat until end of line. */
+ while ( (c=es_getc (fp)) != EOF && c != '\n')
+ ;
+ err = gpg_error (GPG_ERR_INCOMPLETE_LINE);
+ log_error (_("file '%s', line %d: %s\n"),
+ fname, lnr, gpg_strerror (err));
+ continue;
+ }
+ line--n = 0; /* Chop the LF. */
+ if (n && linen-1 == '\r')
+ line--n = 0; /* Chop an optional CR. */
+
+ /* Allow for empty lines and spaces */
+ for (p=line; spacep (p); p++)
+ ;
+ if (!*p || *p == '#')
+ continue;
+
+ /* Get the first token and ignore trailing stuff. */
+ for (pend = p; *pend && !spacep (pend); pend++)
+ ;
+ *pend = 0;
+ ascii_strupr (p);
+
+ if (!strcmp (p, mainpkhex) || !strcmp (p, pkhex))
+ {
+ assert_signer_true = 1;
+ write_status_text (STATUS_ASSERT_SIGNER, p);
+ if (!opt.quiet)
+ log_info ("signer '%s' matched '%s', line %d\n",
+ p, fname, lnr);
+ goto leave;
+ }
+ }
+ if (!err && !es_feof (fp))
+ {
+ err = gpg_error_from_syserror ();
+ log_error (_("error reading '%s', line %d: %s\n"),
+ fname, lnr, gpg_strerror (err));
+ }
+ }
+ }
+
+ leave:
+ es_fclose (fp);
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/g13/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g13/Makefile.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g13/all-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g13/all-tests.scm Changed

@@ -26,10 +26,21 @@
  (define (parse filename key)
    (parse-makefile-expand filename expander key))
 
- (map (lambda (name)
-	(test::binary #f
-		      (path-join "g13" name)
-		      (path-join (getenv "objdir") "g13" name)))
-      (parse-makefile-expand (in-srcdir "g13" "Makefile.am")
-			     (lambda (filename port key) (parse-makefile port key))
-			     "module_tests")))
+ (define g13-enabled?
+   ;; Parse the variable "g13" in the Makefile
+   (not (null?
+         (parse-makefile-expand (in-objdir "Makefile")
+                                (lambda (filename port key) (parse-makefile port key))
+			        "g13"))))
+ (if g13-enabled?
+     (map (lambda (name)
+            (let ((name-ext (string-append name (getenv "EXEEXT"))))
+	      (test::binary #f
+		            (path-join "g13" name-ext)
+		            (path-join (getenv "objdir") "g13" name-ext))))
+          (parse-makefile-expand (in-srcdir "g13" "Makefile.am")
+			         (lambda (filename port key) (parse-makefile port key))
+			         "module_tests"))
+     (begin
+       (info "SKIP: g13")
+       '())))

_service:tar_scm:gnupg-2.3.6.tar.bz2/g13/call-syshelp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g13/call-syshelp.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/g13/g13-syshelp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/g13/g13-syshelp.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/Makefile.am Changed

@@ -18,13 +18,16 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = mkerrors keyboxd-w32info.rc
+EXTRA_DIST = mkerrors keyboxd-w32info.rc keyboxd.w32-manifest.in
 
 AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
+
 if HAVE_W32_SYSTEM
 resource_objs += keyboxd-w32info.o
+
+keyboxd-w32info.o : keyboxd.w32-manifest ../common/w32info-rc.h
 endif
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
@@ -37,12 +40,6 @@
 libexec_PROGRAMS =
 endif
 
-if HAVE_W32CE_SYSTEM
-extra_libs =  $(LIBASSUAN_LIBS)
-else
-extra_libs =
-endif
-
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
 
@@ -75,7 +72,7 @@
 kbxutil_SOURCES = kbxutil.c $(common_sources)
 kbxutil_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
 kbxutil_LDADD   = $(common_libs) \
-                  $(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
+                  $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
                   $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) \
 		  $(NETLIBS)
 
@@ -98,7 +95,7 @@
 	        $(SQLITE3_LIBS) $(GPG_ERROR_LIBS) \
                 $(LIBINTL) $(NETLIBS) $(LIBICONV) \
 		$(resource_objs)
-keyboxd_LDFLAGS = $(extra_bin_ldflags)
+keyboxd_LDFLAGS =
 keyboxd_DEPENDENCIES = $(resource_objs)

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/Makefile.in Changed

@@ -165,7 +165,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 = keyboxd.w32-manifest
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
@@ -209,12 +209,10 @@
 am_kbxutil_OBJECTS = kbxutil-kbxutil.$(OBJEXT) $(am__objects_5)
 kbxutil_OBJECTS = $(am_kbxutil_OBJECTS)
 am__DEPENDENCIES_1 =
-@HAVE_W32CE_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 kbxutil_DEPENDENCIES = $(common_libs) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 kbxutil_LINK = $(CCLD) $(kbxutil_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am__objects_6 = keyboxd-keybox-util.$(OBJEXT) \
@@ -332,7 +330,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)/keyboxd.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)
@@ -527,7 +526,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = mkerrors keyboxd-w32info.rc
+EXTRA_DIST = mkerrors keyboxd-w32info.rc keyboxd.w32-manifest.in
 
 # NB: AM_CFLAGS may also be used by tools running on the build
 # platform to create source files.
@@ -535,16 +534,6 @@
 	$(am__append_2) $(am__append_3) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
 	$(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx. WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library. We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc. 256k is the largest stack
-# we use with pth.
-@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)
 
 # Convenience macros
@@ -554,8 +543,6 @@
 libcommontlsnpth = ../common/libcommontlsnpth.a
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
 noinst_LIBRARIES = libkeybox.a libkeybox509.a
-@HAVE_W32CE_SYSTEM_FALSE@extra_libs = 
-@HAVE_W32CE_SYSTEM_TRUE@extra_libs = $(LIBASSUAN_LIBS)
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
 common_sources = \
@@ -584,7 +571,7 @@
 kbxutil_SOURCES = kbxutil.c $(common_sources)
 kbxutil_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
 kbxutil_LDADD = $(common_libs) \
- $(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
+ $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
 $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) \
 		 $(NETLIBS)
 
@@ -608,7 +595,7 @@
 $(LIBINTL) $(NETLIBS) $(LIBICONV) \
 		$(resource_objs)
 
-keyboxd_LDFLAGS = $(extra_bin_ldflags)
+keyboxd_LDFLAGS = 
 keyboxd_DEPENDENCIES = $(resource_objs)
 all: all-am
 
@@ -644,6 +631,8 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+keyboxd.w32-manifest: $(top_builddir)/config.status $(srcdir)/keyboxd.w32-manifest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1704,6 +1693,8 @@
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
 
+@HAVE_W32_SYSTEM_TRUE@keyboxd-w32info.o : keyboxd.w32-manifest ../common/w32info-rc.h
+
 # Make sure that all libs are build before we use them. This is
 # important for things like make -j2.
 $(PROGRAMS): $(common_libs) $(commonpth_libs)

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/backend-support.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/backend-support.c Changed

@@ -173,18 +173,18 @@
   char hexubid2*UBID_LEN+1;
 
   bin2hex (ubid, UBID_LEN, hexubid);
-  err = status_printf (ctrl, "PUBKEY_INFO", "%d %s %c%c %d %d",
-                       pubkey_type, hexubid,
-                       is_ephemeral? 'e':'-',
-                       is_revoked?   'r':'-',
-                       uid_no, pk_no);
+  err = kbxd_status_printf (ctrl, "PUBKEY_INFO", "%d %s %c%c %d %d",
+                            pubkey_type, hexubid,
+                            is_ephemeral? 'e':'-',
+                            is_revoked?   'r':'-',
+                            uid_no, pk_no);
   if (err)
     goto leave;
 
   if (ctrl->no_data_return)
     err = 0;
   else
-    err = kbxd_write_data_line(ctrl, buffer, buflen);
+    err = kbxd_write_data_line (ctrl, buffer, buflen);
 
  leave:
   return err;
@@ -207,6 +207,7 @@
    *  SEQUENCE    SEQUENCE    0   INTEGER  INTEGER
    *              (tbs)            (version) (s/n)
    *
+   *  Note that v0 certificates don't have an explict version number.
    */
 
   p = blob;
@@ -226,7 +227,11 @@
   if (parse_ber_header (&p, &n, &class, &tag, &cons, &ndef, &objlen, &hdrlen))
     return 0; /* Not a proper BER object.  */
   if (!(class == CLASS_CONTEXT && tag == 0 && cons))
-    return 0; /* No context tag.  */
+    {
+      if (class == CLASS_UNIVERSAL && tag == TAG_INTEGER && !cons)
+        return 1; /* Might be a X.509 v0 cert with implict version.  */
+      return 0; /* No context tag.  */
+    }
 
   if (parse_ber_header (&p, &n, &class, &tag, &cons, &ndef, &objlen, &hdrlen))
     return 0; /* Not a proper BER object.  */

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/kbxserver.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/kbxserver.c Changed

@@ -173,6 +173,23 @@
   return err;
 }
 
+/* This status functions expects a printf style format string.  */
+gpg_error_t
+kbxd_status_printf (ctrl_t ctrl, const char *keyword, const char *format, ...)
+{
+  gpg_error_t err;
+  va_list arg_ptr;
+  assuan_context_t ctx = get_assuan_ctx_from_ctrl (ctrl);
+
+  if (!ctx) /* Oops - no assuan context.  */
+    return gpg_error (GPG_ERR_NOT_PROCESSED);
+
+  va_start (arg_ptr, format);
+  err = vprint_assuan_status (ctx, keyword, format, arg_ptr);
+  va_end (arg_ptr);
+  return err;
+}
+
 
 /* A wrapper around assuan_send_data which makes debugging the output
  * in verbose mode easier.  It also takes CTRL as argument.  */
@@ -929,9 +946,15 @@
     }
   else
     {
+      /* The fd-passing does not work reliable on Windows, and even it
+       * it is not used by gpg and gpgsm the current libassuan slows
+       * down things if it is allowed for the server.*/
       rc = assuan_init_socket_server (ctx, fd,
                                       (ASSUAN_SOCKET_SERVER_ACCEPTED
-                                       |ASSUAN_SOCKET_SERVER_FDPASSING));
+#ifndef HAVE_W32_SYSTEM
+                                       |ASSUAN_SOCKET_SERVER_FDPASSING
+#endif
+                                       ));
     }
 
   if (rc)
@@ -975,10 +998,6 @@
   ctrl->server_local->next_session = session_list;
   session_list = ctrl->server_local;
 
-
-  /* The next call enable the use of status_printf.  */
-  set_assuan_context_func (get_assuan_ctx_from_ctrl);
-
   for (;;)
     {
       rc = assuan_accept (ctx);
@@ -1029,7 +1048,6 @@
 
   assuan_close_output_fd (ctx);
 
-  set_assuan_context_func (NULL);
   ctrl->server_local->assuan_ctx = NULL;
   assuan_release (ctx);

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/kbxutil.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/kbxutil.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keybox-defs.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keybox-defs.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keybox-dump.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keybox-dump.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keybox-init.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keybox-init.c Changed

@@ -28,8 +28,26 @@
 #include "../common/sysutils.h"
 #include "../common/mischelp.h"
 
+#ifdef HAVE_W32_SYSTEM
+# define DEFAULT_LL_BUFFER_SIZE 128
+#else
+# define DEFAULT_LL_BUFFER_SIZE 64
+#endif
+
+static unsigned int ll_buffer_size = DEFAULT_LL_BUFFER_SIZE;
+
 static KB_NAME kb_names;
 
+/* This object is used to mahe setvbuf buffers. We use a short arary
+ * to be able to reuse already allocated buffers. */
+struct stream_buffer_s
+{
+ int inuse; /* True if used by a stream. */
+ size_t bufsize;
+ char *buf;
+};
+static struct stream_buffer_s stream_buffers5;
+
 
 /* Register a filename for plain keybox files. Returns 0 on success,
 * GPG_ERR_EEXIST if it has already been registered, or another error
@@ -85,6 +103,16 @@
 }
 
 
+/* Change the default buffering to KBYTES KiB; using 0 uses the syste
+ * buffers. This function must be called early. */
+void
+keybox_set_buffersize (unsigned int kbytes, int reserved)
+{
+ (void)reserved;
+ /* Round down to 8k multiples. */
+ ll_buffer_size = (kbytes + 7)/8 * 8;
+}
+
 
 static KEYBOX_HANDLE
 do_keybox_new (KB_NAME resource, int secret, int for_openpgp)
@@ -180,7 +208,7 @@
 _keybox_release_blob (hd->saved_found.blob);
 if (hd->fp)
 {
- es_fclose (hd->fp);
+ _keybox_ll_close (hd->fp);
 hd->fp = NULL;
 }
 xfree (hd->word_match.name);
@@ -236,6 +264,100 @@
 }
 
 
+/* Low-level open function to be used for keybox files. This function
+ * also manages custom buffering. On success 0 is returned and a new
+ * file pointer stored at RFP; on error an error code is returned and
+ * NULL is stored at RFP. MODE is one of
+ * KEYBOX_LL_OPEN_READ(0) := fopen mode is "rb"
+ * KEYBOX_LL_OPEN_UPDATE := fopen mode is "r+b"
+ * KEYBOX_LL_OPEN_CREATE := fopen mode is "wb"
+ */
+gpg_error_t
+_keybox_ll_open (estream_t *rfp, const char *fname, unsigned int mode)
+{
+ estream_t fp;
+ int i;
+ size_t bufsize;
+
+ *rfp = NULL;
+
+ fp = es_fopen (fname,
+ mode == KEYBOX_LL_OPEN_CREATE
+ ? "wb,sysopen,sequential" :
+ mode == KEYBOX_LL_OPEN_UPDATE
+ ? "r+b,sysopen,sequential" :
+ "rb,sysopen,sequential");
+ if (!fp)
+ return gpg_error_from_syserror ();
+
+ if (ll_buffer_size)
+ {
+ for (i=0; i < DIM (stream_buffers); i++)
+ if (!stream_buffersi.inuse)
+ {
+ /* There is a free slot - we can use a larger buffer. */
+ stream_buffersi.inuse = 1;
+ if (!stream_buffersi.buf)
+ {
+ bufsize = ll_buffer_size * 1024;
+ stream_buffersi.buf = xtrymalloc (bufsize);
+ if (stream_buffersi.buf)
+ stream_buffersi.bufsize = bufsize;
+ else
+ {
+ log_info ("can't allocate a large buffer for a kbx file;"
+ " using default\n");
+ stream_buffersi.inuse = 0;
+ }
+ }
+
+ if (stream_buffersi.buf)
+ {
+ es_setvbuf (fp, stream_buffersi.buf, _IOFBF,
+ stream_buffersi.bufsize);
+ es_opaque_set (fp, stream_buffers + i);
+ }
+ break;
+ }
+ }
+
+ *rfp = fp;
+ return 0;
+}
+
+
+/* Wrapper around es_fclose to be used for file opened with
+ * _keybox_ll_open. */
+gpg_error_t
+_keybox_ll_close (estream_t fp)
+{
+ gpg_error_t err;
+ struct stream_buffer_s *sbuf;
+ int i;
+
+ if (!fp)
+ return 0;
+
+ sbuf = ll_buffer_size? es_opaque_get (fp) : NULL;
+ if (es_fclose (fp))
+ err = gpg_error_from_syserror ();
+ else
+ err = 0;
+ if (sbuf)
+ {
+ for (i=0; i < DIM (stream_buffers); i++)
+ if (stream_buffers + i == sbuf)
+ break;
+ log_assert (i < DIM (stream_buffers));
+ stream_buffersi.inuse = 0;
+ }
+
+
+ return err;
+}
+
+
+
 /* Close the file of the resource identified by HD. For consistent
 results this function closes the files of all handles pointing to
 the resource identified by HD. */
@@ -253,7 +375,7 @@
 {
 if (roverhd->fp)
 {
- es_fclose (roverhd->fp);
+ _keybox_ll_close (roverhd->fp);
 roverhd->fp = NULL;
 }
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keybox-search.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keybox-search.c Changed

@@ -873,28 +873,12 @@
 }
 
 
-/* Helper to open the file.  */
-static gpg_error_t
-open_file (KEYBOX_HANDLE hd)
-{
-
-  hd->fp = es_fopen (hd->kb->fname, "rb");
-  if (!hd->fp)
-    {
-      hd->error = gpg_error_from_syserror ();
-      return hd->error;
-    }
-
-  return 0;
-}
-
-
 &#xc;
 /*
-
-  The search API
-
-*/
+ *
+ * The search API
+ *
+ */
 
 gpg_error_t
 keybox_search_reset (KEYBOX_HANDLE hd)
@@ -914,7 +898,7 @@
         {
           /* Ooops.  Seek did not work.  Close so that the search will
            * open the file again.  */
-          es_fclose (hd->fp);
+          _keybox_ll_close (hd->fp);
           hd->fp = NULL;
         }
     }
@@ -992,7 +976,7 @@
 
   if (!hd->fp)
     {
-      rc = open_file (hd);
+      rc = _keybox_ll_open (&hd->fp, hd->kb->fname, 0);
       if (rc)
         {
           xfree (sn_array);
@@ -1480,7 +1464,7 @@
           return 0;
         }
 
-      err = open_file (hd);
+      err = _keybox_ll_open (&hd->fp, hd->kb->fname, 0);
       if (err)
         return err;
     }

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keybox-update.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keybox-update.c Changed

@@ -78,10 +78,9 @@
   err = keybox_tmp_names (template, 0, r_bakfname, r_tmpfname);
   if (!err)
     {
-      *r_fp = es_fopen (*r_tmpfname, "wb");
-      if (!*r_fp)
+      err = _keybox_ll_open (r_fp, *r_tmpfname, KEYBOX_LL_OPEN_CREATE);
+      if (err)
         {
-          err = gpg_error_from_syserror ();
           xfree (*r_tmpfname);
           *r_tmpfname = NULL;
           xfree (*r_bakfname);
@@ -174,31 +173,32 @@
   if ((ec = gnupg_access (fname, W_OK)))
     return gpg_error (ec);
 
-  fp = es_fopen (fname, "rb");
-  if (mode == FILECOPY_INSERT && !fp && errno == ENOENT)
+  rc = _keybox_ll_open (&fp, fname, 0);
+  if (mode == FILECOPY_INSERT && gpg_err_code (rc) == GPG_ERR_ENOENT)
     {
       /* Insert mode but file does not exist:
-         Create a new keybox file. */
-      newfp = es_fopen (fname, "wb");
-      if (!newfp )
-        return gpg_error_from_syserror ();
+       * Create a new keybox file. */
+      rc = _keybox_ll_open (&newfp, fname, KEYBOX_LL_OPEN_CREATE);
+      if (rc)
+        return rc;
 
       rc = _keybox_write_header_blob (newfp, for_openpgp);
       if (rc)
         {
-          es_fclose (newfp);
+          _keybox_ll_close (newfp);
           return rc;
         }
 
       rc = _keybox_write_blob (blob, newfp, NULL);
       if (rc)
         {
-          es_fclose (newfp);
+          _keybox_ll_close (newfp);
           return rc;
         }
 
-      if ( es_fclose (newfp) )
-        return gpg_error_from_syserror ();
+      rc = _keybox_ll_close (newfp);
+      if (rc)
+        return rc;
 
 /*        if (chmod( fname, S_IRUSR | S_IWUSR )) */
 /*          { */
@@ -218,7 +218,7 @@
   rc = create_tmp_file (fname, &bakfname, &tmpfname, &newfp);
   if (rc)
     {
-      es_fclose (fp);
+      _keybox_ll_close (fp);
       goto leave;
     }
 
@@ -242,16 +242,16 @@
           if (es_fwrite (buffer, nread, 1, newfp) != 1)
             {
               rc = gpg_error_from_syserror ();
-              es_fclose (fp);
-              es_fclose (newfp);
+              _keybox_ll_close (fp);
+              _keybox_ll_close (newfp);
               goto leave;
             }
         }
       if (es_ferror (fp))
         {
           rc = gpg_error_from_syserror ();
-          es_fclose (fp);
-          es_fclose (newfp);
+          _keybox_ll_close (fp);
+          _keybox_ll_close (newfp);
           goto leave;
         }
     }
@@ -275,16 +275,16 @@
           if (es_fwrite (buffer, nread, 1, newfp) != 1)
             {
               rc = gpg_error_from_syserror ();
-              es_fclose (fp);
-              es_fclose (newfp);
+              _keybox_ll_close (fp);
+              _keybox_ll_close (newfp);
               goto leave;
             }
         }
       if (es_ferror (fp))
         {
           rc = gpg_error_from_syserror ();
-          es_fclose (fp);
-          es_fclose (newfp);
+          _keybox_ll_close (fp);
+          _keybox_ll_close (newfp);
           goto leave;
         }
 
@@ -292,8 +292,8 @@
       rc = _keybox_read_blob (NULL, fp, NULL);
       if (rc)
         {
-          es_fclose (fp);
-          es_fclose (newfp);
+          _keybox_ll_close (fp);
+          _keybox_ll_close (newfp);
           goto leave;
         }
     }
@@ -304,8 +304,8 @@
       rc = _keybox_write_blob (blob, newfp, NULL);
       if (rc)
         {
-          es_fclose (fp);
-          es_fclose (newfp);
+          _keybox_ll_close (fp);
+          _keybox_ll_close (newfp);
           goto leave;
         }
     }
@@ -318,32 +318,30 @@
           if (es_fwrite (buffer, nread, 1, newfp) != 1)
             {
               rc = gpg_error_from_syserror ();
-              es_fclose (fp);
-              es_fclose (newfp);
+              _keybox_ll_close (fp);
+              _keybox_ll_close (newfp);
               goto leave;
             }
         }
       if (es_ferror (fp))
         {
           rc = gpg_error_from_syserror ();
-          es_fclose (fp);
-          es_fclose (newfp);
+          _keybox_ll_close (fp);
+          _keybox_ll_close (newfp);
           goto leave;
         }
     }
 
   /* Close both files. */
-  if (es_fclose(fp))
+  rc = _keybox_ll_close (fp);
+  if (rc)
     {
-      rc = gpg_error_from_syserror ();
-      es_fclose (newfp);
-      goto leave;
-    }
-  if (es_fclose(newfp))
-    {
-      rc = gpg_error_from_syserror ();
+      _keybox_ll_close (newfp);
       goto leave;
     }
+  rc = _keybox_ll_close (newfp);
+  if (rc)
+    goto leave;
 
   rc = rename_tmp_file (bakfname, tmpfname, fname, secret);
 
@@ -502,6 +500,7 @@
 int
 keybox_set_flags (KEYBOX_HANDLE hd, int what, int idx, unsigned int value)
 {
+  gpg_error_t err;
   off_t off;
   const char *fname;
   estream_t fp;
@@ -536,9 +535,10 @@
   off += flag_pos;
 
   _keybox_close_file (hd);
-  fp = es_fopen (hd->kb->fname, "r+b");
-  if (!fp)
-    return gpg_error_from_syserror ();
+
+  err = _keybox_ll_open (&fp, fname, KEYBOX_LL_OPEN_UPDATE);
+  if (err)
+    return err;
 
   ec = 0;
   if (es_fseeko (fp, off, SEEK_SET))
@@ -566,10 +566,11 @@
         }
     }
 
-  if (es_fclose (fp))
+  err = _keybox_ll_close (fp);
+  if (err)
     {
       if (!ec)
-        ec = gpg_err_code_from_syserror ();
+        ec = gpg_err_code (err);
     }
 
   return gpg_error (ec);
@@ -583,7 +584,7 @@
   off_t off;
   const char *fname;
   estream_t fp;
-  int rc;
+  int rc, rc2;
 
   if (!hd)
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -601,9 +602,9 @@
   off += 4;
 
   _keybox_close_file (hd);
-  fp = es_fopen (hd->kb->fname, "r+b");
-  if (!fp)
-    return gpg_error_from_syserror ();
+  rc = _keybox_ll_open (&fp, hd->kb->fname, KEYBOX_LL_OPEN_UPDATE);
+  if (rc)
+    return rc;
 
   if (es_fseeko (fp, off, SEEK_SET))
     rc = gpg_error_from_syserror ();
@@ -612,10 +613,11 @@
   else
     rc = 0;
 
-  if (es_fclose (fp))
+  rc2 = _keybox_ll_close (fp);
+  if (rc2)
     {
       if (!rc)
-        rc = gpg_error_from_syserror ();
+        rc = rc2;
     }
 
   return rc;
@@ -628,7 +630,7 @@
 keybox_compress (KEYBOX_HANDLE hd)
 {
   gpg_err_code_t ec;
-  int read_rc, rc;
+  int read_rc, rc, rc2;
   const char *fname;
   estream_t fp, newfp;
   char *bakfname = NULL;
@@ -656,14 +658,11 @@
   if ((ec = gnupg_access (fname, W_OK)))
     return gpg_error (ec);
 
-  fp = es_fopen (fname, "rb");
-  if (!fp && errno == ENOENT)
+  rc = _keybox_ll_open (&fp, fname, 0);
+  if (gpg_err_code (rc) == GPG_ERR_ENOENT)
     return 0; /* Ready. File has been deleted right after the access above. */
-  if (!fp)
-    {
-      rc = gpg_error_from_syserror ();
-      return rc;
-    }
+  if (rc)
+    return rc;
 
   /* A quick test to see if we need to compress the file at all.  We
      schedule a compress run after 3 hours. */
@@ -679,7 +678,7 @@
 
           if ( (last_maint + 3*3600) > make_timestamp () )
             {
-              es_fclose (fp);
+              _keybox_ll_close (fp);
               _keybox_release_blob (blob);
               return 0; /* Compress run not yet needed. */
             }
@@ -693,7 +692,7 @@
   rc = create_tmp_file (fname, &bakfname, &tmpfname, &newfp);
   if (rc)
     {
-      es_fclose (fp);
+      _keybox_ll_close (fp);
       return rc;;
     }
 
@@ -782,10 +781,10 @@
     rc = read_rc;
 
   /* Close both files. */
-  if (es_fclose(fp) && !rc)
-    rc = gpg_error_from_syserror ();
-  if (es_fclose(newfp) && !rc)
-    rc = gpg_error_from_syserror ();
+  if ((rc2 = _keybox_ll_close (fp)) && !rc)
+    rc = rc2;
+  if ((rc2 = _keybox_ll_close (newfp)) && !rc)
+    rc = rc2;
 
   /* Rename or remove the temporary file. */
   if (rc || !any_changes)

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keybox.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keybox.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keyboxd-w32info.rc -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keyboxd-w32info.rc Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keyboxd.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keyboxd.c Changed

@@ -146,17 +146,12 @@
 
 /* The timer tick used for housekeeping stuff.  Note that on Windows
  * we use a SetWaitableTimer seems to signal earlier than about 2
- * seconds.  Thus we use 4 seconds on all platforms except for
- * Windowsce.  CHECK_OWN_SOCKET_INTERVAL defines how often we check
+ * seconds.  Thus we use 4 seconds on all platforms.
+ * CHECK_OWN_SOCKET_INTERVAL defines how often we check
  * our own socket in standard socket mode.  If that value is 0 we
  * don't check at all.  All values are in seconds. */
-#if defined(HAVE_W32CE_SYSTEM)
-# define TIMERTICK_INTERVAL         (60)
-# define CHECK_OWN_SOCKET_INTERVAL   (0)  /* Never */
-#else
 # define TIMERTICK_INTERVAL          (4)
 # define CHECK_OWN_SOCKET_INTERVAL  (60)
-#endif
 
 /* The list of open file descriptors at startup.  Note that this list
  * has been allocated using the standard malloc.  */
@@ -1141,8 +1136,6 @@
   len = SUN_LEN (unaddr);
   rc = assuan_sock_bind (fd, addr, len);
 
-  /* Our error code mapping on W32CE returns EEXIST thus we also test
-     for this. */
   if (rc == -1
       && (errno == EADDRINUSE
 #ifdef HAVE_W32_SYSTEM
@@ -1502,13 +1495,7 @@
   npth_sigev_add (SIGTERM);
   npth_sigev_fini ();
 #else
-# ifdef HAVE_W32CE_SYSTEM
-  /* Use a dummy event. */
-  sigs = 0;
-  ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
-# else
   events0 = INVALID_HANDLE_VALUE;
-# endif
 #endif
 
   if (disable_check_own_socket)

_service:tar_scm:gnupg-2.3.6.tar.bz2/kbx/keyboxd.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keyboxd.h Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/kbx/keyboxd.w32-manifest.in Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Public Key Daemon)</description>
+<assemblyIdentity
+ type="win32"
+ name="GnuPG.keyboxd"
+ version="@BUILD_VERSION@"
+ />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+</compatibility>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>

_service:tar_scm:gnupg-2.3.6.tar.bz2/m4/gpg-error.m4 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/m4/gpg-error.m4 Changed

@@ -1,5 +1,5 @@
 # gpg-error.m4 - autoconf macro to detect libgpg-error.
-# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021
+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021, 2022
 #               g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
@@ -10,23 +10,13 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# Last-changed: 2021-03-31
+# Last-changed: 2023-04-01
 
-
-dnl AM_PATH_GPG_ERROR(MINIMUM-VERSION,
-dnl                   ACTION-IF-FOUND , ACTION-IF-NOT-FOUND )
 dnl
-dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
-dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS.  The _MT_ variants are
-dnl used for programs requireing real multi thread support.
-dnl
-dnl If a prefix option is not used, the config script is first
-dnl searched in $SYSROOT/bin and then along $PATH.  If the used
-dnl config script does not match the host specification the script
-dnl is added to the gpg_config_script_warn variable.
+dnl Find gpg-error-config, for backward compatibility
 dnl
-AC_DEFUN(AM_PATH_GPG_ERROR,
- AC_REQUIRE(AC_CANONICAL_HOST)
+dnl _AM_PATH_POSSIBLE_GPG_ERROR_CONFIG
+AC_DEFUN(_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG,dnl
   gpg_error_config_prefix=""
   dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
   dnl since that is consistent with how our three siblings use the directory/
@@ -62,9 +52,14 @@
   fi
 
   AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
-  min_gpg_error_version=ifelse($1, ,1.33,$1)
-  ok=no
+)
 
+dnl
+dnl Find gpgrt-config, which uses .pc file
+dnl (minimum pkg-config functionality, supporting cross build)
+dnl
+dnl _AM_PATH_GPGRT_CONFIG
+AC_DEFUN(_AM_PATH_GPGRT_CONFIG,dnl
   AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, $prefix/bin:$PATH)
   if test "$GPGRT_CONFIG" != "no"; then
     # Determine gpgrt_libdir
@@ -120,8 +115,9 @@
         fi
         if test -n "$gpgrt_libdir"; then break; fi
       done
-    else
-      # When we cannot determine system libdir-format, use this:
+    fi
+    if test -z "$gpgrt_libdir"; then
+      # No valid pkgconfig dir in any of the system directories, fallback
       gpgrt_libdir=${possible_libdir1}
     fi
   else
@@ -135,11 +131,33 @@
       AC_MSG_NOTICE(Use gpgrt-config with $gpgrt_libdir as gpg-error-config)
       gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
     else
+      gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
       unset GPGRT_CONFIG
     fi
   elif test "$GPG_ERROR_CONFIG" != "no"; then
     gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
+    unset GPGRT_CONFIG
   fi
+)
+
+dnl AM_PATH_GPG_ERROR(MINIMUM-VERSION,
+dnl                   ACTION-IF-FOUND , ACTION-IF-NOT-FOUND )
+dnl
+dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
+dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS.  The _MT_ variants are
+dnl used for programs requireing real multi thread support.
+dnl
+dnl If a prefix option is not used, the config script is first
+dnl searched in $SYSROOT/bin and then along $PATH.  If the used
+dnl config script does not match the host specification the script
+dnl is added to the gpg_config_script_warn variable.
+dnl
+AC_DEFUN(AM_PATH_GPG_ERROR,dnl
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+AC_REQUIRE(_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG)dnl
+AC_REQUIRE(_AM_PATH_GPGRT_CONFIG)dnl
+  min_gpg_error_version=ifelse($1, ,1.33,$1)
+  ok=no
   if test "$GPG_ERROR_CONFIG" != "no"; then
     req_major=`echo $min_gpg_error_version | \
                sed 's/$0-9*$\.$0-9*$/\1/'`

_service:tar_scm:gnupg-2.3.6.tar.bz2/m4/ksba.m4 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/m4/ksba.m4 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/m4/ldap.m4 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/m4/ldap.m4 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/m4/libassuan.m4 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/m4/libassuan.m4 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/m4/libgcrypt.m4 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/m4/libgcrypt.m4 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/m4/npth.m4 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/m4/npth.m4 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/m4/ntbtls.m4 -> _service:tar_scm:gnupg-2.4.3.tar.bz2/m4/ntbtls.m4 Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/POTFILES.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/POTFILES.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/ca.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/ca.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/ca.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/ca.po Changed

@@ -27,7 +27,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -36,7 +36,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
@@ -47,53 +47,53 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "la contrasenya és invàlida"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -104,28 +104,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "la contrasenya és massa llarga\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -135,276 +135,277 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "la contrasenya és errònia"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, 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"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduïu el nom d'usuari: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduïu la contrasenya\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -412,7 +413,7 @@
 msgstr0 "El nom ha de tenir, si més no, 5 caràcters\n"
 msgstr1 "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -420,397 +421,406 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 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:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 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:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+# Gènere? Nombre? ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "no és suportat"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa el mode de contrasenya especificat"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "utilitza el gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, 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:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, 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:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, 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:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -820,19 +830,19 @@
 "Opcions:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -840,8 +850,8 @@
 "@Ordres:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -851,87 +861,89 @@
 "Opcions:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
 # Parts? Peces? ivb
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -944,19 +956,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -969,7 +981,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -979,48 +991,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "activa una clau"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1031,8 +1052,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1042,7 +1063,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
@@ -1053,7 +1074,7 @@
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1071,52 +1092,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
@@ -1139,28 +1160,28 @@
 msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
 
 # Indi. ivb
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, 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:448
+#: common/sysutils.c:452
 #, 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:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "sí|si"
 
@@ -1216,8 +1237,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
@@ -1232,84 +1253,84 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "ha fallat l'actualització: %s\n"
 
 # Destès? ivb
 # Desatès, sí. jm
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "no es pot fet això en mode desatès\n"
 
 # Destès? ivb
 # Desatès, sí. jm
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "no es pot fet això en mode desatès\n"
 
 # Destès? ivb
 # Desatès, sí. jm
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "no es pot fet això en mode desatès\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
 # Destès? ivb
 # Desatès, sí. jm
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur. Deu ser als arxius. ivb
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1402,7 +1423,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1491,44 +1512,44 @@
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificat correcte"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "La clau és disponible en: "
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Certificat correcte"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "Certificat invàlid"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "la versió és desconeguda"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "No hi ha ajuda disponible per a `%s'"
@@ -1538,12 +1559,12 @@
 msgid "ignoring garbage line"
 msgstr "error en l'última línia\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "no establert"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
@@ -1578,139 +1599,152 @@
 msgid "iconv_open failed: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, 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:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "error en crear «%s»: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "la capçalera d'armadura és invàlida: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "capçalera d'armadura: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "la capçalera de signatura clara és invàlida\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "capçalera d'armadura: "
 
 # És un missatge d'error? ivb
 # «Anidada» és un castellanisme. Niuades? Imbricades (SC)?? ivb
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla imbricades\n"
 
 # FIXME: un-indiar. jm
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "la línia escapada amb guió és invàlida: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "fí de fitxer prematur (al final)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "error en l'última línia\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1718,13 +1752,13 @@
 "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "no llegible per humans"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1733,27 +1767,27 @@
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1763,7 +1797,7 @@
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
@@ -1777,8 +1811,8 @@
 msgid "Enter passphrase: "
 msgstr "Introduïu la contrasenya: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1789,13 +1823,13 @@
 msgid "error from TPM: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, 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/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@ -1806,92 +1840,92 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "no establert"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
@@ -1899,122 +1933,127 @@
 # 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:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 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:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 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:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -2022,102 +2061,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (només signar)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2125,196 +2164,201 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»? ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2378,9 +2422,9 @@
 msgid "subkey"
 msgstr "Clau pública: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
@@ -2405,80 +2449,75 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK 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:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 msgid "using cipher %s.%s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2487,19 +2526,13 @@
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2518,7 +2551,7 @@
 
 # És no-wrap? ivb
 # Com? jm
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2531,434 +2564,438 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "la clau secreta és inusable"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "genera un certificat de revocació"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "s'està escrivint la clau secreta a «%s»\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "error en crear «%s»: %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "No s'ha trobat l'id d'usuari"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Empremta digital:"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, 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:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "|fitxer|crea una signatura"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|fitxer|crea una signatura en text clar"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»? ivb
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»? ivb
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo fitxers|imprimeix resums de missatges"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importa claus d'un servidor de claus"
 
 # «de les claus» o «de la clau»? ivb
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "comprova les signatures de la claus"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2969,7 +3006,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:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2999,13 +3036,13 @@
 " --list-keys noms mostra claus\n"
 " --fingerprint noms mostra empremtes digitals\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -3025,7 +3062,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:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3033,577 +3070,571 @@
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "forma d'ús: gpg opcions "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, 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:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, 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:1719
+#: g10/gpg.c:1728
 #, 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:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, 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:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, 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:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "estableix la llista de preferències"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, 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:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, 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:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, 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:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, 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:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, 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:3647
+#: g10/gpg.c:3668
 #, 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:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, 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:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "l'algorisme de resum seleccionat no és vàlid\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, 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:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "les preferències personals de xifrat són invàlides\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD 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/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, 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:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, 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:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, 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:5702
+#: g10/gpg.c:5762
 #, 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:5735
+#: g10/gpg.c:5795
 #, 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"
@@ -3617,7 +3648,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -3649,20 +3680,20 @@
 msgid "No help available for '%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualitza la base de dades de confiança"
@@ -3670,321 +3701,326 @@
 # Gènere? Nombre? ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "no és suportat"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "mostra empremta"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "mostra empremta"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "la clau secreta és inusable"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "mostra empremta"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " sense ID: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importades: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " no modificades: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " subclaus noves: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " signatures noves: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " noves revocacions: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " importades: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " signatures noves: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, 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"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3993,69 +4029,69 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "raó de la revocació: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentari de la revocació: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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"
@@ -4063,22 +4099,22 @@
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, 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:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -4086,121 +4122,121 @@
 "«%s»\n"
 "\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, 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:3670
+#: g10/import.c:3766
 #, 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:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, 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:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, 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:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, 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:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@ -4210,35 +4246,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Signatura correcta de \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "L'ID d'usuari «%s» està revocat."
 msgstr1 "L'ID d'usuari «%s» està revocat."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4246,7 +4282,7 @@
 msgstr0 "1 signatura no comprovada per falta de clau\n"
 msgstr1 "1 signatura no comprovada per falta de clau\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4254,61 +4290,61 @@
 msgstr0 "%d signatures errònies\n"
 msgstr1 "%d signatures errònies\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Signatura correcta de \""
 msgstr1 "Signatura correcta de \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, 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"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revocació"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "autosignatura"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4320,70 +4356,70 @@
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " No es pot signar.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4392,11 +4428,11 @@
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4405,11 +4441,11 @@
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4418,43 +4454,43 @@
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4464,32 +4500,32 @@
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4498,138 +4534,138 @@
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -4637,149 +4673,158 @@
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt. ivb
 # Idem :) jm
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4787,314 +4832,304 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Usuari inexistent.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Resum: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Funcionalitats: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revocada"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " caduca: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " caduca: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5102,19 +5137,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5124,19 +5159,24 @@
 " causar que una ID d'usuari diferent esdevinga en la primària "
 "assumida.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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"
 
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 # Photo ID com abans. ivb
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5145,38 +5185,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 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:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5184,37 +5224,37 @@
 msgstr0 "S'ha esborrat %d signatura.\n"
 msgstr1 "S'ha esborrat %d signatura.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "L'ID d'usuari «%s» està revocat."
 msgstr1 "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5223,43 +5263,58 @@
 "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:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "l'ID d'usuari «%s» ja està revocat\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5267,274 +5322,274 @@
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 #, 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:4729
+#: g10/keyedit.c:5015
 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:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, 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:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, 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:5829
+#: g10/keyedit.c:6117
 #, 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:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 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:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)? ivb
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, 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:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, 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:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, 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:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5548,180 +5603,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) ElGamal (sign and encrypt)\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ElGamal (signar i xifrar)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (predeterminat)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, 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:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notació de signatura: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "desactiva una clau"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5737,7 +5792,7 @@
 " <n>m = la clau caduca als n mesos\n"
 " <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5753,42 +5808,42 @@
 " <n>m = la signatura caduca als n mesos\n"
 " <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, 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:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5796,12 +5851,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:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5812,7 +5867,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5829,42 +5884,42 @@
 " \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5875,11 +5930,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5896,35 +5951,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5936,18 +5991,18 @@
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5955,70 +6010,70 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, 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:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 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:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -6028,7 +6083,7 @@
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6037,7 +6092,7 @@
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6045,23 +6100,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:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
@@ -6070,27 +6125,43 @@
 msgid "never "
 msgstr "mai "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Resum: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Funcionalitats: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Política de signatura crítica: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Política de signatura: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Notació de signatura crítica: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -6098,7 +6169,7 @@
 msgstr0 "%d signatures errònies\n"
 msgstr1 "%d signatures errònies\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -6106,41 +6177,41 @@
 msgstr0 "1 signatura no comprovada a causa d'un error\n"
 msgstr1 "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Empremta digital de la subclau:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Empremta digital ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6223,340 +6294,346 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "s'està sol·licitant la clau %08lX de %s\n"
 msgstr1 "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, 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:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 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:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %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:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\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:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " alias \""
 
 # «%.*s» no serà una data? Caldrà «el» al davant. ivb
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " alias \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "incert"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " alias \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "l'algoritme de clau pública és desconegut"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
@@ -6665,27 +6742,27 @@
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "la classe de signatura és desconeguda"
@@ -6744,7 +6821,7 @@
 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:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "canvia la contrasenya"
@@ -6808,7 +6885,7 @@
 "%s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6823,75 +6900,75 @@
 "molt gran!\n"
 "Es recomana una imatge amb una mida aproximada de 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduïu el nom del fitxer JPEG per al photo ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "No s'ha pogut obrir la foto «%s»: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "«%s» no és un fitxer JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "És aquesta foto correcta (s/N/x)? "
 
 # Execució de programes remots, o execució remota de programes? jm
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aquesta plataforma necessita fitxers temporals quan es crida a programes "
 "externs\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "s'ha produït una eixida no natural del programa extern\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "s'ha produït un error del sistema en cridar el programa extern: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6899,7 +6976,7 @@
 "les crides a programes externs estan inhabilitades per tindre el fitxer "
 "d'opcions permissos insegurs\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
@@ -6987,36 +7064,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats que duen a una clau de confiança absoluta:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Aquesta clau pertany probablement al seu propietari\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Aquesta clau és nostra\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, fuzzy, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -7028,7 +7105,7 @@
 "«sí» a la següent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -7040,102 +7117,102 @@
 "«sí» a la següent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVÍS: S'està usant una clau no fiable!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, fuzzy, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, fuzzy, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Açò podria significar que la signatura és falsificada.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVÍS: La clau NO és de confiança!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Probablement la signatura és FALSA.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7144,57 +7221,57 @@
 "signatures!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr "No és segur que la signatura pertanya al seu propietari.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: es descarta: la clau pública està desactivada\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: es descarta: la clau pública ja està present\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7202,40 +7279,40 @@
 "\n"
 "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "La clau pública està desactivada.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "es descarta: la clau pública ja està establida\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clau %08lX: sense ID\n"
@@ -7276,7 +7353,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "clau %08lX: sense ID\n"
@@ -7504,46 +7581,41 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "la clau pública %08lX és %lu segons anterior a la signatura\n"
 msgstr1 "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
@@ -7551,7 +7623,7 @@
 msgstr1 "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7565,7 +7637,7 @@
 "amb el rellotge)\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7577,56 +7649,56 @@
 "la clau s'ha creat %lu segon en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
 "subclau\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no "
 "expandida.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7634,7 +7706,7 @@
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7643,24 +7715,24 @@
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7743,137 +7815,137 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "reg de la base de dades de confiança %lu: ha fallat la escriptura (n=%d): "
 "%s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "la transacció de la base de dades de confiança és massa gran\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
 # No em passe! ;) ivb
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, 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:767
+#: g10/tdbio.c:753
 #, 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:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, 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:880
+#: g10/tdbio.c:850
 #, 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:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, 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:985
+#: g10/tdbio.c:955
 #, 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:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, 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:1571
+#: g10/tdbio.c:1541
 #, 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:1596
+#: g10/tdbio.c:1566
 #, 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:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, 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:1872
+#: g10/tdbio.c:1842
 #, 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:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
@@ -8315,7 +8387,7 @@
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, 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"
@@ -8349,14 +8421,14 @@
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "fins ara s'han processat %lu claus\n"
 msgstr1 "fins ara s'han processat %lu claus\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8364,24 +8436,24 @@
 msgstr0 "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 msgstr1 "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, 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"
@@ -8455,7 +8527,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8467,12 +8539,12 @@
 "ha de ser el primer que figure en la línia d'ordres.\n"
 
 # LF -> fi de línia? ivb
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -8488,20 +8560,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Forma d'ús: gpg opcions fitxers (-h per a veure l'ajuda)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8511,16 +8583,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8555,10 +8627,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8578,158 +8650,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "La generació de claus ha fallat: %s\n"
 msgstr1 "La generació de claus ha fallat: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, 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:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, 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:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -8737,43 +8809,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, 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:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8781,22 +8853,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8804,82 +8876,82 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, 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:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # Ídem. ivb
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "l'URI no és suportada"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8901,7 +8973,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8950,323 +9022,323 @@
 msgid "deny the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Forma d'ús: gpg opcions fitxers (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, 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/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "ajuda"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 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:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, 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:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, 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:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " signatures noves: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Empremta digital:"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, 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:1770
+#: sm/certchain.c:1818
 #, 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:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificat duplicat: esborrat"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, 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:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
@@ -9275,19 +9347,19 @@
 # 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "no forçat"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "no"
@@ -9321,7 +9393,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:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9334,42 +9406,42 @@
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9598,17 +9670,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
@@ -9618,7 +9690,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@ -9643,135 +9715,135 @@
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
 # Mode desatès (SC) ivb
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9782,28 +9854,28 @@
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, 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:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9823,7 +9895,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error en crear «%s»: %s\n"
@@ -9833,47 +9905,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, 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:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9903,7 +9975,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9918,59 +9990,59 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
 # «%.*s» no serà una data? Caldrà «el» al davant. ivb
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "armadura: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Signatura correcta de \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " alias \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9997,593 +10069,588 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "certificat duplicat: esborrat"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "certificat duplicat: esborrat"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certificat duplicat: esborrat"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "Empremta digital:"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Certificat invàlid"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, 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:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, 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:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "error en l'última línia\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "certificat duplicat: esborrat"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "error de lectura: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "error en la lectura de «%s»: %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, 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:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, 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:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, 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:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, 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:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, 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:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -10598,24 +10665,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
@@ -10778,140 +10845,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, 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:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10924,80 +10991,80 @@
 "@\n"
 "(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Forma d'ús: gpg opcions fitxers (-h per a veure l'ajuda)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "forma d'ús: gpg opcions "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
@@ -11006,38 +11073,38 @@
 # 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:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "no forçat"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11093,32 +11160,32 @@
 msgid "malloc failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "«%s» no és un fitxer JPEG\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omet aquesta clau\n"
@@ -11211,163 +11278,163 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 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:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, 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:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11378,135 +11445,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, 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:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -11572,12 +11639,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -11685,88 +11752,108 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "canvia la data de caducitat"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "l'algorisme de resum seleccionat no és vàlid\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "les preferències personals de xifrat són invàlides\n"
+
+#, fuzzy
+#~ msgid "AEAD 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"
+
+#~ 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"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "%s: error en escriure el registre de directoris: %s\n"
 
@@ -12442,10 +12529,6 @@
 #~ msgstr "canvia entre el llistat de claus secretes i públiques"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "la contrasenya és errònia"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
 #~ "AVÍS: les opcions en «%s» encara no estan actives durant aquesta "
@@ -13439,9 +13522,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "esborra signatures"
 
-#~ msgid "set preference list"
-#~ msgstr "estableix la llista de preferències"
-
 #~ msgid "updated preferences"
 #~ msgstr "preferències actualitzades"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/cs.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/cs.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/cs.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/cs.po Changed

@@ -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, 2020.
+# Petr Pisar <petr.pisar@atlas.cz>, 2017, 2018, 2019, 2020, 2021, 2022, 2023.
 #
 # 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
@@ -25,8 +25,11 @@
 # zákon o elektronickém podpisu, <http://portal.gov.cz/zakon/227/2000>:
 # kvalifikovaný certifikát/podpis
 #
+# action → způsob užití (klíče)
+# additional decryption subkey → dodatečný dešifrovací klíč
 # administrator → správce
 # cache → keš
+# compliance rules → pravidla normy
 # distribution point → místo distribuce
 # DP (distribution point (of CRL)) → DP
 # load → zavést
@@ -36,10 +39,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg2 2.2.22\n"
+"Project-Id-Version: gnupg2 2.4.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
-"PO-Revision-Date: 2020-08-31 18:53+02:00\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
+"PO-Revision-Date: 2023-06-03 15:45+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 +51,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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "získání zámku pinetry se nezdařilo: %s\n"
@@ -59,51 +62,51 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Zrušit"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Ano"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Ne"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Uložit do správce hesel"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Zviditelnit heslo"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Skrýt heslo"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
-msgstr ""
+msgstr "Caps Lock je zapnutý"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
-msgstr ""
+msgstr "Navrhnout"
 
 #. TRANSLATORS: This string is a tooltip, shown by pinentry when
 #. hovering over the generate button. Please use an appropriate
@@ -112,33 +115,27 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
-#, fuzzy
-#| msgid "pinentry.qualitybar.tooltip"
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
-msgstr ""
-"Kvalita textu zde zadaného.\n"
-"Na podrobnosti ohledně kritérií se zeptejte svého správce."
+msgstr "Navrhne náhodné heslo."
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
-msgstr ""
+msgstr "Poznámka: Mezery nejsou součástí hesla."
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
-#, fuzzy
-#| msgid "Passphrase too long"
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
-msgstr "Heslo je příliš dlouhé"
+msgstr "Toto heslo NENÍ dovoleno"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -148,152 +145,155 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 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:1477
+#: agent/call-pinentry.c:1474
 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:1480
+#: agent/call-pinentry.c:1477
 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "neshodují se – zkuste to znovu"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+msgid "Passphrases match."
+msgstr "Heslo se shoduje."
+
+# TODO: Pluralize
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pokus %d z %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Znovu:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN je příliš dlouhý"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Heslo je příliš dlouhé"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak v PINu"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN je příliš krátký"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Špatný PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Špatné heslo"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
-msgstr ""
+msgstr "Poznámka: Požadavek z webového prohlížeče."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
-msgstr ""
+msgstr "Poznámka: Požadavek ze vzdálené strany."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "chyba při získání sériového čísla karty: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
-msgstr "Prosím, vložte toto heslo znovu"
+msgstr "Prosím, zadejte toto heslo znovu"
 
-#: agent/command.c:2703
-#, fuzzy, c-format
-#| msgid ""
-#| "Please enter the passphrase to protect the imported object within the "
-#| "GnuPG system."
+#: agent/command.c:2908
+#, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr ""
-"Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
-"GnuPG."
+"Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému %s."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
+"Tento klíč (nebo podklíč) není chráněn heslem. Prosím, zadejte nové heslo "
+"pro exportování klíče."
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "nelze vytvořit „%s“: %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nelze otevřít „%s“: %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenalezen žádný vhodný klíč karty: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "chyba při získávání seznamu karet: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -302,105 +302,100 @@
 "Proces SSH si vyžádal použití klíče%%0A %s%%0A (%s)%%0APřejete si to "
 "povolit?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Povolit"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Zakázat"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
-msgstr "Prosím, vložte heslo pro SSH klíč%%0A %F%%0A (%c)"
+msgstr "Prosím, zadejte heslo pro SSH klíč%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
-"Prosím, vložte heslo, abyste ochránil(a) přijatý tajný klíč%%0A %s%%0A %s"
-"%%0Auvnitř úložiště klíčů gpg-agenta"
+"Prosím, zadejte heslo, abyste ochránil(a) přijatý tajný klíč%%0A %s%%0A "
+"%s%%0Auvnitř úložiště klíčů gpg-agenta"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Prosím, vložte kartu se sériovým číslem"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "PIN správce"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Resetační kód"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Potvrďte tlačítkem na kartě nebo bezpečnostním zařízení."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Pro vstup použijte klávesnici čtečky."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Zopakujte resetační kód"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Zopakujte tento PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Zopakujte tento PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Resetační kód nebyl správně zopakován; zkuste to znovu"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK nebyl zopakován správně; zkuste to znovu"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nebyl zopakován správně; zkuste to znovu"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
-msgstr "Prosím, vložte PIN%s%s%s, abyste odemkli kartu"
+msgstr "Prosím, zadejte PIN%s%s%s, abyste odemkli kartu"
 
-#: agent/genkey.c:154
-#, fuzzy, c-format
-#| msgid "error writing to %s: %s\n"
+#: agent/genkey.c:155
+#, c-format
 msgid "error writing to pipe: %s\n"
-msgstr "chyba při zápisu do %s: %s\n"
+msgstr "chyba při zápisu do roury: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Vložte nové heslo"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Nezadali jste heslo!%0APrázdné heslo není dovoleno."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -409,11 +404,11 @@
 "Nezadali jste heslo – toto je obecně špatný nápad!%0AProsím, potvrďte, že si "
 "žádnou ochranu svého klíče nepřejete."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Ano, ochrana není třeba"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -421,7 +416,7 @@
 msgstr1 "Heslo by mělo být dlouhé alespoň %u znaky."
 msgstr2 "Heslo by mělo být dlouhé alespoň %u znaků."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -431,238 +426,234 @@
 msgstr2 ""
 "Heslo by mělo obsahovat alespoň %u číslic nebo %%0Azvláštních znaků."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Heslo by nemělo být známým slovem nebo se shodovat%%0As určitým vzorem."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Varování: Zadali jste nebezpečné heslo."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Použít přesto tento klíč"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Prosím, zadejte nové heslo"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
-#, fuzzy
-#| msgid "Options useful for debugging"
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
-msgstr "Volby užitečné při ladění"
+msgstr "Volby ovlivňující spuštění"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "poběží v režimu démona (na pozadí)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "poběží v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "neodpojovat se od konzole"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "vypisovat příkazy ve stylu sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "vypisovat příkazy ve stylu csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|SOUBOR|načíst volby ze SOUBORU"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Volby ovlivňující diagnostický výstup"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "upovídaný režim"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Volby ovlivňující nastavení"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "nepoužívat SCdémona"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
+msgstr "|PROGRAM|použít PROGRAM jako program SCdaemon"
 
-#: agent/gpg-agent.c:209
-#, fuzzy
-#| msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
-msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
+msgstr "|PROGRAM|použít PROGRAM jako program tpm2daemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorovat požadavky na změnu TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorovat požadavky na změnu X displeje"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "zapnout podporu pro OpenSSH"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGORITMUS|ukazovat otisky SSH pomocí ALGORITMU"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "zapnout podporu pro PuTTY"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+msgid "enable Win32-OpenSSH support"
+msgstr "zapnout podporu Win32-OpenSSH"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Volby ovlivňující bezpečnost"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|zahodit zapamatované PINy po N sekundách"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|zahazovat klíče SSH po N sekundách"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|nastavit maximální životnost dočasné paměti pro PINy na N sekund"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N| nastavit maximální životnost klíčů SSH na N sekund"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "nepoužívat paměť PINů na podepisování"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "nedovolit použít vnější úložiště na hesla"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "nedovolit klientům označovat klíče za „důvěryhodné“"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Volby vynucující politiku hesel"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "nedovolit obejití politiky hesel"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|nastavit minimální vyžadovanou délku nových hesel na N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|vyžaduje alespoň N nepísmenných znaků v novém hesle"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|omezit platnost hesla na N dnů"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "nedovolit opakovat stará hesla"
 
-#: agent/gpg-agent.c:279
-#, fuzzy
-#| msgid "Options controlling the security"
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
-msgstr "Volby ovlivňující bezpečnost"
+msgstr "Volby ovlivňující pinentry"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
-msgstr ""
+msgstr "nikdy nepoužít pinentry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "znemožnit volajícímu přebít pinentry"
 
-#: agent/gpg-agent.c:285
-#, fuzzy
-#| msgid "do not grab keyboard and mouse"
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
-msgstr "neuzurpovat si klávesnici a myš"
+msgstr "dovolit pinetry uzurpovat si klávesnici a myš"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|nastavit časový limit pro Pinentry na N sekund"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "umožnit zadání hesla skrze Emacs"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Použití: @GPG_AGENT@ volby (-h pro nápovědu)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -670,141 +661,141 @@
 "Syntaxe: @GPG_AGENT@ volby příkaz argumenty\n"
 "Správa tajných klíčů pro @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "čtou se možnosti z „%s“\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VAROVÁNÍ: používání parametru „%s“ se nedoporučuje\n"
+msgstr "POZOR: používání parametru „%s“ se nedoporučuje\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "socket nelze vytvořit: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "název socketu „%s“ je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
-msgstr ""
+msgstr "zkouší se ukrást socket z běžícího programu %s\n"
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, 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:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, 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:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "naslouchá se na socketu „%s“\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nelze vytvořit adresář „%s“: %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "volání stat() na „%s“ selhalo: %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "„%s“ nelze použít jako domovský adresář\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, 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:2755
+#: agent/gpg-agent.c:2876
 #, 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:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s pozastaveno\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -812,11 +803,11 @@
 "@Volby:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -824,8 +815,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:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -833,8 +824,8 @@
 "@Příkazy:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -844,11 +835,11 @@
 "Volby:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -856,15 +847,15 @@
 "Syntaxe: gpg-protect-tool volby argumenty\n"
 "Nástroj na správu tajných klíčů\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
-msgstr "Prosím, vložte heslo, abyste zpřístupnili objekt PKCS#12."
+msgstr "Prosím, zadejte heslo, abyste zpřístupnili objekt PKCS#12."
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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."
+msgstr "Prosím, zadejte heslo, abyste ochránili nový objekt PKCS#12."
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -872,60 +863,62 @@
 "Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
 "GnuPG."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
-"Prosím, vložte heslo nebo PIN\n"
+"Prosím, zadejte heslo nebo PIN\n"
 "potřebný pro dokončení této operace."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "zrušeno\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba při otevírání „%s“: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "soubor „%s“, řádek %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, 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:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "systémový důvěryhodný seznam „%s“ není dostupný\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "chybný otisk v „%s“, řádek %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "neplatný příznak klíče v „%s“, řádek %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "chyba při čtení „%s“, řádek %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, 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"
@@ -938,7 +931,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -947,11 +940,11 @@
 "Věříte bezmezně, že%%0A „%s“%%0Ařádně ověřuje identitu uživatele při "
 "vydávání certifikátu?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Ano"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Ne"
@@ -964,7 +957,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -975,35 +968,44 @@
 #. 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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "V pořádku"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Špatně"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, 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:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Změnit heslo"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Změním jej později"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Prosím, vložte kartu se sériovým číslem"
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr "Vyžádáno použití klíče%%0A %s%%0A %s%%0APřejete si to povolit?"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -1011,11 +1013,11 @@
 msgstr ""
 "Opravdu chcete smazat klíč určený pomocí keygripu%%0A %s%%0A %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Smazat klíč"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1028,8 +1030,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s klíč používá nebezpečný (%ubitový) hash\n"
@@ -1039,7 +1041,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
@@ -1049,7 +1051,7 @@
 msgid "secret key parts are not available\n"
 msgstr "tajné části klíče nejsou dostupné\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, 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"
@@ -1064,52 +1066,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "ochranný algoritmus %d (%s) není podporován\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba při vytváření roury: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "chyba při vytváření proudu pro rouru: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba při rozdvojování procesu: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "chyba při spouštění „%s“: pravděpodobně není nainstalován\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "chyba v běhu „%s“: návratový kód %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "chyba v běhu „%s“: násilně ukončeno\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "čekání na ukončení procesu se nezdařilo: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba při získání návratového kódu procesu %d: %s\n"
@@ -1130,29 +1132,29 @@
 msgstr "nemohu vypnout vytváření core souborů: %s\n"
 
 # TODO: i18n of first %s
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, 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:448
+#: common/sysutils.c:452
 #, 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:905
+#: common/sysutils.c:885
 #, 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:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ano"
 
@@ -1206,8 +1208,8 @@
 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:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba při alokování dostatečného množství paměti: %s\n"
@@ -1220,81 +1222,75 @@
 #: common/miscellaneous.c:157
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje\n"
+msgstr "POZOR: „%s%s“ je zastaralý parametr – neúčinkuje\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "neznámý ladicí příznak „%s“ se ignoruje\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "čeká se na dirmngr… (%d s)\n"
 
-#: common/asshelp.c:350
-#, fuzzy, c-format
-#| msgid "waiting for the %s to come up ... (%ds)\n"
+#: common/asshelp.c:344
+#, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
-msgstr "čeká se, až naběhne %s… (%d s)\n"
+msgstr "čeká se, až naběhne keyboxd… (%d s)\n"
 
-#: common/asshelp.c:351
-#, fuzzy, c-format
-#| msgid "waiting for the %s to come up ... (%ds)\n"
+#: common/asshelp.c:345
+#, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
-msgstr "čeká se, až naběhne %s… (%d s)\n"
+msgstr "čeká se, až naběhne agent… (%d s)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
-msgstr "spojení na dirmngr ustanoveno\n"
+msgstr "spojení s dirmngr ustanoveno\n"
 
-#: common/asshelp.c:366
-#, fuzzy, c-format
-#| msgid "connection to the dirmngr established\n"
+#: common/asshelp.c:360
+#, c-format
 msgid "connection to the keyboxd established\n"
-msgstr "spojení na dirmngr ustanoveno\n"
+msgstr "spojení s keyboxd ustanoveno\n"
 
-#: common/asshelp.c:367
-#, fuzzy, c-format
-#| msgid "connection to the dirmngr established\n"
+#: common/asshelp.c:361
+#, c-format
 msgid "connection to the agent established\n"
-msgstr "spojení na dirmngr ustanoveno\n"
+msgstr "spojení s agentem ustanoveno\n"
 
-#: common/asshelp.c:485
-#, fuzzy, c-format
-#| msgid "no running Dirmngr - starting '%s'\n"
+#: common/asshelp.c:479
+#, c-format
 msgid "no running %s - starting '%s'\n"
-msgstr "žádný dirmngr neběží – spouští se „%s“\n"
+msgstr "žádný %s neběží – spouští se „%s“\n"
 
-#: common/asshelp.c:588
-#, fuzzy, c-format
-#| msgid "connection to agent is in restricted mode\n"
+#: common/asshelp.c:582
+#, c-format
 msgid "connection to the agent is in restricted mode\n"
-msgstr "spojení na agenta je v omezeném režimu\n"
+msgstr "spojení s agentem je v omezeném režimu\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "chyba při získávání verze z „%s“: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "server „%s“ je starší než my (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
-msgstr "VAROVÁNÍ: %s\n"
+msgstr "POZOR: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 "Poznámka: Zastaralé servery mohou postrádat důležité bezpečnostní opravy.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Poznámka: Restartovat je můžete příkazem „%s“.\n"
@@ -1367,7 +1363,7 @@
 msgstr "algoritmus: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "nepodporovaný algoritmus: %s"
@@ -1442,39 +1438,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Kořenový certifikát je důvěryhodný"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "pro certifikát nebyl nalezen žádný CRL"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "dostupný CRL je příliš starý"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "Kontrola certifikátů proti CRL/OCSP"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Zahrnuté certifikáty"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Žádné položky auditního protokolu."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Neznámá operace"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent je použitelný"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr je použitelný"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Nápověda pro „%s“ není dostupná.'"
@@ -1483,11 +1479,11 @@
 msgid "ignoring garbage line"
 msgstr "ignoruji řádek s nepořádkem"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "neuvedeno"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatný radix64 znak %02x byl přeskočen\n"
@@ -1495,22 +1491,22 @@
 #: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
-msgstr ""
+msgstr "Je mi líto, jsme v dávkovém režimu – vstup nelze získat\n"
 
 #: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
-msgstr ""
+msgstr "Je mi líto, žádný terminál nebyl vyžádán – vstup nelze získat\n"
 
 #: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
-msgstr ""
+msgstr "příliš mnoho chyb, končí se\n"
 
 #: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
-msgstr ""
+msgstr "Zjištěn Ctrl-D\n"
 
 #: common/utf8conv.c:127
 #, c-format
@@ -1522,137 +1518,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open selhala: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "převod z „%s“ na „%s“ se nezdařil: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "chyba při zápisu do „%s“: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "odstraňuji starý zamykací soubor (vytvořil %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(uváznutí?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "zámek „%s“ nebyl vytvořen: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, 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:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, 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"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "chyba při vytváření „%s“: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "chyba při uzavírání „%s“: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII kódování: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "neplatná hlavička ASCII kódování: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "ASCII hlavička: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "neplatná hlavička podpisu v čitelném formátu\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "neznámá ASCII hlavička: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "vnořené podpisy v čitelném formátu\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "neočekávaný ASCII armor: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "nesprávné označení řádku mínusy: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatný radix64 znak %02X byl přeskočen\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "předčasný konec souboru (žádné CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "předčasný konec souboru (žádné CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "špatný formát CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "předčasný konec souboru (v patičce)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "chyba v patičce\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena žádná platná data ve formátu OpenPGP.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatné kódování ASCII: řádek je delší než %d znaků\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1661,12 +1669,12 @@
 "špatný MTA\n"
 
 # TODO: Pluralize
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " nečitelné pro lidi (%zu bajtů: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1675,35 +1683,35 @@
 "symbolické jméno smí obsahovat pouze písmena, číslice, tečky nebo podtržítka "
 "a musí končit znakem „=“\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "zápis jména uživatele musí obsahovat znak „@“\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "jméno uživatele nesmí obsahovat více než jeden znak „@“\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nemůže obsahovat žádné kontrolní znaky\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "jméno uživatele nesmí obsahovat znak „=“\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "jméno uživatele musí obsahovat pouze tisknutelné znaky nebo mezery\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
-msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu data\n"
+msgstr "POZOR: nalezen neplatný formát zápisu data\n"
 
 #: g10/call-agent.c:155 sm/call-agent.c:214
 #, c-format
@@ -1714,335 +1722,334 @@
 msgid "Enter passphrase: "
 msgstr "Vložte heslo: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s není v souladu s režimem %s\n"
 
 #: g10/call-agent.c:1088
-#, fuzzy, c-format
-#| msgid "error reading from %s: %s\n"
+#, c-format
 msgid "error from TPM: %s\n"
-msgstr "chyba při čtení z %s': %s\n"
+msgstr "chyba z TPM: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problém s agentem: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "v této relaci neběží žádný dirmngr\n"
 
 #: g10/call-dirmngr.c:212
-#, fuzzy, c-format
-#| msgid "keyserver option \"%s\" may not be used in %s mode\n"
+#, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
-msgstr "volba serveru s klíči „%s“ se nesmí používat v režimu %s\n"
+msgstr ""
+"volba serveru s klíči „honor-keyserver-url“ se nesmí používat v režimu Tor\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKD používá zapamatované výsledky"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "To neběží"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Tor není řádně nastaven"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNS není řádně nastaveno"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "nepřijatelné přesměrování HTTP serverem"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "nepřijatelné přesměrování HTTP serverem bylo odklizeno"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "server používá neplatný certifikát"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "Poznámka: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nelze provést v dávkovém režimu\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Váš výběr? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "není nastaveno"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Pan"
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Paní"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "není vyžadováno"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "vyžadováno"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr "Pokud výpis nevypadá v pořádku, zkuste příkaz „%s“\n"
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 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:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak „<“ nelze použít.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: Více mezer není povoleno.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Příjmení držitele karty: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Jméno (křestní) držitele karty: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL pro získání veřejného klíče: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "chyba při čtení „%s“: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "chyba při zápisu do „%s“: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Login (jménu účtu): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Privátní DO data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Jazykové předvolby: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Oslovení (M = Pan, F = Paní, nebo mezera): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatná odpověď.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Otisk CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: chybně utvořené otisk.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s klíčem není možná: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "toto není OpenPGP karta"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Přepsat existující klíč? (a/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
-#, fuzzy
-#| 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"
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
 " please check the documentation of your card to see which\n"
 " key types and sizes are supported.\n"
 msgstr ""
-"Poznámka: Nelze zaručit, že karta podporuje požadovanou velikost.\n"
-" Pokud generování klíče neuspěje, prosím, nahlédněte do "
-"dokumentace\n"
-" své karty, kde se dozvíte, jaké velikosti jsou dovoleny.\n"
+"Poznámka: Nelze zaručit, že karta podporuje požadovaný druh klíče nebo\n"
+" velikost. Pokud generování klíče neuspěje, prosím, nahlédněte\n"
+" do dokumentace své karty, kde se dozvíte, jaké druhy a velikosti\n"
+" jsou dovoleny.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou délku klíče si přejete? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Mění se atribut kartového klíče pro: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Podepisovací klíč\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Šifrovací klíč\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Autentizační klíč\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh klíče, který chcete:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Neplatný výběr.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Přepsat existující klíče? (a/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2053,182 +2060,184 @@
 " PIN = „%s“ PIN správce = „%s“\n"
 "Měli byste je změnit příkazem --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Podepisovací klíč\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Šifrovací klíč\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Autentizační klíč\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Prosím vyberte, kam uložit klíč:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Volání KEYTOCARD selhalo: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Pokračovat (a/N) "
 
 # The code expects non-localized "yes"
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba při nastavování KDF: %s\n"
 
-#: g10/card-util.c:2229
-#, fuzzy, c-format
-#| msgid "error for setup KDF: %s\n"
+#: g10/card-util.c:2255
+#, c-format
 msgid "error for setup UIF: %s\n"
-msgstr "chyba při nastavování KDF: %s\n"
+msgstr "chyba při nastavování UIF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
-msgstr "ukončit toto menu"
+msgstr "ukončí tuto nabídku"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
-msgstr "zobraz příkazy správce"
+msgstr "ukáže příkazy pro správce"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
-msgstr "ukázat tuto pomoc"
+msgstr "ukáže tuto nápovědu"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
-msgstr "vypiš všechna dostupná data"
+msgstr "vypíše všechna dostupná data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "změní jméno majitele karty"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "změní URL pro získání klíče"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "získá klíč specifikovaný v URL karty"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
-msgstr "změnit login name"
+msgstr "změní přihlašovací jméno"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
-msgstr "změnit jazykové předvolby"
+msgstr "změní jazykové předvolby"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "změní oslovení držitele karty"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
-msgstr "vypsat otisk certifikační autority"
+msgstr "změní otisk certifikační autority"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
-msgstr "zapnout/vypnout požadování PINu při každé self-sign operaci"
+msgstr "přepne příznak požadování PINu při každém podpisu"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
-msgstr "vytvořit nový pár klíčů"
+msgstr "vytvoří nové klíče"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "nabídka pro změnu anebo odblokování PINu"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
-msgstr "ověř PIN a vypiš všechna data"
+msgstr "ověří PIN a vypíše všechna data"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
-msgstr "odblokovat PIN pomocí resetačního kódu"
+msgstr "odblokuje PIN pomocí resetačního kódu"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
-msgstr "zničit všechny klíče a data"
+msgstr "zničí všechny klíče a data"
 
-#: g10/card-util.c:2276
-#, fuzzy
-#| msgid "setup KDF for PIN authentication"
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
-msgstr "nastavit KDF pro autentizaci kódem PIN"
+msgstr ""
+"nastaví KDF pro autentizaci kódem PIN (on zapnuto, single jediný, off "
+"vypnuto)"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
-msgstr "změnit atribut klíče"
+msgstr "změní atribut klíče"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
-#, fuzzy
-#| msgid "change the ownertrust"
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
-msgstr "změnit důvěryhodnost vlastníka klíče"
+msgstr "změní příznak interakce uživatele (UIF)"
+
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr "přepne do aplikace OpenPGP"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
-msgstr "pouze příkazy správce\n"
+msgstr "Pouze příkazy správce\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
-msgstr "příkazy správce jsou povoleny\n"
+msgstr "Příkazy správce jsou povoleny\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
-msgstr "příkazy správce nejsou povoleny\n"
+msgstr "Příkazy správce nejsou povoleny\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Neplatný příkaz (zkuste „help“)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klíč „%s“ nenalezen: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2291,9 +2300,9 @@
 msgid "subkey"
 msgstr "podklíče"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
@@ -2319,519 +2328,494 @@
 msgstr ""
 "abyste ho smazal(a), použijte nejprve parametr „--delete-secret-key“.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
 #, c-format
-msgid "error creating passphrase: %s\n"
-msgstr "chyba při vytváření hesla: %s\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"POZOR: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
 
-#: g10/encrypt.c:339
+#: g10/encrypt.c:136 g10/encrypt.c:683
 #, 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:370
-#, fuzzy, c-format
-#| msgid "using cipher %s\n"
-msgid "using cipher %s.%s\n"
-msgstr "použití šifry: %s\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "šifrovací algoritmus „%s“ se nesmí používat pro šifrování\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
 #, c-format
-msgid "'%s' already compressed\n"
-msgstr "„%s“ je již zkomprimován\n"
+msgid "(use option \"%s\" to override)\n"
+msgstr "(přebijete přepínačem „%s“)\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
 #, c-format
-msgid "WARNING: '%s' is an empty file\n"
-msgstr "VAROVÁNÍ: soubor „%s“ je prázdný\n"
-
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
+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:541 g10/encrypt.c:792 g10/misc.c:400
+#: g10/encrypt.c:181 sm/encrypt.c:771
 #, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "POZOR: klíč %s není vhodný pro šifrování v režimu %s\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, 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"
+msgid "error creating passphrase: %s\n"
+msgstr "chyba při vytváření hesla: %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:484
 #, 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"
+msgid "can't use a SKESK packet due to the S2K mode\n"
+msgstr "v režimu S2K nelze použít SKESK paket\n"
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:514
 #, c-format
-msgid "reading from '%s'\n"
-msgstr "čte se z „%s“\n"
+msgid "using cipher %s.%s\n"
+msgstr "použití šifry %s.%s\n"
 
-#: g10/encrypt.c:777
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, 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"
+msgid "'%s' already compressed\n"
+msgstr "„%s“ je již zkomprimován\n"
 
-#: g10/encrypt.c:832 sm/encrypt.c:767
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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"
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "POZOR: soubor „%s“ je prázdný\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
+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:961 g10/sign.c:1273
+#: g10/encrypt.c:867
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "čte se z „%s“\n"
+
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"VAROVÁNÍ: vyžádaný komprimační algoritmus %s (%d) nevyhovuje předvolbám "
+"POZOR: vyžádaný komprimační algoritmus %s (%d) nevyhovuje předvolbám "
 "příjemce\n"
 
-#: g10/encrypt.c:1071
+#: g10/encrypt.c:1179
 #, 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:1164
-#, fuzzy, c-format
-#| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
-msgstr "%s/%s zašifrovaný pro: „%s“\n"
+msgstr "zašifrováno pomocí %s/%s.%s pro: „%s“\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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:245
-#, fuzzy, c-format
-#| msgid "%s encrypted data\n"
+#, c-format
 msgid "%s encrypted data\n"
-msgstr "%s zašifrovaná data\n"
+msgstr "data zašifrovaná pomocí %s\n"
 
 #: g10/decrypt-data.c:248
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zašifrováno neznámým algoritmem %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, 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"
+msgstr "POZOR: zpráva byla zašifrována slabým klíčem v symetrické šifře.\n"
 
 #: g10/decrypt-data.c:383 g10/decrypt-data.c:436
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problém se zašifrovaným paketem\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "exportovat podpisy, které jsou označeny jako jen místní (local-only)"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exportovat atributy uživatelských ID (obecně ID fotografií)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exportovat revokační klíče označené jako „citlivé“"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "odstranit nepoužitelné části z klíče při exportu"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "odstranit při exportu z klíče vše, co lze"
 
-#: g10/export.c:132
+#: g10/export.c:138
+msgid "export only revocation certificates"
+msgstr "exportovat pouze revokační certifikáty"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "použít záložní formát klíče GnuPG"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+msgid "export secret keys using the GnuPG format"
+msgstr "exportovat tajné klíče do formátu GnuPG"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " – přeskočeno"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "zapisuje se do „%s“\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "klíč %s: tělo klíče je na kartě – přeskočeno\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "exportování tajného klíče není povoleno\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klíč %s: PGP 2.x klíč – přeskočeno\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
-msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
-
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "chyba při vytváření „%s“: %s\n"
+msgstr "POZOR: nebylo nic vyexportováno\n"
 
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "ID uživatele nenalezeno"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "„%s“ automaticky získáno přes %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, 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:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Chybí otisk"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, 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:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajný klíč „%s“ nenalezen: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(zkontrolujte argument volby „%s“)\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, 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:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "platné hodnoty pro volbu „%s“:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "vytvořit podpis"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "vytvořit podpis v čitelném dokumentu"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "vytvořit podpis oddělený od dokumentu"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "šifrovat data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "šifrování pouze se symetrickou šifrou"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "dešifrovat data (implicitně)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "vypsat seznam klíčů"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "vypsat seznam klíčů a podpisů"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy klíčů"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam klíčů a otisků"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "vypsat seznam tajných klíčů"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "vytvořit nový pár klíčů"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "rychle vytvořit nový pár klíčů"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "rychle přidat novou identitu uživatele"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "rychle odvolat identitu uživatele"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "rychle nastavit nové datum konce platnosti"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "komplexní vytvoření páru klíčů"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "vytvořit revokační certifikát"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "odstranit klíč ze souboru veřejných klíčů"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klíč ze souboru tajných klíčů"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "rychle podepsat klíč"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "rychle lokálně podepsat klíč"
 
-#: g10/gpg.c:508
-#, fuzzy
-#| msgid "quickly revoke a user-id"
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
-msgstr "rychle odvolat identitu uživatele"
+msgstr "rychle odvolat podpis klíče"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "podepsat klíč"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "podepsat klíč lokálně"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klíč"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "změnit heslo"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exportovat klíče"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exportovat klíče na server klíčů"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importovat klíče ze serveru klíčů"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "vyhledat klíče na serveru klíčů"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat všechny klíče ze serveru klíčů"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importovat/sloučit klíče"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "změnit data na kartě"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "změnit PIN karty"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "aktualizovat databázi důvěry"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "vypsat hash zprávy"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|HODNOTA|nastavit TOFU politiku klíči"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NÁZEV|použít NÁZEV jako implicitní tajný klíč"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|JMÉNO|šifrovat rovněž pro uživatele s ID JMÉNO"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|nastavit e-mailový alias"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "použít chování striktně podle OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "neprovádět žádné změny"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "vyžádat potvrzení před přepsáním"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
-#, fuzzy
-#| msgid "Options controlling the security"
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
-msgstr "Volby ovlivňující bezpečnost"
+msgstr "Volby ovlivňující vstup"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
-#, fuzzy
-#| msgid "Options controlling the diagnostic output"
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
-msgstr "Volby ovlivňující diagnostický výstup"
+msgstr "Volby ovlivňující výstup"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "vytvořit výstup zapsaný v ASCII"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|SOUBOR|zapsat výstup do SOUBORU"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "použít kanonický textový režim"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
-#, fuzzy
-#| msgid "Options controlling the interactivity and enforcement"
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
-msgstr "Volby ovlivňující interaktivitu a vymáhání"
+msgstr "Volby ovlivňující import a export klíče"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|METODA|používat METODU pro dohledávání klíčů podle e-mailové adresy"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "importovat chybějící klíč z podpisu"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "zahrnovat veřejný klíč do podpisů"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "zakázat veškerý přístup k dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
-#, fuzzy
-#| msgid "Options controlling the configuration"
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
-msgstr "Volby ovlivňující nastavení"
+msgstr "Volby ovlivňující výpis klíčů"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
-#, fuzzy
-#| msgid "list secret keys"
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
-msgstr "vypsat seznam tajných klíčů"
+msgstr "Volby určující klíče"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 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:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
-msgstr ""
+msgstr "Volby pro dávkový režim"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
-msgstr ""
+msgstr "Ostatní volby"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2839,7 +2823,7 @@
 "@\n"
 "(Pro úplný seznam všech příkazů a voleb nahlédněte do manuálové stránky.)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2859,11 +2843,11 @@
 " --list-keys jména ukázat klíče\n"
 " --fingerprint jména ukázat otisky\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Použití: @GPG@ možnosti soubory (-h pro nápovědu)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2873,7 +2857,7 @@
 "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2881,580 +2865,566 @@
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Veřejný klíč: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Šifra: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "použití: %s přepínače %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktní příkazy\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nalezen v definici skupiny „%s“\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr ""
-"VAROVÁNÍ: vlastnictví domovského adresáře „%s“ není nastaveno bezpečně\n"
+msgstr "POZOR: vlastnictví domovského adresáře „%s“ není nastaveno bezpečně\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, 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"
+"POZOR: vlastnictví konfiguračního souboru „%s“ není nastaveno bezpečně\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, 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"
+msgstr "POZOR: vlastnictví rozšiřujícího modulu „%s“ není nastaveno bezpečně\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, 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"
+msgstr "POZOR: přístupová práva pro domovský adresář „%s“ nejsou bezpečná\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, 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"
+msgstr "POZOR: přístupová práva pro konfigurační soubor „%s“ nejsou bezpečná\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, 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"
+msgstr "POZOR: přístupová práva rozšiřujícímu modulu „%s“ nejsou bezpečná\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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 "
+"POZOR: vlastnictví adresáře s domovským adresářem „%s“ není nastaveno "
 "nebezpečně\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
-"VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
+"POZOR: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
 "nebezpečně\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, 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 "
+"POZOR: vlastnictví adresáře „%s“ s rozšiřujícím modulem není nastaveno "
 "nebezpečně\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, 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 "
+"POZOR: přístupová práva k adresáři „%s“ s domovským adresářem nejsou "
 "nastavena bezpečně\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
-"VAROVÁNÍ: přístupová práva k adresáři „%s“ s konfiguračním souborem nejsou "
+"POZOR: přístupová práva k adresáři „%s“ s konfiguračním souborem nejsou "
 "nastavena bezpečně\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
-"VAROVÁNÍ: přístupová práva k adresáři „%s“ s rozšiřujícím modulem nejsou "
+"POZOR: přístupová práva k adresáři „%s“ s rozšiřujícím modulem nejsou "
 "nastavena bezpečně\n"
 
 # c-format
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznámá konfigurační položka „%s“\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "zobrazovat ID fotografií během výpisu klíčů"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "ukazovat URL politik během výpisu podpisů"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "ukazovat všechny poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 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:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 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:2081
+#: g10/gpg.c:2092
 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:2083
+#: g10/gpg.c:2094
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "ukazovat podpisy s neplatnými algoritmy během výpisu podpisů"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "ukazovat název souboru s klíči při výpisu klíčů"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+msgid "show preferences"
+msgstr "vypsat předvolby"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámá TOFU politika „%s“\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(možnosti lze vypsat příkazem „help“)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento příkaz není v režimu %s dovolen.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "„%s“ není správná e-mailová adresa\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný režim pinentry „%s“\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný původ požadavku „%s“\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klíčů\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatná volba filtru: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 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:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 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:3423
+#: g10/gpg.c:3441
 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:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný argument u volby „%.50s“\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
-msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
+msgstr "POZOR: program může vytvořit soubor core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "VAROVÁNÍ: %s přepíše %s\n"
+msgstr "POZOR: %s přepíše %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
-msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
+msgstr "POZOR: pracuji s podvrženým systémovým časem: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "vybraný hashovací algoritmus je neplatný\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, 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:3984
+#: g10/gpg.c:4002
 #, 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:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "neplatné uživatelské předvolby pro šifrování\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
-#, fuzzy, c-format
-#| msgid "keysize invalid; using %u bits\n"
+#: g10/gpg.c:4044 g10/gpg.c:4049
+#, c-format
 msgid "chunk size invalid - using %d\n"
-msgstr "neplatná délka klíče; použiji %u bitů\n"
+msgstr "neplatná velikost bloku – použije se %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funkční s %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %s\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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"
+"POZOR: specifikován adresát (-r) bez použití šifrování s veřejným klíčem\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdařilo: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klíče se nepodařil: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export jako SSH klíč se nepodařil: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, 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:5286
+#: g10/gpg.c:5338
 #, 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:5342
+#: g10/gpg.c:5394
 #, 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:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Začněte psát svou zprávu…\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifikační politiku je neplatné\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
@@ -3467,7 +3437,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varování při konfliktu časového razítka"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -3496,337 +3466,337 @@
 msgid "No help available for '%s'"
 msgstr "Pro „%s“ není dostupná žádná nápověda"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "importovat podpisy, které jsou označeny jen jako místní"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "opravit poškození vzniklá při importu z PKS serveru"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "nemazat údaje o důvěře během importu"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "neaktualizovat databázi důvěry po importu"
 
-#: g10/import.c:181
-#, fuzzy
-#| msgid "enable putty support"
+#: g10/import.c:182
 msgid "enable bulk import mode"
-msgstr "zapnout podporu pro PuTTY"
+msgstr "zapnout režim hromadného importu"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "při importu ukázat klíč"
 
-#: g10/import.c:187
-#, fuzzy
-#| msgid "show key during import"
+#: g10/import.c:188
 msgid "show key but do not actually import"
-msgstr "při importu ukázat klíč"
+msgstr "ukázat klíč, ale neimportovat jej"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "přijímat aktualizace pouze u existujících klíčů"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "odstranit z klíče po importu nepoužitelné části"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "odstranit po importu z klíče vše, co lze"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "ignorovat podpisy klíče, které nepodepisují samy sebe"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "spustit importní filtry a exportovat klíč okamžitě"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "předpokládat vstup ve formátu zálohy klíčů GnuPG"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "při importu opravit klíče"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl přeskočen\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu klíče byly doposud zpracovány\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkový počet zpracovaných klíčů: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " přeskočeny klíče PGP2: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " přeskočeny nové klíče: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " bez ID uživatele: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importováno: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " beze změn: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nová ID uživatelů: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nové podklíče: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nové podpisy: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " nové revokace klíčů: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " přečtené tajné klíče: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " importované tajné klíče: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " tajné klíče nezměněny: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " neimportováno: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " odstraněné podpisy: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " odstraněné uživatelské ID: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
-"VAROVÁNÍ: klíč %s obsahuje předvolby pro nedostupné\n"
+"POZOR: klíč %s obsahuje předvolby pro nedostupné\n"
 "algoritmy na těchto ID uživatelů:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": předvolby pro šifrovací algoritmus %s\n"
 
-#: g10/import.c:1359
-#, fuzzy, c-format
-#| msgid " \"%s\": preference for cipher algorithm %s\n"
+#: g10/import.c:1360
+#, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
-msgstr " \"%s\": předvolby pro šifrovací algoritmus %s\n"
+msgstr " \"%s\": předvolby pro AEAD algoritmus %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
-msgstr " \"%s\": předvolby pro podepisovací algoritmus %s\n"
+msgstr " \"%s\": předvolby pro hashovací algoritmus %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": předvolby pro komprimační algoritmus %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporučujeme aktualizaci nastavení vašich preferencí a\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto klíče aby jste předešel problémům s neshodou algoritmů\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klíč %s: chybí identifikátor uživatele\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "klíč %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "zamítnut kontrolou při importu"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klíč %s: poškození PKS podklíče opraveno\n"
 
 # c-format
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klíč %s: přijat id uživatele \"%s\",který není podepsán jím samým\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klíč %s: chybí platný identifikátor uživatele\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klíč %s: nový klíč - přeskočen\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor klíčů (keyring): %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klíč %s: veřejný klíč „%s“ importován\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klíč %s: neodpovídá naší kopii\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klíč %s: „%s“ 1 nový identifikátor uživatele\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klíč %s: „%s“ %d nových identifikátorů uživatele\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klíč %s: „%s“ 1 nový podpis\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klíč %s: „%s“ %d nových podpisů\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klíč %s: „%s“ 1 nový podklíč\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klíč %s: „%s“ %d nových podklíčů\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klíč %s: „%s“ beze změn\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klíč %s: tajný klíč importován\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "klíč %s: tajný klíč již existuje\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "klíč %s: chyba při odesílání dat agentovi: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr "klíč %s: odkaz na kartu je přebit hodnotou klíče\n"
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3835,199 +3805,198 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, 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:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "tajný klíč %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import tajných klíčů není povolen\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Důvod nebyl specifikován"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Klíč je nahrazen"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Klíč byl zkompromitován"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Klíč se již nepoužívá"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Identifikátor uživatele již neplatí"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "důvod pro revokaci: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revokační poznámka: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klíč %s: „%s“ revokační certifikát importován\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, 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:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klíč %s: neplatná vazba podklíče\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, 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:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klíč %s: neplatný odvolací podklíč\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, 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:3814
+#: g10/import.c:3913
 #, 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:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klíč %s: podklíč přeskočen\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
-#, fuzzy, c-format
-#| msgid "key %s: duplicated user ID detected - merged\n"
+#: g10/import.c:4323
+#, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
-msgstr "klíč %s: objeven duplikovaný identifikátor uživatele - sloučen\n"
+msgstr "klíč %s: objeveny duplikované podklíče – sloučeny\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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"
+msgstr "POZOR: klíč %s může být odvolán: zkouším získat revokační klíč %s\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, 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"
+msgstr "POZOR: klíč %s může být odvolán: revokační klíč %s nenalezen.\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, 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:4389
+#: g10/import.c:4508
 #, 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"
@@ -4037,42 +4006,39 @@
 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"
+#: g10/key-check.c:397
+#, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
+msgstr ""
+"podpis vytvořený nepodporovaným algoritmem (%d) veřejného klíče nelze "
+"ověřit: %s.\n"
 
-#: g10/key-check.c:405
-#, fuzzy, c-format
-#| msgid "card does not support digest algorithm %s\n"
+#: g10/key-check.c:406
+#, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "karta nepodporuje hashovací algoritmus %s\n"
+msgstr ""
+"podpis vytvořený nepodporovaným hashovacím algoritmem (%d) nelze ověřit: "
+"%s.\n"
 
-#: g10/key-check.c:571
-#, fuzzy
-#| msgid "Good signature from"
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
-msgstr "Dobrý podpis od"
+msgstr " (následují přeřazené podpisy)"
 
-#: g10/key-check.c:708
-#, fuzzy, c-format
-#| msgid "key %s: %s\n"
+#: g10/key-check.c:709
+#, c-format
 msgid "key %s:\n"
-msgstr "klíč %s: %s\n"
+msgstr "klíč %s:\n"
 
-#: g10/key-check.c:716
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
-#| msgid_plural "User ID \"%s\": %d signatures removed\n"
+#: g10/key-check.c:717
+#, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
-msgstr0 "Uživatelské ID „%s“: odstraněn %d podpis\n"
-msgstr1 "Uživatelské ID „%s“: odstraněny %d podpisy\n"
-msgstr2 "Uživatelské ID „%s“: odstraněno %d podpisů\n"
+msgstr0 "%d duplicitní podpis odstraněn\n"
+msgstr1 "%d duplicitní podpisy odstraněny\n"
+msgstr2 "%d duplicitních podpisů odstraněno\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
@@ -4080,7 +4046,7 @@
 msgstr1 "%d podpisy neověřeny, protože chybí klíče\n"
 msgstr2 "%d podpisů neověřeno, protože chybí klíče\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
@@ -4088,61 +4054,62 @@
 msgstr1 "%d špatné podpisy\n"
 msgstr2 "%d špatných podpisů\n"
 
-#: g10/key-check.c:742
-#, fuzzy, c-format
-#| msgid "Good signature from"
+#: g10/key-check.c:743
+#, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
-msgstr0 "Dobrý podpis od"
-msgstr1 "Dobrý podpis od"
-msgstr2 "Dobrý podpis od"
+msgstr0 "%d podpis přeřazen\n"
+msgstr1 "%d podpisy přeřazeny\n"
+msgstr2 "%d podpisů přeřazeno\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
+"Pozor: Zjištěny chyby a ověřeny pouze podpisy samy sebou.\n"
+"Spusťte „%s“, abyste ověřili všechny podpisy.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, 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:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "schránka na klíče (keybox) „%s“ vytvořena\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "soubor klíčů (keyring) „%s“ vytvořen\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "zdroj bloku klíče „%s“: %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnovení vyrovnávací paměti klíčů: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "odvolání"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "podpis klíče jím samým"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4154,72 +4121,72 @@
 "kontrolou otisků z různých zdrojů…)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Důvěřuji částečně\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Důvěřuji úplně\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
-"Prosím vložte hloubku důvěry (depth trust) k tomuto podpisu.\n"
+"Prosím, zadejte hloubku důvěry (depth trust) k tomuto podpisu.\n"
 "Hloubka větší než 1 umožňuje klíčům, které jste podepsal\n"
 "podepsat jiný klíč, který bude pro Vás důvěryhodný.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
-"Prosím vložte doménu, pro kterou je podpis omezen nebo stiskněte enter pro "
+"Prosím, zadejte doménu, pro kterou je podpis omezen nebo stiskněte enter pro "
 "podpis bez omezení na doménu.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Přeskakuje se ID uživatele „%s“, což není textové ID.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uživatelské ID „%s“ je odvoláno."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jistý(á), že stále chcete podepsat tento klíč? (a/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Nelze podepsat.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypršela platnost uživatelského ID „%s“."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID uživatele „%s“ není podepsáno jím samým."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "ID uživatele „%s“ je připraveno k podpisu."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Podepsat? (a/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4228,11 +4195,11 @@
 "Podpis klíče „%s“ jím samým je\n"
 "podpis formátu PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Přejete si jej změnit na formát OpenPGP? (a/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4241,13 +4208,13 @@
 "Platnost vašeho podpisu na „%s“\n"
 "vypršela.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvořit nový podpis a nahradit jím ten, jehož platnost vypršela? (a/"
 "N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4256,43 +4223,43 @@
 "Váš současný podpis na „%s“\n"
 "je pouze lokální.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Přejete si jej změnit na plně exportovatelný podpise? (a/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "„%s“ je již lokálně podepsán klíčem %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "„%s“ je již podepsán klíčem %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete klíč přesto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podepsání klíčem %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Platnost klíče vypršela!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost klíče vyprší %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Vašeho podpisu vypršela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4302,31 +4269,31 @@
 "patří výše uvedené osobě.\n"
 "Pokud neznáte odpověď, zadejte „0“.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Neodpovím.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Částečně jsem to ověřil(a).%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Velmi pečlivě jsem to ověřil(a).%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Váš výběr? (pro podrobnosti zadejte „?“): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4335,229 +4302,239 @@
 "Jste si jistý(á), že chcete podepsat tento klíč\n"
 "svým klíčem „%s“ (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Jedná se o podpis klíče jím samým.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr "VAROVÁNÍ: podpis nebude označen jako neexportovatelný.\n"
+msgstr "POZOR: podpis nebude označen jako neexportovatelný.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr "VAROVÁNÍ: podpis nebude označen jako neodvolatelný (non-revocable).\n"
+msgstr "POZOR: podpis nebude označen jako neodvolatelný (non-revocable).\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude označen jako neexportovatelný.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude označen jako neodvolatelný (non-revocable).\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento klíč neověřil.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Částečně jsem ověřil tento klíč.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Skutečně podepsat? (a/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "K dispozici je jen kontrolní součet klíče nebo je klíč na kartě - passphrase "
 "nelze změnit.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "klíč %s: chyba při měnění hesla: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "uložit a ukončit"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "vypsat otisk klíče"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "ukázat keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "vypsat seznam klíčů a id uživatelů"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "vyberte identifikátor uživatele N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "vyberte podklíč N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "podepsat vybrané ID uživatele * níže jsou uvedeny relevantní příkazy"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybrané uživatelské ID lokálně"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybrané uživatelské ID důvěryhodným podpisem"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybraná uživatelská ID neodvolatelným podpisem"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "přidat identifikátor uživatele"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "přidat fotografický ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "smazat vybrané ID uživatele"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "přidat podklíč"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "přidat klíč na kartu"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "přesunout klíč na kartu"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
-msgstr ""
+msgstr "převést klíč do formátu TPM pomocí místního TPM"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "přesunout záložní klíč na kartu"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "smazat vybrané podklíče"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "přidat revokační klíč"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr "přidat dodatečný dešifrovací podklíč"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybraných uživatelských ID"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "změnit datum expirace pro klíč nebo vybrané podklíče"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "označit vybrané uživatelské ID jako primární"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "vypsat seznam předvoleb (pro experty)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam předvoleb (podrobně)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferencí pro vybrané uživatelské ID"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovaného serveru klíčů pro vybraná uživatelská ID"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "zadat poznámku pro vybraná uživatelská ID"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "změnit heslo"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "změnit důvěryhodnost vlastníka klíče"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybraných uživatelských ID"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "revokovat vybrané uživatelské ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "revokovat klíč nebo vybrané podklíče"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "nastavit klíč jako platný (enable)"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "nastavit klíč jako neplatný (disable)"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "ukázat vybrané fotografické ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "směstnat nepoužitelná ID uživatelů a odstranit z klíče nepoužitelné podpisy"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "směstnat nepoužitelná ID uživatelů a odstranit z klíče všechny podpisy"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Tajný klíč je dostupný.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Tajné podklíče jsou dostupné.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+"Poznámka: Místní kopie tajného klíče bude smazána až s příkazem „save“.\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4568,286 +4545,275 @@
 " 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:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Klíč je odvolán."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Opravdu podepsat všechna textová ID uživatele? (a/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Neznámý typ podpisu „%s“\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Použijte příkaz „%s“.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Nemůžete smazat poslední id uživatele!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit všechny vybrané id uživatele? (a/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id uživatele? (a/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu přesunout primární klíč? (a/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrat právě jeden klíč.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Příkaz očekává jméno souboru jako argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Nelze otevřít „%s“: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Chyba při čtení záložního klíče z „%s“: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Musíte vybrat alespoň jeden klíč.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento klíč? (a/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu odvolat všechna vybraná ID uživatele? (a/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu odvolat toto ID uživatele? (a/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete odvolat celý klíč? (a/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete odvolat vybrané podklíče? (a/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete odvolat tento podklíč? (a/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Důvěryhodnost vlastníka nelze měnit je-li používána databáze důvěry "
 "poskytnutá uživatelem\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam předvoleb:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat předvolby pro vybraný id uživatele? (a/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat předvolby? (a/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Uložit změny? (a/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Ukončit bez uložení? (a/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "smazání kopie tajného klíče se nezdařilo: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, 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"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "odvolání ID uživatele se nepodařilo: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "nastavení primárního ID uživatele se nepodařilo: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "„%s“ není otisk\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "„%s“ není primární otisk\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Neplatné ID uživatele „%s“: %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "Žádný identifikátor uživatele neodpovídá."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Nic na podepsání.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nepodepsáno vámi.\n"
 
-#: g10/keyedit.c:3031
-#, fuzzy, c-format
-#| msgid "checking created signature failed: %s\n"
+#: g10/keyedit.c:3181
+#, c-format
 msgid "revoking the key signature failed: %s\n"
-msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
+msgstr "odvolat podpis klíče se nepodařilo: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "„%s“ není platná doba expirace\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "„%s“ není řádný otisk\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklíč „%s“ nenalezen\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Hash: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Vlastnosti: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Keyserver bez modifikace"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Preferovaný keyserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Poznámky: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "vytvořen: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "odvolán: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skončila: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skončí: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "použití: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "číslo karty: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "důvěra: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Tento klíč byl označen za neplatný (disabled)"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4856,75 +4822,78 @@
 "být nutně správné, dokud znova nespustíte program.\n"
 
 # status
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "odvolán"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "platnost skončila"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, 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 ""
-"VAROVÁNÍ: žádné uživatelské ID nebylo označeno jako primární. Tento příkaz\n"
+"POZOR: žá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:4187
+#: g10/keyedit.c:4259
 #, 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:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "POZOR: Nezbyl žádný platný šifrovací podklíč.\n"
+
+#: g10/keyedit.c:4353
 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 ""
-"VAROVÁNÍ: Toto je PGP2 klíč. Přidání fotografického ID může v některých\n"
+"POZOR: 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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
-#, fuzzy
-#| msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
-msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
+msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4932,20 +4901,20 @@
 msgstr1 "Smazány %d podpisy.\n"
 msgstr2 "Smazáno %d podpisů.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "neplatný"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4953,316 +4922,328 @@
 msgstr1 "Uživatelské ID „%s“: odstraněny %d podpisy\n"
 msgstr2 "Uživatelské ID „%s“: odstraněno %d podpisů\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uživatelské ID „%s“: je již minimalizované\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uživatelské ID „%s“: je již odstraněné\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 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 ""
-"VAROVÁNÍ: Toto je PGP2 klíč. Přidání pověřeného odvolatele může v některých\n"
+"POZOR: 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:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor pověřeného odvolatele: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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"
+msgstr "POZOR: ustanovení klíče pověřeným odvolatelem je nevratná operace!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr "Zadejte otisk dodatečného dešifrovacího podklíče: "
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, c-format
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "Zadali jste otisk podklíče?\n"
+
+#: g10/keyedit.c:4915
+#, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "klíč „%s“ je již v tomto bloku klíče.\n"
+
+#: g10/keyedit.c:5007
 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:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Měním dobu expirace podklíče.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Měním dobu expirace primárního klíče.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Mění se účel podklíče.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Mění se účel primárního klíče.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právě jeden id uživatele .\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vložte URL preferovaného serveru klíčů: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 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:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Vložte poznámku: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Pokračovat (a/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Neexistuje podklíč s ID klíče „%s“.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklíč s indexem %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID uživatele: „%s“\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvořit pro tento podpis odvolací certifikát? (a/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (neodvolatelné)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, 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:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se odvolat tyto podpisy:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvořit odvolací certifikáty? (a/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný klíč\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "pokus odvolat ID neuživatele: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "uživatelské ID „%s“ je již odvoláno\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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"
+msgstr "POZOR: podpis ID uživatele je datován %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klíč %s je již odvolán.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklíč %s je již odvolán.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "neplatný argument u volby „%s“\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "duplicita předvolby „%s“\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "příliš mnoho předvoleb pro šifrování\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "příliš mnoho předvoleb pro vzorkování\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "příliš mnoho předvoleb pro komprimaci\n"
 
-#: g10/keygen.c:352
-#, fuzzy, c-format
-#| msgid "too many cipher preferences\n"
+#: g10/keygen.c:349
+#, c-format
 msgid "too many AEAD preferences\n"
-msgstr "příliš mnoho předvoleb pro šifrování\n"
+msgstr "příliš mnoho předvoleb pro AEAD\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, 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:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis klíče jím samým (direct signature)\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapisuji podpis klíče sebou samým\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapisuji „key-binding“ podpis\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná délka klíče; použiji %u bitů\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "délka klíče zaokrouhlena na %u bitů\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
-"VAROVÁNÍ: některé OpenPGP programy nedokáží zacházet s DSA klíčem s takto "
+"POZOR: některé OpenPGP programy nedokáží zacházet s DSA klíčem s takto "
 "dlouhým hashem\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Podepisování"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certifikování"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Šifrování"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Autentizace"
 
@@ -5276,180 +5257,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1965
-#, fuzzy, c-format
-#| msgid "Possible actions for a %s key: "
+#: g10/keygen.c:1949
+#, c-format
 msgid "Possible actions for this %s key: "
-msgstr "Pro klíč %s lze provést: "
+msgstr "Možné způsoby užití tohoto klíče %s: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
-msgstr "Aktuálně povolené akce: "
+msgstr "Aktuálně povolené způsoby užití: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
-msgstr " (%c) Zapnout/vypnout schopnost podepisovat\n"
+msgstr " (%c) Přepnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
-msgstr " (%c) Zapnout/vypnout schopnost šifrovat\n"
+msgstr " (%c) Přepnout schopnost šifrovat\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
-msgstr " (%c) Zapnout/vypnout schopnost autentizovat\n"
+msgstr " (%c) Přepnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Konec\n"
 
-#: g10/keygen.c:2115
-#, fuzzy, c-format
-#| msgid " (%d) RSA and RSA (default)\n"
+#: g10/keygen.c:2099
+#, c-format
 msgid " (%d) RSA and RSA%s\n"
-msgstr " (%d) RSA a RSA (implicitní)\n"
+msgstr " (%d) RSA a RSA%s\n"
 
-#: g10/keygen.c:2119
-#, fuzzy, c-format
-#| msgid " (%d) DSA and Elgamal\n"
+#: g10/keygen.c:2103
+#, c-format
 msgid " (%d) DSA and Elgamal%s\n"
-msgstr " (%d) DSA a Elgamal\n"
+msgstr " (%d) DSA a Elgamal%s\n"
 
-#: g10/keygen.c:2122
-#, fuzzy, c-format
-#| msgid " (%d) DSA (sign only)\n"
+#: g10/keygen.c:2106
+#, c-format
 msgid " (%d) DSA (sign only)%s\n"
-msgstr " (%d) DSA (pouze pro podpis)\n"
+msgstr " (%d) DSA (pouze pro podpis)%s\n"
 
-#: g10/keygen.c:2124
-#, fuzzy, c-format
-#| msgid " (%d) RSA (sign only)\n"
+#: g10/keygen.c:2108
+#, c-format
 msgid " (%d) RSA (sign only)%s\n"
-msgstr " (%d) RSA (pouze pro podpis)\n"
+msgstr " (%d) RSA (pouze pro podpis)%s\n"
 
-#: g10/keygen.c:2130
-#, fuzzy, c-format
-#| msgid " (%d) Elgamal (encrypt only)\n"
+#: g10/keygen.c:2114
+#, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
-msgstr " (%d) Elgamal (pouze pro šifrování)\n"
+msgstr " (%d) Elgamal (pouze pro šifrování)%s\n"
 
-#: g10/keygen.c:2132
-#, fuzzy, c-format
-#| msgid " (%d) RSA (encrypt only)\n"
+#: g10/keygen.c:2116
+#, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
-msgstr " (%d) RSA (pouze pro šifrování)\n"
+msgstr " (%d) RSA (pouze pro šifrování)%s\n"
 
-#: g10/keygen.c:2138
-#, fuzzy, c-format
-#| msgid " (%d) DSA (set your own capabilities)\n"
+#: g10/keygen.c:2122
+#, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
-msgstr " (%d) DSA (nastavit si vlastní použití)\n"
+msgstr " (%d) DSA (nastavit si vlastní použití)%s\n"
 
-#: g10/keygen.c:2140
-#, fuzzy, c-format
-#| msgid " (%d) RSA (set your own capabilities)\n"
+#: g10/keygen.c:2124
+#, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
-msgstr " (%d) RSA (nastavit si vlastní použití)\n"
+msgstr " (%d) RSA (nastavit si vlastní použití)%s\n"
 
-#: g10/keygen.c:2146
-#, fuzzy, c-format
-#| msgid " (%d) sign, encrypt\n"
+#: g10/keygen.c:2130
+#, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
-msgstr " (%d) podepisovat, šifrovat\n"
+msgstr " (%d) ECC (podpis a šifrování)%s\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
-msgstr ""
+msgstr " *výchozí*"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (pouze pro podpis)\n"
 
-#: g10/keygen.c:2149
-#, fuzzy, c-format
-#| msgid " (%d) ECC (set your own capabilities)\n"
+#: g10/keygen.c:2133
+#, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
-msgstr " (%d) ECC (nastavit si vlastní použití)\n"
+msgstr " (%d) ECC (nastavit si vlastní použití)%s\n"
 
-#: g10/keygen.c:2151
-#, fuzzy, c-format
-#| msgid " (%d) ECC (encrypt only)\n"
+#: g10/keygen.c:2135
+#, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
-msgstr " (%d) ECC (pouze pro šifrování)\n"
+msgstr " (%d) ECC (pouze pro šifrování)%s\n"
 
-#: g10/keygen.c:2155
-#, fuzzy, c-format
-#| msgid " (%d) Existing key\n"
+#: g10/keygen.c:2139
+#, c-format
 msgid " (%d) Existing key%s\n"
-msgstr " (%d) Existující klíč\n"
+msgstr " (%d) Existující klíč%s\n"
 
-#: g10/keygen.c:2157
-#, fuzzy, c-format
-#| msgid " (%d) Existing key from card\n"
+#: g10/keygen.c:2141
+#, c-format
 msgid " (%d) Existing key from card%s\n"
-msgstr " (%d) Klíč existující na kartě\n"
+msgstr " (%d) Klíč existující na kartě%s\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Vložte keygrip: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 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:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Klíč s takovým keygripem neexistuje\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "chyba při čtení z karty: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Sériové číslo karty: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Dostupné klíče:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Požadovaná délka klíče je %u bitů.\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5465,7 +5432,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:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5481,38 +5448,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:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Klíč je platný po? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platný pro? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Platnost klíče nikdy neskončí\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskončí\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost klíče skončí v %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skončí v %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5520,11 +5487,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:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Je to správně (a/N)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5539,7 +5506,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5555,41 +5522,41 @@
 " „Magda Prochazkova (student) <magda@domena.cz>“\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Jméno a příjmení: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve jméně\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, 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:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Komentář: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentáři\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Používáte znakovou sadu „%s“.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5600,11 +5567,11 @@
 " „%s“\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
 
@@ -5619,33 +5586,33 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Změnit (J)méno, (E)-mail nebo (U)končit? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Nejdřív, prosím, opravte chybu\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5658,18 +5625,18 @@
 "používat disky); díky tomu má generátor lepší šanci získat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
-msgstr ""
+msgstr "POZOR: je požadována verze 4, ale je přebita verzí 5.\n"
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvoření klíče se nepodařilo: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5680,64 +5647,64 @@
 " „%s“\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Pokračovat (A/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Klíč pro „%s“ již existuje\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Přesto vytvořit? (a/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "přesto se vytváří\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, 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:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Vytváření klíče bylo zrušeno.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, 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:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "veřejný klíč se zapisuje do „%s“\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 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:5639
+#: g10/keygen.c:5730
 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"
@@ -5745,7 +5712,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5753,7 +5720,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:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5761,22 +5728,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:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvořit? (a/N) "
 
@@ -5784,27 +5751,43 @@
 msgid "never "
 msgstr "nikdy "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Hash: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Vlastnosti: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Keyserver bez modifikace"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kritická podepisovací politika: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Podepisovací politika: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Kriticky preferovaný keyserver: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kritická podepisovací notace: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Podepisovací notace: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
@@ -5812,7 +5795,7 @@
 msgstr1 "%d dobré podpisy\n"
 msgstr2 "%d dobrých podpisů\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
@@ -5820,7 +5803,7 @@
 msgstr1 "%d podpisy neověřeny, protože došlo k chybám\n"
 msgstr2 "%d podpisů neověřeno, protože došlo k chybám\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
@@ -5828,33 +5811,33 @@
 msgstr1 "Pozor: %lu klíče přeskočeny kvůli jejich přílišné velikosti\n"
 msgstr2 "Pozor: %lu klíčů přeskočeno kvůli jejich přílišné velikosti\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Soubor klíčů (keyring)"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Otisk primárního klíče:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Otisk primárního klíče:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Otisk podklíče:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Otisk klíče ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Sériové číslo karty ="
 
@@ -5934,7 +5917,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "„%s“ není ID klíče: přeskočeno\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5942,145 +5925,141 @@
 msgstr1 "aktualizují se %d klíče z %s\n"
 msgstr2 "aktualizuje se %d klíčů z %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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"
+msgstr "POZOR: nelze aktualizovat klíč %s prostřednictvím %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klíč „%s“ nebyl na serveru klíčů nalezen\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "klíč nebyl na serveru klíčů nalezen\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "požaduji klíč %s z %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "není znám žádný server s klíči\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 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:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "posílám klíč %s na %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "požaduje se klíč z „%s“\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "VAROVÁNÍ: URI %s nelze získat: %s\n"
+msgstr "POZOR: URI %s nelze získat: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
-#, fuzzy, c-format
-#| msgid "%s encrypted session key\n"
+#: g10/mainproc.c:398
+#, c-format
 msgid "%s.%s encrypted session key\n"
-msgstr "%s zašifrovaný klíč sezení\n"
+msgstr "klíč sezení zašifrovaný pomocí %s.%s\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
-#, fuzzy, c-format
-#| msgid "%s encrypted data\n"
+#: g10/mainproc.c:400 sm/decrypt.c:884
+#, c-format
 msgid "%s.%s encrypted data\n"
-msgstr "%s zašifrovaná data\n"
+msgstr "data zašifrovaná pomocí %s.%s\n"
 
-#: g10/mainproc.c:387
-#, fuzzy, c-format
-#| msgid "encrypted with unknown algorithm %d\n"
+#: g10/mainproc.c:405
+#, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
-msgstr "zašifrováno neznámým algoritmem %d\n"
+msgstr "zašifrováno neznámým algoritmem %d.%s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, 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:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "veřejný klíč je %s\n"
 
-#: g10/mainproc.c:532
-#, fuzzy, c-format
-#| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+#: g10/mainproc.c:564
+#, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
-msgstr "zašifrována %u-bitovým %s klíčem, ID %s, vytvořeným %s\n"
+msgstr "zašifrováno klíčem %s, ID %s, vytvořeným %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, 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:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "zašifrováno %s klíčem, ID %s\n"
+msgstr "zašifrováno klíčem %s, ID %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
-msgstr "VAROVÁNÍ: zachyceno více prostých textů\n"
+msgstr "POZOR: zachyceno více prostých textů\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrováno s heslem %lu\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrováno jedním heslem\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrování veřejným klíčem selhalo: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, 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:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, 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"
+msgstr "POZOR: zpráva nebyla chráněna proti porušení její integrity\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -6089,182 +6068,188 @@
 "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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Dešifrování lze vynutit volbou „%s“.\n"
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "vynucené dešifrování selhalo!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrování o.k.\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "VAROVÁNÍ: se zašifrovanou zprávou bylo manipulováno!\n"
+msgstr "POZOR: se zašifrovanou zprávou bylo manipulováno!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrování selhalo: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "operace byla přinucena selhat, protože nebyla splněna pravidla normy\n"
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "původní jméno souboru='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "nenalezen žádná podpis\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ŠPATNÝ podpis od „%s“"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršenou platností od „%s“"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od „%s“"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potlačena\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvořen %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, 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:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " vydavatel „%s“\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Klíč k dispozici na: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Poznámka: Použijte „%s“ pro využití těchto údajů\n"
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "nejistý"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " alias „%s“"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skončila %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skončí %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binární formát"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "textový formát"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "neznámý formát"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", algoritmus klíče"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, 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:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ověřit podpis: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto není podpis oddělený od dokumentu\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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"
+msgstr "POZOR: detekováno více podpisů. Kontrolován bude pouze první.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis třídy 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
@@ -6282,27 +6267,27 @@
 #: g10/misc.c:304
 #, 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"
+msgstr "POZOR: používám experimentální algoritmus veřejného klíče %s\n"
 
 #: g10/misc.c:311
 #, c-format
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
-msgstr "VAROVÁNÍ: Podepisovací a šifrovací klíče Elgamal se nedoporučují\n"
+msgstr "POZOR: Podepisovací a šifrovací klíče Elgamal se nedoporučují\n"
 
 #: g10/misc.c:325
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "VAROVÁNÍ: používám experimentální šifrovací algoritmus %s\n"
+msgstr "POZOR: používám experimentální šifrovací algoritmus %s\n"
 
 #: g10/misc.c:343
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "VAROVÁNÍ: používám experimentální hashovací algoritmus %s\n"
+msgstr "POZOR: používám experimentální hashovací algoritmus %s\n"
 
 #: g10/misc.c:351
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "VAROVÁNÍ: vyžádaný algoritmus %s není doporučen\n"
+msgstr "POZOR: vyžádaný algoritmus %s není doporučen\n"
 
 #: g10/misc.c:380
 #, c-format
@@ -6344,7 +6329,7 @@
 #: g10/misc.c:1197
 #, 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"
+msgstr "POZOR: používání příkaz „%s“ se nedoporučuje - nepoužívejte jej\n"
 
 #: g10/misc.c:1207
 #, c-format
@@ -6355,7 +6340,7 @@
 #, 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"
+msgstr "POZOR: „%s%s“ je zastaralý parametr – neúčinkuje kromě v %s\n"
 
 #: g10/misc.c:1308
 msgid "Uncompressed"
@@ -6366,29 +6351,29 @@
 msgid "uncompressed|none"
 msgstr "nezkomprimováno|nic"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "nejednoznačná volba „%s“\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "neznámá volba „%s“\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "neznámý slabý hashovací algoritmus „%s“\n"
@@ -6424,12 +6409,12 @@
 #: g10/parse-packet.c:357
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "nemohu pracovat s algoritmem veřejného klíče %d\n"
+msgstr "nelze pracovat s algoritmem veřejného klíče %d\n"
 
 #: g10/parse-packet.c:1299
 #, 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"
+msgstr "POZOR: potencionálně nebezpečně symetricky zašifrován klíč sezení\n"
 
 #: g10/parse-packet.c:1818
 #, c-format
@@ -6441,11 +6426,9 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpacket typu %d má nastavený kritický bit\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
-#, fuzzy
-#| msgid "Please enter the new passphrase"
+#: g10/passphrase.c:201 sm/decrypt.c:661
 msgid "Please enter the passphrase for decryption."
-msgstr "Prosím, zadejte nové heslo"
+msgstr "Prosím, zadejte heslo pro dešifrování."
 
 #: g10/passphrase.c:203
 msgid "Enter passphrase\n"
@@ -6486,10 +6469,8 @@
 msgstr "Opravdu chcete trvale smazat tajný klíč OpenPGP:"
 
 #: g10/passphrase.c:515
-#, fuzzy
-#| msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgid "Please enter the passphrase to export the secret key with keygrip:"
-msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný klíč OpenPGP:"
+msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný klíč s keygripem:"
 
 #: g10/passphrase.c:529
 #, c-format
@@ -6506,7 +6487,7 @@
 "vytvořen %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6520,71 +6501,71 @@
 "klíči - velký obrázek bude mít za následek velmi velký veřejný klíč !\n"
 "Vhodná velikost obrázku je asi 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Vložte jméno JPEG souboru s fotografickým ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "nelze otevřít JPEG soubor „%s“: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Tento JPEG je opravdu velký (%d bajtů)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete použít? (a/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "„%s“ není soubor ve formátu JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je tato fotografie správná (a/N/u)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "spuštění externího programu není podporováno\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "na této platformě jsou při volání externích programů vyžadovány\n"
 "dočasné soubory (temp files)\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "nelze spustit shell „%s“: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "neočekávaný konec externího programu\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systémová chyba při volání externího programu: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
-msgstr "VAROVÁNÍ: nelze smazat dočasný soubor (%s) „%s“: %s\n"
+msgstr "POZOR: nelze smazat dočasný soubor (%s) „%s“: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
-msgstr "VAROVÁNÍ: nelze smazat dočasný adresář „%s“: %s\n"
+msgstr "POZOR: nelze smazat dočasný adresář „%s“: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6592,7 +6573,7 @@
 "volání externích programů je zakázáno, protože file permissions nejsou\n"
 "nastaveny nebezpečně\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
@@ -6673,32 +6654,32 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikáty vedoucí k finálnímu důvěryhodnému klíči:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: Nic nenaznačuje tomu, že tento klíč patří uvedenému uživateli\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: Je zde částečná důvěra, že tento klíč patří uvedenému uživateli\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento klíč pravděpodobně náleží uvedenému uživateli\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Tento klíč náleží nám (máme odpovídající tajný klíč)\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: Tento klíč je špatný! Byl označen jako nedůvěryhodný!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6708,7 +6689,7 @@
 "Pokud *skutečně* víte, co děláte, můžete na\n"
 "následující otázku odpovědět ano.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6718,163 +6699,158 @@
 "v uživatelském ID. Pokud *skutečně* víte, co děláte, můžete na\n"
 "následující otázku odpovědět ano.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Použít přesto tento klíč? (a/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
-msgstr "VAROVÁNÍ: Je použit nedůvěryhodný klíč!\n"
+msgstr "POZOR: Je použit nedůvěryhodný klíč!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "VAROVÁNÍ: tento klíč může být revokován (revokační klíč nenalezen)\n"
+msgstr "POZOR: tento klíč může být revokován (revokační klíč nenalezen)\n"
 
-#: g10/pkclist.c:669
-#, fuzzy, c-format
-#| msgid "user ID: \"%s\"\n"
+#: g10/pkclist.c:673
+#, c-format
 msgid "checking User ID \"%s\"\n"
-msgstr "ID uživatele: „%s“\n"
+msgstr "ověřuje se ID uživatele „%s“\n"
 
-#: g10/pkclist.c:681
-#, fuzzy, c-format
-#| msgid "option '%s' given, but option '%s' not given\n"
+#: g10/pkclist.c:685
+#, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
-msgstr "zadána volba „%s“, ale chybí volba „%s“\n"
+msgstr "zadána volba %s, ale vydavatel „%s“ se neshoduje\n"
 
-#: g10/pkclist.c:684
-#, fuzzy, c-format
-#| msgid "key %s: doesn't match our copy\n"
+#: g10/pkclist.c:688
+#, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
-msgstr "klíč %s: neodpovídá naší kopii\n"
+msgstr "vydavatel „%s“ se neshoduje s žádným ID uživatele\n"
 
-#: g10/pkclist.c:687
-#, fuzzy, c-format
-#| msgid "option '%s' given, but option '%s' not given\n"
+#: g10/pkclist.c:691
+#, c-format
 msgid "option %s given but no matching User ID found\n"
-msgstr "zadána volba „%s“, ale chybí volba „%s“\n"
+msgstr "zadána volba %s, ale nenalezeno žádné odpovídající ID uživatele\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "VAROVÁNÍ: Tento klíč byl revokován klíčem s pověřením k revokaci!\n"
+msgstr "POZOR: Tento klíč byl revokován klíčem s pověřením k revokaci!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "VAROVÁNÍ: Tento klíč byl revokován svým vlastníkem!\n"
+msgstr "POZOR: Tento klíč byl revokován svým vlastníkem!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " To může znamenat, že podpis je padělaný.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "VAROVÁNÍ: Tento podklíč byl revokován svým vlastníkem!\n"
+msgstr "POZOR: Tento podklíč byl revokován svým vlastníkem!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Poznámka: Tento klíč byl označen jako neplatný (disabled).\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Poznámka: Skončila platnost tohoto klíče!\n"
 
-#: g10/pkclist.c:729
-#, fuzzy, c-format
-#| msgid "WARNING: This key is not certified with a trusted signature!\n"
+#: g10/pkclist.c:733
+#, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
-msgstr "VAROVÁNÍ: Tento klíč není certifikován důvěryhodným podpisem!\n"
+msgstr ""
+"POZOR: ID uživatele tohoto klíče není certifikován důvěryhodným podpisem!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "VAROVÁNÍ: Tento klíč není certifikován důvěryhodným podpisem!\n"
+msgstr "POZOR: Tento klíč není certifikován důvěryhodným podpisem!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Nic nenaznačuje tomu, že tento podpis patří vlastníkovi klíče.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "VAROVÁNÍ: NEDŮVĚŘUJEME tomuto klíči!\n"
+msgstr "POZOR: NEDŮVĚŘUJEME tomuto klíči!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Tento podpis je pravděpodobně PADĚLANÝ.\n"
 
-#: g10/pkclist.c:753
-#, fuzzy, c-format
-#| msgid ""
-#| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:757
+#, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
 "signatures!\n"
 msgstr ""
-"VAROVÁNÍ: Tento klíč není certifikován dostatečně důvěryhodnými podpisy!\n"
+"POZOR: ID uživatele tohoto klíče není certifikováno dostatečně "
+"důvěryhodnýmipodpisy!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"VAROVÁNÍ: Tento klíč není certifikován dostatečně důvěryhodnými podpisy!\n"
+"POZOR: Tento klíč není certifikován dostatečně důvěryhodnými podpisy!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Není jisté, zda tento podpis patří vlastníkovi.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: přeskočeno: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: přeskočeno: veřejný klíč je neplatný (disabled)\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: přeskočeno: veřejný klíč je již obsažen v databázi\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "nelze zašifrovat pro „%s“\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "zadána volba „%s“, ale nezadány žádné platné výchozí klíče\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "zadána volba „%s“, ale chybí volba „%s“\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nezadali jste identifikátor uživatele (můžete použít \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Aktuální příjemci:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6882,40 +6858,40 @@
 "\n"
 "Napište identifikátor uživatele (user ID). Ukončete prázdným řádkem: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Takový identifikátor uživatele neexistuje.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "přeskočeno: veřejný klíč je už nastaven podle implicitního adresáta\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Veřejný klíč je neplatný (disabled).\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "přeskočeno: veřejný klíč je již nastaven\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "neznámý implicitní adresát „%s“\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "žádné platné adresy\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Poznámka: klíči %s chybí předvolby pro %s\n"
@@ -6932,7 +6908,7 @@
 
 #: g10/plaintext.c:614
 msgid "Please enter name of data file: "
-msgstr "Prosím, vložte název datového souboru: "
+msgstr "Prosím, zadejte název datového souboru: "
 
 #: g10/plaintext.c:651
 #, c-format
@@ -6954,7 +6930,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nelze otevřít podepsaná data na deskriptoru=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "klíč %s se nehodí na rozšifrování v režimu %s\n"
@@ -6965,10 +6941,9 @@
 msgstr "anonymní adresát; zkusí se tajný klíč %s…\n"
 
 #: g10/pubkey-enc.c:146 g10/pubkey-enc.c:159
-#, fuzzy, c-format
-#| msgid "key %s is not suitable for decryption in %s mode\n"
+#, c-format
 msgid "used key is not marked for encryption use.\n"
-msgstr "klíč %s se nehodí na rozšifrování v režimu %s\n"
+msgstr "použitý klíč nemá vyznačeno použití pro šifrování.\n"
 
 #: g10/pubkey-enc.c:157
 #, c-format
@@ -6988,7 +6963,7 @@
 #: g10/pubkey-enc.c:399
 #, 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"
+msgstr "POZOR: v předvolbách příjemce nenalezen šifrovací algoritmus %s\n"
 
 #: g10/pubkey-enc.c:432
 #, c-format
@@ -7183,37 +7158,32 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "%s klíč %s vyžaduje hash o délce %zu nebo více bitů (hash je %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávě\n"
+msgstr "POZOR: konflikt hashe podpisu ve zprávě\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "VAROVÁNÍ: podepisovací podklíč %s není křížově certifikován\n"
+msgstr "POZOR: podepisovací podklíč %s není křížově certifikován\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "více informací naleznete na adrese %s\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "VAROVÁNÍ: podepisovací podklíč %s má neplatnou křížovou certifikaci\n"
+msgstr "POZOR: podepisovací podklíč %s má neplatnou křížovou certifikaci\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
@@ -7221,7 +7191,7 @@
 msgstr1 "veřejný klíč %s je o %lu sekundy novější než podpis\n"
 msgstr2 "veřejný klíč %s je o %lu sekund novější než podpis\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
@@ -7229,7 +7199,7 @@
 msgstr1 "veřejný klíč %s je o %lu dny novější než podpis\n"
 msgstr2 "veřejný klíč %s je o %lu dnů novější než podpis\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7245,7 +7215,7 @@
 "klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
 "je problém s hodinami)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7260,90 +7230,87 @@
 "klíč %s byl vytvořen %lu dnů v budoucnosti (došlo ke změně času nebo\n"
 "je problém s hodinami)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Poznámka: podpisovému klíči %s skončila platnost v %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Poznámka: podpisový klíč %s byl odvolán\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, 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"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
-"VAROVÁNÍ: nelze %%-expandovat notaci (příliš dlouhé). Použity "
-"neexpandované.\n"
+"POZOR: nelze %%-expandovat notaci (příliš dlouhé). Použity neexpandované.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr ""
-"VAROVÁNÍ: nemohu %%-expandovat URL politiky (příliš dlouhé). Použity "
+"POZOR: nemohu %%-expandovat URL politiky (příliš dlouhé). Použity "
 "neexpandované.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 msgstr ""
-"VAROVÁNÍ: nemohu %%-expandovat URL preferovaného keyservery (příliš dlouhé). "
+"POZOR: nemohu %%-expandovat URL preferovaného keyservery (příliš dlouhé). "
 "Použity neexpandované.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: „%s“\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"VAROVÁNÍ: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám "
-"příjemce\n"
+"POZOR: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám příjemce\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1631
-#, fuzzy, c-format
-#| msgid "%s encryption will be used\n"
+#: g10/sign.c:1645
+#, c-format
 msgid "%s.%s encryption will be used\n"
-msgstr "bude použito šifrování %s\n"
+msgstr "bude použito šifrování %s.%s\n"
 
 #: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
@@ -7418,133 +7385,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáze důvěry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "pro „%s“ nelze vytvořit zámek\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "„%s“ nelze zamknout\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, 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"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transakce s databází důvěry je příliš dlouhá\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adresář neexistuje!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "k „%s“ nelze přistoupit: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvořena neplatná databáze důvěry\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: databáze důvěry vytvořena\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Poznámka: do databáze důvěry nelze zapisovat\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatná databáze důvěry\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodařilo se vytvořit hashovací tabulku: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba při aktualizaci záznamu verze: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba při čtení záznamu verze: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, 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:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "databáze důvěry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, 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:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: není soubor databáze důvěry\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: záznam verze s číslem %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatná verze souboru %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, 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:1827
+#: g10/tdbio.c:1797
 #, 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:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulování záznamu selhalo: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: přidání záznamu selhalo: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Chyba: Databáze důvěry je poškozena.\n"
@@ -8006,7 +7973,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "není nutné kontrolovat databázi důvěry\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "další kontrola databáze důvěry v %s\n"
@@ -8036,7 +8003,7 @@
 msgid "checking the trustdb\n"
 msgstr "kontroluji databázi důvěry\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8044,7 +8011,7 @@
 msgstr1 "zpracovány %d klíče"
 msgstr2 "zpracováno %d klíčů"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8052,17 +8019,17 @@
 msgstr1 " (vymazána %d počítadla platnosti)\n"
 msgstr2 " (vymazáno %d počítadel platnosti)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8070,7 +8037,7 @@
 "hloubka: %d platných: %3d podepsaných: %3d důvěra: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, 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"
@@ -8140,7 +8107,7 @@
 msgid "ultimate"
 msgstr " absolutní "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8151,41 +8118,39 @@
 "Prosím, nezapomeňte, že soubor s podpisem (.sig nebo .asc)\n"
 "by měl být prvním souborem zadaným na příkazové řádce.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupní řádek %u je příliš dlouhý nebo na konci chybí znak LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nemohu otevřít deskriptor %d: %s\n"
 
 #: g10/cipher-cfb.c:70
-#, fuzzy, c-format
-#| msgid "WARNING: message was not integrity protected\n"
+#, c-format
 msgid "WARNING: encrypting without integrity protection is dangerous\n"
-msgstr "VAROVÁNÍ: zpráva nebyla chráněna proti porušení její integrity\n"
+msgstr "POZOR: šifrování bez ochrany proti porušení integrity je nebezpečné\n"
 
 #: g10/cipher-cfb.c:72
-#, fuzzy, c-format
-#| msgid "ambiguous option '%s'\n"
+#, c-format
 msgid "Hint: Do not use option %s\n"
-msgstr "nejednoznačná volba „%s“\n"
+msgstr "Rada: Nepoužívejte volbu %s\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "nastavit příznaky ladění"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "zapnout úplné ladění"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Použití: kbxutil volby soubory (-h pro nápovědu)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8196,132 +8161,118 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%sČíslo&#x1f;: %s%%0ADržitel&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Zbývá pokusů: %d"
 
 #: scd/app-piv.c:1845
-#, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "|N|Please enter the new Global-PIN"
-msgstr "||Prosím vložte PIN"
+msgstr "|N|Prosím zadejte nový globální PIN"
 
 #: scd/app-piv.c:1846
-#, fuzzy
-#| msgid "||Please enter the Reset Code for the card"
 msgid "||Please enter the Global-PIN of your PIV card"
-msgstr "||Prosím, zadejte resetační kód karty"
+msgstr "||Prosím, zadejte globální PIN vaší karty PIV"
 
 #: scd/app-piv.c:1853
-#, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "|N|Please enter the new PIN"
-msgstr "||Prosím vložte PIN"
+msgstr "|N|Prosím, zadejte nový PIN"
 
 #: scd/app-piv.c:1854
-#, fuzzy
-#| msgid "||Please enter the Reset Code for the card"
 msgid "||Please enter the PIN of your PIV card"
-msgstr "||Prosím, zadejte resetační kód karty"
+msgstr "||Prosím, zadejte PIN vaší karty PIV"
 
 #: scd/app-piv.c:1861
-#, fuzzy
-#| msgid "|A|Please enter the Admin PIN"
 msgid "|N|Please enter the new Unblocking Key"
-msgstr "|A|Prosím, zadejte PIN správce"
+msgstr "|N|Prosím, zadejte nový kód pro odblokování (PUK)"
 
 #: scd/app-piv.c:1862
-#, fuzzy
-#| msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgid "||Please enter the Unblocking Key of your PIV card"
-msgstr "|P|Prosím, zadejte kód pro odblokování (PUK) standardních klíčů."
+msgstr "||Prosím, zadejte kód pro odblokování (PUK) vaší karty PIV"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback skončila chybou: %s\n"
 
 #: scd/app-piv.c:1895
-#, fuzzy, c-format
-#| msgid "PIN for CHV%d is too short; minimum length is %d\n"
+#, c-format
 msgid "PIN 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"
+msgstr "PIN je příliš krátký; minimální délka je %d\n"
 
 #: scd/app-piv.c:1903
-#, fuzzy, c-format
-#| msgid "PIN for CHV%d is too short; minimum length is %d\n"
+#, c-format
 msgid "PIN is too long; maximum length is %d\n"
-msgstr "PIN pro CHV%d je příliš krátký; minimální délka je %d\n"
+msgstr "PIN je příliš dlouhý; maximální délka je %d\n"
 
 #: scd/app-piv.c:1910
 #, c-format
 msgid "PIN has invalid characters; only digits are allowed\n"
-msgstr ""
+msgstr "PIN obsahuje neplatné znaky; povoleny jsou pouze číslice\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "klíč již existuje\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existující klíč bude přepsán\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "generování nového klíče\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "nový klíč se zapisuje\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze uložit klíč: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpověď neobsahuje modulus RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpověď neobsahuje veřejný exponent RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "odpověď neobsahuje veřejný klíč EC\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "prosím počkejte než bude klíč vygenerován…\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "generování klíče se nezdařilo\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8329,67 +8280,65 @@
 msgstr1 "generování klíče dokončeno (%d sekundy)\n"
 msgstr2 "generování klíče dokončeno (%d sekund)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "odpověď neobsahuje veřejný klíč\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 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ů."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Prosím, zadejte PIN správce"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Prosím, zadejte PIN pro standardní klíče."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
-#, fuzzy
-#| msgid "the NullPIN has not yet been changed\n"
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
-msgstr "NullPIN ještě nebyl změněn\n"
+msgstr "Poznámka: PIN ještě nebyl zapnut."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, 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:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8397,7 +8346,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:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8405,27 +8354,27 @@
 "|NP|Prosím, zadejte kód pro odblokování (PUK) klíče určeného na tvorbu "
 "kvalifikovaných podpisů."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, 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:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "uložení otisku se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, 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:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "čtení veřejného klíče se nezdařilo: %s\n"
@@ -8433,43 +8382,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%sČíslo&#x1f;: %s%%0ADržitel&#x1f;: %s%%0APočítadlo&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "použije se výchozí PIN jako %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Prosím, odemkněte kartu"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "ověření CHV%d se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzamčena!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8481,20 +8430,20 @@
 msgstr2 ""
 "Do trvalého uzamčení karty zůstává %d pokusů na zadání PINu správce\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, 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:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
-msgstr "||Prosím vložte PIN"
+msgstr "||Prosím, zadejte PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Prosím, zadejte resetační kód karty"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, 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"
@@ -8502,78 +8451,78 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nový resetační kód"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nový PIN správce"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Nový PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 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:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Prosím, zadejte PIN a nový PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "chyba při čtení aplikačních dat\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "chyba při čtení otisku DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "chybí časové razítko vytvoření\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "nepodporovaná křivka\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nepodporuje hashovací algoritmus %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvořené podpisy: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, 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:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@ -8593,7 +8542,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "pracovat ve více serverové režimu (na popředí)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
 
@@ -8607,11 +8556,11 @@
 
 #: scd/scdaemon.c:151
 msgid "|NAME|use NAME as ct-API driver"
-msgstr "NÁZEV|použít NÁZEV jako ovladač ct-API"
+msgstr "|NÁZEV|použít NÁZEV jako ovladač ct-API"
 
 #: scd/scdaemon.c:153
 msgid "|NAME|use NAME as PC/SC driver"
-msgstr "NÁZEV|použít NÁZEV jako ovladač PC/SC"
+msgstr "|NÁZEV|použít NÁZEV jako ovladač PC/SC"
 
 #: scd/scdaemon.c:157
 msgid "do not use the internal CCID driver"
@@ -8631,17 +8580,17 @@
 
 #: scd/scdaemon.c:172
 msgid "|LIST|change the application priority to LIST"
-msgstr ""
+msgstr "|SEZNAM|změnit prioritu aplikace na SEZNAM"
 
 #: scd/scdaemon.c:180
 msgid "deny the use of admin card commands"
 msgstr "zakázat používání správcovských příkazů karty"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Použití: @SCDAEMON@ volby (-h pro nápovědu)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8649,311 +8598,311 @@
 "Syntaxe: scdaemon volby příkaz argumenty\n"
 "Démon pro čipové karty (smartcard) pro @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsluha pro deskriptor %d spuštěna\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsluha pro deskriptor %d ukončena\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, 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/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
-msgstr ""
+msgstr "Možná se používá Tor – přístup k síti je omezen"
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "certifikátem vyžadovaný ověřovací model: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "řetězený"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "jednovrstvý"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "certifikát vydavatele není označen jako CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "politika označená jako kritická bez nastavených politik"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "„%s“ nebylo možné otevřít: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certifikační politika není dovolena"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "otisk se nepodařilo získat\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "hledám vydavatele na jiném místě\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "počet odpovídajících vydavatelů: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccess nelze získat: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, 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:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "počet odpovídajících certifikátů: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, 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:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "alokace popisovače keyDB se nezdařila\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "certifikát byl odvolán"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "status certifikáty není znám"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola CRL se nezdařila: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikát s chybnou platností: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikát ještě nenabyl platnosti"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "kořenový certifikát ještě nezačal platit"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "mezilehlý certifikát ještě nezačal platit"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikátu vypršela platnost"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "kořenový certifikát je prošlý"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "mezilehlý certifikát je prošlý"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "chybí povinné atributy certifikátu: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "certifikát s neplatnou platností"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "podpis nebyl vytvořen v době životnosti certifikátu"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikát nebyl vytvořen v době životnosti vydavatele"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "mezilehlý certifikát nebyl vytvořen v době životnosti vydavatele"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( podpis vytvořen "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " ( certifikát vytvořen "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " ( certifikát planý od "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( vydavatel platný od "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "otisk=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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"
+msgstr "POZOR: datum vytvoření podpisu není známo – předpokládám současnost"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "v certifikátu nebyl nalezen vydavatel"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "certifikát podepsaný sám sebou má ŠPATNÝ podpis"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "kořenový certifikát není označen jako důvěryhodný"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "řetěz certifikátů je příliš dlouhý\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certifikát vydavatele nebyl nalezen"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikát má ŠPATNÝ podpis"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 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:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, 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:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikát je v pořádku\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mezilehlý certifikát je v pořádku\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "kořenový certifikát je v pořádku\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "přepínám do řetězeného modelu"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "použit ověřovací model: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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"
 
 # Yet another expression for `not enough memory' :)
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "nedostatek paměti\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(toto je algoritmus MD2)\n"
@@ -8962,7 +8911,7 @@
 # none serial, none date
 # #-#-#-#-# cs.po (dirmngr 1.0.3) #-#-#-#-#
 # status
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "žádný"
 
@@ -8982,7 +8931,7 @@
 msgid "Error - invalid DN"
 msgstr "Chyba – neplatné DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8996,46 +8945,45 @@
 "sériové číslo %s, ID 0x%08lX,\n"
 "vytvořen %s, platnost vyprší %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, 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:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikát není použitelný pro šifrování\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikát není použitelný pro podepisování\n"
 
-#: sm/certlist.c:361
-#, fuzzy, c-format
-#| msgid "lookup a certificate"
+#: sm/certlist.c:379
+#, c-format
 msgid "looking for another certificate\n"
-msgstr "vyhledá certifikát"
+msgstr "hledá se jiný certifikát\n"
 
 #: sm/certreqgen.c:468 sm/certreqgen.c:753
 #, c-format
@@ -9252,30 +9200,29 @@
 msgid "resource problem: out of core\n"
 msgstr "problém se zdroji: nedostatek paměti\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(toto je algoritmus RC2)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(toto nevypadá jako zašifrovaná zpráva)\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # kw
-#: sm/decrypt.c:1318
-#, fuzzy, c-format
-#| msgid "encrypted with %s key, ID %s\n"
+#: sm/decrypt.c:1314
+#, c-format
 msgid "encrypted to %s key %s\n"
-msgstr "zašifrováno %s klíčem, ID %s\n"
+msgstr "zašifrováno pro %s klíč %s\n"
 
 #: sm/delete.c:50 sm/delete.c:109
 #, c-format
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikát „%s“ nebyl nenalezen: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "chyba při zamykání schránky na klíče: %s\n"
@@ -9300,123 +9247,123 @@
 msgid "no valid recipients given\n"
 msgstr "(nebyli zadáni Žádní platní příjemci)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "vypsat seznam externích klíčů"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "vypsat řetěz certifikátů"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "importovat certifikáty"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "exportovat certifikáty"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "zaregistrovat čipovou kartu"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "předat příkaz do dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "vyvolat gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "vůbec nepoužívat terminál"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|počet certifikátů, které zahrnout"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|SOUBOR|vzít politiky ze SOUBORU"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "předpokládat vstup ve formátu PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "předpokládat vstup ve formátu Base-64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "předpokládat vstup v binárním formátu"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "vytvářet výstup zakódovaný pomocí Base-64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 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:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|SOUBOR|přidat klíčenku na seznam klíčenek"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "stahovat chybějící certifikáty vydavatelů"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NÁZEV|používat kódování NÁZEV pro PKCS#12 hesla"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "nikdy nenahlížet do CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "neprověřovat kořenové certifikáty proti CRL"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "kontrolovat platnost pomocí OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "nekontrolovat politiky certifikátu"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NÁZEV|použít šifrovací algoritmus NÁZEV"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NÁZEV|použít hashovací algoritmus NÁZEV"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy se neptat"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "předpokládat ano na většinu otázek"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "předpokládat ne na většinu otázek"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Použití: @GPGSM@ možnosti soubory (-h pro pomoc)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9426,27 +9373,27 @@
 "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:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámý model ověřování „%s“\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importují se běžné certifikáty „%s“\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nelze podepsat pomocí „%s“: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@ -9466,7 +9413,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "základní kontrola certifikátu selhala – neimportováno\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "chyba při získání uložených příznaků: %s\n"
@@ -9476,48 +9423,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "chyba při importování certifikátu: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba při čtení vstupu: %s\n"
 
-#: sm/keydb.c:508
-#, fuzzy, c-format
-#| msgid "no dirmngr running in this session\n"
+#: sm/keydb.c:528
+#, c-format
 msgid "no keyboxd running in this session\n"
-msgstr "v této relaci neběží žádný dirmngr\n"
+msgstr "v této relaci neběží žádný keyboxd\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "chyba při otevírání databáze klíčů: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, 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:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "chyba při hledání zapisovatelné keyDB: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "chyba při ukládání certifikátu: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, 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:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "chyba při ukládání příznaků: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Chyba – "
 
@@ -9553,7 +9499,7 @@
 "\n"
 "%s%sJste si skutečně jisti, že to chcete udělat?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9573,62 +9519,61 @@
 "„%s“\n"
 "Vezměte na vědomí, že tento certifikát NEVYTVOŘÍ kvalifikovaný podpis!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "hashovací algoritmus %d (%s) podepisovatele %d není podporován; použiji %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "hashovací algoritmus použitý pro podepisovatele %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola kvalifikovaného certifikátu selhala: %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: sm/sign.c:913
-#, fuzzy, c-format
-#| msgid "Signature made %s using %s key ID %s\n"
+#: sm/sign.c:1147
+#, c-format
 msgid "%s/%s signature using %s key %s\n"
-msgstr "Podpis vytvořen %s pomocí klíče %s s ID uživatele %s\n"
+msgstr "%s/%s podpis vytvořen pomocí %s klíče %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Podpis vytvořen "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "datum neudáno"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "algoritmus:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, 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:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Dobrý podpis od"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " alias"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Toto je kvalifikovaný podpis\n"
@@ -9654,314 +9599,309 @@
 msgstr "zámek keše certifikátů nelze uvolnit: %s\n"
 
 # TODO: plural
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "%u certifikátů bude z keše vyřazeno\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "certifikát „%s“ nelze rozebrat: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "certifikát „%s“ je již zapamatován\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "zaveden důvěryhodný certifikát „%s“\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certifikát „%s“ zaveden\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " otisk SHA1 = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr "vydavatel ="
 
 # XXX: align with msgid " issuer ="
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " subjekt ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "chyba při zavádění certifikátu „%s“: %s\n"
 
 # XXX: Align with msgid "runtime cached certificates:"
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr " trvale zavedených certifikátů: %u\n"
 
 # XXX: Align with msgid "permanently loaded certificates:"
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "za běhu zapamatovaných certifikátů: %u\n"
 
 # XXX: Align with msgid "permanently loaded certificates:"
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " důvěryhodných certifikátů: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certifikát již v keši\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "certifikát uložen do keše\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, 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:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "neplatný řetězec otisku SHA1 „%s“\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, 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:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, 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:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "v certifikátu nebyl nalezen vydavatel\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "chyba při zjišťování authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "vytváří se adresář „%s“\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "chyba při vytváření adresáře „%s“: %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "adresář databáze „%s“ se ignoruje\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "chyba při čtení adresáře „%s“: %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "odstraňuje se soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "soubor „%s“ nebude neodstraněn\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "chyba při zavírání souboru keše: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "nový kešový dir soubor „%s“ vytvořen\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "první záznam „%s“ není verze\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, 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:503
+#: dirmngr/crlcache.c:510
 #, 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:614
+#: dirmngr/crlcache.c:621
 #, 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:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "nalezen neplatný řádek %2$u v „%1$s\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, 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:646
+#: dirmngr/crlcache.c:653
 #, 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:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "neplatný haš vydavatele v „%s“ na řádku %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "v „%s“ na řádku %u chybí DN vydavatele\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "neplatné časové razítko v „%s“ na řádku %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "v kešovém dir souboru nalezeny chyby\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, 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:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "chyba při uzavírání „%s“: %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nelze vypočítat haš „%s“: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, 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:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "chyba při výpočtu haše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "chybně formátovaný kontrolní součet souboru „%s“\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, 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:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "otevírá se kešový soubor „%s“\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, 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:1153
+#: dirmngr/crlcache.c:1160
 #, 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:1174
+#: dirmngr/crlcache.c:1181
 #, 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:1176
+#: dirmngr/crlcache.c:1183
 #, 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:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
@@ -9969,7 +9909,7 @@
 "vyžadována\n"
 
 # TODO: plural
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9978,7 +9918,7 @@
 "force-crl-refresh je aktivováno a %d minut uplynulo vydavateli s ID %s, "
 "aktualizace je požadována\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
@@ -9987,12 +9927,12 @@
 
 # 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:1325
+#: dirmngr/crlcache.c:1332
 #, 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:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
@@ -10001,181 +9941,181 @@
 
 # XXX: The message is followed by the serial number
 # TODO: Use c-format
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, 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:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, 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:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "z libksba obdržen neplatný S-výraz\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "neznámý hašovací algoritmus „%s“\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "výroba S-výrazu selhala: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse selhal: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, 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:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, 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:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "v CRL nebyl nalezen žádný vydavatel CRL: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "certifikát vydavatele CRL bude hledán podle authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "ověřování podpisu CRL selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "volání ksba_crl_new selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "volání ksba_crl_set_reader selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "odstraněn zastaralý dočasný soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "volání crl_parse_insert selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, 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:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "neznámé kritické rozšíření CRL %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "chyba při čtení rozšíření CRL: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "vytváří se soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, 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:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10184,66 +10124,66 @@
 "aktualizace souboru DIR selhalo – záznam keše bude při příštím startu "
 "programu ztracen\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, 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:2519
+#: dirmngr/crlcache.c:2544
 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:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " CHYBA: CRL nebude použit\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " CHYBA: Tento zapamatovaný CRL byl možná pozměněn!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " POZOR: neplatná délka záznamu keše\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problém se čtením záznamu keše: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problém se čtením klíče keše: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, 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:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Konec výpisu CRL\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "volání crl_fetch přes DP selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "volání crl_cache_insert přes vydavatele selhalo: %s\n"
@@ -10253,31 +10193,28 @@
 msgid "reader to file mapping table full - waiting\n"
 msgstr "tabulka mapování čtenáře na soubor je plná – čeká se\n"
 
-# Poslední argument je název protokolu
 #: dirmngr/crlfetch.c:155
-#, fuzzy
-#| msgid "CRL access not possible due to Tor mode\n"
 msgid "CRL access not possible due to Tor mode"
-msgstr "Přístup k CRL není možný kvůli režimu Tor\n"
+msgstr "Přístup k CRL není možný kvůli režimu Tor"
 
 # Poslední argument je název protokolu
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "Přístup k CRL není možný kvůli vypnutému %s\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "chyba při získávání „%s“: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "chyba při inicializaci čtecího objektu: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "dohledání certifikátu nemožné kvůli vypnutému %s\n"
@@ -10422,139 +10359,135 @@
 msgid "looking up '%s'\n"
 msgstr "hledá se „%s“\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "vypíše obsah CRL keše"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|stáhne CRL z URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "vypne dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "vyprázdní keš"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "povolí kontrolu verze softwaru po síti"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 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:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
-msgstr ""
+msgstr "Volby týkající se sítě"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "směrovat veškerý síťový provoz skrz Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Nastavení HTTP serverů"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "zakáže použití HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignoruje HTTP distribuční místa CRL "
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "používat systémové nastavení HTTP proxy"
 
-#: dirmngr/dirmngr.c:251
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
-msgstr "Nastavení HTTP serverů"
+msgstr "Nastavení pro servery OpenPGP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|používat server klíčů na URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 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:258
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
-msgstr "Nastavení HTTP serverů"
+msgstr "Nastavení pro servery X.509"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "zakáže použití LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignoruje LDAP distribuční místa CRL"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|STROJ|pro LDAP dotazy použije STROJ"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "nepoužije náhradní stroje s --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|použít tento server pro dohledávání klíčů"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|nastaví časový limit pro LDAP na N sekund"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Nastavení OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "povolí odesílání OCSP dotazů"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|použije OCSP odpovídače na URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "vynutí zavedení zastaralých CRL"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10563,11 +10496,11 @@
 "@\n"
 "(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Použití: @DIRMNGR@ volby (-h pro nápovědu)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10575,104 +10508,104 @@
 "Syntaxe: @DIRMNGR@ volby příkaz argumenty\n"
 "Přístup k serveru s klíči, CRL a OCSP z @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "platné úrovně ladění jsou: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "použití: %s volby "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "stahování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "zpracování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, 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:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: zjištěn neplatný otisk\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: chyba čtení: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, 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:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "přijat SIGTERM – vypíná se…\n"
 
 # TODO: plural
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "vypnutí vynuceno\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "přijat SIGINT – okamžité vypnutí\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "přijat signál č. %d – žádná akce nedefinována\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "chyba přístupu k „%s“: status HTTP %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL „%s“ přesměrováno na „%s“ (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "příliš mnoho přesměrování\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "přesměrování změněno na „%s“\n"
@@ -10727,35 +10660,35 @@
 msgid "malloc failed: %s\n"
 msgstr "funkce malloc selhala: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "„%s“ není LDAP URL\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "„%s“ není platné LDAP URL\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search přesáhl omezení velikosti serveru\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: zadáno heslo bez uživatele\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
+msgstr "%s:%u: ignoruje se neznámý příznak „%s“\n"
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: přeskakuji tento řádek\n"
+msgstr "%s:%u: tento řádek se přeskakuje\n"
 
 #: dirmngr/misc.c:172
 #, c-format
@@ -10788,10 +10721,8 @@
 msgstr "odpověď serveru je příliš velká, limit je %d bajtů\n"
 
 #: dirmngr/ocsp.c:148
-#, fuzzy
-#| msgid "OCSP request not possible due to Tor mode\n"
 msgid "OCSP request not possible due to Tor mode"
-msgstr "OCSP dotaz není možný kvůli režimu Tor\n"
+msgstr "OCSP dotaz není možný kvůli režimu Tor"
 
 #: dirmngr/ocsp.c:157
 #, c-format
@@ -10843,162 +10774,162 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "nepodepsáno výchozím OCSP certifikátem podepisovatele"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "alokování prvku seznamu selhalo: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "chyba při zjišťování ID odpovídače: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "žádný vhodný certifikát pro ověření OCSP odpovědi nebyl nalezen\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certifikát vydavatele nenalezen: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "volající nevrátil cílový certifikát\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "volající nevrátil vydávající certifikát\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "alokace OCSP kontextu selhala: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "žádný výchozí OCSP odpovídač nedefinován\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "žádný výchozí OCSP podepisovatel nedefinován\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "použije se výchozí OCSP odpovídač „%s“\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "použije se OCSP odpovídač „%s“\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "chyba při zjišťování OCSP stavu cílového certifikátu: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "stav certifikátu je: %s (nyní=%s, příště=%s)\n"
 
 # status
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "dobrý"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certifikát byl odvolán kdy: %s, důvod: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP odpovídač vrátil stav v budoucnosti\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP odpovídač vrátil ne současný stav\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP odpovídač vrátil příliš starý stav\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "volání assuan_inquire(%s) selhalo: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "v ID certifikátu chybí serialno (sériové číslo)"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "volání assuan_inquire selhalo: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "volání fetch_cert_by_url selhalo: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "chyba při odesílání dat: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "volání start_cert_fetch selhalo: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "volání fetch_next_cert selhalo: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies (max. odpovědí) %d překročeno\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "řídící strukturu nelze alokovat: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "alokace kontextu assuan selhala: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "inicializace serveru selhala: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "registrace příkazu u Assuanu selhala: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problém příjmu Assuanu: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@ -11008,85 +10939,83 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "kořenová CA, která není označena jako CA, bude přijata"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "kontrola CRL se zanořila příliš hluboko\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "nekontroluje se CRL pro"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "kontroluje se CRL pro"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "kontrola důvěryhodnosti kořenového certifikátu selhala: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "řetěz certifikátů je v pořádku\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "stručný výstup"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "vypisovat data v šestnáctkové soustavě"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "dekódovat přijaté datové řádky"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "připojit se k dirmngr"
 
-#: tools/gpg-connect-agent.c:90
-#, fuzzy
-#| msgid "connect to the dirmngr"
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
-msgstr "připojit se k dirmngr"
+msgstr "připojit se ke keyboxd"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NÁZEV|připojit se na socket Assuanu s NÁZVEM"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADRESA|připojit se na socket Assuanu na ADRESE"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "spustit server Assuan zadaný na příkazové řádce"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "nepoužívat rozšířený režim připojení"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|SOUBOR|spustit příkazy ze SOUBORU při startu"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "spustit /subst při startu"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11094,49 +11023,48 @@
 "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:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "volba „%s“ ignorovaná kvůli „%s“\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "přijímání řádku se nezdařilo: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "řádek je příliš dlouhý – přeskočen\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "neznámý příkaz „%s“\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "odesílání řádku selhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
-#, fuzzy, c-format
-#| msgid "no dirmngr running in this session\n"
+#: tools/gpg-connect-agent.c:2332
+#, c-format
 msgid "no keybox daemon running in this session\n"
-msgstr "v této relaci neběží žádný dirmngr\n"
+msgstr "v této relaci neběží žádný démon keybox\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba při odesílání standardního parametru: %s\n"
@@ -11150,10 +11078,8 @@
 msgstr "S/MIME"
 
 #: tools/gpgconf-comp.c:666
-#, fuzzy
-#| msgid "public key is %s\n"
 msgid "Public Keys"
-msgstr "veřejný klíč je %s\n"
+msgstr "Veřejné klíče"
 
 #: tools/gpgconf-comp.c:670
 msgid "Private Keys"
@@ -11165,7 +11091,7 @@
 
 #: tools/gpgconf-comp.c:679
 msgid "TPM"
-msgstr ""
+msgstr "TPM"
 
 #: tools/gpgconf-comp.c:686
 msgid "Network"
@@ -11198,12 +11124,12 @@
 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:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba při uzavírání „%s“\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba při rozboru „%s“\n"
@@ -11309,89 +11235,93 @@
 "Syntaxe: gpg-check-pattern volby soubor_se_vzorem\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
-#: tools/gpg-card.c:2407
-#, fuzzy, c-format
-#| msgid "Note: keys are already stored on the card!\n"
+#: tools/gpg-card.c:2425
+#, c-format
 msgid "Note: key %s is already stored on the card!\n"
-msgstr "Poznámka: na kartě jsou již klíče uloženy!\n"
+msgstr "Poznámka: na kartě je již klíč %s uložen!\n"
 
-#: tools/gpg-card.c:2410
-#, fuzzy, c-format
-#| msgid "Note: keys are already stored on the card!\n"
+#: tools/gpg-card.c:2428
+#, c-format
 msgid "Note: Keys are already stored on the card!\n"
-msgstr "Poznámka: na kartě jsou již klíče uloženy!\n"
+msgstr "Poznámka: Na kartě jsou již klíče uloženy!\n"
 
-#: tools/gpg-card.c:2413
-#, fuzzy, c-format
-#| msgid "Replace existing keys? (y/N) "
+#: tools/gpg-card.c:2431
+#, c-format
 msgid "Replace existing key %s ? (y/N) "
-msgstr "Přepsat existující klíče? (a/N) "
+msgstr "Přepsat existující klíče %s? (a/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
-#, fuzzy, c-format
-#| msgid "OpenPGP card no. %s detected\n"
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
+#, c-format
 msgid "%s card no. %s detected\n"
-msgstr "Nalezena OpenPGP karta číslo %s\n"
+msgstr "Nalezena karta %s číslo %s\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
-msgstr ""
+msgstr "Příznak interakce uživatele (UIF) je nastaven na „%s“ – nelze změnit\n"
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
+"Pozor: Nastavení příznaku interakce uživatele (UIF) na „%s“\n"
+" lze zvrátit pouze obnovením do továrního nastavení!\n"
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
-msgstr ""
+msgstr "Prosím, použijte „uif --yes %d %s“\n"
 
-#: tools/gpg-card.c:3686
-#, fuzzy
-#| msgid "add a certificate to the cache"
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
-msgstr "přidá certifikát do keše"
+msgstr "autentizuje se kartě"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
-msgstr ""
+msgstr "odešle reset démonu pro karty"
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
-msgstr "nastavit KDF pro autentizaci kódem PIN"
+msgstr "nastaví KDF pro autentizaci kódem PIN"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
-msgstr ""
+msgstr "změní soukromý datový objekt"
 
-#: tools/gpg-card.c:3693
-#, fuzzy
-#| msgid "add a certificate to the cache"
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
-msgstr "přidá certifikát do keše"
+msgstr "přečte certifikát z datového objektu"
 
-#: tools/gpg-card.c:3694
-#, fuzzy
-#| msgid "add a certificate to the cache"
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
-msgstr "přidá certifikát do keše"
+msgstr "uloží certifikát do datového objektu"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
-msgstr ""
+msgstr "uloží soukromý klíč do datového objektu"
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
-msgstr ""
+msgstr "Příkazy pro správu Yubikey"
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
-msgstr ""
+msgstr "spravuje historii příkazů"
+
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "vybraný algoritmus AEAD je neplatný\n"
+
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "neplatné uživatelské předvolby pro AEAD\n"
+
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "AEAD algoritmus „%s“ se nesmí používat v režimu %s\n"
+
+#~ msgid "continuing verification anyway due to option %s\n"
+#~ msgstr "přesto se pokračuje v ověřování kvůli volbě %s\n"
 
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "chyba při zápisu do dočasného souboru: %s\n"
@@ -11399,6 +11329,9 @@
 #~ msgid "run in supervised mode"
 #~ msgstr "poběží v režimu dohledu"
 
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Jméno nemůže začínat číslicí\n"
 
@@ -11414,15 +11347,127 @@
 #~ msgid "selfsigned certificate has a BAD signature"
 #~ msgstr "sám sebou podepsaný certifikát má CHYBNÝ podpis"
 
+#~ msgid "detected card with S/N: %s\n"
+#~ msgstr "nalezena karta se sériovým číslem: %s\n"
+
+#~ msgid "no authentication key for ssh on card: %s\n"
+#~ msgstr "na kartě není autentizační klíč pro SSH: %s\n"
+
+#~ msgid "Please remove the current card and insert the one with serial number"
+#~ msgstr "Prosím, vyjměte kartu a vložte jinou se sériovým číslem"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "použít pro server soubor s protokolem"
+
+#~ msgid "Note: no default option file '%s'\n"
+#~ msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
+
+#~ msgid "option file '%s': %s\n"
+#~ msgstr "soubor s možnostmi „%s“: %s\n"
+
+#~ msgid "connection to %s established\n"
+#~ msgstr "spojení k programu %s ustanoveno\n"
+
+#~ msgid "no running gpg-agent - starting '%s'\n"
+#~ msgstr "gpg-agent neběží – spouští se „%s“\n"
+
+#~ msgid "argument not expected"
+#~ msgstr "argument nebyl očekáván"
+
+#~ msgid "read error"
+#~ msgstr "chyba při čtení"
+
+#~ msgid "keyword too long"
+#~ msgstr "klíčové slovo je příliš dlouhé"
+
+#~ msgid "missing argument"
+#~ msgstr "postrádám argument"
+
+#~ msgid "invalid argument"
+#~ msgstr "neplatný argument"
+
+#~ msgid "invalid command"
+#~ msgstr "neplatný příkaz"
+
+#~ msgid "invalid alias definition"
+#~ msgstr "neplatný definice aliasu"
+
+#~ msgid "out of core"
+#~ msgstr "nedostatek paměti"
+
+#~ msgid "invalid option"
+#~ msgstr "neplatný parametr"
+
+#~ msgid "missing argument for option \"%.50s\"\n"
+#~ msgstr "postrádám argument u volby „%.50s“\n"
+
+#~ msgid "option \"%.50s\" does not expect an argument\n"
+#~ msgstr "volba „%.50s“ nečeká argument\n"
+
+#~ msgid "invalid command \"%.50s\"\n"
+#~ msgstr "neplatný příkaz „%.50s“\n"
+
+#~ msgid "option \"%.50s\" is ambiguous\n"
+#~ msgstr "volba „%.50s“ není jednoznačná\n"
+
+#~ msgid "command \"%.50s\" is ambiguous\n"
+#~ msgstr "příkaz „%.50s“ není jednoznačný\n"
+
+#~ msgid "invalid option \"%.50s\"\n"
+#~ msgstr "neplatný parametr „%.50s“\n"
+
+#~ msgid "unable to execute program '%s': %s\n"
+#~ msgstr "nelze spustit program „%s“: %s\n"
+
+#~ msgid "unable to execute external program\n"
+#~ msgstr "nelze spustit externí program\n"
+
+#~ msgid "unable to read external program response: %s\n"
+#~ msgstr "nelze přečíst odpověď externího programu: %s\n"
+
+#~ msgid "Note: old default options file '%s' ignored\n"
+#~ msgstr "Poznámka: starý implicitní soubor s možnostmi „%s“ ignorován\n"
+
+#~ msgid "validate signatures with PKA data"
+#~ msgstr "ověřovat podpisy s daty PKA"
+
+#~ msgid "elevate the trust of signatures with valid PKA data"
+#~ msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
+
+#~ msgid " (%d) ECC and ECC\n"
+#~ msgstr " (%d) ECC a ECC\n"
+
+#~ msgid "honor the PKA record set on a key when retrieving keys"
+#~ msgstr "respektovat PKA záznamy klíče při získávání klíčů"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "požaduji klíč %s z %s serveru %s\n"
 
+#~ msgid "Note: Verified signer's address is '%s'\n"
+#~ msgstr "Poznámka: Podepisovatelova ověřená adresa je „%s“\n"
+
+#~ msgid "Note: Signer's address '%s' does not match DNS entry\n"
+#~ msgstr ""
+#~ "Poznámka: Podepisovatelova adresa „%s“ se neshoduje s DNS záznamem\n"
+
+#~ msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+#~ msgstr "úroveň důvěry opravena na PLNOU, kvůli platné PKA informaci\n"
+
+#~ msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+#~ msgstr "úroveň důvěry opravena na ŽÁDNOU, kvůli špatné PKA informaci\n"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
+
 #~ msgid "%s:%u: no hostname given\n"
 #~ msgstr "%s:%u: nebyl zadán název stroje\n"
 
 #~ msgid "could not parse keyserver\n"
 #~ msgstr "nelze rozebrat serveru klíčů\n"
 
+#~ msgid "run without asking a user"
+#~ msgstr "běží bez dotazování se uživatele"
+
 #~ msgid "return all values in a record oriented format"
 #~ msgstr "vrátí všechny hodnoty v záznamově orientovaném formátu"
 
@@ -11519,16 +11564,6 @@
 #~ msgid "LDAP init to '%s:%d' failed: %s\n"
 #~ msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
 
-#, fuzzy
-#~| msgid "LDAP init to '%s:%d' failed: %s\n"
-#~ msgid "LDAP init to '%s' failed: %s\n"
-#~ msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
-
-#, fuzzy
-#~| msgid "LDAP init to '%s:%d' failed: %s\n"
-#~ msgid "LDAP init to '%s' done\n"
-#~ msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
-
 #~ msgid "binding to '%s:%d' failed: %s\n"
 #~ msgstr "napojení k „%s:%d“ selhalo: %s\n"
 
@@ -11541,135 +11576,6 @@
 #~ msgid "ldapserver missing"
 #~ msgstr "chybí ldapserver (LDAP server)"
 
-#, fuzzy
-#~| msgid "change a passphrase"
-#~ msgid "Suggest a random passphrase."
-#~ msgstr "změnit heslo"
-
-#~ msgid "detected card with S/N: %s\n"
-#~ msgstr "nalezena karta se sériovým číslem: %s\n"
-
-#~ msgid "no authentication key for ssh on card: %s\n"
-#~ msgstr "na kartě není autentizační klíč pro SSH: %s\n"
-
-#~ msgid "Please remove the current card and insert the one with serial number"
-#~ msgstr "Prosím, vyjměte kartu a vložte jinou se sériovým číslem"
-
-#~ msgid "use a log file for the server"
-#~ msgstr "použít pro server soubor s protokolem"
-
-#~ msgid "connection to %s established\n"
-#~ msgstr "spojení k programu %s ustanoveno\n"
-
-#~ msgid "no running gpg-agent - starting '%s'\n"
-#~ msgstr "gpg-agent neběží – spouští se „%s“\n"
-
-#~ msgid "argument not expected"
-#~ msgstr "argument nebyl očekáván"
-
-#~ msgid "read error"
-#~ msgstr "chyba při čtení"
-
-#~ msgid "keyword too long"
-#~ msgstr "klíčové slovo je příliš dlouhé"
-
-#~ msgid "missing argument"
-#~ msgstr "postrádám argument"
-
-#~ msgid "invalid argument"
-#~ msgstr "neplatný argument"
-
-#~ msgid "invalid command"
-#~ msgstr "neplatný příkaz"
-
-#~ msgid "invalid alias definition"
-#~ msgstr "neplatný definice aliasu"
-
-#~ msgid "out of core"
-#~ msgstr "nedostatek paměti"
-
-#, fuzzy
-#~| msgid "invalid command"
-#~ msgid "invalid meta command"
-#~ msgstr "neplatný příkaz"
-
-#, fuzzy
-#~| msgid "unknown command '%s'\n"
-#~ msgid "unknown meta command"
-#~ msgstr "neznámý příkaz „%s“\n"
-
-#, fuzzy
-#~| msgid "unexpected data"
-#~ msgid "unexpected meta command"
-#~ msgstr "neočekávaná data"
-
-#~ msgid "invalid option"
-#~ msgstr "neplatný parametr"
-
-#~ msgid "missing argument for option \"%.50s\"\n"
-#~ msgstr "postrádám argument u volby „%.50s“\n"
-
-#~ msgid "option \"%.50s\" does not expect an argument\n"
-#~ msgstr "volba „%.50s“ nečeká argument\n"
-
-#~ msgid "invalid command \"%.50s\"\n"
-#~ msgstr "neplatný příkaz „%.50s“\n"
-
-#~ msgid "option \"%.50s\" is ambiguous\n"
-#~ msgstr "volba „%.50s“ není jednoznačná\n"
-
-#~ msgid "command \"%.50s\" is ambiguous\n"
-#~ msgstr "příkaz „%.50s“ není jednoznačný\n"
-
-#~ msgid "invalid option \"%.50s\"\n"
-#~ msgstr "neplatný parametr „%.50s“\n"
-
-#~ msgid "Note: no default option file '%s'\n"
-#~ msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
-
-#~ msgid "option file '%s': %s\n"
-#~ msgstr "soubor s možnostmi „%s“: %s\n"
-
-#~ msgid "unable to execute program '%s': %s\n"
-#~ msgstr "nelze spustit program „%s“: %s\n"
-
-#~ msgid "unable to execute external program\n"
-#~ msgstr "nelze spustit externí program\n"
-
-#~ msgid "unable to read external program response: %s\n"
-#~ msgstr "nelze přečíst odpověď externího programu: %s\n"
-
-#~ msgid "validate signatures with PKA data"
-#~ msgstr "ověřovat podpisy s daty PKA"
-
-#~ msgid "elevate the trust of signatures with valid PKA data"
-#~ msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
-
-#~ msgid " (%d) ECC and ECC\n"
-#~ msgstr " (%d) ECC a ECC\n"
-
-#~ msgid "honor the PKA record set on a key when retrieving keys"
-#~ msgstr "respektovat PKA záznamy klíče při získávání klíčů"
-
-#~ msgid "Note: Verified signer's address is '%s'\n"
-#~ msgstr "Poznámka: Podepisovatelova ověřená adresa je „%s“\n"
-
-#~ msgid "Note: Signer's address '%s' does not match DNS entry\n"
-#~ msgstr ""
-#~ "Poznámka: Podepisovatelova adresa „%s“ se neshoduje s DNS záznamem\n"
-
-#~ msgid "trustlevel adjusted to FULL due to valid PKA info\n"
-#~ msgstr "úroveň důvěry opravena na PLNOU, kvůli platné PKA informaci\n"
-
-#~ msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
-#~ msgstr "úroveň důvěry opravena na ŽÁDNOU, kvůli špatné PKA informaci\n"
-
-#~ msgid "|FILE|write a server mode log to FILE"
-#~ msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
-
-#~ msgid "run without asking a user"
-#~ msgstr "běží bez dotazování se uživatele"
-
 #~ msgid "allow PKA lookups (DNS requests)"
 #~ msgstr "povolit dohledávání PKA (dotazy na DNS)"
 
@@ -11682,9 +11588,6 @@
 #~ msgid "LDAP server list"
 #~ msgstr "Seznam LDAP serverů"
 
-#~ msgid "Note: old default options file '%s' ignored\n"
-#~ msgstr "Poznámka: starý implicitní soubor s možnostmi „%s“ ignorován\n"
-
 #~ msgid ""
 #~ "@\n"
 #~ "Commands:\n"
@@ -12035,8 +11938,7 @@
 #~ msgstr "vytvořen nový konfigurační soubor „%s“\n"
 
 #~ msgid "WARNING: options in '%s' are not yet active during this run\n"
-#~ msgstr ""
-#~ "VAROVÁNÍ: nastavení z „%s“ nejsou při tomto spuštění zatím aktivní\n"
+#~ msgstr "POZOR: nastavení z „%s“ nejsou při tomto spuštění zatím aktivní\n"
 
 #~ msgid ""
 #~ "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -12078,7 +11980,7 @@
 #~ msgstr "požadováno %d částečné důvěry a %d úplné důvěry, model %s\n"
 
 #~ msgid "||Please enter the PIN%%0Asigs done: %lu"
-#~ msgstr "||Prosím vložte PIN%%0Apodpis hotov: %lu"
+#~ msgstr "||Prosím zadejte PIN%%0Apodpis hotov: %lu"
 
 #~ msgid "|A|Please enter the Admin PIN%%0Aremaining attempts: %d"
 #~ msgstr "|A|Prosím, zadejte PIN správce%%0Azbývá pokusů: %d"
@@ -12101,9 +12003,6 @@
 #~ msgid "Key Acquirer"
 #~ msgstr "Stahovač klíčů"
 
-#~ msgid "Passphrase"
-#~ msgstr "Heslo"
-
 #~ msgid "name of socket too long\n"
 #~ msgstr "název socketu je příliš dlouhý\n"
 
@@ -12126,8 +12025,7 @@
 #~ msgstr "nemazat dočasné soubory po jejich použití"
 
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
-#~ msgstr ""
-#~ "VAROVÁNÍ: volba „%s“ pro server klíčů není na této platformě účinná\n"
+#~ msgstr "POZOR: volba „%s“ pro server klíčů není na této platformě účinná\n"
 
 #~ msgid "cleared passphrase cached with ID: %s\n"
 #~ msgstr "vymazané heslo zapamatované pro ID: %s\n"
@@ -12584,7 +12482,7 @@
 #~ msgstr "odemknutí podklíče selhalo: %s\n"
 
 #~ msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-#~ msgstr "VAROVÁNÍ: tajný klíč %s není chráněn pomocí simple SK checksum\n"
+#~ msgstr "POZOR: tajný klíč %s není chráněn pomocí simple SK checksum\n"
 
 #~ msgid "too many entries in pk cache - disabled\n"
 #~ msgstr "příliš mnoho položek v bufferu veřejných klíčů – vypnuto\n"
@@ -12696,7 +12594,7 @@
 #~ msgstr "chyba při zápisu do souboru tajných klíčů „%s“: %s\n"
 
 #~ msgid "WARNING: 2 files with confidential information exists.\n"
-#~ msgstr "VAROVÁNÍ: Existují dva soubory s tajnými informacemi.\n"
+#~ msgstr "POZOR: Existují dva soubory s tajnými informacemi.\n"
 
 #~ msgid "%s is the unchanged one\n"
 #~ msgstr "%s je beze změny\n"
@@ -12720,7 +12618,7 @@
 #~ msgstr "vyhledávám „%s“ na serveru %s\n"
 
 #~ msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-#~ msgstr "VAROVÁNÍ: obsluha serveru klíčů z jiné verze GnuPG (%s)\n"
+#~ msgstr "POZOR: obsluha serveru klíčů z jiné verze GnuPG (%s)\n"
 
 #~ msgid "keyserver did not send VERSION\n"
 #~ msgstr "server klíčů neposlal VERSION\n"
@@ -12747,7 +12645,7 @@
 #~ msgstr "chyba komunikace se serverem klíčů: %s\n"
 
 #~ msgid "WARNING: unable to parse URI %s\n"
-#~ msgstr "VAROVÁNÍ: URI %s nelze rozebrat\n"
+#~ msgstr "POZOR: URI %s nelze rozebrat\n"
 
 #~ msgid "the IDEA cipher plugin is not present\n"
 #~ msgstr "IDEA modul pro GnuPG nenalezen\n"
@@ -12774,7 +12672,7 @@
 #~ msgstr "%s…\n"
 
 #~ msgid "WARNING: Weak key detected - please change passphrase again.\n"
-#~ msgstr "VAROVÁNÍ: Objeven slabý klíč – změňte, prosím, znovu heslo.\n"
+#~ msgstr "POZOR: Objeven slabý klíč – změňte, prosím, znovu heslo.\n"
 
 #~ msgid ""
 #~ "generating the deprecated 16-bit checksum for secret key protection\n"
@@ -13219,7 +13117,7 @@
 #~ msgstr "poznámka: soubor random_seed je prázdný\n"
 
 #~ msgid "WARNING: invalid size of random_seed file - not used\n"
-#~ msgstr "VAROVÁNÍ: neplatná velikost random_seed - soubor nepoužit\n"
+#~ msgstr "POZOR: neplatná velikost random_seed - soubor nepoužit\n"
 
 #~ msgid "can't read `%s': %s\n"
 #~ msgstr "nemohu číst „%s“: %s\n"
@@ -13234,7 +13132,7 @@
 #~ msgstr "nemohu zavřít „%s“: %s\n"
 
 #~ msgid "WARNING: using insecure random number generator!!\n"
-#~ msgstr "VAROVÁNÍ: použitý generátor náhodných čísel není bezpečný!!\n"
+#~ msgstr "POZOR: použitý generátor náhodných čísel není bezpečný!!\n"
 
 #~ msgid ""
 #~ "The random number generator is only a kludge to let\n"
@@ -13369,6 +13267,9 @@
 #~ 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"
 
@@ -13409,7 +13310,7 @@
 #~ msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 
 #~ msgid "WARNING: using insecure memory!\n"
-#~ msgstr "VAROVÁNÍ: Používaná paměť není bezpečná!\n"
+#~ msgstr "POZOR: Používaná paměť není bezpečná!\n"
 
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "provést operaci není možné bez inicializované bezpečné paměti\n"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/da.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/da.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/da.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/da.po Changed

@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke indhente pinentry-lås: %s\n"
@@ -35,59 +35,59 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "_Afbryd"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Afbryd"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Indtast ny adgangsfrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -98,7 +98,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -112,14 +112,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -127,7 +127,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -137,7 +137,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denne række indikerer kvaliteten for ovenstående angivne adgangskode.\n"
@@ -146,7 +146,7 @@
 "specialtegn. Spørg din administrator om mere præcis information om\n"
 "hvordan man anvender sikre adgangskoder."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -154,7 +154,7 @@
 "Indtast venligst din PIN, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -162,76 +162,82 @@
 "Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Adgangsfrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "matcher ikke - prøv igen"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase"
+msgid "Passphrases match."
+msgstr "Adgangsfrase"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (forsøg %d af %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN er for lang"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Adgangsfrase er for lang"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige tegn i PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN er for kort"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Ugyldig PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Ugyldig adgangsfrase"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Genindtast venligst denne adgangsfrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -243,54 +249,54 @@
 "Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
 "GnuPG-systemet."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen egnet kortnøgle fundet: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -299,20 +305,20 @@
 "En ssh-proces anmodte om brugen af nøgle%%0A %s%%0A (%s)%%0AØnsker du at "
 "tillade dette"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Tillad"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Nægt"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Indtast venligst adgangsfrasen for ssh-nøglen%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -321,86 +327,82 @@
 "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:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Indsæt venligst kortet med serielnummeret"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Administrator-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Nulstillingskode"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0ABrug læserens numeriske tastatur for indtastning."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Gentag denne nulstillingskode"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Gentag denne PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Gentag denne PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nulstillingskode er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Indtast venligst PIN'en%s%s%s for at låse kortet op"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "fejl ved skrivning til »%s«: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Indtast ny adgangsfrase"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "Du har ikke indtastet en adgangsfrase!%0AEn tom adgangsfrase er ikke tilladt."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -409,11 +411,11 @@
 "Du har ikke indtastet en adgangsfrase - dette er generelt en dårlig ide!"
 "%0ABekræft venligst at du ikke ønsker beskyttelse på din nøgle."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Ja, beskyttelse er ikke krævet"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -421,7 +423,7 @@
 msgstr0 "Navn skal være mindst 5 bogstaver langt\n"
 msgstr1 "Navn skal være mindst 5 bogstaver langt\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -439,7 +441,7 @@
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "indeholde mindst %u cifre eller%%0specielle tegn."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -449,7 +451,7 @@
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase må "
 "ikke være en kendt term eller matche%%0Aet bestemt mønster."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -462,238 +464,244 @@
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "være mindst %u tegn langt."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Brug denne alligevel"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Indtast venligst den nye adgangsfrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Tilvalg nyttige for fejlsøgning"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "kør i dæmontilstand (baggrunden)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "frakobl ikke fra konsollen"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "kommandoresultat i sh-stil"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "kommandoresultat i csh-stil"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|læs tilvalg fra FIL"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "uddybende"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "vær mindre uddybende"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|skriv servertilstandslogge til FIL"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Tilvalg der kontrollerer konfigurationen"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "brug ikke SCdaemon'en"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|brug PGM som SCdaemon-program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|brug PGM som SCdaemon-program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørgsler om at ændre TTY'en"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørgsler om at ændre X-skærmen"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktiver ssh-agent-emulering"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable ssh-agent emulation"
+msgid "enable Win32-OpenSSH support"
+msgstr "aktiver ssh-agent-emulering"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|udløb SSH-nøgler efter N sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "brug ikke PIN-mellemlageret når der underskrives"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, 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:252
+#: agent/gpg-agent.c:259
 #, 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:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "tillad forhåndsindstilling af adgangsfrase"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|angiv minimal krævet længde for nye adgangsfraser til N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|kræv mindst N ikkealfanumeriske tegn for en ny adgangsfrase"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|giv adgangsfrasen udløb efter N dage"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillad ikke genbrug af gamle adgangsfraser"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "fang ikke tastatur og mus"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|brug PGM som PIN-Entry-program"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 #, 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:573
+#: agent/gpg-agent.c:582
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent options command args\n"
@@ -705,153 +713,153 @@
 "Syntaks: gpg-agent tilvalg kommando parametre\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, 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:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, 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:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved indhentelse af nonce for soklen\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, 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:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, 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:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "mappe »%s« oprettet\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, 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:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, 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:2755
+#: agent/gpg-agent.c:2876
 #, 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:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, 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:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -859,11 +867,11 @@
 "@Indstillinger:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -871,8 +879,8 @@
 "Syntaks: gpg-preset-passphrase tilvalg KEYGRIP\n"
 "Adgangskode for mellemlagervedligeholdelse\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -880,8 +888,8 @@
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -891,11 +899,11 @@
 "Tilvalg:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -903,17 +911,17 @@
 "Syntaks: gpg-protect-tool tilvalg parametre\n"
 "Vedligeholdelsesværktøj for hemmelig nøgle\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -921,7 +929,7 @@
 "Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
 "GnuPG-systemet."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -929,59 +937,61 @@
 "Indtast venligst adgangsfrasen eller PIN'en\n"
 "krævet for at færdiggøre denne handling."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "afbrudt\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
 msgstr "fejl ved åbning af »%s«: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 #| msgid "file `%s', line %d: %s\n"
 msgid "file '%s', line %d: %s\n"
 msgstr "fil »%s«, linje %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, 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:207
+#: agent/trustlist.c:226
 #, 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:251
+#: agent/trustlist.c:270
 #, 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:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, 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:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, 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:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
@@ -994,7 +1004,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -1003,11 +1013,11 @@
 "Stoler du fuldstændig på at%%0A \"%s\"%%0Akorrekt certificerer "
 "brugercertifikater?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Nej"
@@ -1020,7 +1030,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -1032,20 +1042,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Forkert"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -1054,15 +1064,29 @@
 "Denne adgangsfrase er ikke blevet ændret%%0Asiden %.4s-%.2s-%.2s. Ændr den "
 "nu."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Ændr adgangsfrasen"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Jeg ændrer den senere"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Indsæt venligst kortet med serielnummeret"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"En ssh-proces anmodte om brugen af nøgle%%0A %s%%0A (%s)%%0AØnsker du at "
+"tillade dette"
+
+#: agent/findkey.c:1766
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1070,13 +1094,13 @@
 "%%0A?"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "aktiver nøgle"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1087,8 +1111,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-nøglen bruger en usikker (%u bit) hash\n"
@@ -1099,7 +1123,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
@@ -1109,7 +1133,7 @@
 msgid "secret key parts are not available\n"
 msgstr "hemmelige nøgledele er ikke tilgængelige\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1127,13 +1151,13 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "beskyttelsesalgoritme %d%s er ikke understøttet\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
@@ -1141,43 +1165,43 @@
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved forgrening af proces: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 #| msgid "error running `%s': probably not installed\n"
 msgid "error running '%s': probably not installed\n"
 msgstr "fejl ved kørsel af »%s«: sikkert ikke installeret\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error running '%s': exit status %d\n"
 msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 #| msgid "error running `%s': terminated\n"
 msgid "error running '%s': terminated\n"
 msgstr "fejl ved kørsel af »%s«: termineret\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved indhentelse af afslutningskode for proces %d: %s\n"
@@ -1198,30 +1222,30 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke slå kernedump fra: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Advarsel: usikker ejerskab på %s »%s«\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, 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:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ja"
 
@@ -1275,8 +1299,8 @@
 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:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fejl ved allokering af nok hukommelse: %s\n"
@@ -1292,82 +1316,82 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "venter %d sekunder på at agenten kommer frem\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "venter %d sekunder på at agenten kommer frem\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "venter %d sekunder på at agenten kommer frem\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 #| msgid "can't connect to the dirmngr - trying fall back\n"
 msgid "connection to the dirmngr established\n"
 msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "can't connect to the dirmngr - trying fall back\n"
 msgid "connection to the keyboxd established\n"
 msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "can't connect to the dirmngr - trying fall back\n"
 msgid "connection to the agent established\n"
 msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running dirmngr - starting `%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "ingen kørende dirmngr - starter »%s«\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "can't connect to the dirmngr - trying fall back\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "ADVARSEL: %s overskriver %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1441,7 +1465,7 @@
 msgstr "algoritme: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "ikke understøttet algoritme: %s"
@@ -1516,39 +1540,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Rodcertifikat er troværdigt"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "ingen CRL fundet for certifikat"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "den tilgængelige CRL er for gammel"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP-kontrol af certifikater"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Inkluderede certifikater"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Ingen punkter i revisionslog."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Ukendt handling"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent er brugbar"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr er brugbar"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 #| msgid "No help available for `%s'."
 msgid "No help available for '%s'."
@@ -1558,11 +1582,11 @@
 msgid "ignoring garbage line"
 msgstr "ignorerer affaldslinje"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "ingen"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64-tegn %02x udeladt\n"
@@ -1598,153 +1622,167 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open mislykkedes: %s:\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering fra »%s« til »%s« mislykkedes: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, 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:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "fjerner stale-låsfil (oprettet af %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(baglås?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, 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:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "venter på lås %s ...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (kræver %s, har %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "fejl ved oprettelse af »%s«: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+#| msgid "error closing %s: %s\n"
+msgid "error closing '%s': %s\n"
+msgstr "fejl ved lukning af %s: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "ugyldigt clearsig-hoved\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "ukendt panserhoved: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "indlejrede underskrifter i klartekst\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "uventet panser: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "ugyldig striplet undvegen linje: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64-tegn %02x udeladt\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "ugyldig udformet CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinje\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldige OpenPGP-data fundet.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linje længere end %d tegn\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "citeret udskrivingstegn i panser - måske på grund af en fejlbehæftet MTA\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "kan ikke læses af mennesker"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1753,28 +1791,28 @@
 "et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
 "sluttes med et »=«\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "et brugernotationsnavn skal indeholde tegnet »@«\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "et notationsnavn må ikke indeholde mere end et »@«-tegn\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 #| msgid "a notation name must not contain more than one '@' character\n"
 msgid "a notation name may not contain an '=' character\n"
 msgstr "et notationsnavn må ikke indeholde mere end et »@«-tegn\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1784,7 +1822,7 @@
 "et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
 "sluttes med et »=«\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ADVARSEL: Ingen notationsdata fundet\n"
@@ -1800,8 +1838,8 @@
 msgid "Enter passphrase: "
 msgstr "Indtast adgangsfrase\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1813,13 +1851,13 @@
 msgid "error from TPM: %s\n"
 msgstr "fejl ved læsning fra %s: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1831,206 +1869,211 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "du kan ikke bruge %s i tilstanden %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "Tor is not properly configured"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "DNS is not properly configured"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnr. %s detekteret\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke udføre dette i jobtilstand\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "ikke indstillet"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fejl: Kun ren ASCII er tilladt i øjeblikket.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fejl: Tegnet »<« må ikke bruges.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fejl: Dobbelt mellemrum er ikke tilladt.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Kortholders efternavn: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "Adresse hvor offentlig nøgle skal hentes: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, 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:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Loginddata (kontonavn): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Private DO-data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Sprogpræferencer: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fejl: ugyldig længde for præferencestreng.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Fejl: ugyldigt svar.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA-fingeraftryk: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fejl: Ugyldigt formateret fingeraftryk.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nøglehandling er ikke mulig: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Erstat eksisterende nøgle? (j/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -2047,112 +2090,112 @@
 " dokumentationen for dit kort for at se hvilke størrelser, der\n"
 " er tilladt.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afrundet op til %u bit\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 #| msgid " (1) Signature key\n"
 msgid "Signature key\n"
 msgstr " (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 #| msgid " (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr " (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 #, fuzzy
 #| msgid " (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr " (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 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:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA og Elgamal\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstat eksisterende nøgler (j/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2167,189 +2210,194 @@
 " PIN = »%s« Admin-PIN = »%s«\n"
 "Du bør ændre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Vælg venligst hvor nøglen skal gemmes:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "læsning mislykkedes: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, 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:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "vis administratorkommandoer"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "vis denne hjælpetekst"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "vis alle tilgængelige data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "ændr kortholders navn"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "ændr adresse for at indhente nøgle"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "hent nøglen angivet i kortadressen"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "ændr logindnavnet"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "ændr sprogpræferencerne"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "ændr kortholders køn"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "ændr et CA-fingeraftryk"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "skift force PIN-flag for underskriften"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "opret nye nøgler"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "menu til at ændre eller fjerne blokering for PIN'en"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "verificer PIN'en og vis alle data"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "fjern blokering for PIN'en med en nulstillingskode"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr ""
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Kommandoer kun for administratoren\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Administratorkommandoer er tilladt\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Administratorkommandoer er ikke tilladt\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Ugyldig kommando (prøv »help«)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nøglen »%s« blev ikke fundet: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2411,9 +2459,9 @@
 msgid "subkey"
 msgstr "Pubkey: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "opdatering mislykkedes: %s\n"
@@ -2438,86 +2486,81 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
+"præferencer\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "kan ikke bruge en symmetrisk ESK-pakke på grund af S2K-tilstanden\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "bruger chiffer %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "»%s« allerede komprimeret\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "læser fra »%s«\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
-"præferencer\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2526,19 +2569,13 @@
 "ADVARSEL: Tvang for komprimeringsalgoritme %s (%d) overtræder modtagerens "
 "præferencer\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: »%s«\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2555,7 +2592,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypteret med ukendt algoritme %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2568,424 +2605,429 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved håndtering af krypteret pakke\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "eksportunderskrifter som er markeret som kun lokale"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "bruger-id'er for eksportattributter (normalt billed-id'er)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "tilbagekaldsnøgler for eksport markeret som »sensitive«"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "fjern nøgledele der ikke kan bruges under eksport"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "fjern så meget som muligt fra nøglen under eksport"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "opret et tilbagekaldscertifikat"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: udelod: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "skriver til »%s«\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nøgle %s: nøgle i PGP 2.x-stil - udeladt\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "fejl ved oprettelse af »%s«: %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "Bruger-id blev ikke fundet"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, 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:1330
+#: g10/getkey.c:1331
 #, 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:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Ingen fingeraftryk"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, 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:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, 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:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "opret en underskrift"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "opret en underskrift i klartekst"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "opret en separat underskrift"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "krypter kun med symmetrisk chiffer"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "afkrypter data (standard)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "godkend en underskrift"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "vis nøgler og underskrifter"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "vis nøgler og fingeraftryk"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "fjern nøgler fra den offentlige nøglering"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøgler fra den hemmelige nøglering"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "underskriv eller rediger en nøgle"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "ændr en adgangsfrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "eksporter nøgler"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "eksporter nøgler til en nøgletjener"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importer nøgler fra en nøgleserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "søg efter nøgler på en nøgleserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "opdater alle nøgler fra en nøgleserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importer/sammenføj nøgler"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "udskriv kortstatus"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "ændr data på et kort"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "ændr et korts PIN"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "opdater troværdighedsdatabasen"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "vis beskedsammendrag"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "kør i servertilstand"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|krypter også til bruger-id-NAVN"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|opsæt e-post-aliasser"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "brug streng OpenPGP-opførsel"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "spørg før overskrivning"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "opret ascii-pansrede uddata"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv resultat til FIL"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "brug kanonisk teksttilstand"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|brug MEKANISMER til at finde nøgler efter postadresser"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importer nøgler fra en nøgleserver"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "deaktiver al adgang til dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Tilvalg der kontrollerer konfigurationen"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|krypter for BRUGER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2993,7 +3035,7 @@
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3023,14 +3065,14 @@
 " --list-keys navne vis nøgler\n"
 " --fingerprint navne vis fingeraftryk\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -3045,7 +3087,7 @@
 "Sign, check, encrypt eller decrypt\n"
 "standardhandling afhænger af inddata\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3053,82 +3095,82 @@
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 #| msgid "usage: gpgsm options "
 msgid "usage: %s options %s\n"
 msgstr "brug: gpgsm tilvalg "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "kommandoer er i konflikt\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, 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:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, 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:1719
+#: g10/gpg.c:1728
 #, 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:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, 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:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3137,19 +3179,19 @@
 msgstr ""
 "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3159,492 +3201,486 @@
 msgstr ""
 "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "ukendt konfigurationspunkt »%s«\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "vis billed-id'er under nøglevisninger"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, 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:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "vil politikadresser under underskriftvisninger"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "vis alle notationer under underskriftvisninger"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotationer under underskriftvisninger"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brugerangivne notationer under underskriftvisninger"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 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:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "vis udløbsdatoer under underskriftvisninger"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "vis nøgleringsnavnet i nøglevisninger"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "vis udløbsdatoer under underskriftvisninger"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "vis præferencer (ekspert)"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, 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:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, 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:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, 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:3314
+#: g10/gpg.c:3327
 #, 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:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke fortolke nøgleserveradresse\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "vis billed-id'er under underskriftverificering"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "vis politikadresser under underskriftverificering"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "vis alle notationer under underskriftverificering"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotationer under underskriftverificering"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "vis brugerangivne notationer under underskriftverificering"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "vis bruger-id-validitet under underskriftverificering"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "vis kun den primære bruger-id i underskriftverificering"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke angive kørselssti til %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: program kan oprette en kernefil!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overskriver %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kører med forfalsket systemtid: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt chifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "valgt sammendragsalgoritme er ugyldig\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, 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:3984
+#: g10/gpg.c:4002
 #, 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:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldige standardpræferencer\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldige præferencer for personlig chiffer\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "ugyldige præferencer for personlig chiffer\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldige præferencer for personlig sammendrag\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldige præferencer for personlig komprimering\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker endnu ikke med %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, 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:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nøgleserver send mislykkedes: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nøgleserver modtag mislykkedes: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nøgleserver søg mislykkedes: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "nøgleserver opdater mislykkedes: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ugyldig hash-algoritme »%s«\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, 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:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Gå til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@ -3657,7 +3693,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "giv kun tidsstempelkonflikter en advarsel"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation til denne FD"
 
@@ -3687,164 +3723,164 @@
 msgid "No help available for '%s'"
 msgstr "Ingen hjælp tilgængelig for »%s«"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "importer underskrifter som er markeret som local-only"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparer skade fra pks-nøgleserveren under import"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 #| msgid "do not update the trustdb after import"
 msgid "do not clear the ownertrust values during import"
 msgstr "opdater ikke trustdb efter import"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "opdater ikke trustdb efter import"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr ""
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key during import"
 msgstr "vis nøglefingeraftryk"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key but do not actually import"
 msgstr "vis nøglefingeraftryk"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "accepter kun opdateringer til eksisterende nøgler"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "fjern ubrugelige dele fra nøgle efter import"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "fjern så meget som muligt fra nøgle efter import"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 #, fuzzy
 #| msgid "assume input is in binary format"
 msgid "assume the GnuPG key backup format"
 msgstr "antag inddata er i binært format"
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "repair keys on import"
 msgstr "vis nøglefingeraftryk"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr " udelader bloktype %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr " %lu-nøgler behandlet\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr " Totalt antal behandl.: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " udeladte nye nøgler: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " udeladte nye nøgler: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " w/o bruger-id'er: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importerede: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " uændrede: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nye bruger-id'er: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nye undernøgler: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nye underskrifter: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " nye nøgletilbagekald: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " hemmelige nøgler læst: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " hemmel. nøgler import: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmel. nøgler uændret: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " ikke importerede: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " underskrifter ryddet: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " bruger-id'er ryddet: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3853,182 +3889,187 @@
 "ADVARSEL: nøgle %s indeholder præferencer for utilgængelige\n"
 "algoritmer på disse bruger-id'er:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " »%s«: præference for chifferalgoritme %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " »%s«: præference for chifferalgoritme %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " »%s«: præference for sammendragsalgortime %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " »%s«: præference for komprimeringsalgortime %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det anbefales på det stærkeste, at du opdaterer dine præferencer og\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "gendistribuerer denne nøgle for at undgå potentielle problemer med rod i\n"
 "algoritmen\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nøgle %s: ingen bruger-id\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "udelod »%s«: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nøgle %s: korruption af PKS-undernøgle er repareret!\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nøgle %s: accepteret ikke egenunderskrevet bruger-id »%s«\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nøgle %s: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes en manglende egenunderskrift\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nøgle %s: ny nøgle - udeladt\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbar nøglering fundet: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "fejl ved skrivning af nøglering »%s«: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nøgle %s: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nøgle %s: »%s« %d nye bruger-id'er\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nøgle %s: »%s« 1 ny underskrift\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nøgle %s: »%s« %d nye underskrifter\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nøgle %s: »%s« %d nye undernøgler\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nøgle %s: »%s« %d underskrift renset\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nøgle %s: »%s« %d underskrifter renset\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nøgle %s: »%s« %d bruger-id renset\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nøgle %s: »%s« %d bruger-id'er renset\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nøgle %s: »%s« ikke ændret\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nøgle %s: hemmelig nøgle importeret\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
 msgstr "fejl under afsendelse af %s-kommando: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -4037,204 +4078,204 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, 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:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import af hemmelige nøgler er ikke tilladt\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Ingen årsag angivet"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Nøglen er blevet afløst"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Nøglen er blevet kompromitteret"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Nøglen bruges ikke længere"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Bruger-id er ikke længere gyldigt"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "årsag for tilbagekald: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "tilbagekaldskommentar: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nøgle %s: ingen bruger-id for underskrift\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nøgle %s: ugyldig undernøglebinding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nøgle %s: fjernet flerundernøglebinding\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nøgle %s: udeladt bruger-id »%s«\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nøgle %s: udeladt undernøgle\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "nøgle %s: duplikeret bruger-id detekteret - sammenføjet\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
@@ -4245,32 +4286,32 @@
 msgid "error allocating memory: %s\n"
 msgstr "fejl ved allokering af nok hukommelse: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 #| msgid "Good signature from"
 msgid " (reordered signatures follow)"
 msgstr "God underskrift fra"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s:\n"
 msgstr "udelod »%s«: %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "%d duplicate signature removed\n"
@@ -4278,7 +4319,7 @@
 msgstr0 "Bruger-id »%s«: %d underskrift fjernet\n"
 msgstr1 "Bruger-id »%s«: %d underskrift fjernet\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4286,7 +4327,7 @@
 msgstr0 "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
 msgstr1 "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4294,7 +4335,7 @@
 msgstr0 "%d ugyldige underskrifter\n"
 msgstr1 "%d ugyldige underskrifter\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 #| msgid "Good signature from"
 msgid "%d signature reordered\n"
@@ -4302,57 +4343,57 @@
 msgstr0 "God underskrift fra"
 msgstr1 "God underskrift fra"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, 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:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 #| msgid "keybox `%s' created\n"
 msgid "keybox '%s' created\n"
 msgstr "nøgleboks »%s« oprettet\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "nøglering »%s« oprettet\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 #| msgid "keyblock resource `%s': %s\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "nøgleblokressource »%s«: %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "tilbagekald"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "egenunderskrift"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4363,17 +4404,17 @@
 "andre brugers nøgler\n"
 "(ved at kigge på pas, kontrollere fingeraftryk fra andre kilder etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Marginal troværdighed\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Fuld troværdighed\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4383,52 +4424,52 @@
 "En dybde større end 1 giver nøglen du underskriver mulighed for\n"
 "at lavet troværdighedsunderskrifter på dine vegne.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Indtast venligst et domæne for at begrænse denne underskrift, eller retur "
 "for ingen.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Bruger-id »%s« er tilbagekaldt."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker på, at du stadig vil underskrive (j/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Kunne ikke underskrive.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Bruger-id »%s« er udløbet."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Bruger-id »%s« er ikke egenunderskrevet."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Bruger-id »%s« kan underskrives. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4437,11 +4478,11 @@
 "Egenunderskriften på »%s«\n"
 "er en underskrift i PGP 2.x-stil.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Ønsker du at forfremme den til en OpenPGP-egenunderskrift? (j/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4450,12 +4491,12 @@
 "Din aktuelle underskrift på »%s«\n"
 "er udløbet.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Ønsker du at udstede en ny underskrift for at erstatte den udløbne? (j/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4464,45 +4505,45 @@
 "Din aktuelle underskrift på »%s«\n"
 "er en lokal underskrift.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Ønsker du at forfremme den til en fuld underskrift, der kan eksporteres (j/"
 "N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "»%s« var allerede underskrevet lokalt af nøgle %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "»%s« var allerede underskrevet af nøgle %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ønsker du at underskrive den igen alligevel? (j/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Intet at underskrive med nøgle %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Denne nøgle er udløbet!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne nøgle er ved at udløbe på %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ønsker du at dine underskrifter skal udløbe på samme tidspunkt? (J/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4513,33 +4554,33 @@
 "faktisk tilhører personen navngivet ovenfor? Hvis du ikke kender svaret, så "
 "indtast »0«.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Jeg vil ikke svare.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Jeg har ingen kontrol udført.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Jeg har udført en overfladisk kontrol.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Jeg har foretaget en meget omhyggelig kontrol.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 #| msgid "Your selection? (enter `?' for more information): "
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Dit valg? (indtast »?« for yderligere information): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4548,243 +4589,254 @@
 "Er du sikker på, at du ønsker at underskrive denne nøgle\n"
 "med din nøgle »%s« (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Dette vil være en egenunderskrift.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "ADVARSEL: Underskriften vil ikke blive markeret som ikke at kunne "
 "eksporteres.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "ADVARSEL: Underskriften vil ikke blive markereret som ikke at kunne "
 "tilbagekaldes.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Underskriften vil blive markeret som ikke at kunne eksporteres.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Underskriften vil blive markeret som ikke at kunne tilbagekaldes.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Jeg har overhovedet ikke kontrolleret denne nøgle.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Jeg har overfladisk kontrolleret denne nøgle.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "underskrift mislykkedes: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Nøgle har kun stump eller ikkekort nøgleposter - ingen adgangsfrase at "
 "ændre.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "vis nøglefingeraftryk"
 
 # 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/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 #| msgid "Enter the keygrip: "
 msgid "show the keygrip"
 msgstr "Indtst nøglegrebet: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "vis nøgle og bruger-id'er"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "vælg bruger-id N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "vælg undernøgle N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "kontroller underskrifter"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 "underskriv valgte bruger-id'er * se nedenfor for relaterede kommandoer"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "underskriv valgte bruger-id'er lokalt"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "underskriv valgte bruger-id'er med en troværdighedsunderskrift"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "underskriv bruger-id'er md en underskrift der ikke kan kaldes tilbage"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "tilføj billed-id"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "slet valgte bruger-id'er"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "tilføj en undernøgle"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "tilføj en nøgle til et smartkort"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "flyt en nøgle til et smartkort"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "flyt en sikkerhedskopinøgle til et smartkort"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "slet valgte undernøgler"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "tilføj en tilbagekaldsnøgle"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Datadekryptering lykkedes"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "slet underskrifter fra de valgte bruger-id'er"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "ændr udløbsdatoen for nøglen eller valgte undernøgler"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "marker den valgte bruger-id som primær"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "vis præferencer (ekspert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "vis præferencer (uddybende)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "angiv præferenceliste for de valgte bruger-id'er"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "angiv den foretrukne nøgleserveradresse for de valgte bruger-id'er"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "angiv en notation for de valgte bruger-id'er"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "ændr adgangsfrasen"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "tilbagekald underskrifter på de valgte bruger-id'er"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "tilbagekald valgte bruger-id'er"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "tilbagekald nøgle eller valgte undernøgler"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "aktiver nøgle"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "deaktiver nøgle"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "vis valgte billed-id'er"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "komprimer ubrugelige bruger-id'er og fjern ubrugelige underskrifter fra nøgle"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "komprimer ubrugelige bruger-id'er og fjern alle underskrifter fra nøgle"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Hemmelig nøgle er tilgængelig.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Hemmelig nøgle er tilgængelig.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Har brug for den hemmelige nøgle for dette.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 #, fuzzy
 #| msgid ""
 #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@ -4805,304 +4857,295 @@
 "tnrsign\n"
 " etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Nøglen er tilbagekaldt."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 #| msgid "Really sign all user IDs? (y/N) "
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Fif: Vælg bruger-id'erne at underskrive\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "Unknown signature type '%s'\n"
 msgstr "Ukendt underskrifttype »%s«\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Du skal vælge mindst en bruger-id.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan ikke slette den sidste bruger-id!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig fjerne alle valgte bruger-id'er? (j/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig fjerne denne bruger-id? (j/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Du skal vælge præcis en nøgle.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Kommando forventer en filnavnsparameter\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 #| msgid "Can't open `%s': %s\n"
 msgid "Can't open '%s': %s\n"
 msgstr "Kan ikke åbne »%s«: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 #| msgid "Error reading backup key from `%s': %s\n"
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Fejl ved læsning af sikkerhedskopinøgle fra »%s«: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Du skal vælge mindst en nøgle.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig slette denne nøgle? (j/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig tilbagekalde alle valgte bruger-id'er? (j/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig tilbagekalde dette bruger-id? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig tilbagekalde hele nøglen? (j/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du virkelig tilbagekalde de valgte undernøgler? (j/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig tilbagekalde denne undernøgle? (j/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Ejertroværdighed kan ikke indstilles, når der bruges en brugerleveret "
 "troværdighedsdatabase\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Angiv præferenceliste til:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opdater præferencerne for de valgte bruger-id'er (j/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Opdater præferencerne? (j/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Gem ændringer? (j/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting certificate \"%s\" failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 #| msgid "failed to get the fingerprint\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "kunne ikke indhente fingeraftrykket\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Ingen sådan bruger-id.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Intet at underskrive med nøgle %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke underskrevet af dig.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, 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:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Sammendrag: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Funktioner: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Nøgleserver no-modify"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Fortrukken nøgleserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "oprettet: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "tilbagekaldt: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "udløbet: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "udløber: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "brug: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "troværdighed: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "validitet: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Denne nøgle er blevet deaktiveret"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5110,17 +5153,17 @@
 "Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
 "korrekt med mindre du genstarter programmet.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "tilbagekaldt"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "udløbet"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5129,18 +5172,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5150,37 +5198,37 @@
 "medføre at\n"
 " nogle version af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slet denne gode underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Slet denne ugyldige underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Slet denne ukendte underskrift? (j/n/a)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Virkelig slette denne egenunderskrift? (j/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5188,20 +5236,20 @@
 msgstr0 "Slettede %d underskrift.\n"
 msgstr1 "Slettede %d underskrift.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Intet slettet.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruger-id »%s« komprimeret: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5209,17 +5257,17 @@
 msgstr0 "Bruger-id »%s«: %d underskrift fjernet\n"
 msgstr1 "Bruger-id »%s«: %d underskrift fjernet\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruger-id »%s«: allerede minimeret\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruger-id »%s«: allerede ryddet\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5229,44 +5277,60 @@
 "tilbagekalder\n"
 " kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(med mindre du angiver nøglen med fingeraftryk)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5277,249 +5341,249 @@
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, 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:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Vælg venligst præcis en bruger-id.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Indtast din foretrukne nøglerserveradresse: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 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:5384
+#: g10/keyedit.c:5672
 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:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Indtast notationen: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Fortsæt? (j/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, 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:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøgle med indeks %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: »%s«\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (kan ikke eksporteres)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne underskrift udløb den %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (kan ikke tilbagekaldes)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "tilbagekaldt af din nøgle %s på %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøgle\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, 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:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "præference »%s« duplikeret\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "for mange sammendragpræferencer\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "for mange komprimeringspræferencer\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, 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:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkte underskrift\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver egenunderskrift\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver underskrift for nøglebinding\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nøglestørrelse afrundet op til %u bit\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5527,19 +5591,19 @@
 "ADVARSEL: Nogle OpenPGP-programmer kan ikke håndtere en DS-nøgle med denne\n"
 "sammendragsstørrelse\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Underskriv"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certificer"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Godkend"
 
@@ -5553,123 +5617,123 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "UuKkGfAa"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Mulige handligner for en %s-nøgle: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Aktuelt tilladte handlinger: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Skift evnen til at underskrive\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Skift evnen til at kryptere\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Skift evnen til at godkende\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Afsluttet\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA og RSA (standard)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA og Elgamal\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (kun underskriv)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (kun underskriv)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (kun krypter)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (kun krypter)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) sign, encrypt\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) underskriv, krypter\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (kun underskriv)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) DSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (kun krypter)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Eksisterende nøgle\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
@@ -5678,62 +5742,62 @@
 # 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:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Indtst nøglegrebet: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøgle med dette nøglegreb\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "fejl ved læsning af kort: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serielnummer for kortet: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tilgængelige nøgler:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5749,7 +5813,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:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5765,38 +5829,38 @@
 " <n>m = underskriften udløber om n måneder\n"
 " <n>y = underskriften udløber om n år\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Underskrift er gyldig for? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Nøglen udløber aldrig\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Underskriften udløber aldrig\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøglen udløber den %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Underskriften udløber den %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5804,11 +5868,11 @@
 "Dit system kan ikke vise datoer efter 2038.\n"
 "Det vil dog blive korrekt håndteret op til 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt? (j/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5822,7 +5886,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5838,42 +5902,42 @@
 " »Heinrich Heine (digteren) <heinrichh@duesseldorf.de>«\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Fødselsnavn: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-post-adresse: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig e-post-adresse\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5884,11 +5948,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 
@@ -5903,35 +5967,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Ret venligst fejlen først\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5943,18 +6007,18 @@
 "under oprettelse af primtallet; dette giver det vilkårlig\n"
 "taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøgleoprettelse mislykkedes: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5962,72 +6026,72 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, 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:4624
+#: g10/keygen.c:4701
 #, fuzzy
 #| msgid "Use this key anyway? (y/N) "
 msgid "Create anyway? (y/N) "
 msgstr "Brug denne nøgle alligevel? (j/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "opretter ny nøgle\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Nøgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, 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:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -6035,7 +6099,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6043,7 +6107,7 @@
 "nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6051,24 +6115,24 @@
 "nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette? (j/N) "
 
@@ -6076,27 +6140,43 @@
 msgid "never "
 msgstr "aldrig "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Sammendrag: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Funktioner: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Nøgleserver no-modify"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kritisk underskriftspolitik: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Underskriftspolitik: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Kritisk foretrukken nøgleserver: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kritisk underskriftnotation: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Underskriftsnotation: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -6104,7 +6184,7 @@
 msgstr0 "%d ugyldige underskrifter\n"
 msgstr1 "%d ugyldige underskrifter\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -6112,40 +6192,40 @@
 msgstr0 "1 underskrift er ikke kontrolleret på grund af en fejl\n"
 msgstr1 "1 underskrift er ikke kontrolleret på grund af en fejl\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Nøglering"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Primær nøglefingeraftryk:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr "Primær nøglefingeraftryk:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Undernøglefingeraftryk:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Nøglefingeraftryk ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Serielnr. for kort ="
 
@@ -6225,7 +6305,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "»%s« er ikke et nøgle-id: udelader\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6233,319 +6313,325 @@
 msgstr0 "opdaterer %d nøgler fra %s\n"
 msgstr1 "opdaterer %d nøgler fra %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nøgle »%s« blev ikke fundet på nøgleserver\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "nøgle blev ikke fundet på nøgleserver\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "anmoder om nøgle %s fra %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "ingen nøgleserverhandling!\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "udelod »%s«: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sender nøgle %s til %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, 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:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s krypteret sessionsnøgle\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s krypterede data\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "krypteret med ukendt algoritme %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "adgangsfrase oprettet med ukendt sammendragsalgoritme %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøgle er %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "krypteret med %u-bit %s nøgle, id %s, oprettet %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " »%s«\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypteret med %s nøgle, id %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: flere klartekster set\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypteret med %lu adgangsfraser\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypteret med 1 adgangsfrase\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "afkryptering af offentlig nøgle mislykkedes: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "krypterede data for offentlig nøgle: god DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: besked var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "afkryptering okay\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "oprindeligt filnavn=»%.*s«\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen underskrift fundet\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "UGYLDIG underskrift fra »%s«"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Udløbet underskrift fra »%s«"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra »%s«"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "underskriftverificering undertrykt\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Underskrift lavet %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " bruger %s nøgle %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 #| msgid " aka \"%s\""
 msgid " issuer \"%s\"\n"
 msgstr " også kendt som »%s«"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Nøgle tilgængelig på: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "usikker"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " også kendt som »%s«"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Underskrift udløbet %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Underskrift udløber %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "tekstilstand"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "ukendt"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritme: %s"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke kontrollere underskrift: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en frakoblet underskrift\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
@@ -6553,12 +6639,12 @@
 "ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
 "kontrolleret.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "uafhængig underskrift for klasse 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) underskrift\n"
@@ -6665,30 +6751,30 @@
 msgid "uncompressed|none"
 msgstr "ukomprimeret|ingen"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "tvetydigt tilvalg »%s«\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6745,7 +6831,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpakke af typen %d har kritiske bitsæt\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6820,7 +6906,7 @@
 "%s"
 msgstr "%u-bit %s nøgle, id %s, oprettet %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6834,75 +6920,75 @@
 "stort billede, vil din nøgle også blive meget stor!\n"
 "En billede på 240x288 er en god størrelse.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Indtast JPEG-filnavn for billed-id: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 #| msgid "unable to open JPEG file `%s': %s\n"
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "kan ikke åbne JPEG-fil »%s«: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Denne JPEG er virkelig stor (%d byte) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker på, at du vil benytte billedet (j/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 #| msgid "`%s' is not a JPEG file\n"
 msgid "'%s' is not a JPEG file\n"
 msgstr "»%s« er ikke en JPEG-fil\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette billede korrekt (j/N/a)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "kørsel via eksternt program er ikke understøttet\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "denne platform kræver midlertidige filer når der kaldes eksterne programmer\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 #| msgid "unable to execute shell `%s': %s\n"
 msgid "unable to execute shell '%s': %s\n"
 msgstr "kan ikke køre skal »%s«: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "unaturlig afslutning på eksternt program\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfejl under kald af eksternt program: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "ADVARSEL: kan ikke fjerne midlertidig fil (%s) »%s«: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "ADVARSEL: kan ikke fjerne midlertidig mappe »%s«: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6910,7 +6996,7 @@
 "kald fra eksterne programmer er deaktiveret på grund af usikre rettigheder "
 "for indstillingsfil\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke vise billed-id!\n"
@@ -6994,36 +7080,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikater der fører til en ultimativ troværdig nøgle:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Der er ingen garanti for, at denne nøgle tilhører den navngivne bruger\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Der er begrænset garanti for, at denne nøgle tilhører den navngivne "
 "bruger\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne nøgle tilhører sikkert den navngivne bruger\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Denne nøgle tilhører os\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, fuzzy, c-format
 #| msgid "root certificate has now been marked as trusted\n"
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "rodcertifikat er nu blevet markeret som troværdig\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 #| msgid ""
 #| "It is NOT certain that the key belongs to the person named\n"
@@ -7038,7 +7124,7 @@
 "i bruger-id'et. Hvis du *virkelig* ved hvad du gør,\n"
 "så kan du besvare det næste spørgsmål med ja.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -7048,108 +7134,108 @@
 "i bruger-id'et. Hvis du *virkelig* ved hvad du gør,\n"
 "så kan du besvare det næste spørgsmål med ja.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Brug denne nøgle alligevel? (j/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger nøgle uden troværdighed!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ADVARSEL: Denne nøgle kan tilbagekaldes (tilbagekaldsnøgle er ikke til "
 "stede)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "bruger-id: »%s«\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "nøgle %s: stemmer ikke med vores kopi\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "option %s given but no matching User ID found\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ADVARSEL: Denne nøgle er blevet tilbagekaldt af dens designmæssige "
 "tilbagekalder!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne nøgle er blevet tilbagekaldt af dets ejer!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Dette kan betyde at underskriften er forfalsket.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undernøgle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Bemærk: Denne nøgle er blevet deaktiveret.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Bemærk: Denne nøgle er forældet!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "ADVARSEL: Denne nøgle er ikke certificeret med en troværdig underskrift!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ADVARSEL: Denne nøgle er ikke certificeret med en troværdig underskrift!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " Intet tyder på at denne signatur tilhører ejeren.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE på denne nøgle!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7160,7 +7246,7 @@
 "ADVARSEL: Denne nøgle er ikke certificeret med tilstrækkelig troværdige "
 "underskrifter!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7168,53 +7254,53 @@
 "ADVARSEL: Denne nøgle er ikke certificeret med tilstrækkelig troværdige "
 "underskrifter!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Det er ikke sikkert at signaturen tilhører ejeren.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlig nøgle er slået fra\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig nøgle er allerede til stede\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "kan ikke forbinde til »%s«: %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "linje %d: ugyldig algoritme\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du angav ikke et bruger-id. (du kan bruge »-r«)\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Aktuelle modtagere:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7222,40 +7308,40 @@
 "\n"
 "Indtast bruger-id'et. Slut med en tom linje: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Ingen sådan bruger-id.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig nøgle er allerede valgt som standardmodtager\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Offentlig nøgle er slået fra.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "udelod: offentlig nøgle er allerede angivet\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukendt standardmodtager »%s«\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, 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:1760
+#: g10/pkclist.c:1786
 #, 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"
@@ -7294,7 +7380,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke åbne underskrevne data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -7520,39 +7606,34 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "DSA-nøgle %s kræver en %u bit eller større hash\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "du kan ikke bruge %s i tilstanden %s\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ADVARSEL: konflikt for underskriftssammendrag i besked\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "ADVARSEL: underskriftsundernøgle %s er ikke krydscertificeret\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se venligst %s for yderligere information\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ADVARSEL: underskriftsundernøgle %s har en ugyldig krydscertificering\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu second newer than the signature\n"
@@ -7560,7 +7641,7 @@
 msgstr0 "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
 msgstr1 "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu day newer than the signature\n"
@@ -7568,7 +7649,7 @@
 msgstr0 "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
 msgstr1 "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7583,7 +7664,7 @@
 "nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
 "problem med uret)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7597,54 +7678,54 @@
 "nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
 "problem med uret)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 #| msgid "NOTE: signature key %s expired %s\n"
 msgid "Note: signature key %s expired %s\n"
 msgstr "BEMÆRK: underskriftnøgle %s udløb %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: signature key %s has been revoked\n"
 msgid "Note: signature key %s has been revoked\n"
 msgstr "BEMÆRK: underskriftnøgle %s er blevet tilbagekaldt\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, 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"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "ADVARSEL: kan ikke %%-udvide notation (for stor). Bruger uden udvidelse.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7652,7 +7733,7 @@
 "ADVARSEL: kan ikke %%-udvide politikadresse (for stor). Bruger uden "
 "udvidelse.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7661,12 +7742,12 @@
 "ADVARSEL: kan ikke %%-udvide foretrukken nøgleserveradresse (for stor). "
 "Bruger uden udvidelse.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-underskrift fra: »%s«\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7674,12 +7755,12 @@
 "ADVARSEL: tvang af sammendragsalgoritme %s (%d) overtræder "
 "modtagerpræferencer\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "underskriver:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7759,137 +7840,137 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronisering mislykkedes: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
 msgstr "kan ikke oprette lås for »%s«\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 #| msgid "can't lock `%s'\n"
 msgid "can't lock '%s'\n"
 msgstr "kan ikke låse »%s«\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: skrivning mislykkedes (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transaktion for trustdb er for stor\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: mappe findes ikke!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, 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:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: kunne ikke oprette versionspost: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ugyldig trustdb oprettet\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb oprettet\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ugyldig trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: kunne ikke oprette hashtabel: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fejl ved opdatering af versionspost: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fejl ved læsning af versionspost: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fejl ved skrivning af versionspost: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek mislykkedes: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: læsning mislykkedes (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ikke en trustdb-fil\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ugyldig filversion %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fejl ved læsning af fri post: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fejl ved skrivning af mappepost: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: mislykkedes med at nulle en post: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, 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:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fejl: trustdb er ødelagt.\n"
@@ -8334,7 +8415,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "intet behov for kontrol af trustdb\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "næste kontrol af trustdb sker den %s\n"
@@ -8367,7 +8448,7 @@
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8375,7 +8456,7 @@
 msgstr0 " %lu-nøgler behandlet\n"
 msgstr1 " %lu-nøgler behandlet\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8383,17 +8464,17 @@
 msgstr0 "%d nøgler behandlet (%d validiteter ryddet)\n"
 msgstr1 "%d nøgler behandlet (%d validiteter ryddet)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "ingen ultimativ troværdige nøgler fundet\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8401,7 +8482,7 @@
 "dybde: %d gyldig: %3d underskrevet: %3d troværdighed: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
@@ -8474,7 +8555,7 @@
 msgid "ultimate"
 msgstr " ultim. "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8485,12 +8566,12 @@
 "Husk at underskriftfilen (.sig eller .asc)\n"
 "skal være den første fil på kommandolinjen.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "inddatalinje %u er for lang eller mangler LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke åbne fd %d: %s\n"
@@ -8507,19 +8588,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "tvetydigt tilvalg »%s«\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "sæt aflusningstilvalg"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "aktiver fuld fejlsøgning"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Brug: kbxutil tilvalg filer (-h for hjælp)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8530,16 +8611,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8580,10 +8661,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|Indtast venligst PIN Unblocking Code (PUK) for standardnøglerne."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-tilbagekald returnerede fejl: %s\n"
@@ -8605,58 +8686,58 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "nøgle findes allerede\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "eksisterende nøgle vil blive erstattet\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "opretter ny nøgle\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nøgle\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke gemme nøglen: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svar indeholder ikke RSA modulus'erne\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "vent venligst mens nøglen bliver oprettet ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "oprettelse af nøgle mislykkedes\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8664,12 +8745,12 @@
 msgstr0 "nøgleoprettelse færdig (%d sekunder)\n"
 msgstr1 "nøgleoprettelse færdig (%d sekunder)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svar indeholder ikke data for offentlig nøgle\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Indtast venligst PIN'en for nøglen til at oprette kvalificerede "
@@ -8677,55 +8758,55 @@
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Indtast venligst administrator-PIN'en"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Indtast venligst PIn'en for standardnøglerne."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN'en er endnu ikke ændret\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN'en er endnu ikke ændret\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8733,7 +8814,7 @@
 "|NP|Indtast venligst en ny PIN Unblocking Code (PUK) for nøglen til at "
 "oprette kvalificerede underskrifter."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8741,27 +8822,27 @@
 "|P|Indtast venligst PIN Unblocking Code (PUK) for nøglen til at oprette "
 "kvalificerede underskrifter."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke gemme fingeraftrykket: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "fejl ved indhentelse af CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
@@ -8769,46 +8850,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruger standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Indtast venligst PIN'en"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificering af CHV%d mislykkedes: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent låst!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, 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"
@@ -8817,20 +8898,20 @@
 msgstr0 "%d PIN-forsøg for administrator før kort permanent låses\n"
 msgstr1 "%d PIN-forsøg for administrator før kort permanent låses\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "adgang til administratorkommandoer er ikke konfigureret\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Indtast venligst PIN'en"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Indtast venligst nulstillingskoden for kortet"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
@@ -8838,73 +8919,73 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny nulstillingskode"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny administrator-PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Indtast venligst administrator-PIN'en og ny administrator-PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Indtast venligst PIN'en og ny PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "fejl ved læsning af programdata\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "fejl ved læsning af fingeraftryk DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "oprettelsestidsstempel mangler\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "ikke understøttet algoritme: %s"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur for OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "underskrifter oprettet indtil videre: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8912,7 +8993,7 @@
 "verifikation af administrator-PIN er i øjeblikket forbudt via denne "
 "kommando\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@ -8932,7 +9013,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "kør i flerservertilstand (forgrund)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
 
@@ -8976,13 +9057,13 @@
 msgid "deny the use of admin card commands"
 msgstr "nægt brugen af kommandoer for administratorkort"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, 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:327
+#: scd/scdaemon.c:328
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon options command args\n"
@@ -8994,7 +9075,7 @@
 "Syntaks: scdaemon tilvalg kommando parametre\n"
 "Smartcard-dæmon for GnuPG\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
@@ -9002,315 +9083,315 @@
 msgstr ""
 "brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "håndtering for fd %d startet\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "håndtering for fd %d termineret\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fejl ved indhentelse af nøglebrugsinformation: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "anmodt om valideringsmodel af certifikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "kæde"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "skal"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "udstedercertifikat er ikke markeret som en CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "kritisk markeret politik uden konfigurerede politikker"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, 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:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certifikatpolitik er ikke tilladt"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "kunne ikke indhente fingeraftrykket\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår udsteder op på ekstern placering\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antallet af udstedere der matcher: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår udsteder op fra Dirmngr-mellemlageret\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antallet af matchende certifikater: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only-nøgleopslag mislykkedes: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "kunne ikke allokere keyDB-håndtag\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "certifikat er blevet tilbagekaldt"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "status for certifikatet er ukendt"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrol af CRL'en mislykkedes: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med ugyldig validitet: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "rodcertifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "mellemliggende certifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikat er udløbet"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "rodcertifikat er udløbet"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "mellemliggende certifikat er udløbet"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "krævede certifikatattributter mangler: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "certifikat med ugyldig validitet"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "underskrift blev ikke oprettet under certifikatets livsforløb"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikat blev ikke oprettet under udsteders livsforløb"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "mellemliggende certifikat blev ikke oprettet under udsteders livsforløb"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " (underskr. oprettet den "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (certifkat oprettet den "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (certifikat gyldigt fra "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( udsteder gyldig fra "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeraftryk=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "ADVARSEL: oprettelsestidspunkt for underskrift er ukendt - antager aktuelt "
 "tidspunkt"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "ingen udsteder fundet i certifikat"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rodcertifikat er ikke markeret som troværdig"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkæde er for lang\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "udstedercertifikat blev ikke fundet"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikat har en UGYLDIG underskrift"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "fandt et andet mulig matchende CA-certifikat - prøver igen"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, 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:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikat er gyldigt\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mellemliggende certifikat er gyldigt\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rodcertifikat er gyldigt\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "skifter til kædemodel"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodel brugt: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "uden for kerne\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er MD2-algoritmen)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ingen"
 
@@ -9330,7 +9411,7 @@
 msgid "Error - invalid DN"
 msgstr "Fejl - ugyldig DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9345,42 +9426,42 @@
 "S/N %s, id 0x%08lX,\n"
 "oprettet %s, udløber %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nøglebrug angivet - antager alle mulige brug\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikat kan ikke bruges til kryptering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikat kan ikke bruges til underskrivning\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "looking for another certificate\n"
@@ -9620,17 +9701,17 @@
 msgid "resource problem: out of core\n"
 msgstr "ressourceproblem: ikke nok kerne\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(dette er RC2-algoritmen)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(dette ser ikke ud til at være en krypteret besked)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9642,7 +9723,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikat »%s« blev ikke fundet: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fejl ved låsning af nøgleboks: %s\n"
@@ -9669,125 +9750,125 @@
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige modtagere angivet\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "vis eksterne nøgler"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "vis certifikatkæde"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "importer certifikater"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "eksporter certifikater"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "registrer et smartkort"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "opstart gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikater der skal inkluderes"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|tag politikinformation fra FIL"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "antag inddata er i PEM-format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "antag inddata er i base-64-format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "antag inddata er i binært format"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "opret base-64-kodet resultat"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|tilføj nøglering til nøgleringslisten"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "hent manglende udstedercertifikater"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "konsulter aldrig en CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "kontroller ikke CRL'er for rodcertifikater"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "kontroller validitet med OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "kontroller ikke certifikatpolitikker"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug chifferalgoritme NAVN"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "kørselstilstand: spørg aldrig"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spørgsmål"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spørgsmål"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|skriv en revisionslog til FIL"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm options files\n"
@@ -9802,31 +9883,31 @@
 "Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
 "standardhandling afhænger af inddata\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "ukendt valideringsmodel »%s«\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, 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:1774
+#: sm/gpgsm.c:1825
 #, 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:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@ -9846,7 +9927,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "grundlæggende certifikatkontroller mislykkedes - ikke importeret\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
@@ -9856,49 +9937,49 @@
 msgid "error importing certificate: %s\n"
 msgstr "fejl under import af certifikat: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved læsning af inddata: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "fejl ved åbning af »%s«: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem under udkig efter eksisterende certifikat: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fejl under søgning efter skrivbar keyDB (nøgledatabase): %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem under gensøgning af certifikat: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fejl ved lagring af flag: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Fejl - "
 
@@ -9936,7 +10017,7 @@
 "\n"
 "%s%sEr du sikker på, at det er hvad du ønsker?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9956,45 +10037,45 @@
 "»%s«\n"
 "Bemærk, at dette certifikat IKKE vil oprette en kvalificeret underskrift!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "hashalgoritme %d (%s) for underskriver %d er ikke understøttet; bruger %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "hashalgoritme brugt for underskriver %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Underskrift lavet %s med %s nøgle-id %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Underskrift lavet "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "dato ikke angivet"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 #| msgid "algorithm: %s"
 msgid "algorithm:"
 msgstr "algoritme: %s"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -10002,17 +10083,17 @@
 "ugyldig underskrift: attribut for beskedsammendag matcher ikke den "
 "beregnede\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "God underskrift fra"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " også kendt som"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dette er en kvalificeret underskrift\n"
@@ -10039,651 +10120,645 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "problem under udkig efter eksisterende certifikat: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, fuzzy, c-format
 #| msgid "looking up issuer from the Dirmngr cache\n"
 msgid "dropping %u certificates from the cache\n"
 msgstr "slår udsteder op fra Dirmngr-mellemlageret\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "kan ikke oprette »%s«: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 #| msgid "certificate `%s' deleted\n"
 msgid "certificate '%s' already cached\n"
 msgstr "certifikat »%s« slettet\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 #| msgid "duplicated certificate `%s' deleted\n"
 msgid "trusted certificate '%s' loaded\n"
 msgstr "duplikeret certifikat »%s« slettet\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 #| msgid "certificate `%s' deleted\n"
 msgid "certificate '%s' loaded\n"
 msgstr "certifikat »%s« slettet\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 #| msgid "fingerprint=%s\n"
 msgid " SHA1 fingerprint = %s\n"
 msgstr "fingeraftryk=%s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error loading certificate '%s': %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "permanently loaded certificates: %u\n"
 msgstr "Inkluderede certifikater"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, 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:840
+#: dirmngr/certcache.c:858
 #, 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:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 #| msgid " (certificate created at "
 msgid "certificate already cached\n"
 msgstr " (certifkat oprettet den "
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate cached\n"
 msgstr "certifikat er gyldigt\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, 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:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ugyldig fingeraftryk"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, 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:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, 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:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, 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:1749
+#: dirmngr/certcache.c:1767
 #, 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:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, 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:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 #| msgid "ignoring garbage line"
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorerer affaldslinje"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, 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:274
+#: dirmngr/crlcache.c:281
 #, 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:283
+#: dirmngr/crlcache.c:290
 #, 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, 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:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, 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:631
+#: dirmngr/crlcache.c:638
 #, 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:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, 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:678
+#: dirmngr/crlcache.c:685
 #, 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:685
+#: dirmngr/crlcache.c:692
 #, 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:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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: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:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, 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:1010
+#: dirmngr/crlcache.c:1017
 #, 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:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error hashing '%s': %s\n"
 msgstr "fejl i »%s«: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, 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:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, 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:1144
+#: dirmngr/crlcache.c:1151
 #, 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:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, 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:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, 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:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, 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:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "underskriftverificering undertrykt\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "ksba_crl_new failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, 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:2266
+#: dirmngr/crlcache.c:2277
 #, 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:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, 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:2413
+#: dirmngr/crlcache.c:2434
 #, 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:2445
+#: dirmngr/crlcache.c:2466
 #, 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:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, 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:2568
+#: dirmngr/crlcache.c:2597
 #, 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:2599
+#: dirmngr/crlcache.c:2628
 #, 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:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, 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:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -10700,25 +10775,25 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "certifikat »%s« blev ikke fundet: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 #| msgid "error retrieving `%s' via %s: %s\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: fejl ved skrivning af mappepost: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 #| msgid "certificate `%s' not found: %s\n"
 msgid "certificate search not possible due to disabled %s\n"
@@ -10887,151 +10962,151 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "|FILE|run commands from FILE on startup"
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|kør kommandoer fra FIL ved opstart"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "shutdown the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration for HTTP-servere"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "brug systemets HTTP-proxyopsætning"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Konfiguration for HTTP-servere"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|brug nøgleserver på adressen"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Konfiguration for HTTP-servere"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, 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:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 #, 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:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Konfiguration for OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 #, fuzzy
 #| msgid "allow PKA lookups (DNS requests)"
 msgid "allow sending OCSP requests"
 msgstr "tillad PKA-opslag (DNS-forespørgsler)"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|brug nøgleserver på adressen"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -11044,13 +11119,13 @@
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, 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:460
+#: dirmngr/dirmngr.c:476
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent options command args\n"
@@ -11062,114 +11137,114 @@
 "Syntaks: gpg-agent tilvalg kommando parametre\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, 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:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 #| msgid "usage: gpgsm options "
 msgid "usage: %s options "
 msgstr "brug: gpgsm tilvalg "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, 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:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, 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:1733
+#: dirmngr/dirmngr.c:1786
 #, 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:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ugyldig fingeraftryk"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, 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:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "ikke tvunget"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, 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:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11230,33 +11305,33 @@
 msgid "malloc failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, 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/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: adgangskode angivet uden bruger\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: udelader denne linje\n"
@@ -11358,183 +11433,183 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "allocating list item failed: %s\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting responder ID: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, fuzzy, c-format
 #| msgid "certificate should not have been used for OCSP response signing\n"
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 #| msgid "issuer certificate not found"
 msgid "issuer certificate not found: %s\n"
 msgstr "udstedercertifikat blev ikke fundet"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "caller did not return the target certificate\n"
 msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 #| msgid "error storing certificate\n"
 msgid "caller did not return the issuing certificate\n"
 msgstr "fejl ved lagring af certifikat\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 #| msgid "failed to allocate keyDB handle\n"
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "kunne ikke allokere keyDB-håndtag\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "ingen hemmelig standardnøglering: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, fuzzy, c-format
 #| msgid "using default PIN as %s\n"
 msgid "using default OCSP responder '%s'\n"
 msgstr "bruger standard-PIN som %s\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "bruger chiffer %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 #| msgid "certificate has been revoked"
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certifikat er blevet tilbagekaldt"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error sending data: %s\n"
 msgstr "fejl under afsendelse af %s-kommando: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "start_cert_fetch failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_next_cert failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, 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:2984
+#: dirmngr/server.c:3135
 #, 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:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11546,97 +11621,97 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "udstedercertifikat er ikke markeret som en CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "kontrollerer trustdb\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 #| msgid "checking the CRL failed: %s"
 msgid "checking CRL for"
 msgstr "kontrol af CRL'en mislykkedes: %s"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 #| msgid "checking for qualified certificate failed: %s\n"
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate chain is good\n"
 msgstr "certifikat er gyldigt\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "stille"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "vis data ud hex-kodet"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "afkod modtagne datalinjer"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 #, 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:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "send en kommando til dirmngr'en"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|forbind til Assuansokkel NAVN"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 #, 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:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "kør Assuanserveren angivet på kommandolinjen"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "brug ikke udvidet forbindelsestilstand"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|kør kommandoer fra FIL ved opstart"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "kør /subst ved opstart"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-connect-agent options\n"
@@ -11648,50 +11723,50 @@
 "Syntaks: gpg-connect-agent tilvalg\n"
 "Forbind til en kørende agent og send kommandoer\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "tilvalg »%s« ignoreret på grund af »%s«\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "linje er for lang - udeladt\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 #| msgid "unknown command `%s'\n"
 msgid "unknown command '%s'\n"
 msgstr "ukendt kommando »%s«\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fejl under afsendelse af standardtilvalg: %s\n"
@@ -11759,13 +11834,13 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Bemærk at gruppespecifikationer ignoreres\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, 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:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11889,90 +11964,109 @@
 "Syntaks: gpg-check-pattern tilvalg mønsterfil\n"
 "Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, 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"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Erstat eksisterende nøgler (j/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "OpenPGP-kortnr. %s detekteret\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid " (certificate created at "
 msgid "authenticate to the card"
 msgstr " (certifkat oprettet den "
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid " (certificate created at "
 msgid "read a certificate from a data object"
 msgstr " (certifkat oprettet den "
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid " (certificate created at "
 msgid "store a certificate to a data object"
 msgstr " (certifkat oprettet den "
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "valgt sammendragsalgoritme er ugyldig\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "ugyldige præferencer for personlig chiffer\n"
+
+#, fuzzy
+#~| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "tvang for symmetrisk chiffer %s (%d) overtræder modtagerens præferencer\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "fejl ved skrivning til midlertidig fil: %s\n"
 
@@ -12769,9 +12863,6 @@
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "skift mellem hemmelig og offentlig nøglevisning"
 
-#~ msgid "Passphrase"
-#~ msgstr "Adgangsfrase"
-
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "brug midlertidige filer til at sende data til nøgleserverhjælpere"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/de.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/de.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/de.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/de.po Changed

@@ -7,19 +7,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-2.3.0\n"
+"Project-Id-Version: gnupg-2.4.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
-"PO-Revision-Date: 2022-04-25 15:41+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
+"PO-Revision-Date: 2023-05-30 13:46+0200\n"
 "Last-Translator: Werner Koch <wk@gnupg.org>\n"
-"Language-Team: German <de@li.org>\n"
+"Language-Team: German\n"
 "Language: de\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"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, 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,51 +30,51 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "_Abbrechen"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "_Ja"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "_Nein"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "Im Passwordmanager _speichern"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 "Möchten Sie das eingegebene Passwort wirklich auf dem Bildschirm sichtbar "
 "machen?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "Das Passwort sichtbar machen"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Das Passwort unsichtbar machen"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "FESTSTELLTASTE ist aktiviert"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "Vorschlag"
 
@@ -85,27 +85,27 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "Einen Vorschlag für ein gutes Passwort erzeugen."
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "(Leerzeichen sind nicht Bestandteil des Passwortes)"
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "Das Passwort ist nicht erlaubt"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Qualität:"
 
@@ -115,14 +115,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Die Qualität des Passwortes, welches 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:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -130,7 +130,7 @@
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -138,76 +138,80 @@
 "Bitte geben Sie Ihr Passwort ein, so daß der geheime Schlüssel benutzt "
 "werden kann."
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Passwort:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+msgid "Passphrases match."
+msgstr "Passwort stimmt."
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Nochmal:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Das Passwort ist zu lang!"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN!"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz!"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Falsche PIN!"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Falsches Passwort!"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "Hinweis: Anfrage vom Webbrowser."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "Hinweis: Anfrage von einem anderen Rechner."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Bitte geben Sie das Passwort noch einmal ein:"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -216,7 +220,7 @@
 "Bitte geben Sie das Passwort ein, um das importierte Objekt im %s System zu "
 "schützen."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
@@ -224,154 +228,149 @@
 "Dieser (Unter-)Schlüssel ist nicht mit einem Passwort geschützt.\n"
 "Bitte geben Sie ein neuse Passwort für den Export an."
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "keine passender Kartenschlüssel gefunden: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "Fehler beim Holen der Liste der Karten: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
-"Ein SSH Processs möchte folgenden Schlüssel verwenden:%%0A %s%%0A "
+"Ein SSH Prozess möchte folgenden Schlüssel verwenden:%%0A %s%%0A "
 "(%s)%%0AErlauben Sie dies?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Erlauben"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Verweigern"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr ""
 "Bitte geben Sie das Passwort für den SSH-Schlüssel%%0A %F%%0A (%c)%%0Aein."
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
-"Bitte geben Sie ein Passwort ein, um den empfangenen geheimen\n"
-"Schlüssel%%0A %s%%0A %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
-"schützen."
+"Bitte geben Sie ein Passwort ein, um den empfangenen geheimen Schlüssel"
+"%%0A %s%%0A %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu schützen."
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Bitte legen Sie die Karte mit der folgenden Seriennummer ein"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Rückstellcode"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Bitte die Bestätigungstaste des Tokens drücken."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Zur Eingabe die Tastatur des Kartenlesers verwenden."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Rückstellcode bitte wiederholen"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "PUK bitte wiederholen"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "PIN bitte wiederholen"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Rückstellcode wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Bitte geben Sie die PIN%s%s%s ein, um die Karte zu entsperren"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "Fehler beim Schreiben auf eine \"Pipe\": %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Neues Passwort eingeben"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "Sie haben kein Passwort eingegeben!%0AEine leeres Passwort ist nicht erlaubt."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -381,18 +380,18 @@
 "Bitte bestätigen Sie, daß sie auf den lokalen Schutz Ihres privaten\n"
 "Schlüssels verzichten."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Ja, ein Schutz ist nicht notwendig"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "Ein Passwort sollte mindestens %u Zeichen lang sein."
 msgstr1 "Ein Passwort sollte mindestens %u Zeichen lang sein."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -403,232 +402,236 @@
 msgstr1 ""
 "Ein Passwort sollte mindestens %u Sonderzeichen oder%%0AZiffern enthalten."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Ein Passwort sollte kein bekanntes Wort sein oder%%0Anach bekannten Regeln "
 "aufgebaut sein."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 "WARNUNG: Sie haben ein offensichtlich unsicheres%0APasswort eingegeben."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Dieses trotzdem benutzen"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Bitte geben Sie das Passwort ein,%0Aum Ihren Schlüssel zu schützen."
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
-msgstr "Bitte geben Sie das Passwort ein:"
+msgstr "Bitte geben Sie das neue Passwort ein:"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr "Optionen zum Start des Programms"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung der Diagnoseausgaben"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "Reduzierte Informationen"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|Benutze PGM als SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|Benutze PGM als tpm2daemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|Einige Kommandos über NAME annehmen"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "SSH Unterstützung einschalten"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "Verwende ALGO für SSH Fingerabdrücke"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "PuTTY Unterstützung einschalten"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+msgid "enable Win32-OpenSSH support"
+msgstr "Win32-OpenSSH Unterstützung einschalten"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
-msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
+msgstr "|N|Lösche unbenutzte Passwörter nach N Sekunden aus dem Cache"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|Lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
+msgstr "|N|Lösche unbenutzte SSH Passwörter nach N Sekunden aus dem Cache"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|Setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
+msgstr "|N|Lösche Passwörter nach N Sekunden aus dem Cache"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|Setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
+msgstr "|N|Lösche SSH Passwörter nach N Sekunden aus dem Cache"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
-msgstr "Benutze PINs im Cache nicht beim Signieren"
+msgstr "Benutze den Passwort Cache nicht beim Signieren"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "Erlaube ein \"preset\" der Passwörter"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Optionen für Passwort Regeln"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "Einhaltung der Passwort Regeln erzwingen"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|Setze die kleinste erlaubte Länge von Passwörtern auf N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|Verlange mindestens N Nicht-Buchstaben für ein neues Passwort"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|DATEI|Prüfe neue Passwörter gegen die Regeln in DATEI"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|Lasse das Passwort nach N Tagen verfallen"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "Verbiete die Wiedernutzung alter Passwörter."
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr "Optionen für das Pinentry"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr "Niemals das Pinentry benutzen"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "Aufrufer darf das Pinentry nicht ersetzen"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "Tastatur und Maus \"grabben\""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|Benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "Erlaube die Eingabe eines Passwortes über Emacs"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Gebrauch: @GPG_AGENT@ Optionen Kommando Argumente"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -636,141 +639,141 @@
 "Syntax: @GPG_AGENT@ Optionen Befehl Argumente\n"
 "Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "Versuche den Socket des laufenden %s zu übernehmen\n"
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, 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:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, 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:2755
+#: agent/gpg-agent.c:2876
 #, 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:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -778,11 +781,11 @@
 "@Optionen:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -790,8 +793,8 @@
 "Syntax: gpg-preset-passphrase Optionen KEYGRIP\n"
 "Pflege des Passwortpuffers\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -799,8 +802,8 @@
 "@Befehle:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -810,11 +813,11 @@
 "Optionen:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -822,16 +825,16 @@
 "Syntax: gpg-protect-tool Optionen Argumente\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bitte geben Sie das Passwort zum Entsperren des PKCS#12 Objekts ein."
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Bitte geben Sie das Passwort zum Schützen des neuen PKCS#12 Objekts ein."
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -839,7 +842,7 @@
 "Bitte geben Sie das Passwort ein, um das importierte Objekt im GnuPG System "
 "zu schützen."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -847,55 +850,57 @@
 "Die Eingabe des Passwortes bzw. der PIN\n"
 "wird benötigt, um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage des Passwortes: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr ""
 "Anweisung \"%s\" in `%s', Zeile %d\n"
 " ignoriert\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr ""
 "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Ungültiges Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger Wurzelzertifikate\n"
@@ -908,7 +913,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -918,11 +923,11 @@
 "\"%%0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja"
 "\"."
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Nein"
@@ -935,7 +940,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -947,22 +952,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Falsch"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Hinweis: Dieses Passwort wurde noch nie geändert/%0ABitte ändern Sie sie "
 "jetzt."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -971,15 +976,26 @@
 "Dieses Passwort wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
 "mehr geändert. Bitte ändern Sie sie jetzt."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Das Passwort ändern"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Ich werde sie später ändern"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Bitte legen Sie die Karte mit der folgenden Seriennummer ein"
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"Ein Prozess möchte folgenden Schlüssel verwenden:%%0A %s%%0A "
+"(%s)%%0AErlauben Sie dies?"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -988,11 +1004,11 @@
 "Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A %s%%0A %%C%%0Awirklich "
 "entfernen?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Schlüssel löschen"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1006,8 +1022,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-Schlüssel verwendet ein unsicheres (%u-Bit) Hashverfahren\n"
@@ -1018,7 +1034,7 @@
 msgstr ""
 "Ein %zu-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Prüfung der erstellten Signatur ist fehlgeschlagen: %s\n"
@@ -1028,7 +1044,7 @@
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "Public-Key-Verfahren %d (%s) wird nicht unterstützt\n"
@@ -1043,52 +1059,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "Schutzverfahrenshash %d (%s) wird nicht unterstützt\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "Fehler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung von Prozessen schlug fehl: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
@@ -1108,28 +1124,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Besitzrechte für %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, 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:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ja"
 
@@ -1184,8 +1200,8 @@
 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:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
@@ -1200,73 +1216,73 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "Unbekanntes Debug Flag '%s' wird ignoriert\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "Warte bis der Dirmngr bereit ist ... (%ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "Warte bis der Keyboxd bereit ist ... (%ds)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "Warte bis der gpg-agent bereit ist ... (%ds)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "Verbindung zum Dirmngr aufgebaut\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "Verbindung zum Keyboxd aufgebaut\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr "Verbindung zum gpg-agent aufgebaut\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "Kein aktiver %s - `%s' wird gestartet\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "Verbindung zum gpg-agent ist im eingeschränkten Modus.\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "Fehler beim Holen der Version von '%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "Der Server '%s' is älter als wir selbst (Version %s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "WARNUNG: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 "Hinweis: Wichtige Sicherheits-Fixes können in veralteten Servern fehlen.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Hinweis: Der Befehl \"%s\" startet diese Server neu.\n"
@@ -1339,7 +1355,7 @@
 msgstr "Verfahren: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "Nicht unterstütztes Verfahren: %s"
@@ -1414,39 +1430,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Wurzelzertifikat vertrauenswürdig"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "Keine CRL für das Zertifikat gefunden"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "Die vorhandene CRL ist zu alt"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP Prüfung der Zertifikate"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Mitgesendete Zertifikate"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Keine Einträge in der Audit-Datei"
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Unbekannte Operation"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent benutzbar"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr benutzbar"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Keine Hilfe für '%s' vorhanden."
@@ -1455,11 +1471,11 @@
 msgid "ignoring garbage line"
 msgstr "Zeile mit nicht identifizierten Zeichen wird ignoriert"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "keine"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
@@ -1494,136 +1510,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open fehlgeschlagen: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "eine übriggebliebene Sperrdatei wird entfernt (erzeugt von %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(Deadlock?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "Dateisperre %s konnte nicht eingerichtet werden: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, 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"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "Fehler beim Erstellen von `%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "Fehler beim Schließen von `%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-Hülle: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "Ungültige ASCII-Hülle"
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "ASCII-Hülle: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "Ungültige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "Unbekannter Header in der ASCII-Hülle: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextsignatur\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "Unerwartete ASCII-Hülle: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Ungültiges \"radix64\" Zeichen %02x übersprungen\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Prüfsumme\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Prüfsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1631,12 +1659,12 @@
 "\"quoted printable\" Zeichen in der ASCII-Hülle gefunden - möglicherweise\n"
 " war ein fehlerhafter Email-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " Nicht als Klartext darstellbar (%zu bytes: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1645,34 +1673,34 @@
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen maximal einmal verwenden\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "Ein \"notation\"-Wert darf das '='-Zeichen nicht verwenden\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
@@ -1686,8 +1714,8 @@
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Passwort ein: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is nicht konform mit dem %s Modus\n"
@@ -1697,13 +1725,13 @@
 msgid "error from TPM: %s\n"
 msgstr "Fehler vom TPM: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "Der Dirmngr läuft nicht für diese Session\n"
@@ -1715,198 +1743,204 @@
 "Die Schlüsselserveroption \"honor-keyserver-url\" ist im Tor-Modus nicht "
 "erlaubt.\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKD Abfrage wurde aus dem Cache bedient"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "Der Tor Dienst läuft nicht"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Der Tor Dienst ist falsch konfiguriert"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNS is falsch konfiguriert"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "HTTP Weiterleitung kann nicht akzeptiert werden"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "HTTP Weiterleitung wurde gesäubert"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "Der Server benutzt eine ungültiges Zertifikat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "Hinweis: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "nicht gesetzt"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Hr."
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Fr."
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+"Falls das Listing nicht korrekt erscheint, geben Sie bitte \"%s\" ein\n"
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Anrede (M=Hr., F=Fr. oder Leerzeichen): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1919,102 +1953,102 @@
 " fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
 " zu Rate.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Ändern des Schlüsselattributs für den: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 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:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2025,178 +2059,183 @@
 " PIN = '%s' Admin-PIN = '%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 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:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Hinweis: Dieses Kommando zerstört alle auf der Karte gespeicherten "
 "Schlüssel!\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Fortsetzen? (j/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "Fehler beim Einstellen der KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "Fehler beim Einstellen des UIF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "Ändern der Anrede des Kartenbesitzers"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "die PIN mit dem Rückstellcode wieder freigeben"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "alle Schlüssel und Daten löschen"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "Einrichten der KDF zur Authentifizierung (on/single/off)"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "Das Schlüsselattribut ändern"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "Das User Interaction Flag (UIF) ändern"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr "Auf die OpenPGP Anwendung umschalten"
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2260,9 +2299,9 @@
 msgid "subkey"
 msgstr "Unterschlüssel"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
@@ -2290,84 +2329,76 @@
 "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
-#, c-format
-msgid "error creating passphrase: %s\n"
-msgstr "Fehler beim Erzeugen des Passwortes: %s\n"
-
-#: g10/encrypt.c:339
+#: g10/encrypt.c:109
 #, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"Aufgrund des S2K-Modus kann ein symmetrisches ESK Paket nicht benutzt "
-"werden\n"
-
-#: g10/encrypt.c:370
-#, c-format
-msgid "using cipher %s.%s\n"
-msgstr "benutze Cipher %s.%s\n"
-
-#: g10/encrypt.c:382 g10/encrypt.c:874
-#, c-format
-msgid "'%s' already compressed\n"
-msgstr "`%s' ist bereits komprimiert\n"
-
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
-#, c-format
-msgid "WARNING: '%s' is an empty file\n"
-msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
+"WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
+"%s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
+#: g10/encrypt.c:136 g10/encrypt.c:683
 #, c-format
 msgid "cipher algorithm '%s' may not be used for encryption\n"
 msgstr ""
 "Das Verschlüsselungsverfahren %s darf nicht zum Verschlüsseln verwendet "
 "werden.\n"
 
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(benutze Option \"%s\" zum hinwegsetzen)\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
 #, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:181 sm/encrypt.c:771
 #, 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"
+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:721
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
-msgid "reading from '%s'\n"
-msgstr "Lesen von '%s'\n"
+msgid "error creating passphrase: %s\n"
+msgstr "Fehler beim Erzeugen des Passwortes: %s\n"
 
-#: g10/encrypt.c:777
+#: g10/encrypt.c:484
 #, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
-"%s (%d) verletzt die Empfängervoreinstellungen\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
+msgstr "Aufgrund des S2K-Modus kann ein SKESK Paket nicht benutzt werden\n"
 
-#: g10/encrypt.c:832 sm/encrypt.c:767
+#: g10/encrypt.c:514
 #, 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"
+msgid "using cipher %s.%s\n"
+msgstr "benutze Cipher %s.%s\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr "Operation abgebrochen wegen nicht erfüllter Compliance.\n"
+msgid "'%s' already compressed\n"
+msgstr "`%s' ist bereits komprimiert\n"
+
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
+#, 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:867
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "Lesen von '%s'\n"
+
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2376,19 +2407,12 @@
 "WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empfängervoreinstellungen.\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s verschlüsselt für: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2403,7 +2427,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2415,392 +2439,394 @@
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "Exportiere auch Signaturen die als nicht exportfähig markiert sind"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "Exportiere Attribute von User-IDs (i.A. Foto-IDs)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "Exportiere Widerrufsschlüssel die als \"sensitiv\" markiert sind"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "Unbrauchbare Teile des Schlüssel während des Exports entfernen"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "Während des Exports soviel wie möglich vom Schlüssel entfernen"
 
-#: g10/export.c:132
+#: g10/export.c:138
+msgid "export only revocation certificates"
+msgstr "Nur Schlüsselwiderruf-Zertifikate exportieren"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "Das GnuPG Datensicherungsformat für Schlüssel benutzen"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+msgid "export secret keys using the GnuPG format"
+msgstr "Geheime Schlüssel im GnuPG Format exportieren"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - übersprungen"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Schlüssel %s: Schlüsselmaterial ist auf einer Karte - übersprungen\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "Fehler beim Erstellen von `%s': %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "User-ID nicht gefunden"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "`%s' automatisch via %s geholt\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "Fehler beim automatischen holen von `%s' über `%s': %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Kein Fingerabdruck vorhanden"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, 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:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(Prüfe das Argument der Option '%s')\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Gültige Argumente für Option '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "Eine Signatur erzeugen"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "Eine Klartextsignatur erzeugen"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Signatur erzeugen"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "Schnell ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "Schnell eine neue User-ID anfügen"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "Schnell eine User-ID widerrufen"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "Schnell ein neues Ablaufdatum setzen"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "Schlüssel schnell signieren"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "Schlüssel schnell nur für diesen Rechner signieren"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
 msgstr "Schnell eine Schlüsselsignatur widerrufen"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "Signieren oder bearbeiten eines Schlüssels"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "Das Passwort ändern"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "Hashwerte für die Dateien ausgeben"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|Auch an NAME verschlüsseln"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|Email Alias festlegen"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "vor Überschreiben nachfragen"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr "Optionen für die Eingabe"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr "Optionen für die Ausgabe"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|DATEI|Ausgabe auf DATEI schreiben"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr "Optionen für den Schlüsselimport und -export"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse "
 "aufzufinden."
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "Schlüssel aus der Signatur importieren"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "Schlüssel mit in die Signatur packen"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr "Optionen für das Auflisten der Schlüssel"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
 msgstr "Optionen zur Auswahl der Schlüssel"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|Verschlüsseln für USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr "Optionen für die Verwendung in Scripts"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr "Weitere Optionen"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2809,7 +2835,7 @@
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2829,11 +2855,11 @@
 " --list-keys Namen Schlüssel anzeigen\n"
 " --fingerprint Namen \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Aufruf: @GPG@ Optionen Dateien (-h für Hilfe)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2843,7 +2869,7 @@
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2851,75 +2877,75 @@
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "Aufruf: %s Optionen %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2927,20 +2953,20 @@
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2948,479 +2974,472 @@
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "Richtlinien-URL mit den Signaturen anlisten"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "Standard Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "Benutzer-Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Auch Signaturen mit ungültigen Algorithmen anlisten"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+msgid "show preferences"
+msgstr "Voreinstellungen anzeigen"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Unbekannte TOFU Regel '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Ungültiger Subjekt-Name '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Ungültiges \"Herkunft\"-Argument '%s'\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Ungültige Filter-Option: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "Foto-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 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:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 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:3423
+#: g10/gpg.c:3441
 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:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, 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:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Ungültiges Argument für Option \"%.50s\"\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, 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:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3949
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "Das ausgewählte AEAD-Verfahren ist ungültig\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, 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:3984
+#: g10/gpg.c:4002
 #, 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:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:4012
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "ungültige private AEAD-Voreinstellungen\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "Ungültige \"Chunk\"-Größe; %d wird verwendet\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:4134
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "Das AEAD-Verfahren %s darf im %s Modus nicht verwendet werden.\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, 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:5342
+#: g10/gpg.c:5394
 #, 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:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@ -3433,7 +3452,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -3462,153 +3481,153 @@
 msgid "No help available for '%s'"
 msgstr "Keine Hilfe für '%s' vorhanden."
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "Importiere Signaturen, die als nicht exportfähig markiert sind"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "Beseitige Beschädigung durch den Schlüsselserver während des Imports"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "die \"Ownertrust\" Werte beim Import nicht löschen"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "ändern Sie die \"Trust\"-Datenbank nach dem Import nicht"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr "Bulk-Importmodus einschalten"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "Schlüssel beim Import anzeigen"
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "show key but do not actually import"
 msgstr "Schlüssel anzeigen aber nicht importieren"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "Nur Änderungen bereits existierender Schlüssel vornehmen"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "nach dem Import soviel wie möglich aus dem Schlüssel entfernen"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "Ignoriere Signaturen die keine Eigenbeglaubigungen sind"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "Import-Filter anwenden und Schlüssel direkt exportieren"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "Eingabedaten sind im GnuPG Datensicherungsformat für Schlüssel"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "Schlüssel beim Import reparieren"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schlüssel bislang bearbeitet\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " ignorierte PGP-2 Schlüssel: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " ignorierte neue Schlüssel: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " ohne User-ID: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importiert: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " unverändert: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " neue User-IDs: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " neue Unterschlüssel: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " neue Signaturen: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " gelesene geheime Schlüssel: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " geheime Schlüssel importiert: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " unveränderte geh. Schl.: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " nicht importiert: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " Signaturen bereinigt: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " User-IDs bereinigt: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3617,179 +3636,185 @@
 "WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
 "Verfahren für folgende User-ID:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\": Einstellungen des AEAD-Verfahrens %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " \"%s\": Einstellungen der Hashmethode %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
 "Verfahrenskombinationen zu vermeiden\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
 "ändern\n"
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schlüssel %s: Keine User-ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "Schlüssel %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "vom Import-Aufpasser zurückgewiesen"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+"Schlüssel %s: Der \"stub\" wurde durch einen realen Schlüssel ersetzt\n"
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3798,208 +3823,208 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, 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:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "Geheimer Schlüssel %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Schlüssel ist überholt"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Schlüssel wird nicht mehr benutzt"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Grund für Widerruf: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "Schlüssel %s: Doppelte Unterschlüssel entdeckt - zusammengeführt\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
@@ -4009,14 +4034,14 @@
 msgid "error allocating memory: %s\n"
 msgstr "Fehler beim Allozieren von Speicher: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@ -4024,44 +4049,44 @@
 "Die Signatur mit der nicht unterstützten Hashmethode (%d) kann nicht\n"
 "geprüft werden: %s.\n"
 
-#: g10/key-check.c:571
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr " (neu geordnete Signaturen folgen)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "Schlüssel %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "%d doppelte Signatur entfernt\n"
 msgstr1 "%d doppelte Signaturen entfernt\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
 msgstr1 "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d falsche Beglaubigung\n"
 msgstr1 "%d falsche Beglaubigungen\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "%d Signatur neu eingeordnet\n"
 msgstr1 "%d Signaturen neu eingeordnet\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -4070,45 +4095,45 @@
 "WARNUNG: Es wurden Fehler gefunden aber nur Eigenbeglaubigungen geprüft; um "
 "alle Beglaubigungen zu prüfen das Kommando '%s' verwenden.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "Die \"Keybox\" `%s' wurde erstellt\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "Schlüsselbund `%s' erstellt\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "Schlüsselblockhilfsmittel`%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "Widerruf"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "Eigenbeglaubigung"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4121,17 +4146,17 @@
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollständig\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4141,52 +4166,52 @@
 "Eine Tiefe größer 1 erlaubt dem zu signierenden Schlüssel\n"
 "Trust-Signatures für Sie zu machen.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Geben Sie bitte eine Domain ein, um die Signatur einzuschränken\n"
 "oder nur die Eingabetaste für keine Domain\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Überspringe User-ID \"%s\" da es keine textbasierte ID ist.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Beglaubigen ist nicht möglich.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "User-ID \"%s\" ist signierbar."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Wirklich signieren? (j/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4195,11 +4220,11 @@
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4208,13 +4233,13 @@
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Soll eine neue Beglaubigung als Ersatz für die abgelaufene erstellt werden? "
 "(J/n) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4223,44 +4248,44 @@
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur für diesen Rechner gültig.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %s lokal beglaubigt\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %s beglaubigt\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Dieser Schlüssel ist verfallen!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schlüssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4270,32 +4295,32 @@
 "wollen, wirklich der o.g. Person gehört?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Ich habe es überhaupt nicht überprüft.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Ich habe es flüchtig überprüft.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Ich habe es sehr sorgfältig überprüft.%s\n"
 
 # translated by wk
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4304,234 +4329,245 @@
 "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
 "Schlüssel \"%s\" (%s) beglaubigen wollen\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "WARNUNG: Die Signatur wird nicht als nicht-exportierbar markiert werden.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "WARNUNG: Die Signatur wird nicht als unwiderrufbar markiert werden.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Die Signatur wird als nicht-exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Die Signatur wird als unwiderrufbar markiert werden.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Ich habe diesen Schlüssel flüchtig überprüft.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Wirklich signieren? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- kein "
 "Passwort ist zu ändern.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "Schlüssel %s: Fehler beim Ändern des Passwortes: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "Fingerabdruck des Schlüssels anzeigen"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "\"Keygrip\" des Schlüssels anzeigen"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "Schlüssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "User-ID N auswählen"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "Unterschlüssel N auswählen"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "Signaturen prüfen"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "die ausgewählten User-IDs beglaubigen * für verwandte Befehle s.u."
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Signatur beglaubigen"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "die ausgewählten User-IDs unwiderrufbar beglaubigen"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzufügen"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "ausgewählte User-IDs entfernen"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "einen Unterschlüssel hinzufügen"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "der Smartcard einen Schlüssel hinzufügen"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "einen Schlüssel auf die Smartcard schieben"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr "Konvertiere einen Schlüssel in das TPM Format für den lokalen TPM"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "ausgewählte Unterschlüssel entfernen"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "Einen Widerrufschlüssel hinzufügen"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr "Einen ADSK hinzufügen"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (für Experten)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausführlich)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Setze die URL des bevorzugten Schlüsselservers für die ausgewählten User-IDs"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "Eine Notation für die ausgewählten User-IDs setzen"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "Das Passwort ändern"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "Den \"Ownertrust\" ändern"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "Ausgewählte User-ID widerrufen"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "Schlüssel anschalten"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "ausgewählte Foto-IDs anzeigen"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "unbrauchbare User-IDs verkleinern und unbrauchbare Signaturen aus dem "
 "Schlüssel entfernen"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "unbrauchbare User-IDs verkleinern und alle Signaturen aus dem Schlüssel "
 "entfernen"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Geheimer Unterschlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+"Hinweis: Die lokale Kopie des geheimen Schlüssels wird nur nach \"save\" "
+"gelöscht.\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4544,288 +4580,278 @@
 "Signaturen\n"
 " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Wirklich alle textbasierten User-IDs beglaubigen? (j/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Unbekannter Signaturtyp `%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Benutze den '%s' Befehl.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? (j/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Befehl benötigt einen Dateinamen als Argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Fehler beim Lesen der Sicherungskopie des Schlüssels von `%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? (j/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "\"Owner trust\" kann nicht gesetzt werden, wenn eine anwendereigene 'Trust'-"
 "Datenbank benutzt wird\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Setze die Liste der Voreinstellungen auf:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 "(j/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Änderungen speichern? (j/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "Fehler beim Löschen der Kopie des geheimen Schlüssels: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, 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"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Fehler beim Widerrufen der User-ID: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Fehler beim Setzen der Haupt-User-ID: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" ist kein Fingerabdruck\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Ungültige User-ID '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "Keine passende User-ID"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Nichts zu beglaubigen\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nicht von Ihnen signiert.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "Fehler beim Widerruf der Schlüsselsignatur: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' ist kein gültiges Ablaufdatum\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" ist kein gültiger Fingerabdruck\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "Unterschlüssel \"%s\" nicht gefunden\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Eigenschaften: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "Nutzung: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4833,18 +4859,18 @@
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "verfallen"
 
 # translated by wk
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4853,17 +4879,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, 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:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+"WARNUNG: Es sind keine Unterschlüssel zum Verschlüsseln mehr vorhanden.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4873,72 +4905,72 @@
 "könnte\n"
 " bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "%d Beglaubigung entfernt.\n"
 msgstr1 "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "User-ID \"%s\": %d Signatur entfernt\n"
 msgstr1 "User-ID \"%s\": %d Signaturen entfernt\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4948,287 +4980,301 @@
 " Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 " des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr "Geben Sie den Fingerprint des ADSK an: "
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, c-format
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "Haben Sie den Fingerprint des Unterschlüssels angegeben?\n"
+
+#: g10/keyedit.c:4915
+#, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Den Schlüssel \"%s\" gibt es bereits in diesem Schlüsselblock\n"
+
+#: g10/keyedit.c:5007
 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:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, 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:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "Ungültiges Argument für Option '%s'\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "Voreinstellung `%s' ist doppelt\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "zu viele Verschlüsselungeinstellungen\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "zu viele Komprimierungsvoreinstellungen\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "zu viele AEAD-Einstellungen\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5236,19 +5282,19 @@
 "WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
 "Digestlänge nicht verwenden\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Signieren"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Zertif."
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Verschl."
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Authentisierung"
 
@@ -5262,166 +5308,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsVvAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Mögliche Aktionen für diesen %s Schlüssel: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Derzeit erlaubte Vorgänge: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Umschalten der Signaturnutzbarkeit\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Umschalten der Verschlüsselungsnutzbarkeit\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Umschalten der Authentisierungsnutzbarkeit\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Beenden\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA und RSA%s\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA und Elgamal%s\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, c-format
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (nur signieren)%s\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, c-format
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (nur signieren)%s\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ECC (signieren, verschlüsseln)%s\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr " *standard*"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (nur signieren)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Vorhandener Schlüssel%s\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Vorhandener Schlüssel auf der Karte%s\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Geben Sie den \"Keygrip\" ein: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Kein gültiger \"Keygrip\" (40 Hex-Ziffern werden erwartet)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "Fehler beim Lesen von der Karte: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Karten-Seriennummer: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Vorhandene Schlüssel:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "gerundet auf %u Bit\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5437,7 +5483,7 @@
 " <n>m = Schlüssel verfällt nach n Monaten\n"
 " <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5453,38 +5499,38 @@
 " <n>m = Schlüssel verfällt nach n Monaten\n"
 " <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signatur verfällt am %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5492,11 +5538,11 @@
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5510,7 +5556,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5526,41 +5572,41 @@
 " \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, 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:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5571,11 +5617,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 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"
 
@@ -5590,31 +5636,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfAa"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5625,19 +5671,19 @@
 "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:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 "WARNUNG: Der angefragte v4 Schlüssel wurde durch einen v5 Schlüssel ersetzt\n"
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5648,64 +5694,64 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Fortsetzen? (J/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Trotzdem erzeugen? (j/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "wird trotzdem erzeugt\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, 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:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5714,7 +5760,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5722,7 +5768,7 @@
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5730,22 +5776,22 @@
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
@@ -5753,74 +5799,90 @@
 msgid "never "
 msgstr "niemals "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Eigenschaften: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Entscheidende Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Entscheidender bevorzugter Schlüsselserver"
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Entscheidender Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d korrekte Signatur\n"
 msgstr1 "%d korrekte Signaturen\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 "%d Beglaubigung aufgrund eines Fehlers nicht geprüft\n"
 msgstr1 "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 "WARNUNG: %lu Schlüssel übersprungen, da er zu groß ist\n"
 msgstr1 "WARNUNG: %lu Schlüssel übersprungen, da sie zu groß sind\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Schlüsselbund"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck ="
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck ="
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck ="
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Kartenseriennr. ="
 
@@ -5898,145 +5960,145 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "%d Schlüssel wird per %s aktualisiert\n"
 msgstr1 "%d Schlüssel werden per %s aktualisiert\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, 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:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "fordere Schlüssel %s von %s an\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "Kein Schlüsselserver bekannt\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "übersprungen \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sende Schlüssel %s auf %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "fordere Schlüssel von %s an\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr "%s.%s verschlüsselter Sitzungsschlüssel\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s verschlüsselte Daten\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d.%s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Das Passwort wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s, erzeugt %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschlüsselt mit %lu Passwörtern\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschlüsselt mit einem Passwort\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -6046,184 +6108,190 @@
 "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:771
+#: g10/mainproc.c:813
 #, 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:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "Entschlüsselungs-Fehler erzwungen!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "Operation abgebrochen wegen nicht erfüllter Compliance.\n"
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "Keine Signatur gefunden\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Signatur von \"%s\""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Signatur von \"%s\""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Signatur von \"%s\""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Signaturüberprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur vom %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, 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:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " Aussteller \"%s\"\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, 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:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "ungewiß "
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " alias \"%s\""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Signatur verfällt am %s.\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s Signatur, Hashmethode %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", Schlüsselverfahren "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, 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:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Signatur kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Signatur\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Signatur der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Signatur nach alter (PGP 2.x) Art\n"
@@ -6331,29 +6399,29 @@
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "Unbekannte Option '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
@@ -6408,7 +6476,7 @@
 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:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 msgid "Please enter the passphrase for decryption."
 msgstr "Bitte geben Sie das Passwort zur Entschlüsselung ein:"
 
@@ -6480,7 +6548,7 @@
 "%s"
 
 # translated by wk
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6495,72 +6563,72 @@
 "wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der Größe\n"
 "240x288 Pixel ist eine gute Wahl.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Dateiname mit JPEG für die Foto-ID eingeben: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "JPEG-Datei `%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Diese JPEG-Datei ist echt groß (%d Byte)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "`%s' ist keine JPEG-Datei\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ist dieses Bild richtig? (j/N) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "Ausführen von externen Programmen wird nicht unterstützt\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Diese Plattform benötigt temporäre Dateien zur Ausführung von externen\n"
 "Programmen\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "Ausführen der Shell `%s' nicht möglich: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "ungewöhnliches Ende eines externen Programms\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "Fehler beim Aufruf eines externen Programms: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr ""
 "WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "WARNUNG: Temporäres Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6568,7 +6636,7 @@
 "Ausführen von externen Programmen ist ausgeschaltet, da die Dateirechte "
 "nicht sicher sind\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
@@ -6649,40 +6717,40 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Es gibt keine Garantie, daß dieser Schlüssel wirklich dem angegebenen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Es gibt nur eine beschränkte Garantie, daß dieser Schlüssel wirklich dem "
 "angegebenen Besitzer gehört.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Dieser Schlüssel gehört wahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 "%s: Der Schlüssel ist gefälscht! Er wurde als nicht vertrauenswürdig "
 "markiert.\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6692,7 +6760,7 @@
 "markiert. Wenn Sie *wirklich* wissen, was Sie tun, können Sie die\n"
 "nächste Frage mit ja beantworten.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6702,85 +6770,85 @@
 "Genannten gehört. Wenn Sie *wirklich* wissen, was Sie tun,\n"
 "können Sie die nächste Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Diesen Schlüssel trotzdem benutzen? (j/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel ist u.U. widerrufen: Widerrufschlüssel ist nicht "
 "vorhanden\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "Prüfe User-ID: \"%s\"\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "Option '%s' angegeben aber Herausgeber \"%s\" paßt nicht\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "Herausgeber \"%s\" paßt zu keiner User-ID\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "Option '%s' angegeben aber keine passende User-ID gefunden\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel wurde vom vorgesehen Widerrufer widerrufen!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Das könnte bedeuten, daß die Signatur gefälscht ist.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "WARNUNG: Die User-ID des Schlüssels trägt keine vertrauenswürdige Signatur!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
@@ -6788,17 +6856,17 @@
 " Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
@@ -6807,7 +6875,7 @@
 "WARNUNG: Die User-ID des Schlüssels ist nicht durch hinreichend "
 "vertrauenswürdige Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6815,53 +6883,53 @@
 "WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 " Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: übersprungen: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "Verschlüsseln an '%s' ist nicht möglich\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "Option '%s' ohne gültige Standardschlüssel angegeben\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "Option '%s' ohne Verwendung der Option '%s' angegeben\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Sie haben keine User-ID angegeben (Sie können die Option \"-r\" verwenden).\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Derzeitige Empfänger:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6869,41 +6937,41 @@
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, 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:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@ -6942,7 +7010,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "Schlüssel \"%s\" ist zum Entschlüsseln im %s Modus nicht geeignet.\n"
@@ -7178,38 +7246,33 @@
 msgstr ""
 "%s-Schlüssel %s benötigt einen mindestens %zu Bit langen Hash (Hash ist %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr ""
 "Schlüssel \"%s\" darf zum Signieren im %s Modus nicht verwendet werden.\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr "Die Prüfung wird aufgrund der Option %s weiter durchgeführt\n"
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Botschaft\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "WARNUNG: Signaturunterschlüssel %s hat keine Rücksignatur\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "Siehe %s für weitere Infos\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "WARNUNG: Signaturunterschlüssel %s hat eine ungültige Rücksignatur\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
@@ -7217,14 +7280,14 @@
 msgstr1 ""
 "Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Signatur\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 "Öffentlicher Schlüssel %s ist %lu Tag jünger als die Signatur\n"
 msgstr1 "Öffentlicher Schlüssel %s ist %lu Tage jünger als die Signatur\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7237,7 +7300,7 @@
 "Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhrenproblem)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7249,55 +7312,55 @@
 "Schlüssel %s wurde %lu Tage in der Zukunft erzeugt (Zeitreise oder "
 "Uhrenproblem)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu groß). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7305,7 +7368,7 @@
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu groß). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7314,12 +7377,12 @@
 "WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
 "(zu groß). Verwende \"unerweiterte\".\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s Signatur von: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7327,12 +7390,12 @@
 "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
 "Empfängervoreinstellungen\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "signiere:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, c-format
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s Verschlüsselung wird verwendet\n"
@@ -7410,133 +7473,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "Datei `%s' konnte nicht gesperrt werden\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "'%s' kann nicht gesperrt werden\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu groß\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "kann auf `%s' nicht zugreifen: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ungültige trust-db erzeugt\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Hinweis: Die \"trustdb\" ist nicht schreibbar\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ungültige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anhängen: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fehler: Die Vertrauensdatenbank ist fehlerhaft\n"
@@ -8004,7 +8067,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
@@ -8034,7 +8097,7 @@
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8042,24 +8105,24 @@
 msgstr1 "%d Schlüssel bislang bearbeitet"
 
 # translated by wk
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 " (%d Validity Zähler gelöscht)\n"
 msgstr1 " (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8067,7 +8130,7 @@
 "Tiefe: %d gültig: %3d signiert: %3d Vertrauen: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8138,7 +8201,7 @@
 msgid "ultimate"
 msgstr " ultimativ "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8149,12 +8212,12 @@
 "Denken Sie daran, daß die Datei mit der Signatur (.sig oder .asc)\n"
 "als erste in der Kommandozeile stehen sollte.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "fd=%d kann nicht geöffnet werden: %s\n"
@@ -8169,19 +8232,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "Tip: Die Option '%s' nicht benutzen.\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "Debug Flags setzen"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "Alle Debug Flags setzen"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Aufruf: kbxutil Optionen Dateien (-h für Hilfe)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8192,16 +8255,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%sNummer&#x1f;: %s%%0ABesitzer&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Verbliebene Versuche: %d"
@@ -8230,10 +8293,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|Bitte geben Sie den PIN Unblocking Key (PUK) Ihrer PIV Karte ein"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -8253,69 +8316,69 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN hat ungültige Zeichen; es sind nur Ziffern erlaubt\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "der neue Schlüssel wird geschrieben\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "Der EC Schlüssel fehlt in der Antwort\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "Schlüsselerzeugung abgeschlossen (%d Sekunde)\n"
 msgstr1 "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, 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-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 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 "
@@ -8323,55 +8386,55 @@
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Bitte die PIN für den Standard-Schlüssel eingeben."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "Tip: Die PIN wurde noch nicht aktiviert."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "Die Nullpin wurde noch nicht geändert\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8379,7 +8442,7 @@
 "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8387,27 +8450,27 @@
 "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, 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:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
@@ -8415,44 +8478,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
-msgstr "%sNummer&#x1f;: %s%%0ABesitzer&#x1f;: %s%%0AAnzahl&#x1f;: %lu%s"
+msgstr "%sNummer&#x1f;: %s%%0ABesitzer&#x1f;: %s%%0AZähler&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "Die Standard PIN wird für %s benutzt\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Bitte entsperren Sie die Karte"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8460,20 +8523,20 @@
 msgstr0 "Noch %d Admin-PIN-Versuch, bis die Karte dauerhaft gesperrt ist\n"
 msgstr1 "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Bitte die PIN eingeben"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 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:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, 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"
@@ -8481,72 +8544,72 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Neuer Rückstellcode"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 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:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Bitte die PIN sowie die neue PIN eingeben"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "Nicht unterstützte Kurve\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, 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:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, 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:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8554,7 +8617,7 @@
 "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -8574,7 +8637,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
@@ -8618,11 +8681,11 @@
 msgid "deny the use of admin card commands"
 msgstr "Verweigere die Benutzung von \"Admin\"-Befehlen"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Gebrauch: @SCDAEMON@ Optionen (-h für Hilfe)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8630,328 +8693,328 @@
 "Syntax: @SCDAEMON@ Optionen Befehl Argumente\n"
 "Smartcard Daemon für @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr "Der Tor Dienst ist aktiv - Zugriff zum Netz ist eingeschränkt"
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "Durch Zertifikat angefordertes Gültigkeitsmodell: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "Kette"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "Schale"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "Das Herausgeberzertifikat ist nicht für eine CA gekennzeichnet"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "entscheidende Richtlinie ohne konfigurierte Richtlinien"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "Die Zertifikatsrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "Kann den Fingerprint nicht ermitteln\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Herausgeber: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccess kann nicht geholt werden: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Der Herausgeber wird im Cache des Dirmngr gesucht\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "Anzahl der übereinstimmenden Zertifikate: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, 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:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "Kann keinen KeyDB Handler bereitstellen\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "Das Zertifikat wurde widerrufen"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "Der Status des Zertifikats ist nicht bekannt"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Die CRL konnte nicht geprüft werden: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "Das Wurzelzertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "Das Zwischenzertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "Das Wurzelzertifikat ist abgelaufen"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "Das Zwischenzertifikat ist abgelaufen"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "Notwendige Zertifikatattribute fehlen: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "Zertifikat mit unzulässiger Gültigkeit"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "Die Signatur wurde nicht in der Gültigkeitszeit des Zertifikat erzeugt"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 "Das Zertifikat wurde nicht während der Gültigkeitszeit des Herausgebers "
 "erzeugt"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 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:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( Signatur erzeugt am "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " ( Zertifikat erzeugt am "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " ( Zertifikat gültig von "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( Herausgeber gültig von "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingerprint=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "Herausgeberzertifikat nicht gefunden"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "Das Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
 "nochmal"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, 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:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "Das Zertifikat ist korrekt\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Das Zwischenzertifikat ist korrekt\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "Das Wurzelzertifikat ist korrekt\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "Umgeschaltet auf das Kettenmodell"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "Benutztes Gültigkeitsmodell: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "Nicht genügend Speicher\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "keine"
 
@@ -8971,7 +9034,7 @@
 msgid "Error - invalid DN"
 msgstr "Fehler - Ungültiger DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8987,45 +9050,45 @@
 "gültig von %s bis %s\n"
 "zu entsperren.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, 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:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "schaue nach einem anderen Zertifikat\n"
@@ -9244,19 +9307,19 @@
 msgid "resource problem: out of core\n"
 msgstr "Resourcenproblem: Nicht genügend Hauptspeicher\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(Dies ist der RC-2 Algorithmus)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(dies ist wahrscheinlich keine verschlüsselte Botschaft)\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # kw
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "verschlüsselt an %s Schlüssel, ID %s\n"
@@ -9266,7 +9329,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "Zertifikat `%s' nicht gefunden: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "Fehler beim Sperren der Keybox: %s\n"
@@ -9291,123 +9354,123 @@
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommando an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 Format erzeugen"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passwörter"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "Zertifikatsrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Aufruf: @GPGSM@ Optionen Dateien (-h für Hilfe)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9416,27 +9479,27 @@
 "Syntax: @GPGSM@ Optionen Dateien\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@ -9456,7 +9519,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
@@ -9466,47 +9529,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "Der Keyboxd läuft nicht für diese Session\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "Fehler beim Öffnen der Schlüsseldatenbank: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "Problem bei der Suche nach vorhandenem Zertifikat: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "Fehler bei der Suche nach einer schreibbaren KeyDB: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "Fehler beim Speichern des Zertifikats: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "Fehler beim Speichern der Flags: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Fehler - "
 
@@ -9544,7 +9607,7 @@
 "\n"
 "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9565,44 +9628,44 @@
 "zu erzeugen. Bitte beachten Sie, daß dies KEINE qualifizierte\n"
 "Signatur erzeugen wird."
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "Hashverfahren %d (%s) wird für Unterzeichner %d nicht unterstützt; %s wird "
 "benutzt\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "Benutztes Hashverfahren für Unterzeichner %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s Signatur mittels %s Schlüssel %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Signatur erzeugt am "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "Datum nicht vorhanden"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "Verfahren:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9610,17 +9673,17 @@
 "Ungültige Signatur: Botschaft entspricht nicht dem Prüfwert in der "
 "Botschaft.\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Korrekte Signatur von"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " alias"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dies ist eine qualifizierte Signatur.\n"
@@ -9651,328 +9714,323 @@
 msgstr ""
 "Sperre für den Zertifikatzwischenspeicher kann nicht freigegeben werden: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "%u Zertifikate werden aus dem Zertifikatzwischenspeicher entfernt\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "Zertifikat `%s' kann nicht zerlegt werden: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "Zertifikat `%s' ist bereits im Zwischenspeicher\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "Vertrauenswürdiges Zertifikat `%s' wurde geladen\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "Zertifikat `%s' wurde geladen\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " SHA1 Fingerabdruck=%s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " Issuer ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " Subjekt ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "Fehler beim Laden des Zertifikats `%s': %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr " dauerhaft geladene Zertifikate: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " zwischengespeicherte Zertifikate: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " vertrauenswürdige Zertifikate: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "Zertifikat ist bereits im Zwischenspeicher\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "Zertifikat wurde zwischengespeichert\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "Fehler beim Zwischenspeichern des Zertifikats: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ungültiger SHA1 Fingerabdruck `%s'\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "Fehler beim Holen des Zertifikats mittels Seriennummer: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "Fehler beim Holen des Zertifikats mittels Subject: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "Fehler beim Holen des \"authorityKeyIdentifier\": %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "Das Verzeichnis `%s' wird erzeugt\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "Fehler beim Erzeugen des Verzeichnis '%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "Das DB-Verzeichnis `%s' wird ignoriert\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "Fehler beim Lesen des Verzeichnis `%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "Die Zwischenspeicherdatei `%s' wird entfernt\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "Die Datei `%s' wird nicht gelöscht\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "Fehler beim Schließen der Zwischenspeicherdatei: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "Neue Zwischenspeicherverzeichnisdatei `%s' wurde erzeugt\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, 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:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "Alte Version des Zwischenspeicherverzeichnisses - räume auf\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "Alte Version des Zwischenspeicherverzeichnisses - gebe auf\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, 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:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "Ungültige Zeile in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Doppelter Eintrag in `%s', Zeile %u festgestellt\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, 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:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "Ungültiger Issuer Hashwert in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "Kein Issuer DN in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "Ungültiger Zeitstempel in `%s', Zeile %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "Id der Zwischenspeicherverzeichnisdatei wurden Fehler erkannt\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, 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:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "Fehler beim Schließen von `%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "Fehler beim Umbenennen von `%s` nach `%s': %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "Hashwert von `%s' kann nicht gebildet werden: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "Fehler beim Vorbereiten des MD5 Hashkontext: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "Fehler beim Hashen von `%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "Ungültig formatierte Prüfsumme für `%s'\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, 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:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "Die Zwischenspeicherdatei `%s' wird geöffnet\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "Fehler beim Öffnen der Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, 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:1174
+#: dirmngr/crlcache.c:1181
 #, 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:1176
+#: dirmngr/crlcache.c:1183
 #, 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:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, 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:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9981,205 +10039,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:1316
+#: dirmngr/crlcache.c:1323
 #, 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:1325
+#: dirmngr/crlcache.c:1332
 #, 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:1336
+#: dirmngr/crlcache.c:1343
 #, 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:1348
+#: dirmngr/crlcache.c:1355
 #, 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:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, 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:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "Ungültige S-Expression von Libksba erhalten\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "Konvertierung der S-Expression fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "Ungültige Hashmethode `%s'\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "Erzeugen der S-Expression fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, 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:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "Fehler beim Holen eines CRL Items: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, 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:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "CRL Herausgeberzertifikat wird über \"authorityKeyIdentifier\" geholt\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "Signaturprüfung der CRL ist fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "Die alte temporäre Zwischenspeicherdatei `%s' wurde entfernt\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, 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:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "Unbekannte kritische CRL Erweiterung %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "Fehler beim Lesen einer CRL Erweiterung: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "Zwischenspeicherdatei `%s' wird erzeugt\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "Problem beim Umbenennen von `%s' nach `%s': %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10188,70 +10246,70 @@
 "Update der Zwischenspeicherverzeichnisdatei fehlgeschlagen - "
 "Zwischenspeichereintrag wird mit dem nächste Programmstart verloren gehen\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Anfang CRL Ausgabe (geholt via %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 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:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " FEHLER: Die CRL wird nicht benutzt\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 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:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNUNG: Ungültige Länge eines Zwischenspeicherdatensatzes\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "Problem beim Lesen eines Zwischenspeicherdatensatzes: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "Problem beim Lesen eines Zwischenspeicherschlüssels: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, 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:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Ende CRL Ausgabe\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch über den DP fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert über den DP fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert über den Issuer fehlgeschlagen: %s\n"
@@ -10265,23 +10323,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "CRL Zugriff ist im Tor Modus nicht möglich"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "CRL Zugriff nicht möglich da %s abgeschaltet ist\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "Fehler beim Holen von `%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "Fehler beim Initialisieren des \"reader\" Objekts: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "Zertifikatsuche ist nicht möglich da %s abgeschaltet ist\n"
@@ -10428,135 +10486,135 @@
 msgid "looking up '%s'\n"
 msgstr "Auffinden von `%s'\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|Hole eine CRL von dieser URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "Den Dirmngr herunterfahren"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "Den Zwischenspeicher löschen"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "Online Softwareversionstest erlauben"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 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:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr "Netzwerkbezogene Optionen"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "Netzzugriff nur über Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration für HTTP Server"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "Sperre die Benutzung von HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "Übergehe HTTP CRL Distribution Points"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|Leite alle HTTP Anfragen über URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "Benutze die HTTP Proxy Einstellung des Systems"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr "Konfiguration für OpenPGP Server"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "Benutze Schlüsselserver unter der URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 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:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr "Konfiguration für X.509 Server"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "Sperre die Benutzung von LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "Übergehe LDAP CRL Distribution Points"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|Benutze HOST für LDAP Anfragen"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|Setze die LDAP Zeitüberschreitung auf N Sekunden"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "OCSP Anfragen erlauben"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "Laden von abgelaufenen CRLs erzwingen"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10566,11 +10624,11 @@
 "(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
 "und Optionen)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Gebrauch: @DIRMNGR@ Optionen"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10578,105 +10636,105 @@
 "Syntax: @DIRMNGR@ Optionen Kommando Argumente\n"
 "Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "Gültige Debugebenen sind: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "Aufruf: %s Optionen "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: Lesefehler: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, 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:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "Herunterfahren wurde erzwungen\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "Signal %d empfangen - keine Aktion definiert\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "Fehler beim Zugreifen auf `%s': HTTP Status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL `%s' nach `%s' umgeleitet (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "zu viele verschachtelte Umleitungen\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "\"Redirection\" geändert auf '%s'\n"
@@ -10731,32 +10789,32 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc() fehlgeschlagen: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "`%s' ist kein LDAP URL\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "`%s' ist ein ungültiger LDAP URL\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search erreichte die Größengrenze des Servers\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: Passwort ohne Benutzer\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr "%s:%u: Unbekanntes Flag '%s' wird nicht beachtet\n"
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: Zeile wird übersprungen\n"
@@ -10845,162 +10903,162 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "Nicht durch voreingestelltes OCSP \"Signer-Zertifikat\" signiert"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "malloc() fehlgeschlagen: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "Fehler beim Holen der Responder-ID: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "Kein benutzbares Zertifikat zur Überprüfung der OCSP Antwort gefunden\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Herausgeberzertifikat nicht gefunden: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "Aufrufer gab das Ziel Zertifikat nicht zurück\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Aufrufer gab das Issuer Zertifikat nicht zurück\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "Fehler beim Bereitstellen eines OCSP Kontext: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "Kein voreingestellter OCSP Responder definiert\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "Kein voreingestellter OCSP \"Signer\" definiert\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "Der voreingestellte OCSP Responder `%s' wird benutzt\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "Der OCSP Responder `%s' wird benutzt\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "Fehler beim Holen des OCSP Status für das Zielzertifikat: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "Zertifikatstatus ist: %s (this=%s next=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "Gut"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "Zertifikat wurde widerrufen am: %s wegen: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP Responder gab einen Status in der Zukunft zurück\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP Responder gab einen nicht aktuellen Status zurück\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP Responder gab einen zu alten Status zurück\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "Seriennummer fehlt in der Cert-ID"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "Fehler beim Senden der Daten: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d überschritten\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "Fehler beim Initialisieren des Servers: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept Problem: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@ -11011,85 +11069,85 @@
 msgstr ""
 "Herausgeberzertifikat akzeptiert obgleich nicht für eine CA gekennzeichnet"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "CRL Überprüfung ist zu tief geschachtelt\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "keine Prüfung der CRL für"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "Prüfen der CRL für"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr ""
 "Prüfung der Vertrauenswürdigkeit des Wurzelzertifikats fehlgeschlagen: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "Der Zertifikatkette ist gültig\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "Reduzierte Informationen"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "Druckdaten hexkodiert ausgeben"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "Dekodiere empfangene Datenzeilen"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "Mit dem Dirmngr verbinden"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr "Mit dem Keyboxd verbinden"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|Verbinde mit dem Assuan-Socket NAME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|Verbinde mit dem Assuan-Server an Adresse ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "Starten des auf der Kommandozeile angegebenen Assuan-Server"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "Den \"extended connect\"-Modus nicht nutzen"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|DATEI|Beim Starten Kommandos aus DATEI lesen"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "Nach dem Starten \"/subst\" ausführen"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Aufruf: @GPG@-connect-agent Optionen (-h für Hilfe)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11097,48 +11155,48 @@
 "Syntax: @GPG@-connect-agent Optionen\n"
 "Mit einem laufenden Agenten verbinden und Befehle senden\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "Option \"%s\" wird wegen \"%s\" nicht beachtet\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "Empfangen der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "Zeile zu lang - übersprungen\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unbekannter Befehl `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "Senden der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "Der Keyboxd läuft nicht für diese Session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
@@ -11198,12 +11256,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "Fehler beim Schließen von '%s'\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "Fehler beim Hashen von '%s'\n"
@@ -11308,34 +11366,34 @@
 "Syntax: gpg-check-pattern optionen Musterdatei\n"
 "Das von stdin gelesene Passwort gegen die Musterdatei prüfen\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Hinweis: Schlüssel %s ist bereits auf der Karte gespeichert!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Vorhandenen Schlüssel %s ersetzen? (j/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s Karte Nr. %s erkannt\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 "User Interaction Flag ist auf \"%s\" gesetzt - Änderung nicht möglich\n"
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11344,47 +11402,64 @@
 "WARNUNG: Das Setzen des User Interaction Flags auf \"%s\" kann\n"
 " nur durch ein \"factory-reset\" rückgängig gemacht werden!\n"
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Bitte \"uif --yes %d %s\" benutzen\n"
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "Gegen die Karte authentifizieren"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "Ein Reset an den SCdaemon senden"
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "Einrichten der KDF zur Authentifizierung"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "Ein privates Datenobjekt ändern"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "Ein Zertifikat aus einem Datenobjekt lesen"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "Ein Zertifikat in einem Datenobjekt speichern"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "Privaten Schlüssel in einem Datenobjekt speichern"
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Verwaltungskommandos für Yubikeys"
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "Verwaltung der Kommandohistorie"
 
+#~ msgid "continuing verification anyway due to option %s\n"
+#~ msgstr "Die Prüfung wird aufgrund der Option %s weiter durchgeführt\n"
+
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "Das ausgewählte AEAD-Verfahren ist ungültig\n"
+
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "ungültige private AEAD-Voreinstellungen\n"
+
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "Das AEAD-Verfahren %s darf im %s Modus nicht verwendet werden.\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
+#~ "verletzt die Empfängervoreinstellungen\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
 
@@ -12333,9 +12408,6 @@
 #~ msgstr ""
 #~ "Umschalten zwischen dem Auflisten geheimer und öffentlicher Schlüssel"
 
-#~ msgid "Passphrase"
-#~ msgstr "Passwort"
-
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "verwende temporäre Dateien, um Daten an die Schlüsselserverhilfsprogramme "

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/el.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/el.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/el.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/el.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
@@ -29,52 +29,52 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "μη έγκυρη φράση κλειδί"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,28 +85,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "η φράση κλειδί είναι πολύ μεγάλη\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -116,273 +116,274 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "κακή φράση κλειδί"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "κακή φράση κλειδί"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "η γραμμή είναι πολύ μεγάλη\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "η φράση κλειδί είναι πολύ μεγάλη\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "κακό MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "κακή φράση κλειδί"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "δε βρέθηκε εγγράψιμη μυστική κλειδοθήκη: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Επαναλάβετε τη φράση κλειδί: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Επαναλάβετε τη φράση κλειδί: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Επαναλάβετε τη φράση κλειδί: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Πληκτρολογήστε τη φράση κλειδί\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -390,7 +391,7 @@
 msgstr0 "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
 msgstr1 "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -398,390 +399,396 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Χρειάζεστε μια Φράση κλειδί για να προστατεύσετε το μυστικό κλειδί.\n"
 "\n"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "αναλυτικά"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "ήσυχη έξοδος"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|ΟΝΟΜΑ|καθορισμός του σετ χαρακτήρων τερματικού σε ΟΝΟΜΑ"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "δεν υποστηρίζεται"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "δεν υποστηρίζεται"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "δεν υποστηρίζεται"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|χρήση της κατάστασης φράσης κλειδί N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "χρήση του gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Αναφέρετε τα προβλήματα στο <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "αδυναμία δημιουργίας του %s: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
 
-#: agent/gpg-agent.c:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: κατάλογος δημιουργήθηκε\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου: %s\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: παραλείφθηκε: %s\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -791,19 +798,19 @@
 "Επιλογές:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -811,8 +818,8 @@
 "@Εντολές:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -822,86 +829,88 @@
 "Επιλογές:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, fuzzy
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Ακύρωση"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -914,19 +923,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ναι|ναί"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -939,7 +948,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -949,48 +958,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
 "%%0A?"
 msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "ενεργοποιεί ένα κλειδί"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1001,8 +1019,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1012,7 +1030,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
@@ -1022,7 +1040,7 @@
 msgid "secret key parts are not available\n"
 msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1040,52 +1058,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
@@ -1106,28 +1124,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "αδυναμία απενεργοποίησης των core dump: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ναι|ναί"
 
@@ -1182,8 +1200,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
@@ -1198,74 +1216,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1349,7 +1367,7 @@
 msgstr "θωράκιση: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1433,44 +1451,44 @@
 msgid "Root certificate trustworthy"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "άγνωστη έκδοση"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
@@ -1480,12 +1498,12 @@
 msgid "ignoring garbage line"
 msgstr "σφάλμα στη γραμμή trailer\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "άγνωστο"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "μη έγκυρος radix64 χαρακτήρας %02x παράβλεψη\n"
@@ -1520,136 +1538,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "το δημόσιο κλειδί %08lX δεν βρέθηκε: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "θωράκιση: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "μη έγκυρη επικεφαλίδα θωράκισης: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "επικεφαλίδα θωράκισης: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "μη έγκυρη επικεφαλίδα clearsig\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "επικεφαλίδα θωράκισης: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "φωλιασμένες μη κρυπτογραφημένες υπογραφές\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "μη αναμενόμενη θωράκιση:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "μη έγκυρη dash escaped γραμμή: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "μη έγκυρος radix64 χαρακτήρας %02x παράβλεψη\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "πρόωρο τέλος αρχείου (απουσία CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "πρόωρο τέλος αρχείου (εντός CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "λάθος μορφή CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "σφάλμα CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "πρόωρο τέλος αρχείου (στο Τrailer)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "σφάλμα στη γραμμή trailer\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "μη έγκυρη θωράκιση: η γραμμή είναι πάνω από %d χαρακτήρες\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1657,13 +1688,13 @@
 "εκτυπώσιμος, σε εισαγωγικά, χαρακτήρας στη θωράκιση - ίσως έγινε χρήση "
 "προβληματικού MTA\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "μη αναγνώσιμο"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1672,27 +1703,27 @@
 "ένα όνομα σημείωσης μπορεί να περιέχει μόνο εκτυπώσιμους χαρακτήρες και κενά "
 "και να λήγει με ένα '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "το όνομα σημείωσης χρήστη πρέπει να περιέχει το '@' χαρακτήρα\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "το όνομα σημείωσης χρήστη πρέπει να περιέχει το '@' χαρακτήρα\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "η τιμή σημείωσης πρέπει να μη χρησιμοποιεί χαρακτήρες control\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "το όνομα σημείωσης χρήστη πρέπει να περιέχει το '@' χαρακτήρα\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1702,7 +1733,7 @@
 "ένα όνομα σημείωσης μπορεί να περιέχει μόνο εκτυπώσιμους χαρακτήρες και κενά "
 "και να λήγει με ένα '='\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: βρέθηκαν μη έγκυρα δεδομένα σημείωσης\n"
@@ -1716,8 +1747,8 @@
 msgid "Enter passphrase: "
 msgstr "Πληκτρολογήστε τη φράση κλειδί: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1728,13 +1759,13 @@
 msgid "error from TPM: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "πρόβλημα με τον agent: agent επιστρέφει 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
@@ -1745,209 +1776,214 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "θωράκιση: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "το μυστικό κλειδί δεν είναι διαθέσιμο"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Η επιλογή σας; "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "μη επεξεργασμένο"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "κανένα αντίστιχο δημόσιο κλειδί: %s\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "αναωεωμένες επιλογές"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1955,102 +1991,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (για υπογραφή μόνο)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA και ElGamal (προκαθορισμένο)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Μη έγκυρη επιλογή.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2058,197 +2094,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Σίγουρα να υπογραφεί; "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "τερματισμός αυτού του μενού"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "απεικόνιση αυτής της βοήθειας"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "αλλαγή της ημερομηνίας λήξης"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Μη έγκυρη εντολή (δοκιμάστε \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output δεν λειτουργεί για αυτή την εντολή\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2310,9 +2351,9 @@
 msgid "subkey"
 msgstr "ΔημοσΚλειδί:"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
@@ -2338,83 +2379,78 @@
 msgstr ""
 "χρησιμοποιείστε πρώτα την επιλογή \"--delete-secret-key\" για διαγραφή του.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
+"επιλογές του παραλήπτη\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
+
+#: g10/encrypt.c:181 sm/encrypt.c:771
+#, fuzzy, c-format
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
+
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "αδυναμία χρήσης ενός συμμετρικού πακέτου ESK λόγω της κατάστασης S2K\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "χρήση του κρυπταλγόριθμου: %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
-
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "απαγορεύετε η χρήση του αλγόριθμου περίληψης \"%s\" στην κατάσταση %s\n"
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "ανάγνωση από `%s'\n"
 
-#: g10/encrypt.c:777
-#, fuzzy, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
-"επιλογές του παραλήπτη\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, fuzzy, c-format
-msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
-
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2423,20 +2459,13 @@
 "ο εξαναγκασμός χρήσης του αλγορίθμου συμπίεσης %s (%d) παραβιάζει τις\n"
 "επιλογές του παραλήπτη\n"
 
-#: g10/encrypt.c:1071
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
-"επιλογές του παραλήπτη\n"
-
-#: g10/encrypt.c:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s κρυπτογραφήθηκε για: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2453,7 +2482,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2466,7 +2495,7 @@
 msgid "problem handling encrypted packet\n"
 msgstr "πρόβλημα στο χειρισμό κρυπτογραφημένου πακέτου\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
@@ -2474,423 +2503,427 @@
 "Η υπογραφή θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
 "\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "δε βρέθηκαν κλειδιά ανάκλησης για το `%s'\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "μη χρησιμοποιήσιμο μυστικό κλειδί"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: παραλείφθηκε: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "εγγραφή στο `%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "κλειδί %08lX: κλειδί τύπου PGP 2.x - παραλείφθηκε\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "User id δεν βρέθηκε"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "χρήση του δευτερεύοντος κλειδιού %08lX αντί του πρωτεύοντος %08lX\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|αρχείο|δημιουργία μιας μη κρυπτογραφημένης υπογραφής"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "κρυπτογράφηση δεδομένων"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "κρυπτογράφηση με χρήση μόνο συμμετρικών αλγορίθμων"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "αποκρυπτογράφηση δεδομένων (προκαθορισμένο)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "επαλήθευση μιας υπογραφής"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "απεικόνιση της λίστας κλειδιών"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "απεικόνιση της λίστας κλειδιών και υπογραφών"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "έλεγχος υπογραφής κλειδιού"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "απεικόνιση της λίστας κλειδιών και αποτυπωμάτων (fingerprints)"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "αφαίρεση των κλειδιών από τη μυστική κλειδοθήκη"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "υπογραφή ενός κλειδιού"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "υπογραφή ενός κλειδιού τοπικά"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "υπογραφή ενός κλειδιού"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "υπογραφή ενός κλειδιού τοπικά"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "υπογραφή ή επεξεργασία ενός κλειδιού"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "εξαγωγή κλειδιών"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "εισαγωγή/συγχώνευση κλειδιών"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|αλγόρ αρχεία| απεικόνιση περιλήψεων των μηνυμάτων"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "να μη γίνει καμμία αλλαγή"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "ερώτηση πριν την επικάλυψη"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "δημιουργία ascii θωρακισμένης εξόδου"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "χρήση κανονικής κατάστασης κειμένου"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|καθορισμός επιπέδου συμπίεσης N (0 απενεργοποιεί)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "έλεγχος υπογραφής κλειδιού"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "χρήση αυτής της ταυτότητας (user id) για υπογραφή ή αποκρυπτογράφηση"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2898,7 +2931,7 @@
 "@\n"
 "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2928,13 +2961,13 @@
 " --list-keys ονόματα απεικόνιση κλειδιών\n"
 " --fingerprint ονόματα απεικόνιση αποτυπωμάτων (fingerprints)\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, fuzzy
 #| msgid "Usage: gpg options files (-h for help)"
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2949,7 +2982,7 @@
 "υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
 "η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2957,578 +2990,572 @@
 "\n"
 "Υποστηριζόμενοι αλγόριθμοι:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "ΔημοσΚλειδί:"
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Κρυπταλγόριθμος: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Συμπίεση: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "χρήση: gpg επιλογές "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "δεν βρέθηκε το σύμβολο = στον ορισμό της ομάδας \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέρετε το κλειδί"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "ορισμός απεικόνισης επιλογών"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Μη έγκυρη διεύθυνση Email\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "αδυναμία ορισμού του exec-path σε %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το πρόγραμμα ίσως δημιουργήσει αρχείο core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "το %s δεν επιτρέπεται με το %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "ο επιλεγμένος αλγόριθμος περίληψης για πιστοποίηση\n"
 "δεν είναι έγκυρος\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed πρέπει να είναι μεγαλύτερα από 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed πρέπει να είναι μεγαλύτερα από 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "μη έγκυρη κατάσταση S2K; πρέπει να είναι 0, 1 ή 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "μη έγκυρες προεπιλογές\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου περίληψης\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου συμπίεσης\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "μη έγκυρο μέγεθος κλειδιού, χρήση %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "απαγορεύετε η χρήση του αλγόριθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν παραλήπτες (-r) χώρις χρήση κρυπτογράφησης\n"
 "δημοσίου κλειδιού\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver λήψη απέτυχε: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver αναζήτηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver ανανέωση απέτυχε: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "αποθωράκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Μπορείτε τώρα να εισαγάγετε το μήνυμα σας ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "το URL πολιτικής πιστοποιητικού που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
@@ -3542,7 +3569,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "ορισμός των συγκρούσεων ώρας (timestamp) μόνο σαν προειδοποίηση"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|εγγραφή των πληροφοριών κατάστασης στο FD"
 
@@ -3573,339 +3600,344 @@
 msgid "No help available for '%s'"
 msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "δεν υποστηρίζεται"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "μη χρησιμοποιήσιμο μυστικό κλειδί"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "παράλειψη τμήματος του τύπου %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Συνολικός αριθμός που επεξεργάστηκαν: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " νέα κλειδιά που παραλείφθηκαν: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " νέα κλειδιά που παραλείφθηκαν: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " χωρίς user ID: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " εισαχθέντα: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " αμετάβλητα: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " νέα user ID: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " νέα υποκλειδιά: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " νέες υπογραφές: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " νέες ανακλήσεις κλειδιών: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " αναγνωσμένα μυστικά κλειδιά: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " εισαχθέντα μυστικά κλειδιά: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " αμετάβλητα μυστικά κλειδιά: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " μη εισαχθέντα: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " νέες υπογραφές: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " αναγνωσμένα μυστικά κλειδιά: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "παραλείφθηκε `%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "κλειδί %08lX: επιδιόρθωση φθαρμένου υποκλειδιού HKP\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "κλειδί %08lX: δεκτό μη ιδιο-υπογεγραμμένο user ID '%s'\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "κλειδί %08lX: δεν έχει έγκυρα user ID\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "αυτό μπορεί να συνέβει από μια απούσα ιδιοϋπογραφή\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί που δε βρέθηκε: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "κλειδί %08lX: νέο κλειδί - παραλείφθηκε\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "δεν βρεθηκε εγγράψιμη κλειδοθήκη: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "κλειδί %08lX: το δημόσιο κλειδί \"%s\" έχει εισαχθεί\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "κλειδί %08lX: δεν ταιριάζει με το αντίγραφο μας\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέο user ID\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέα υπογραφή\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέο υποκλειδί\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα υποκλειδιά\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "κλειδί %08lX: \"%s\" αμετάβλητο\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί εισήχθηκε\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3914,207 +3946,207 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί με άκυρο κρυπταλγ. %d - παραλείφθηκε\n"
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Δεν έχει οριστεί αιτία"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Το κλειδί έχει παρακαμθεί"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Το κλειδί έχει εκτεθεί"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Το κλειδί δε χρησιμοποιείται πλέον"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Το User ID δεν είναι πλέον έγκυρο"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "αιτία για ανάκληση:"
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "σχόλιο ανάκλησης:"
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "κλειδί %08lX: όχι δημόσιο κλειδί - αδυναμία εφαρμογής πιστοποιητικού "
 "ανάκλησης\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "κλειδί %08lX: αδυναμία εντοπισμού του αρχικού τμήματος κλειδιού: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του αρχικού τμήματος κλειδιού: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - απόρριψη\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης εισήχθηκε\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "κλειδί %08lX: δεν υπάρχει user ID για την υπογραφή\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού στο user id "
 "\"%s\"\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "κλειδί %08lX: μη έγκυρη ιδιο-υπογραφή στο user id \"%s\"\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση κλειδιού\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "κλειδί %08lX: μη έγκυρη δέσμευση υποκλειδιού\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "κλειδί %08lX: αφαιρέθηκε η δέσμευση πολλαπλού υποκλειδιού\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για την ανάκληση κλειδιού\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "κλειδί %08lX: μη έγκυρη ανάκληση υποκλειδιού\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "κλειδί %08lX: αφαιρέθηκε η ανάκληση πολλαπλού υποκλειδιού\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "κλειδί %08lX: παραλείφθηκε user ID '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "κλειδί %08lX: παραλείφθηκε υποκλειδί\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "κλειδί %08lX: μη εξαγόμενη υπογραφή (κλάση %02x) - παραλείφθηκε\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "κλειδί %08lX: το πιστοποιητικό ανάκλησης σε λάθος σημείο - παραλείφθηκε\n"
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - παραλείφθηκε\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "κλειδί %08lX: μη αναμενώμενη κλάση υπογραφής (0x%02x) - παραλείφθηκε\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: λήψη κλειδιού ανάκλησης "
 "%08lX\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: το κλειδί ανάκλησης %08lX\n"
 "δεν είναι παρών.\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης προστέθηκε\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
@@ -4124,35 +4156,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
 
-#: g10/key-check.c:405
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Καλή υπογραφή από \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "παραλείφθηκε `%s': %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "Το user ID \"%s\" ανακαλείτε."
 msgstr1 "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4160,7 +4192,7 @@
 msgstr0 "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
 msgstr1 "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4168,61 +4200,61 @@
 msgstr0 "%d κακές υπογραφές\n"
 msgstr1 "%d κακές υπογραφές\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Καλή υπογραφή από \""
 msgstr1 "Καλή υπογραφή από \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "κλειδοθήκη `%s' δημιουργήθηκε\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "κλειδοθήκη `%s' δημιουργήθηκε\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "ανάκληση"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "ιδιο-υπογραφή"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4235,68 +4267,68 @@
 "να κοιτάζει passports και fingerprints από διάφορες πηγές...);\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Έχω μερική εμπιστοσύνη\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Έχω πλήρη εμπιστοσύνη\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Σίγουρα θέλετε ακόμα να το υπογράψετε; (y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Αδυναμία υπογραφής.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Το user ID \"%s\" έχει έληξε."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογραφεί."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογραφεί."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Σίγουρα να υπογραφεί; "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4305,11 +4337,11 @@
 "Η ιδιο-υπογραφή στο \"%s\"\n"
 "είναι μια υπογραφή τύπου PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Θέλετε να τη προάγετε σε μια OpenPGP ιδιο-υπογραφή; (y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4318,12 +4350,12 @@
 "Η προυπάρχουσα υπογραφή σας στο \"%s\"\n"
 "έχει λήξει.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Θέλετε να ορίσετε μια νέα υπογραφή προς αντικατάσταση της ληγμένης; (y/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4332,43 +4364,43 @@
 "Η προυπάρχουσα υπογραφή σας στο \"%s\"\n"
 "είναι μια τοπική υπογραφή.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Θέλετε να τη προάγετε σε μια πλήρη εξαγώγιμη υπογραφή; (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ήδη υπογράφθηκε από το κλειδί %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ήδη υπογράφθηκε από το κλειδί %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Σίγουρα θέλετε ακόμα να το ξαναυπογράψετε; (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Τίποτα για να υπογραφεί με το κλειδί %08lX\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Αυτό το κλειδί πρόκειτε να λήξει στις %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Θέλετε η υπογαφήσας να λήξει ταυτόχρονα; (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4378,32 +4410,32 @@
 "ανήκει πράγματι στο προανφερθέν άτομο; Εάν δεν ξέρετε τι να απαντήσετε "
 "πατήστε\"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Δεν απαντώ.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Δεν έχω ελέγξει καθόλου.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Έχω κάνει τον συνήθη έλεγχο.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Έχω κάνει εκτεταμένο έλεγχο.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Η επιλογή σας; (πληκτρολογήστε ? για πληροφορίες): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4412,21 +4444,21 @@
 "Σίγουρα θέλετε να υπογράψετε αυτό το κλειδί\n"
 "με το κλειδί σας: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Αυτή θα είναι μια ιδιο-υπογραφή.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η υπογραφή δε θα σημειωθεί σαν μη-εξαγώγιμη.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -4434,14 +4466,14 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η υπογραφή δε θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
 "\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Η υπογραφή θα σημειωθεί σαν μη-εξαγώγιμη.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -4449,243 +4481,252 @@
 "Η υπογραφή θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
 "\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Δεν έχω ελέγξει καθόλου αυτό το κλειδί.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Έχω κάνει συνηθισμένο έλεγχο σε αυτό το κλειδί.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Έχω ελέγξει πολύ προσεκτικά αυτό το κλειδί.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Σίγουρα να υπογραφεί; "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "αποθήκευση και έξοδος"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Σημείωση υπογραφής: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "απεικόνιση των κλειδιών και των user ID"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "επιλογή user ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "επιλογή user ID N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "ανάκληση υπογραφών"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "υπογραφή του κλειδιού τοπικά"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Συμβουλή: Επιλέξτε το user ID για υπογραφή\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "προσθήκη ενός user ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "προσθήκη ενός photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "διαγραφή ενός user ID"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "διαγραφή ενός δευτερεύοντος κλειδιού"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "προσθήκη ενός κλειδιού ανάκλησης"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "σημείωση του user ID σαν πρωτεύων"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "απεικόνιση προεπιλογών (ειδικές)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "απεικόνιση επιλογών (αναλυτικά)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Σίγουρα θέλετε να ανακληθούν όλα τα επιλεγμένα user ID; "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "ανάκληση ενός user ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "ανάκληση ενός δευτερεύοντος κλειδιού"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "ενεργοποιεί ένα κλειδί"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "απενεργοποιεί ένα κλειδί"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "απεικόνιση photo ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Απαιτείται το μυστικό κλειδί για να γίνει αυτό.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4693,310 +4734,300 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Το κλειδί ανακλήθηκε."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Σίγουρα να υπογραφούν όλα τα user ID; "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Σίγουρα να υπογραφούν όλα τα user ID; "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Συμβουλή: Επιλέξτε το user ID για υπογραφή\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "άγνωστη κλάση υπογραφής"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Πρέπει να επιλέξετε το λιγότερο ένα user ID.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Δεν μπορείτε να διαγράψετε το τελευταίο user ID!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Σίγουρα θέλετε να διαγραφούν όλα τα επιλεγμένα user ID; "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Σίγουρα θέλετε να ανακληθούν όλα τα επιλεγμένα user ID; "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το user ID; "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Σίγουρα θέλετε να ανακληθούν τα επιλεγμένα κλειδιά; "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ορισμός απεικόνισης επιλογών"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Σίγουρα να ανανεωθούν οι προεπιλογές;"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Αποθήκευση των αλλαγών; "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Τερματισμός χωρίς αποθήκευση; "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Το κλειδί δεν άλλαξε οπότε δεν χρειάζεται ενημέρωση.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "μη έγκυρη τιμή\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Δεν υπάρχει αυτό το user ID.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Τίποτα για να υπογραφεί με το κλειδί %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " υπογράφθηκε από %08lX στις %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Περίληψη: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Δυνατότητε: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Σημείωση: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Δεν υπάρχουν προεπιλογές σε ένα user ID τύπου PGP 2.x.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3849
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (ευαίσθητο)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "αδυναμία δημιουργίας του %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "ανακλημένο"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " λήγει: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " λήγει: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " εμπιστοσύνη: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " εμπιστοσύνη: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Αυτό το κλειδί έχει απενεργοποιηθεί"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5004,19 +5035,19 @@
 "Η εγγυρότητα του απεικονιζόμενου κλειδιού δεν είναι απαραίτητα σωστή\n"
 "εκτός και εάν επανακκινήσετε το πρόγραμμα.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "ανακλημένο"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5025,18 +5056,23 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει σημειωθεί ID χρήστη σαν πρωτεύων. Αυτή η εντολή\n"
 " μπορεί να κάνει ένα άλλο ID χρήστη να γίνει το πρωτεύων.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5045,35 +5081,35 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τύπου PGP2. Η προσθήκη ενός photo ID\n"
 " μπορεί να κάνει μερικές εκδόσεις PGP να το απορρίψουν.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Σίγουρα ακόμα θέλετε να το προσθέσετε; (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Δεν μπορείτε να προσθέσετε μια photo ID σε ένα κλειδί τύπου PGP2.\n"
 
-#: g10/keyedit.c:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Διαγραφή αυτής της καλής υπογραφής; (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Διαγραφή αυτής της μη έγκυρης υπογραφής; (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Διαγραφή αυτής της άγνωστης υπογραφής; (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Σίγουρα να διαγραφεί αυτή η ιδιο-υπογραφή; (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5081,38 +5117,38 @@
 msgstr0 "Διαγράφτηκε %d υπογραφή.\n"
 msgstr1 "Διαγράφτηκε %d υπογραφή.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Τίποτα δεν διαγράφτηκε.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "μη έγκυρη θωράκιση"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "Το user ID \"%s\" ανακαλείτε."
 msgstr1 "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5122,40 +5158,40 @@
 " καθορισμένου ανακλητή μπορεί να κάνει μερικές εκδόσεις PGP\n"
 " να το απορρίψουν.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Δεν μπορείτε να προσθέσετε ένα καθορισμένο ανακλητή σε κλειδί τύπου PGP2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Πληκτρολογήστε το user ID του διορισμένου ανακλητή: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "αδυναμία ορισμού ενός κλειδιού τύπου PGP 2.x, σαν διορισμένου ανακλητή\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4713
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "δε μπορείτε να ορίσετε ένα κλειδί σαν το διορισμένο ανακλητή του εαυτού του\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4735
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ορισμένο ανακλητή!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εάν ορίσετε ένα κλειδί σαν διορισμένο ανακλητή δεν μπορεί να "
 "επανέλθει!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5163,7 +5199,22 @@
 "Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(εκτός εάν προσδιορίσετε ένα κλειδί από αποτύπωμα)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5172,270 +5223,270 @@
 "Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Αλλαγή ημερομηνίας λήξης για ένα δευτερεύον κλειδί.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Αλλαγή ημερομηνίας λήξης για ένα πρωτεύον κλειδί.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Αλλαγή ημερομηνίας λήξης για ένα δευτερεύον κλειδί.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Αλλαγή ημερομηνίας λήξης για ένα πρωτεύον κλειδί.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX δεν έχει κατ' αντιπαράσταση "
 "πιστοποιηθεί\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Πρέπει να επιλέξετε ακριβώς ένα user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "παραλείφθηκε η v3 ιδιο-υπογραφή στο user id \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Σημείωση υπογραφής: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Επικάλυψη (y/N); "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr " υπογράφθηκε από %08lX στις %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Αυτή η υπογραφή έληξε στις %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτή την υπογραφή; (y/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Έχετε υπογράψει αυτά τα user ID:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " ανακλήθηκε από %08lX στις %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Σκοπεύετε να ανακαλέσετε αυτές τις υπογραφές:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Σίγουρα να δημιουργηθούν τα πιστοποιητικά ανάκλησης; (y/N)"
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "κανένα μυστικό κλειδί\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογραφή user ID έχει ημερομηνία %d δεύτερα στο μέλλον\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "εγγραφή άμεσης υπογραφής\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "εγγραφή ιδιο-υπογραφής\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "εγγραφή υπογραφής \"δέσιμου\" κλειδιού\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "μη έγκυρο μέγεθος κλειδιού, χρήση %u bits\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "στρογγυλοποίηση του μέγεθος κλειδιού έως %u bits\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "κρυπτογράφηση δεδομένων"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5449,179 +5500,179 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA και ElGamal (προκαθορισμένο)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA και ElGamal (προκαθορισμένο)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (για υπογραφή μόνο)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (για υπογραφή μόνο)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) RSA (υπογραφή και κρυπτογράφηση)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (προκαθορισμένο)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (για υπογραφή μόνο)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Σημείωση υπογραφής: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "απενεργοποιεί ένα κλειδί"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Το μέγεθος κλειδιού που ζητήθηκε είναι %u bits\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5637,7 +5688,7 @@
 " <n>m = το κλειδί λήγει σε n μήνες\n"
 " <n>y = το κλειδί λήγει σε n έτη\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5653,40 +5704,40 @@
 " <n>m = το κλειδί λήγει σε n μήνες\n"
 " <n>y = το κλειδί λήγει σε n έτη\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Το κλειδί είναι έγκυρο για; (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Η υπογραφή έιναι έγκυρη για; (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "μη έγκυρη τιμή\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "το %s δεν λήγει ποτέ\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "το %s δεν λήγει ποτέ\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "το %s λήγει στις %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Υπογραφή λήγει στις %s.\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5694,12 +5745,12 @@
 "Το σύστημα σας δεν μπορεί να απεικονίσει ημερομηνίες πέρα του 2038.\n"
 "Όμως, θα χειρίζονται σωστά έως το 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Είναι αυτό σωστό (y/n); "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5710,7 +5761,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5727,42 +5778,42 @@
 " \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Αληθινό Όνομα: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Διεύθυνση Email: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Μη έγκυρη διεύθυνση Email\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Σχόλιο: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Μη έγκυρος χαρακτήρας στο σχόλιο\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5773,11 +5824,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Παρακαλώ μην τοποθετείτε την διεύθυνση email στο όνομα ή στο σχόλιο\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5792,35 +5843,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
 
-#: g10/keygen.c:3130
+#: g10/keygen.c:3114
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Παρακαλώ, διορθώστε πρώτα το σφάλμα\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5832,18 +5883,18 @@
 "τους δίσκους) κατα τη διάρκεια υπολογισμού πρώτων αριθμών. Αυτό δίνει\n"
 "στη γεννήτρια τυχαίων αριθμών μια ευκαιρία να μαζέψει αρκετή εντροπία.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5851,67 +5902,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Η δημιουργία κλειδιού αναβλήθηκε.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "εγγραφή του δημοσίου κλειδιού στο `%s'\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "δε βρέθηκε εγγράψιμη δημόσια κλειδοθήκη: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "το δημόσιο και το μυστικό κλειδί δημιουργήθηκαν και υπογράφηκαν.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5922,7 +5973,7 @@
 "Μπορείτε να χρησιμοποιήσετε την εντολή \"--edit-key\" για να δημιουργηθεί\n"
 "ένα δευτερεύον κλειδί για αυτό το λόγο.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5930,7 +5981,7 @@
 "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
 "απλώς πρόβλημα στο ρολόι)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5938,7 +5989,7 @@
 "το κλειδί δημιουργήθηκε %lu δευτερόλεπτα στο μέλλον (χρονοδίνη ή\n"
 "απλώς πρόβλημα στο ρολόι)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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"
@@ -5946,17 +5997,17 @@
 "ΣΗΜΕΙΩΣΗ: η δημιουργία υποκλειδιών για κλειδιά v3 δεν είναι σύμφωνο\n"
 "με το OpenPGP\n"
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Σίγουρα να δημιουργηθεί; "
@@ -5965,27 +6016,43 @@
 msgid "never "
 msgstr "ποτέ "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Περίληψη: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Δυνατότητε: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Πολιτική κρίσιμης υπογραφής: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Πολιτική υπογραφής: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Σημείωση κρίσιμης υπογραφής: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Σημείωση υπογραφής: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5993,7 +6060,7 @@
 msgstr0 "%d κακές υπογραφές\n"
 msgstr1 "%d κακές υπογραφές\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -6001,41 +6068,41 @@
 msgstr0 "1 υπογραφή δεν ελέγχθηκε λόγο ενός σφάλματος\n"
 msgstr1 "1 υπογραφή δεν ελέγχθηκε λόγο ενός σφάλματος\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Κλειδοθήκη"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Αποτύπωμα πρωτεύοντος κλειδιού:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Αποτύπωμα πρωτ. κλειδιού:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Αποτύπωμα υποκλειδιού:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Αποτύπωμα κλειδιού ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6115,269 +6182,275 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "αίτηση κλειδιού %08lX από το %s\n"
 msgstr1 "αίτηση κλειδιού %08lX από το %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "αίτηση κλειδιού %08lX από το %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "μη έγκυρες επιλογές εξαγωγής\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "παραλείφθηκε `%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "υπογράφθηκε με το κλειδί σας %08lX στις %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "αίτηση κλειδιού %08lX από το %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "παράξενο μέγεθος για ένα κλειδί κρυπτογραφημένης συνεδρίας (%d)\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s κλειδί κρυπτογραφημένης συνεδρία\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s κρυπτογραφημένα δεδομένα\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "δημόσιο κλειδί είναι %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "κρυπτογραφημένο με %u-bit %s κλειδί, ID %08lX, δημιουργήθηκε %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid " \"%s\"\n"
 msgstr " γνωστό σαν \""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "κρυπτογραφημένο με %s key, ID %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "κρυπτογραφημένο με 1 φράση κλειδί\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "κρυπτογράφηση με δημόσιο κλειδί απέτυχε: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "κρυπτογραφημένα δεδομένα με δημόσιο κλειδί: καλό DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "υπόθεση %s κρυπτογραφημένων δεδομένων\n"
 
-#: g10/mainproc.c:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν προστατεύτηκε η ακεραιότητα του μηύματος\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "αποκρυπτογράφηση OK\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το κρυπτογραφημένο μήνυμα έχει πειραχθεί!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "αρχικό όνομα αρχείου='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ανεξάρτητη ανάκληση - χρησιμοποιείστε \"gpg --import\" για εφαρμογή\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Καλή υπογραφή από \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ΚΑΚΗ υπογραφή από \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Ληγμένη υπογραφή από \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Καλή υπογραφή από \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "καταστολή ανάκλησης υπογραφής\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "αδυναμία χειρισμού αυτών των πολλαπλών υπογραφών\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " γνωστό σαν \""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Υπογραφή έγινε στο %.*s με χρήση του κλειδιού%s ID %08lX\n"
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " γνωστό σαν \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "αβέβαιο"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " γνωστό σαν \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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"
@@ -6385,68 +6458,68 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστεύσιμη "
 "υπογραφή!\n"
 
-#: g10/mainproc.c:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Υπογραφή λήγει στις %s.\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "δυαδικό"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "κατάσταση-κειμένου"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "άγνωστος αλγόριθμος δημοσίου κλειδιού"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Αδυναμία ελέγχου της υπογραφής: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "δεν είναι αποκομμένη υπογραφή\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εντοπισμός πολλαπλών υπογραφών. Μόνο η πρώτη θα ελεγχθεί.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ανεξάρτητη υπογραφή κλάσης 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "υπογραφή παλιού στυλ (PGP 2.x)\n"
@@ -6553,27 +6626,27 @@
 msgid "uncompressed|none"
 msgstr "Ασυμπίεστο"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "αυτό το μήνυμα ίσως δεν μπορεί να χρησιμοποιηθεί από %s\n"
 
-#: g10/misc.c:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "άγνωστη κλάση υπογραφής"
@@ -6630,7 +6703,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "υποπακέτο τύπου %d έχει ορισμένο το κριτικό bit\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "αλλαγή της φράσης κλειδί"
@@ -6694,7 +6767,7 @@
 "%s"
 msgstr "%u-bit %s κλειδί, ID %08lX, δημιουργία %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6708,73 +6781,73 @@
 "χρησιμοποιείτε μια μεγάλη εικόνα το κλειδί σας αντίστοιχα θα γίνει μεγάλο!\n"
 "Ιδανίκό μέγεθος για μια εικόνα είναι αυτό κοντά στο 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Πληκτρολογήστε ένα όνομα αρχείου για το photo ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\" δεν είναι JPEG αρχείο\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Είναι αυτή η φωτογραφία σωστή (y/N/q); "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "δεν υποστηρίζετε η απομακρυσμένη εκτέλεση προγράμματος\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "αυτή η πλατφόρμα απαιτεί προσωρ. αρχεία στην κλήση εξωτερικών προγραμμάτων\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "αδυναμία εκτέλεσης του %s \"%s\": %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "αφύσικη έξοδος του εξωτερικού προγράμματος\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "σφάλμα συστήματος κατά την κλήση εξωτερικού προγράμματος: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής προσωρινού φακέλου `%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6782,7 +6855,7 @@
 "οι κλήσεις εξωτερικών προγραμμάτων απενεργοποιήθηκαν λόγω ανασφαλών αδειών\n"
 "αρχείου\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "αδυναμία απεικόνισης του photo ID!\n"
@@ -6869,34 +6942,34 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Πιστοποιητικά που οδηγούν σε ένα κλειδί απόλυτης εμπιστοσύνης:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Δεν υπάρχει ένδειξη ότι η υπογραφή αυτή ανήκει στον ιδιοκτήτη.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Δεν υπάρχει ένδειξη ότι η υπογραφή αυτή ανήκει στον ιδιοκτήτη.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Αυτό το κλειδί πιθανώς ανήκει στον ιδιοκτήτη\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Αυτό το κλειδί ανήκει σε εμάς\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6908,7 +6981,7 @@
 "να απαντήσετε στην επόμενη ερώτηση καταφατικά\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6920,76 +6993,76 @@
 "να απαντήσετε στην επόμενη ερώτηση καταφατικά\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Χρήση κλειδιού χωρίς εμπιστοσύνη!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αυτό το κλειδί μπορεί να ανακληθεί (λείπει το κλειδί "
 "ανάκλησης)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "κλειδί %08lX: δεν ταιριάζει με το αντίγραφο μας\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ορισμένο ανακλητή!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ιδιοκτήτη του!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Αυτό μπορεί να σημαίνει ότι η υπογραφή είναι πλαστογραφία.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το υποκλειδί έχει ανακληθεί από τον ιδιοκτήτη του!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Σημείωση: Αυτό το κλειδί έχει απενεργοποιηθεί.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Σημείωση: Αυτό το κλειδί έχει λήξει!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
@@ -6997,30 +7070,30 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστεύσιμη "
 "υπογραφή!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστεύσιμη "
 "υπογραφή!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " Δεν υπάρχει ένδειξη ότι η υπογραφή ανήκει στον ιδιοκτήτη.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ΔΕΝ εμπιστευόμαστε αυτό το κλειδί!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Η υπογραφή μάλλον είναι πλαστογραφία.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7031,7 +7104,7 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με υπογραφές\n"
 "αρκετής εμπιστοσύνης!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7039,51 +7112,51 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με υπογραφές\n"
 "αρκετής εμπιστοσύνης!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Δεν είναι βέβαιο ότι η υπογραφή ανήκει στον ιδιοκτήτη.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: παραλείφθηκε: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: παραλείφθηκε: το δημόσιο κλειδί έχει απενεργοποιηθεί.\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: παραλείφθηκε: δημόσιο κλειδί είναι ήδη παρόν\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Δεν ορίστηκε ένα user ID. (χρησιμοποιείστε το \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7091,41 +7164,41 @@
 "\n"
 "Πληκτρολογήστε το user ID. Τέλος με μια άδεια γραμμή: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Δεν υπάρχει αυτό το user ID.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "παραλείφθηκε: δημόσιο κλειδί έχει ήδη οριστεί σαν εξ ορισμού παραλήπτης\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Το δημόσιο κλειδί έχει απενεργοποιηθεί.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "παραλείφθηκε: δημόσιο κλειδί έχει ήδη οριστεί\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "καμμία έγκυρη διεύθυνση\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
@@ -7164,7 +7237,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "αδυναμία πρόσβασης υπογεγραμμένων δεδομένων `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
@@ -7388,42 +7461,37 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σύγκρουση υπογραφής περίληψης στο μήνυμα\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX δεν έχει κατ' αντιπαράσταση "
 "πιστοποιηθεί\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = απεικόνιση περισσότερων πληροφοριών\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX έχει άκυρη κατ' αντιπαράσταση "
 "πιστοποίηση\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
@@ -7432,7 +7500,7 @@
 msgstr1 ""
 "το δημόσιο κλειδί %08lX είναι %lu δευτερόλεπτο νεότερο από την υπογραφή\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
@@ -7441,7 +7509,7 @@
 msgstr1 ""
 "το δημόσιο κλειδί %08lX είναι %lu δευτερόλεπτο νεότερο από την υπογραφή\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7454,7 +7522,7 @@
 "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
 "απλώς πρόβλημα στο ρολόι)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7466,51 +7534,51 @@
 "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
 "απλώς πρόβλημα στο ρολόι)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί υπογραφής %08lX έληξε στις %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "κλειδί %08lX: κανένα υποκλειδί για το πακέτο ανάκλησης υποκλειδιού\n"
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση υποκλειδιού\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στην %%-ανάπτυξη σημείωσης (πολυ μεγάλη).\n"
 " Χρήση μη ανεπτυγμένου.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7518,7 +7586,7 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στη %%-ανάπτυξη του url πολιτικής (πολυ μεγάλο).\n"
 " Χρήση μη ανεπτυγμένου.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7527,12 +7595,12 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στη %%-ανάπτυξη του url πολιτικής (πολυ μεγάλο).\n"
 " Χρήση μη ανεπτυγμένου.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s υπογραφή από: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7540,12 +7608,12 @@
 "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
 "προεπιλογές του παραλήπτη\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "υπογραφή:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7628,134 +7696,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync απέτυχε: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "αδυναμία πρόσβασης του `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: αποτυχία lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: αποτυχία write (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "πολύ μεγάλη συναλλαγή trustdb\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ο φάκελος δεν υπάρχει!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: αποτυχία δημιουργίας μιας εγγραφής έκδοσης: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: δημιουργήθηκε μη έγκυρη trustdb\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: δημιουργήθηκε η trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "ΣΗΜΕΙΩΣΗ: η trustdb δεν είναι εγγράψιμη\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: μη έγκυρη trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: σφάλμα στην ενημέρωση της εγγραφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: σφάλμα στην εγγραφή της εγγραφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: απέτυχε lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: δεν είναι trustdb αρχείο\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: εγγραφή έκδοσης με recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: μη έγκυρη έκδοση αρχείου %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: αποτυχία στον μηδενισμό μιας εγγραφής: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: αποτυχία στην προσθήκη μιας εγγραφής: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: δημιουργήθηκε η trustdb\n"
@@ -8189,7 +8257,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "επόμενος έλεγχος της trustdb θα γίνει στις %s\n"
@@ -8219,14 +8287,14 @@
 msgid "checking the trustdb\n"
 msgstr "έλεγχος της trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
 msgstr1 "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8234,24 +8302,24 @@
 msgstr0 "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
 msgstr1 "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "δε βρέθηκαν απόλυτα εμπιστεύσιμα κλειδιά\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "δε βρέθηκε το δημόσιο κλειδί του απόλυτα εμπιστεύσιμου κλειδιού %08lX\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
@@ -8325,7 +8393,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8336,12 +8404,12 @@
 "Παρακαλώ μην ξεχνάτε ότι το αρχείο υπογραφής (.sig or .asc)\n"
 "πρέπει να είναι το πρώτο αρχείο στη γραμμή εντολών.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "γραμμή εισόδου %u είναι πολύ μεγάλη ή της λείπει το LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
@@ -8357,20 +8425,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8380,16 +8448,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8424,10 +8492,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8447,158 +8515,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "Η δημιουργία κλειδιού απέτυχε: %s\n"
 msgstr1 "Η δημιουργία κλειδιού απέτυχε: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Σημείωση: Αυτό το κλειδί έχει απενεργοποιηθεί.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
@@ -8606,43 +8674,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8650,22 +8718,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8673,81 +8741,81 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "αλλαγή της φράσης κλειδί"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "μη υποστηριζόμενο URI"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
@@ -8768,7 +8836,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8817,333 +8885,333 @@
 msgid "deny the use of admin card commands"
 msgstr "συγκρουόμενες εντολές\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "δεν υποστηρίζεται η έκδοση πρωτοκόλλου %d του gpg-agent\n"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, fuzzy, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: αδυναμία πρόσβασης: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " νέες υπογραφές: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "κακό πιστοποιητικό"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "απεικόνιση του fingerprint"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "επαλήθευση μιας υπογραφής"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "μη επεξεργασμένο"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "όχι|οχι"
@@ -9166,7 +9234,7 @@
 msgid "Error - invalid DN"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9180,42 +9248,42 @@
 "\"%.*s\"\n"
 "%u-bit %s κλειδί, ID %08lX, δημιουργία %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "κακό πιστοποιητικό"
@@ -9441,17 +9509,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "κρυπτογραφημένο με %s key, ID %08lX\n"
@@ -9461,7 +9529,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
@@ -9486,134 +9554,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Δεν δώθηκε περιγραφή)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "μη χρήση τερματικού"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "δημιουργία ascii θωρακισμένης εξόδου"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "προσθήκη αυτού του κλειδιού στη λίστα των κλειδοθηκών"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ για φράσεις κλειδιά"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου περίληψης μηνύματος ΟΝΟΜΑ "
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "κατάσταση batch: να μη γίνονται ερωτήσεις"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "απάντηση ναι στις περισσότερες ερωτήσεις"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "απάντηση όχι στις περισσότερες ερωτήσεις"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, fuzzy
 #| msgid "Usage: gpg options files (-h for help)"
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9624,27 +9692,27 @@
 "υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
 "η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "εγγραφή στο `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9664,7 +9732,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
@@ -9674,47 +9742,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? πρόβλημα στον έλεγχο ανάκλησης: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9744,7 +9812,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9759,58 +9827,58 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Υπογραφή έγινε στο %.*s με χρήση του κλειδιού%s ID %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Υπογραφή έληξε στις %s.\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "θωράκιση: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Καλή υπογραφή από \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " γνωστό σαν \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9837,225 +9905,225 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "απεικόνιση του fingerprint"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "κακό πιστοποιητικό"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "creating directory '%s'\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "σφάλμα στη γραμμή trailer\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, fuzzy, c-format
 #| msgid "new configuration file `%s' created\n"
 msgid "new cache dir file '%s' created\n"
 msgstr "δημιουργήθηκε νέο αρχείο επιλογών `%s'\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, fuzzy, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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"
@@ -10063,329 +10131,324 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυρο μέγεθος αρχείου random_seed - δεν\n"
 "χρησιμοποιείτε\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, fuzzy, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, fuzzy, c-format
 #| msgid "No help available for `%s'"
 msgid "no CRL available for issuer id %s\n"
 msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "μη έγκυρη απάντηση από τον agent\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "unknown hash algorithm '%s'\n"
 msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "εγγραφή στο `%s'\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "καταστολή ανάκλησης υπογραφής\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "εγγραφή στο `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
@@ -10393,36 +10456,36 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυρο μέγεθος αρχείου random_seed - δεν\n"
 "χρησιμοποιείτε\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? πρόβλημα στον έλεγχο ανάκλησης: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
@@ -10437,24 +10500,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
@@ -10610,140 +10673,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χρήση αυτού του διακομιστή κλειδιών για αναζήτηση"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10756,115 +10819,115 @@
 "@\n"
 "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "χρήση: gpg επιλογές "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "η γραμμή είναι πολύ μεγάλη\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "μη επεξεργασμένο"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "πάρα πολλές `%c' προεπιλογές\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10920,32 +10983,32 @@
 msgid "malloc failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" δεν είναι JPEG αρχείο\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = παράλειψη αυτού του κλειδιού\n"
@@ -11037,164 +11100,164 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "δεν υπάρχει προκαθορισμένη κλειδοθήκη: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "χρήση του κρυπταλγόριθμου: %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11205,135 +11268,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "έλεγχος της trustdb\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "τερματισμός"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Χρήση: gpg επιλογές αρχεία (-h για βοήθεια)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "η γραμμή είναι πολύ μεγάλη\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "η υπογραφή απέτυχε: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@ -11399,12 +11462,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -11513,88 +11576,107 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "αλλαγή της ημερομηνίας λήξης"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
+#~ "επιλογές του παραλήπτη\n"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "εγγραφή στο `%s'\n"
 
@@ -12253,10 +12335,6 @@
 #~ msgstr "αλλαγή μεταξύ της απεικόνισης μυστικού και δημόσιου κλειδιού"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "κακή φράση κλειδί"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
 #~ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: οι επιλογες στο `%s' δεν είναι ενεργές σε αυτή την "
@@ -13224,9 +13302,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "διαγραφή υπογραφών"
 
-#~ msgid "set preference list"
-#~ msgstr "ορισμός απεικόνισης επιλογών"
-
 #~ msgid "updated preferences"
 #~ msgstr "αναωεωμένες επιλογές"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/en@boldquot.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/en@boldquot.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/en@boldquot.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/en@boldquot.po Changed

@@ -1,7 +1,7 @@
 # English translations for GNU gnupg package.
-# Copyright (C) 2022 Free Software Foundation, Inc.
+# Copyright (C) 2023 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gnupg package.
-# Automatically generated, 2022.
+# Automatically generated, 2023.
 #
 # 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.3.6\n"
+"Project-Id-Version: GNU gnupg 2.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
-"PO-Revision-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
+"PO-Revision-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -53,49 +53,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "Caps Lock is on"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "Suggest"
 
@@ -106,27 +106,27 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "Note: The blanks are not part of the passphrase."
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "Passphrase Not Allowed"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -136,11 +136,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -148,7 +148,7 @@
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -156,76 +156,80 @@
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+msgid "Passphrases match."
+msgstr "Passphrases match."
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "Note: Request from the web browser."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error getting serial number of card: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -234,7 +238,7 @@
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
@@ -242,45 +246,45 @@
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "can't create '%s': %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "no suitable card key found: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error getting list of cards: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -289,20 +293,20 @@
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Allow"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Deny"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -311,83 +315,79 @@
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Please insert the card with serial number"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Reset Code"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Push ACK button on card/token."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Use the reader's pinpad for input."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Repeat this Reset Code"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Repeat this PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Repeat this PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reset Code not correctly repeated; try again"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK not correctly repeated; try again"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN not correctly repeated; try again"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Please enter the PIN%s%s%s to unlock the card"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "error writing to pipe: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -396,18 +396,18 @@
 "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."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Yes, protection is not needed"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "A passphrase should be at least %u character long."
 msgstr1 "A passphrase should be at least %u characters long."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -417,227 +417,231 @@
 msgstr1 ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Take this one anyway"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|use PGM as the tpm2daemon program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+msgid "enable Win32-OpenSSH support"
+msgstr "enable Win32-OpenSSH support"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Options controlling the security"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “&#x1b;1mtrusted&#x1b;0m”"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|set minimal required length for new passphrases to N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|require at least N non-alpha characters for a new passphrase"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "allow passphrase to be prompted through Emacs"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Usage: @GPG_AGENT@ options (-h for help)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -645,141 +649,141 @@
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘&#x1b;1m%s&#x1b;0m’ given\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘&#x1b;1m%s&#x1b;0m’ is not considered an option\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “&#x1b;1m%s&#x1b;0m” is a deprecated option\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘&#x1b;1m%s&#x1b;0m’ is too long\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘&#x1b;1m%s&#x1b;0m’ created\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘&#x1b;1m%s&#x1b;0m’ as home directory\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -787,11 +791,11 @@
 "@Options:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -799,8 +803,8 @@
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -808,8 +812,8 @@
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -819,11 +823,11 @@
 "Options:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Usage: gpg-protect-tool options (-h for help)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -831,15 +835,15 @@
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -847,7 +851,7 @@
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -855,52 +859,54 @@
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelled\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “&#x1b;1m%s&#x1b;0m” ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘&#x1b;1m%s&#x1b;0m’ not available\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -913,7 +919,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -922,11 +928,11 @@
 "Do you ultimately trust%%0A “&#x1b;1m%s&#x1b;0m”%%0Ato correctly certify user "
 "certificates?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -939,7 +945,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -951,20 +957,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -973,15 +979,24 @@
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -990,11 +1005,11 @@
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
 "%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1007,8 +1022,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s key uses an unsafe (%u bit) hash\n"
@@ -1018,7 +1033,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
@@ -1028,7 +1043,7 @@
 msgid "secret key parts are not available\n"
 msgstr "secret key parts are not available\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -1043,52 +1058,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "protection hash algorithm %d (%s) is not supported\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creating a pipe: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "error creating a stream for a pipe: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "waiting for process %d to terminate failed: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "error running '%s': probably not installed\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "error running '%s': exit status %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "error running '%s': terminated\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "waiting for processes to terminate failed: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error getting exit code of process %d: %s\n"
@@ -1108,28 +1123,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "can't disable core dumps: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Warning: unsafe ownership on %s “&#x1b;1m%s&#x1b;0m”\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “&#x1b;1m%s&#x1b;0m”\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘&#x1b;1m%s&#x1b;0m’ to become accessible ...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘&#x1b;1m%s&#x1b;0m’ to ‘&#x1b;1m%s&#x1b;0m’ failed: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1183,8 +1198,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "out of core while allocating %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error allocating enough memory: %s\n"
@@ -1199,72 +1214,72 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: “&#x1b;1m%s%s&#x1b;0m” is an obsolete option - it has no effect\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "unknown debug flag ‘&#x1b;1m%s&#x1b;0m’ ignored\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "waiting for the dirmngr to come up ... (%ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "waiting for the keyboxd to come up ... (%ds)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "waiting for the agent to come up ... (%ds)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "connection to the dirmngr established\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "connection to the keyboxd established\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr "connection to the agent established\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "no running %s - starting ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "connection to the agent is in restricted mode\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "error getting version from '%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "server ‘&#x1b;1m%s&#x1b;0m’ is older than us (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "WARNING: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr "Note: Outdated servers may lack important security fixes.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Note: Use the command “&#x1b;1m%s&#x1b;0m” to restart them.\n"
@@ -1337,7 +1352,7 @@
 msgstr "algorithm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1412,39 +1427,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP check of certificates"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Included certificates"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "No audit log entries."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Unknown operation"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent usable"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr usable"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "No help available for '%s'."
@@ -1453,11 +1468,11 @@
 msgid "ignoring garbage line"
 msgstr "ignoring garbage line"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "none"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
@@ -1492,148 +1507,160 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open failed: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversion from ‘&#x1b;1m%s&#x1b;0m’ to ‘&#x1b;1m%s&#x1b;0m’ failed: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "failed to create temporary file '%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error writing to '%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "removing stale lockfile (created by %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock ‘&#x1b;1m%s&#x1b;0m’ not made: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "error closing '%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "invalid armor header: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "armor header: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "invalid clearsig header\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "unknown armor header: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "nested clear text signatures\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "unexpected armor: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "invalid dash escaped line: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "invalid radix64 character %02X skipped\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "premature eof (no CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "premature eof (in CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "malformed CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC error; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "premature eof (in trailer)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "error in trailer line\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "no valid OpenPGP data found.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "invalid armor: line longer than %d characters\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " not human readable (%zu bytes: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1642,32 +1669,32 @@
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘&#x1b;1m=&#x1b;0m’\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "a user notation name must contain the ‘&#x1b;1m@&#x1b;0m’ character\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "a notation name must not contain more than one ‘&#x1b;1m@&#x1b;0m’ character\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "a notation value must not use any control characters\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "a notation name may not contain an ‘&#x1b;1m=&#x1b;0m’ character\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "a notation name must have only printable characters or spaces\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNING: invalid notation data found\n"
@@ -1681,8 +1708,8 @@
 msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is not compliant with %s mode\n"
@@ -1692,13 +1719,13 @@
 msgid "error from TPM: %s\n"
 msgstr "error from TPM: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem with the agent: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no dirmngr running in this session\n"
@@ -1709,197 +1736,202 @@
 msgstr ""
 "keyserver option “&#x1b;1mhonor-keyserver-url&#x1b;0m” may not be used in Tor mode\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKD uses a cached result"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "Tor is not running"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Tor is not properly configured"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNS is not properly configured"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "unacceptable HTTP redirect from server"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "unacceptable HTTP redirect from server was cleaned up"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "can't do this in batch mode\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "not set"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "not forced"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr "Please try command “&#x1b;1m%s&#x1b;0m” if the listing does not look correct\n"
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: Only plain ASCII is currently allowed.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: The “&#x1b;1m<&#x1b;0m” character may not be used.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: Double spaces are not allowed.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1911,99 +1943,99 @@
 " please check the documentation of your card to see which\n"
 " key types and sizes are supported.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2014,176 +2046,181 @@
 " PIN = ‘&#x1b;1m%s&#x1b;0m’ Admin PIN = ‘&#x1b;1m%s&#x1b;0m’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Signature key\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Encryption key\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Authentication key\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “&#x1b;1myes&#x1b;0m”) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "error for setup UIF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "setup KDF for PIN authentication (on/single/off)"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "change the User Interaction Flag"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr "switch to the OpenPGP app"
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Invalid command (try “&#x1b;1mhelp&#x1b;0m”)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "can't open ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “&#x1b;1m%s&#x1b;0m” not found: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2241,9 +2278,9 @@
 msgid "subkey"
 msgstr "subkey"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2268,77 +2305,71 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use option “&#x1b;1m--delete-secret-keys&#x1b;0m” to delete it first.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "cipher algorithm ‘&#x1b;1m%s&#x1b;0m’ may not be used for encryption\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr "(use option “&#x1b;1m%s&#x1b;0m” to override)\n"
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "cipher algorithm ‘&#x1b;1m%s&#x1b;0m’ may not be used in %s mode\n"
+
+#: g10/encrypt.c:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
 
-#: g10/encrypt.c:339
+#: g10/encrypt.c:484
 #, 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"
+msgid "can't use a SKESK packet due to the S2K mode\n"
+msgstr "can't use a SKESK packet due to the S2K mode\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "using cipher %s.%s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘&#x1b;1m%s&#x1b;0m’ already compressed\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘&#x1b;1m%s&#x1b;0m’ is an empty file\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "cipher algorithm ‘&#x1b;1m%s&#x1b;0m’ may not be used for encryption\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr "(use option “&#x1b;1m%s&#x1b;0m” to override)\n"
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "cipher algorithm ‘&#x1b;1m%s&#x1b;0m’ may not be used in %s mode\n"
-
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "digest algorithm ‘&#x1b;1m%s&#x1b;0m’ may not be used in %s mode\n"
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "reading from ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr "operation forced to fail due to unfulfilled compliance rules\n"
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2347,17 +2378,12 @@
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s encrypted for: “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘&#x1b;1m%s&#x1b;0m’ may not be used in %s mode\n"
@@ -2372,7 +2398,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2384,386 +2410,388 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problem handling encrypted packet\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "export signatures that are marked as local-only"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "export attribute user IDs (generally photo IDs)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "export revocation keys marked as “&#x1b;1msensitive&#x1b;0m”"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "remove unusable parts from key during export"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "remove as much as possible from key during export"
 
-#: g10/export.c:132
+#: g10/export.c:138
+msgid "export only revocation certificates"
+msgstr "export only revocation certificates"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "use the GnuPG key backup format"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+msgid "export secret keys using the GnuPG format"
+msgstr "export secret keys using the GnuPG format"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - skipped"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "writing to ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "key %s: key material on-card - skipped\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "exporting secret keys not allowed\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "key %s: PGP 2.x style key - skipped\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "error creating '%s': %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "User ID not found"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatically retrieved ‘&#x1b;1m%s&#x1b;0m’ via %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error retrieving ‘&#x1b;1m%s&#x1b;0m’ via %s: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "No fingerprint"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, 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:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “&#x1b;1m%s&#x1b;0m” not found: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(check argument of option '%s')\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Warning: not using ‘&#x1b;1m%s&#x1b;0m’ as default key: %s\n"
 
-#: g10/getkey.c:2098
+#: g10/getkey.c:2107
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "using “&#x1b;1m%s&#x1b;0m” as default secret key for signing\n"
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "all values passed to ‘&#x1b;1m%s&#x1b;0m’ ignored\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|use NAME as default secret key"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|encrypt to user ID NAME as well"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|set up email aliases"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr "Options controlling the input"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr "Options controlling the output"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "import missing key from a signature"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
 msgstr "Options to specify keys"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr "Options for unattended use"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2771,7 +2799,7 @@
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2791,11 +2819,11 @@
 " --list-keys names show keys\n"
 " --fingerprint names show fingerprints\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Usage: @GPG@ options files (-h for help)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2805,7 +2833,7 @@
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2813,73 +2841,73 @@
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "usage: %s options %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2887,19 +2915,19 @@
 "WARNING: unsafe enclosing directory ownership on configuration file ‘&#x1b;1m"
 "%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on extension ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on homedir ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2907,468 +2935,461 @@
 "WARNING: unsafe enclosing directory permissions on configuration file ‘&#x1b;1m"
 "%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on extension ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "show signatures with invalid algorithms during signature listings"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+msgid "show preferences"
+msgstr "show preferences"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “&#x1b;1mhelp&#x1b;0m” to list choices)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘&#x1b;1m%s&#x1b;0m’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“&#x1b;1m%s&#x1b;0m” is not a proper mail address\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘&#x1b;1m%s&#x1b;0m’ is not a valid character set\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “&#x1b;1m%.50s&#x1b;0m”\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3949
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "selected AEAD algorithm is invalid\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:4012
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "invalid personal AEAD preferences\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "chunk size invalid - using %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:4134
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "AEAD algorithm ‘&#x1b;1m%s&#x1b;0m’ may not be used in %s mode\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "compression algorithm ‘&#x1b;1m%s&#x1b;0m’ may not be used in %s mode\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘&#x1b;1m%s&#x1b;0m’ failed: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "‘&#x1b;1m%s&#x1b;0m’ does not appear to be a valid key ID, fingerprint or keygrip\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, 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:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3381,7 +3402,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "make timestamp conflicts only a warning"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -3410,153 +3431,153 @@
 msgid "No help available for '%s'"
 msgstr "No help available for ‘&#x1b;1m%s&#x1b;0m’"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "import signatures that are marked as local-only"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "repair damage from the pks keyserver during import"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "do not clear the ownertrust values during import"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "do not update the trustdb after import"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr "enable bulk import mode"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "show key during import"
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "show key but do not actually import"
 msgstr "show key but do not actually import"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "only accept updates to existing keys"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "remove unusable parts from key after import"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "remove as much as possible from key after import"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "ignore key-signatures which are not self-signatures"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "run import filters and export key immediately"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "assume the GnuPG key backup format"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "repair keys on import"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "skipping block of type %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu keys processed so far\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Total number processed: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " skipped PGP-2 keys: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " skipped new keys: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " w/o user IDs: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " imported: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " unchanged: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " new user IDs: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " new subkeys: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " new signatures: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " new key revocations: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " secret keys read: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " secret keys imported: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " secret keys unchanged: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " not imported: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " signatures cleaned: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " user IDs cleaned: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3565,176 +3586,181 @@
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " “&#x1b;1m%s&#x1b;0m”: preference for cipher algorithm %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " “&#x1b;1m%s&#x1b;0m”: preference for AEAD algorithm %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " “&#x1b;1m%s&#x1b;0m”: preference for digest algorithm %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " “&#x1b;1m%s&#x1b;0m”: preference for compression algorithm %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-distribute this key to avoid potential algorithm mismatch problems\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "key %s: PKS subkey corruption repaired\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "key %s: accepted non self-signed user ID “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "key %s: no valid user IDs\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "key %s: public key not found: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "key %s: new key - skipped\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "key %s: public key “&#x1b;1m%s&#x1b;0m” imported\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "key %s: doesn't match our copy\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” 1 new user ID\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” %d new user IDs\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” 1 new signature\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” %d new signatures\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” 1 new subkey\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” %d new subkeys\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” %d signature cleaned\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” %d signatures cleaned\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” %d user ID cleaned\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” %d user IDs cleaned\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” not changed\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "key %s: secret key already exists\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr "key %s: card reference is overridden by key material\n"
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3743,197 +3769,197 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, 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:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "secret key %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” revocation certificate imported\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "key %s: no user ID for signature\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "key %s: unsupported public key algorithm on user ID “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "key %s: invalid self-signature on user ID “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "key %s: unsupported public key algorithm\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "key %s: invalid direct key signature\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "key %s: no subkey for key binding\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "key %s: removed multiple subkey binding\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "key %s: no subkey for key revocation\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "key %s: removed multiple subkey revocation\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "key %s: skipped user ID “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: duplicated user ID detected - merged\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "key %s: duplicated subkeys detected - merged\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "key %s: “&#x1b;1m%s&#x1b;0m” revocation certificate added\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
@@ -3943,57 +3969,57 @@
 msgid "error allocating memory: %s\n"
 msgstr "error allocating memory: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr " (reordered signatures follow)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "key %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "%d duplicate signature removed\n"
 msgstr1 "%d duplicate signatures removed\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 "%d signature not checked due to a missing key\n"
 msgstr1 "%d signatures not checked due to missing keys\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d bad signature\n"
 msgstr1 "%d bad signatures\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "%d signature reordered\n"
 msgstr1 "%d signatures reordered\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -4002,45 +4028,45 @@
 "Warning: errors found and only checked self-signatures, run ‘&#x1b;1m%s&#x1b;0m’ to "
 "check all signatures.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error creating keybox '%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "error creating keyring '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ‘&#x1b;1m%s&#x1b;0m’ created\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "keyring ‘&#x1b;1m%s&#x1b;0m’ created\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "keyblock resource '%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "failed to rebuild keyring cache: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revocation"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "self-signature"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4052,17 +4078,17 @@
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = I trust marginally\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = I trust fully\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4072,50 +4098,50 @@
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Skipping user ID “&#x1b;1m%s&#x1b;0m”, which is not a text ID.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID “&#x1b;1m%s&#x1b;0m” is revoked."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Unable to sign.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID “&#x1b;1m%s&#x1b;0m” is expired."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID “&#x1b;1m%s&#x1b;0m” is not self-signed."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "User ID “&#x1b;1m%s&#x1b;0m” is signable. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Sign it? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4124,11 +4150,11 @@
 "The self-signature on “&#x1b;1m%s&#x1b;0m”\n"
 "is a PGP 2.x-style signature.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4137,12 +4163,12 @@
 "Your current signature on “&#x1b;1m%s&#x1b;0m”\n"
 "has expired.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Do you want to issue a new signature to replace the expired one? (y/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4151,43 +4177,43 @@
 "Your current signature on “&#x1b;1m%s&#x1b;0m”\n"
 "is a local signature.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“&#x1b;1m%s&#x1b;0m” was already locally signed by key %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“&#x1b;1m%s&#x1b;0m” was already signed by key %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Do you want to sign it again anyway? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nothing to sign with key %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "This key has expired!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "This key is due to expire on %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Do you want your signature to expire at the same time? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4198,31 +4224,31 @@
 "to the person named above? If you don't know what to answer, enter "
 "“&#x1b;1m0&#x1b;0m”.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) I will not answer.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) I have not checked at all.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) I have done casual checking.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) I have done very careful checking.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Your selection? (enter ‘&#x1b;1m?&#x1b;0m’ for more information): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4231,226 +4257,237 @@
 "Are you sure that you want to sign this key with your\n"
 "key “&#x1b;1m%s&#x1b;0m” (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "This will be a self-signature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "WARNING: the signature will not be marked as non-exportable.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "WARNING: the signature will not be marked as non-revocable.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "The signature will be marked as non-exportable.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "The signature will be marked as non-revocable.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "I have not checked this key at all.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "I have checked this key casually.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "I have checked this key very carefully.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "key %s: error changing passphrase: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "save and quit"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "show key fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "show the keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "list key and user IDs"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "select user ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "select subkey N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "check signatures"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "sign selected user IDs * see below for related commands"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "sign selected user IDs locally"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "sign selected user IDs with a trust signature"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "sign selected user IDs with a non-revocable signature"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "add a user ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "add a photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "delete selected user IDs"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "add a subkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "add a key to a smartcard"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "move a key to a smartcard"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr "convert a key to TPM form using the local TPM"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "move a backup key to a smartcard"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "delete selected subkeys"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "add a revocation key"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr "add an additional decryption subkey"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "delete signatures from the selected user IDs"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "change the expiration date for the key or selected subkeys"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "flag the selected user ID as primary"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "list preferences (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "list preferences (verbose)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "set preference list for the selected user IDs"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "set the preferred keyserver URL for the selected user IDs"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "set a notation for the selected user IDs"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "change the passphrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "change the ownertrust"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoke signatures on the selected user IDs"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "revoke selected user IDs"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "revoke key or selected subkeys"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "enable key"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "disable key"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "show selected photo IDs"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "compact unusable user IDs and remove unusable signatures from key"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "compact unusable user IDs and remove all signatures from key"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Secret subkeys are available.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+"Note: the local copy of the secret key will only be deleted with "
+"“&#x1b;1msave&#x1b;0m”.\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Need the secret key to do this.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4463,284 +4500,274 @@
 "signatures\n"
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Really sign all text user IDs? (y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Really sign all user IDs? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Select the user IDs to sign\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Unknown signature type ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "You must select at least one user ID.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Use the ‘&#x1b;1m%s&#x1b;0m’ command.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "You can't delete the last user ID!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Really remove all selected user IDs? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Really remove this user ID? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Command expects a filename argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Can't open '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Error reading backup key from '%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "You must select at least one key.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Do you really want to delete the selected keys? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Do you really want to delete this key? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Really revoke all selected user IDs? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Really revoke this user ID? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Do you really want to revoke the entire key? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Do you really want to revoke the selected subkeys? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Do you really want to revoke this subkey? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Owner trust may not be set while using a user provided trust database\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Really update the preferences for the selected user IDs? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Really update the preferences? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Save changes? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "deleting copy of secret key failed: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“&#x1b;1m%s&#x1b;0m” is not a fingerprint\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“&#x1b;1m%s&#x1b;0m” is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘&#x1b;1m%s&#x1b;0m’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“&#x1b;1m%s&#x1b;0m” is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “&#x1b;1m%s&#x1b;0m” not found\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Features: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4748,17 +4775,17 @@
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4767,17 +4794,22 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "WARNING: No valid encryption subkey left over.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4787,72 +4819,72 @@
 "versions\n"
 " of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr "Such a user ID already exists on this key!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "Deleted %d signature.\n"
 msgstr1 "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “&#x1b;1m%s&#x1b;0m” compacted: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "User ID “&#x1b;1m%s&#x1b;0m”: %d signature removed\n"
 msgstr1 "User ID “&#x1b;1m%s&#x1b;0m”: %d signatures removed\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “&#x1b;1m%s&#x1b;0m”: already minimized\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “&#x1b;1m%s&#x1b;0m”: already clean\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4862,40 +4894,54 @@
 "cause\n"
 " some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr "Enter the fingerprint of the additional decryption subkey: "
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, c-format
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "Did you specify the fingerprint of a subkey?\n"
+
+#: g10/keyedit.c:4915
+#, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "key “&#x1b;1m%s&#x1b;0m” is already on this keyblock\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4903,256 +4949,256 @@
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 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:5384
+#: g10/keyedit.c:5672
 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:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, 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:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “&#x1b;1m%s&#x1b;0m” is already revoked\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "invalid value for option ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preference ‘&#x1b;1m%s&#x1b;0m’ duplicated\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "too many cipher preferences\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "too many digest preferences\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "too many AEAD preferences\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘&#x1b;1m%s&#x1b;0m’ in preference string\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, 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:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5166,166 +5212,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Possible actions for this %s key: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Finished\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA and RSA%s\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA and Elgamal%s\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, c-format
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (sign only)%s\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, c-format
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (sign only)%s\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (encrypt only)%s\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (encrypt only)%s\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ECC (sign and encrypt)%s\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr " *default*"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (encrypt only)%s\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Existing key%s\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Existing key from card%s\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error reading the card: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serial number of the card: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5341,7 +5387,7 @@
 " <n>m = key expires in n months\n"
 " <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5357,38 +5403,38 @@
 " <n>m = signature expires in n months\n"
 " <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5396,11 +5442,11 @@
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5414,7 +5460,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5430,41 +5476,41 @@
 " “&#x1b;1mHeinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>&#x1b;0m”\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "The characters ‘&#x1b;1m%s&#x1b;0m’ and ‘&#x1b;1m%s&#x1b;0m’ may not appear in name\n"
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘&#x1b;1m%s&#x1b;0m’ character set.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5475,11 +5521,11 @@
 " “&#x1b;1m%s&#x1b;0m”\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
@@ -5494,31 +5540,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5530,18 +5576,18 @@
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "WARNING: v4 is specified, but overridden by v5.\n"
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5552,64 +5598,64 @@
 " “&#x1b;1m%s&#x1b;0m”\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “&#x1b;1m%s&#x1b;0m” already exists\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Note: Use “&#x1b;1m%s %s&#x1b;0m” for a full featured key generation dialog.\n"
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Note: backup of card key saved to ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5617,36 +5663,36 @@
 "Note that this key cannot be used for encryption. You may want to use\n"
 "the command “&#x1b;1m--edit-key&#x1b;0m” to generate a subkey for this purpose.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, 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:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, 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:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5654,74 +5700,90 @@
 msgid "never "
 msgstr "never "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Critical signature policy: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Signature policy: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Critical preferred keyserver: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Critical signature notation: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Signature notation: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d good signature\n"
 msgstr1 "%d good signatures\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 "%d signature not checked due to an error\n"
 msgstr1 "%d signatures not checked due to errors\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 "Warning: %lu key skipped due to its large size\n"
 msgstr1 "Warning: %lu keys skipped due to their large sizes\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Subkey fingerprint:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Key fingerprint ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Card serial no. ="
 
@@ -5798,144 +5860,144 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“&#x1b;1m%s&#x1b;0m” not a key ID: skipping\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "refreshing %d key from %s\n"
 msgstr1 "refreshing %d keys from %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “&#x1b;1m%s&#x1b;0m” not found on keyserver\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “&#x1b;1m%s&#x1b;0m”: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr "%s.%s encrypted session key\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s encrypted data\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "encrypted with unknown algorithm %d.%s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generated with unknown digest algorithm %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "encrypted with %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -5945,179 +6007,185 @@
 "likely that this message is legitimate. This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘&#x1b;1m%s&#x1b;0m’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "operation forced to fail due to unfulfilled compliance rules\n"
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “&#x1b;1mfor-your-eyes-only&#x1b;0m”\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “&#x1b;1mgpg --import&#x1b;0m” to apply\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “&#x1b;1m%s&#x1b;0m”"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “&#x1b;1m%s&#x1b;0m”"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “&#x1b;1m%s&#x1b;0m”"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " using %s key %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " issuer “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Note: Use ‘&#x1b;1m%s&#x1b;0m’ to make use of this info\n"
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "uncertain"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " aka “&#x1b;1m%s&#x1b;0m”"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "WARNING: not a detached signature; file ‘&#x1b;1m%s&#x1b;0m’ was NOT verified!\n"
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6219,28 +6287,28 @@
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ambiguous option ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "unknown option ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "unknown weak digest ‘&#x1b;1m%s&#x1b;0m’\n"
@@ -6293,7 +6361,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 msgid "Please enter the passphrase for decryption."
 msgstr "Please enter the passphrase for decryption."
 
@@ -6355,7 +6423,7 @@
 "created %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6369,77 +6437,77 @@
 "very large picture, your key will become very large as well!\n"
 "Keeping the image close to 240x288 is a good size to use.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Enter JPEG filename for photo ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "unable to open JPEG file '%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "This JPEG is really large (%d bytes) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Are you sure you want to use it? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "‘&#x1b;1m%s&#x1b;0m’ is not a JPEG file\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Is this photo correct (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "no remote program execution supported\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "this platform requires temporary files when calling external programs\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "unable to execute shell '%s': %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "unnatural exit of external program\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "system error while calling external program: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "WARNING: unable to remove temp directory '%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "external program calls are disabled due to unsafe options file permissions\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "unable to display photo ID!\n"
@@ -6521,32 +6589,32 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificates leading to an ultimately trusted key:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: There is no assurance this key belongs to the named user\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: There is limited assurance this key belongs to the named user\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "This key probably belongs to the named user\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "This key belongs to us\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: This key is bad! It has been marked as untrusted!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6556,7 +6624,7 @@
 "*really* know what you are doing, you may answer the next\n"
 "question with yes.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6566,99 +6634,99 @@
 "in the user ID. If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Use this key anyway? (y/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNING: Using untrusted key!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "WARNING: this key might be revoked (revocation key not present)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "checking User ID “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "option %s given but issuer “&#x1b;1m%s&#x1b;0m” does not match\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "issuer “&#x1b;1m%s&#x1b;0m” does not match any User ID\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "option %s given but no matching User ID found\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "WARNING: This key has been revoked by its designated revoker!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNING: This key has been revoked by its owner!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " This could mean that the signature is forged.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNING: This subkey has been revoked by its owner!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: This key has been disabled.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Note: This key has expired!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "WARNING: The key's User ID is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNING: This key is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " There is no indication that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNING: We do NOT trust this key!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " The signature is probably a FORGERY.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
@@ -6667,57 +6735,57 @@
 "WARNING: The key's User ID is not certified with sufficiently trusted "
 "signatures!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "can't encrypt to ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "option ‘&#x1b;1m%s&#x1b;0m’ given, but no valid default keys given\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "option ‘&#x1b;1m%s&#x1b;0m’ given, but option ‘&#x1b;1m%s&#x1b;0m’ not given\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "You did not specify a user ID. (you may use “&#x1b;1m-r&#x1b;0m”)\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6725,40 +6793,40 @@
 "\n"
 "Enter the user ID. End with an empty line: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "unknown default recipient “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -6796,7 +6864,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "can't open signed data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "key %s is not suitable for decryption in %s mode\n"
@@ -7019,51 +7087,46 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr "continuing verification anyway due to option %s\n"
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNING: signature digest conflict in message\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "WARNING: signing subkey %s is not cross-certified\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "please see %s for more information\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
 msgstr0 "public key %s is %lu second newer than the signature\n"
 msgstr1 "public key %s is %lu seconds newer than the signature\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 "public key %s is %lu day newer than the signature\n"
 msgstr1 "public key %s is %lu days newer than the signature\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7074,7 +7137,7 @@
 msgstr1 ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7084,55 +7147,55 @@
 msgstr1 ""
 "key %s was created %lu days in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Note: signature key %s expired %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Note: signature key %s has been revoked\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "key %s: no subkey for subkey binding signature\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7141,24 +7204,24 @@
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature from: “&#x1b;1m%s&#x1b;0m”\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "signing:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, c-format
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s encryption will be used\n"
@@ -7233,133 +7296,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "can't create lock for ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "can't lock ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaction too large\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "can't access '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: failed to create version record: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: invalid trustdb created\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb created\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Note: trustdb not writable\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: invalid trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: failed to create hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: The trustdb is corrupted.\n"
@@ -7793,7 +7856,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
@@ -7823,38 +7886,38 @@
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%d key processed"
 msgstr1 "%d keys processed"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 " (%d validity count cleared)\n"
 msgstr1 " (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, 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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
@@ -7923,7 +7986,7 @@
 msgid "ultimate"
 msgstr "ultimate"
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -7934,12 +7997,12 @@
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "input line %u too long or missing LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "can't open fd %d: %s\n"
@@ -7954,19 +8017,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "Hint: Do not use option %s\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "set debugging flags"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "enable full debugging"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Usage: kbxutil options files (-h for help)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -7977,16 +8040,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%sNumber&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
@@ -8015,10 +8078,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||Please enter the Unblocking Key of your PIV card"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
@@ -8038,119 +8101,119 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN has invalid characters; only digits are allowed\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existing key will be replaced\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "failed to store the key: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "response does not contain the RSA modulus\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "response does not contain the RSA public exponent\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "response does not contain the EC public key\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "please wait while key is being generated ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "key generation completed (%d second)\n"
 msgstr1 "key generation completed (%d seconds)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Please enter the PIN for the key to create qualified signatures."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Please enter the PIN for the standard keys."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "Note: PIN has not yet been enabled."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "the NullPIN has not yet been changed\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8158,7 +8221,7 @@
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8166,27 +8229,27 @@
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -8194,42 +8257,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8237,20 +8300,20 @@
 msgstr0 "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgstr1 "%d Admin PIN attempts remaining before card is permanently locked\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -8258,79 +8321,79 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, 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:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8350,7 +8413,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
@@ -8394,11 +8457,11 @@
 msgid "deny the use of admin card commands"
 msgstr "deny the use of admin card commands"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Usage: @SCDAEMON@ options (-h for help)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8406,315 +8469,315 @@
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "please use the option ‘&#x1b;1m--daemon&#x1b;0m’ to run the program in the background\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error getting key usage information: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr "Tor might be in use - network access is limited"
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "validation model requested by certificate: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "issuer certificate is not marked as a CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "critical marked policy without configured policies"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "failed to open '%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certificate policy not allowed"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "failed to get the fingerprint\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "looking up issuer at external location\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "can't get authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "looking up issuer from the Dirmngr cache\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only key lookup failed: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "please make sure that the “&#x1b;1mdirmngr&#x1b;0m” is properly installed\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "checking the CRL failed: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificate with invalid validity: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "required certificate attributes missing: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "intermediate certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( signature created at "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (certificate created at "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (certificate valid from "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( issuer valid from "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "self-signed certificate has a BAD signature"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificate has a BAD signature"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "found another possible matching CA certificate - trying again"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certificate chain longer than allowed by CA (%d)"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "out of core\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "none"
 
@@ -8734,7 +8797,7 @@
 msgid "Error - invalid DN"
 msgstr "Error - invalid DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8749,42 +8812,42 @@
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "looking for another certificate\n"
@@ -9002,17 +9065,17 @@
 msgid "resource problem: out of core\n"
 msgstr "resource problem: out of core\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(this is the RC2 algorithm)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(this does not seem to be an encrypted message)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "encrypted to %s key %s\n"
@@ -9022,7 +9085,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificate ‘&#x1b;1m%s&#x1b;0m’ not found: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error locking keybox: %s\n"
@@ -9047,123 +9110,123 @@
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "don't use the terminal at all"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|take policy information from FILE"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "create base-64 encoded output"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|use USER-ID as default secret key"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "do not check CRLs for root certificates"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Usage: @GPGSM@ options files (-h for help)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9173,27 +9236,27 @@
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9213,7 +9276,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "basic certificate checks failed - not imported\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error getting stored flags: %s\n"
@@ -9223,47 +9286,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "no keyboxd running in this session\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error opening key DB: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem looking for existing certificate: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error finding writable keyDB: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error storing certificate: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem re-searching certificate: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Error - "
 
@@ -9299,7 +9362,7 @@
 "\n"
 "%s%sAre you really sure that you want to do this?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9319,59 +9382,59 @@
 "“&#x1b;1m%s&#x1b;0m”\n"
 "Note, that this certificate will NOT create a qualified signature!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "hash algorithm used for signer %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "checking for qualified certificate failed: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s signature using %s key %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Signature made "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "date not given"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "algorithm:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, 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:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Good signature from"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " aka"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "This is a qualified signature\n"
@@ -9396,315 +9459,310 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "can't release lock on the certificate cache: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "dropping %u certificates from the cache\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "can't parse certificate '%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "certificate ‘&#x1b;1m%s&#x1b;0m’ already cached\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "trusted certificate ‘&#x1b;1m%s&#x1b;0m’ loaded\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certificate ‘&#x1b;1m%s&#x1b;0m’ loaded\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " SHA1 fingerprint = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " issuer ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " subject ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "error loading certificate '%s': %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanently loaded certificates: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " runtime cached certificates: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " trusted certificates: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificate already cached\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificate cached\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error caching certificate: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "invalid SHA1 fingerprint string ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error fetching certificate by S/N: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error fetching certificate by subject: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no issuer found in certificate\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error getting authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "creating directory ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "error creating directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignoring database dir ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "error reading directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "removing cache file ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "not removing file ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "new cache dir file ‘&#x1b;1m%s&#x1b;0m’ created\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "first record of ‘&#x1b;1m%s&#x1b;0m’ is not the version\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "old version of cache directory - cleaning up\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "old version of cache directory - giving up\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "extra field detected in crl record of ‘&#x1b;1m%s&#x1b;0m’ line %u\n"
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "invalid line detected in ‘&#x1b;1m%s&#x1b;0m’ line %u\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "duplicate entry detected in ‘&#x1b;1m%s&#x1b;0m’ line %u\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "unsupported record type in ‘&#x1b;1m%s&#x1b;0m’ line %u skipped\n"
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "invalid issuer hash in ‘&#x1b;1m%s&#x1b;0m’ line %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "no issuer DN in ‘&#x1b;1m%s&#x1b;0m’ line %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "invalid timestamp in ‘&#x1b;1m%s&#x1b;0m’ line %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "WARNING: invalid cache file hash in ‘&#x1b;1m%s&#x1b;0m’ line %u\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "detected errors in cache dir file\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, 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:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "error closing '%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "error renaming ‘&#x1b;1m%s&#x1b;0m’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "can't hash '%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "error setting up MD5 hash context: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "error hashing '%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "invalid formatted checksum for ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, 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:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "opening cache file ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "error opening cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "error initializing cache file ‘&#x1b;1m%s&#x1b;0m’ for reading: %s\n"
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, 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:1176
+#: dirmngr/crlcache.c:1183
 #, 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:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "no CRL available for issuer id %s\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, 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:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9713,194 +9771,194 @@
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, 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:1325
+#: dirmngr/crlcache.c:1332
 #, 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:1336
+#: dirmngr/crlcache.c:1343
 #, 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:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "WARNING: invalid cache record length for S/N "
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, 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:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "error getting data from cache file: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "got an invalid S-expression from libksba\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "converting S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "unknown hash algorithm ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creating S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error getting update times of CRL: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, 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:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no CRL issuer found in CRL: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader failed: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "removed stale temporary cache file ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error creating temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error finishing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error closing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, 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:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem renaming ‘&#x1b;1m%s&#x1b;0m’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9909,12 +9967,12 @@
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Begin CRL dump (retrieved via %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9922,55 +9980,55 @@
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: The CRL will not be used\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 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:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error reading cache entry from db: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -9984,23 +10042,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "CRL access not possible due to Tor mode"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "CRL access not possible due to disabled %s\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "error retrieving '%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "error initializing reader object: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "certificate search not possible due to disabled %s\n"
@@ -10145,135 +10203,135 @@
 msgid "looking up '%s'\n"
 msgstr "looking up ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "list the contents of the CRL cache"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|load CRL from FILE into cache"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|fetch a CRL from URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "shutdown the dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 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:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr "Network related options"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Configuration for HTTP servers"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "use system's HTTP proxy setting"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr "Configuration for OpenPGP servers"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|use keyserver at URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 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:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr "Configuration for X.509 servers"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "inhibit the use of LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignore LDAP CRL distribution points"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|use this keyserver to lookup keys"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Configuration for OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "allow sending OCSP requests"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignore certificate contained OCSP service URLs"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10283,11 +10341,11 @@
 "(See the “&#x1b;1minfo&#x1b;0m” manual for a complete listing of all commands and "
 "options)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Usage: @DIRMNGR@ options (-h for help)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10295,103 +10353,103 @@
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "usage: %s options "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘&#x1b;1m%s&#x1b;0m’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘&#x1b;1m%s&#x1b;0m’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, 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:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘&#x1b;1m%s&#x1b;0m’ redirected to ‘&#x1b;1m%s&#x1b;0m’ (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘&#x1b;1m%s&#x1b;0m’\n"
@@ -10446,32 +10504,32 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc failed: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "‘&#x1b;1m%s&#x1b;0m’ is not an LDAP URL\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "‘&#x1b;1m%s&#x1b;0m’ is an invalid LDAP URL\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search hit the size limit of the server\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: password given without user\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr "%s:%u: ignoring unknown flag ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: skipping this line\n"
@@ -10560,161 +10618,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "not signed by a default OCSP signer's certificate"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "allocating list item failed: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error getting responder ID: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "no suitable certificate found to verify the OCSP response\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "issuer certificate not found: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "caller did not return the target certificate\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "caller did not return the issuing certificate\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "failed to allocate OCSP context: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error getting OCSP status for target certificate: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "certificate status is: %s (this=%s next=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certificate has been revoked at: %s due to: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP responder returned a status in the future\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP responder returned a non-current status\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) failed: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "serialno missing in cert ID"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url failed: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -10724,83 +10782,83 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "accepting root CA not marked as a CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "CRL checking too deeply nested\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "not checking CRL for"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "checking CRL for"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "checking trustworthiness of root certificate failed: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "certificate chain is good\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "quiet"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "print data out hex encoded"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "decode received data lines"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "connect to the dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr "connect to the keyboxd"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|connect to Assuan socket NAME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|connect to Assuan server at ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 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:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "do not use extended connect mode"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|run commands from FILE on startup"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "run /subst on startup"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Usage: @GPG@-connect-agent options (-h for help)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -10808,48 +10866,48 @@
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "option “&#x1b;1m%s&#x1b;0m” requires a program and optional arguments\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option “&#x1b;1m%s&#x1b;0m” ignored due to “&#x1b;1m%s&#x1b;0m”\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "receiving line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "line too long - skipped\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unknown command ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "no keybox daemon running in this session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
@@ -10909,12 +10967,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘&#x1b;1m%s&#x1b;0m’\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘&#x1b;1m%s&#x1b;0m’\n"
@@ -11019,33 +11077,33 @@
 "Syntax: gpg-check-pattern options patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Note: key %s is already stored on the card!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Note: Keys are already stored on the card!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Replace existing key %s ? (y/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s card no. %s detected\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr "User Interaction Flag is set to “&#x1b;1m%s&#x1b;0m” - can't change\n"
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11054,43 +11112,43 @@
 "Warning: Setting the User Interaction Flag to “&#x1b;1m%s&#x1b;0m”\n"
 " can only be reverted using a factory reset!\n"
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Please use “&#x1b;1muif --yes %d %s&#x1b;0m”\n"
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "authenticate to the card"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "send a reset to the card daemon"
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "change a private data object"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "read a certificate from a data object"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "store a certificate to a data object"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "store a private key to a data object"
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey management commands"
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "manage the command history"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/en@quot.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/en@quot.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/en@quot.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/en@quot.po Changed

@@ -1,7 +1,7 @@
 # English translations for GNU gnupg package.
-# Copyright (C) 2022 Free Software Foundation, Inc.
+# Copyright (C) 2023 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gnupg package.
-# Automatically generated, 2022.
+# Automatically generated, 2023.
 #
 # 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.3.6\n"
+"Project-Id-Version: GNU gnupg 2.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
-"PO-Revision-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
+"PO-Revision-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -50,49 +50,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "Caps Lock is on"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "Suggest"
 
@@ -103,27 +103,27 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "Note: The blanks are not part of the passphrase."
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "Passphrase Not Allowed"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -133,11 +133,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -145,7 +145,7 @@
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -153,76 +153,80 @@
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+msgid "Passphrases match."
+msgstr "Passphrases match."
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "Note: Request from the web browser."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error getting serial number of card: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -231,7 +235,7 @@
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
@@ -239,45 +243,45 @@
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "can't create '%s': %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "no suitable card key found: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error getting list of cards: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -286,20 +290,20 @@
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Allow"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Deny"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -308,83 +312,79 @@
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Please insert the card with serial number"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Reset Code"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Push ACK button on card/token."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Use the reader's pinpad for input."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Repeat this Reset Code"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Repeat this PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Repeat this PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reset Code not correctly repeated; try again"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK not correctly repeated; try again"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN not correctly repeated; try again"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Please enter the PIN%s%s%s to unlock the card"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "error writing to pipe: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -393,18 +393,18 @@
 "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."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Yes, protection is not needed"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "A passphrase should be at least %u character long."
 msgstr1 "A passphrase should be at least %u characters long."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -414,227 +414,231 @@
 msgstr1 ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Take this one anyway"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|use PGM as the tpm2daemon program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+msgid "enable Win32-OpenSSH support"
+msgstr "enable Win32-OpenSSH support"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Options controlling the security"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted”"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|set minimal required length for new passphrases to N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|require at least N non-alpha characters for a new passphrase"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "allow passphrase to be prompted through Emacs"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Usage: @GPG_AGENT@ options (-h for help)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -642,141 +646,141 @@
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘%s’ is not considered an option\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s” is a deprecated option\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -784,11 +788,11 @@
 "@Options:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -796,8 +800,8 @@
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -805,8 +809,8 @@
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -816,11 +820,11 @@
 "Options:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Usage: gpg-protect-tool options (-h for help)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -828,15 +832,15 @@
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -844,7 +848,7 @@
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -852,52 +856,54 @@
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelled\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “%s” ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘%s’ not available\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -910,7 +916,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -918,11 +924,11 @@
 msgstr ""
 "Do you ultimately trust%%0A “%s”%%0Ato correctly certify user certificates?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -935,7 +941,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -947,20 +953,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -969,15 +975,24 @@
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -986,11 +1001,11 @@
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
 "%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1003,8 +1018,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s key uses an unsafe (%u bit) hash\n"
@@ -1014,7 +1029,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
@@ -1024,7 +1039,7 @@
 msgid "secret key parts are not available\n"
 msgstr "secret key parts are not available\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -1039,52 +1054,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "protection hash algorithm %d (%s) is not supported\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creating a pipe: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "error creating a stream for a pipe: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "waiting for process %d to terminate failed: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "error running '%s': probably not installed\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "error running '%s': exit status %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "error running '%s': terminated\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "waiting for processes to terminate failed: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error getting exit code of process %d: %s\n"
@@ -1104,28 +1119,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "can't disable core dumps: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Warning: unsafe ownership on %s “%s”\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “%s”\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1179,8 +1194,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "out of core while allocating %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error allocating enough memory: %s\n"
@@ -1195,72 +1210,72 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: “%s%s” is an obsolete option - it has no effect\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "unknown debug flag ‘%s’ ignored\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "waiting for the dirmngr to come up ... (%ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "waiting for the keyboxd to come up ... (%ds)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "waiting for the agent to come up ... (%ds)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "connection to the dirmngr established\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "connection to the keyboxd established\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr "connection to the agent established\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "no running %s - starting ‘%s’\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "connection to the agent is in restricted mode\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "error getting version from '%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "server ‘%s’ is older than us (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "WARNING: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr "Note: Outdated servers may lack important security fixes.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Note: Use the command “%s” to restart them.\n"
@@ -1333,7 +1348,7 @@
 msgstr "algorithm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1408,39 +1423,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP check of certificates"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Included certificates"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "No audit log entries."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Unknown operation"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent usable"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr usable"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "No help available for '%s'."
@@ -1449,11 +1464,11 @@
 msgid "ignoring garbage line"
 msgstr "ignoring garbage line"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "none"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
@@ -1488,148 +1503,160 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open failed: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "failed to create temporary file '%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error writing to '%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "removing stale lockfile (created by %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock ‘%s’ not made: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "error closing '%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "invalid armor header: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "armor header: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "invalid clearsig header\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "unknown armor header: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "nested clear text signatures\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "unexpected armor: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "invalid dash escaped line: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "invalid radix64 character %02X skipped\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "premature eof (no CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "premature eof (in CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "malformed CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC error; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "premature eof (in trailer)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "error in trailer line\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "no valid OpenPGP data found.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "invalid armor: line longer than %d characters\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " not human readable (%zu bytes: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1638,32 +1665,32 @@
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘=’\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "a user notation name must contain the ‘@’ character\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "a notation name must not contain more than one ‘@’ character\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "a notation value must not use any control characters\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "a notation name may not contain an ‘=’ character\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "a notation name must have only printable characters or spaces\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNING: invalid notation data found\n"
@@ -1677,8 +1704,8 @@
 msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is not compliant with %s mode\n"
@@ -1688,13 +1715,13 @@
 msgid "error from TPM: %s\n"
 msgstr "error from TPM: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem with the agent: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no dirmngr running in this session\n"
@@ -1704,197 +1731,202 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "keyserver option “honor-keyserver-url” may not be used in Tor mode\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKD uses a cached result"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "Tor is not running"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Tor is not properly configured"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNS is not properly configured"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "unacceptable HTTP redirect from server"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "unacceptable HTTP redirect from server was cleaned up"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "can't do this in batch mode\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "not set"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "not forced"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr "Please try command “%s” if the listing does not look correct\n"
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: Only plain ASCII is currently allowed.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: The “<” character may not be used.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: Double spaces are not allowed.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1906,99 +1938,99 @@
 " please check the documentation of your card to see which\n"
 " key types and sizes are supported.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2009,176 +2041,181 @@
 " PIN = ‘%s’ Admin PIN = ‘%s’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Signature key\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Encryption key\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Authentication key\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “yes”) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "error for setup UIF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "setup KDF for PIN authentication (on/single/off)"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "change the User Interaction Flag"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr "switch to the OpenPGP app"
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Invalid command (try “help”)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “%s” not found: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2236,9 +2273,9 @@
 msgid "subkey"
 msgstr "subkey"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2263,77 +2300,71 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "cipher algorithm ‘%s’ may not be used for encryption\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr "(use option “%s” to override)\n"
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
 
-#: g10/encrypt.c:339
+#: g10/encrypt.c:484
 #, 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"
+msgid "can't use a SKESK packet due to the S2K mode\n"
+msgstr "can't use a SKESK packet due to the S2K mode\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "using cipher %s.%s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "cipher algorithm ‘%s’ may not be used for encryption\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr "(use option “%s” to override)\n"
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "reading from ‘%s’\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr "operation forced to fail due to unfulfilled compliance rules\n"
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2342,17 +2373,12 @@
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s encrypted for: “%s”\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
@@ -2367,7 +2393,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2379,386 +2405,388 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problem handling encrypted packet\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "export signatures that are marked as local-only"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "export attribute user IDs (generally photo IDs)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "export revocation keys marked as “sensitive”"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "remove unusable parts from key during export"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "remove as much as possible from key during export"
 
-#: g10/export.c:132
+#: g10/export.c:138
+msgid "export only revocation certificates"
+msgstr "export only revocation certificates"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "use the GnuPG key backup format"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+msgid "export secret keys using the GnuPG format"
+msgstr "export secret keys using the GnuPG format"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - skipped"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "writing to ‘%s’\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "key %s: key material on-card - skipped\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "exporting secret keys not allowed\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "key %s: PGP 2.x style key - skipped\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "error creating '%s': %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "User ID not found"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatically retrieved ‘%s’ via %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error retrieving ‘%s’ via %s: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "No fingerprint"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, 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:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “%s” not found: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(check argument of option '%s')\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "all values passed to ‘%s’ ignored\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|use NAME as default secret key"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|encrypt to user ID NAME as well"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|set up email aliases"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr "Options controlling the input"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr "Options controlling the output"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "import missing key from a signature"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
 msgstr "Options to specify keys"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr "Options for unattended use"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2766,7 +2794,7 @@
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2786,11 +2814,11 @@
 " --list-keys names show keys\n"
 " --fingerprint names show fingerprints\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Usage: @GPG@ options files (-h for help)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2800,7 +2828,7 @@
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2808,556 +2836,549 @@
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "usage: %s options %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "show signatures with invalid algorithms during signature listings"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+msgid "show preferences"
+msgstr "show preferences"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help” to list choices)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s” is not a proper mail address\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s”\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3949
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "selected AEAD algorithm is invalid\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:4012
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "invalid personal AEAD preferences\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "chunk size invalid - using %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:4134
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "AEAD algorithm ‘%s’ may not be used in %s mode\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, 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:5342
+#: g10/gpg.c:5394
 #, 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:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3370,7 +3391,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "make timestamp conflicts only a warning"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -3399,153 +3420,153 @@
 msgid "No help available for '%s'"
 msgstr "No help available for ‘%s’"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "import signatures that are marked as local-only"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "repair damage from the pks keyserver during import"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "do not clear the ownertrust values during import"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "do not update the trustdb after import"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr "enable bulk import mode"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "show key during import"
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "show key but do not actually import"
 msgstr "show key but do not actually import"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "only accept updates to existing keys"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "remove unusable parts from key after import"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "remove as much as possible from key after import"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "ignore key-signatures which are not self-signatures"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "run import filters and export key immediately"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "assume the GnuPG key backup format"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "repair keys on import"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "skipping block of type %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu keys processed so far\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Total number processed: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " skipped PGP-2 keys: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " skipped new keys: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " w/o user IDs: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " imported: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " unchanged: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " new user IDs: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " new subkeys: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " new signatures: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " new key revocations: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " secret keys read: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " secret keys imported: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " secret keys unchanged: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " not imported: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " signatures cleaned: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " user IDs cleaned: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3554,176 +3575,181 @@
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " “%s”: preference for cipher algorithm %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " “%s”: preference for AEAD algorithm %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " “%s”: preference for digest algorithm %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " “%s”: preference for compression algorithm %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-distribute this key to avoid potential algorithm mismatch problems\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "key %s: PKS subkey corruption repaired\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "key %s: accepted non self-signed user ID “%s”\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "key %s: no valid user IDs\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "key %s: public key not found: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "key %s: new key - skipped\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "key %s: public key “%s” imported\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "key %s: doesn't match our copy\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "key %s: “%s” 1 new user ID\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "key %s: “%s” %d new user IDs\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "key %s: “%s” 1 new signature\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "key %s: “%s” %d new signatures\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "key %s: “%s” 1 new subkey\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "key %s: “%s” %d new subkeys\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "key %s: “%s” %d signature cleaned\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "key %s: “%s” %d signatures cleaned\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "key %s: “%s” %d user ID cleaned\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "key %s: “%s” %d user IDs cleaned\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "key %s: “%s” not changed\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "key %s: secret key already exists\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr "key %s: card reference is overridden by key material\n"
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3732,197 +3758,197 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, 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:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "secret key %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "key %s: “%s” revocation certificate imported\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "key %s: no user ID for signature\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "key %s: unsupported public key algorithm\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "key %s: invalid direct key signature\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "key %s: no subkey for key binding\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "key %s: removed multiple subkey binding\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "key %s: no subkey for key revocation\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "key %s: removed multiple subkey revocation\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "key %s: skipped user ID “%s”\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: duplicated user ID detected - merged\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "key %s: duplicated subkeys detected - merged\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "key %s: “%s” revocation certificate added\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
@@ -3932,57 +3958,57 @@
 msgid "error allocating memory: %s\n"
 msgstr "error allocating memory: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr " (reordered signatures follow)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "key %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "%d duplicate signature removed\n"
 msgstr1 "%d duplicate signatures removed\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 "%d signature not checked due to a missing key\n"
 msgstr1 "%d signatures not checked due to missing keys\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d bad signature\n"
 msgstr1 "%d bad signatures\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "%d signature reordered\n"
 msgstr1 "%d signatures reordered\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -3991,45 +4017,45 @@
 "Warning: errors found and only checked self-signatures, run ‘%s’ to check "
 "all signatures.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error creating keybox '%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "error creating keyring '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ‘%s’ created\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "keyring ‘%s’ created\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "keyblock resource '%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "failed to rebuild keyring cache: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revocation"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "self-signature"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4041,17 +4067,17 @@
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = I trust marginally\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = I trust fully\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4061,50 +4087,50 @@
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Skipping user ID “%s”, which is not a text ID.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID “%s” is revoked."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Unable to sign.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID “%s” is expired."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID “%s” is not self-signed."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "User ID “%s” is signable. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Sign it? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4113,11 +4139,11 @@
 "The self-signature on “%s”\n"
 "is a PGP 2.x-style signature.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4126,12 +4152,12 @@
 "Your current signature on “%s”\n"
 "has expired.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Do you want to issue a new signature to replace the expired one? (y/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4140,43 +4166,43 @@
 "Your current signature on “%s”\n"
 "is a local signature.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s” was already locally signed by key %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s” was already signed by key %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Do you want to sign it again anyway? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nothing to sign with key %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "This key has expired!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "This key is due to expire on %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Do you want your signature to expire at the same time? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4186,31 +4212,31 @@
 "belongs\n"
 "to the person named above? If you don't know what to answer, enter “0”.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) I will not answer.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) I have not checked at all.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) I have done casual checking.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) I have done very careful checking.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Your selection? (enter ‘?’ for more information): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4219,226 +4245,236 @@
 "Are you sure that you want to sign this key with your\n"
 "key “%s” (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "This will be a self-signature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "WARNING: the signature will not be marked as non-exportable.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "WARNING: the signature will not be marked as non-revocable.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "The signature will be marked as non-exportable.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "The signature will be marked as non-revocable.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "I have not checked this key at all.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "I have checked this key casually.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "I have checked this key very carefully.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "key %s: error changing passphrase: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "save and quit"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "show key fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "show the keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "list key and user IDs"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "select user ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "select subkey N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "check signatures"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "sign selected user IDs * see below for related commands"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "sign selected user IDs locally"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "sign selected user IDs with a trust signature"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "sign selected user IDs with a non-revocable signature"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "add a user ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "add a photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "delete selected user IDs"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "add a subkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "add a key to a smartcard"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "move a key to a smartcard"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr "convert a key to TPM form using the local TPM"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "move a backup key to a smartcard"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "delete selected subkeys"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "add a revocation key"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr "add an additional decryption subkey"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "delete signatures from the selected user IDs"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "change the expiration date for the key or selected subkeys"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "flag the selected user ID as primary"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "list preferences (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "list preferences (verbose)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "set preference list for the selected user IDs"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "set the preferred keyserver URL for the selected user IDs"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "set a notation for the selected user IDs"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "change the passphrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "change the ownertrust"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoke signatures on the selected user IDs"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "revoke selected user IDs"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "revoke key or selected subkeys"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "enable key"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "disable key"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "show selected photo IDs"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "compact unusable user IDs and remove unusable signatures from key"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "compact unusable user IDs and remove all signatures from key"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Secret subkeys are available.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+"Note: the local copy of the secret key will only be deleted with “save”.\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Need the secret key to do this.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4450,284 +4486,274 @@
 " 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:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Really sign all text user IDs? (y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Really sign all user IDs? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Select the user IDs to sign\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Unknown signature type ‘%s’\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "You must select at least one user ID.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Use the ‘%s’ command.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "You can't delete the last user ID!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Really remove all selected user IDs? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Really remove this user ID? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Command expects a filename argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Can't open '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Error reading backup key from '%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "You must select at least one key.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Do you really want to delete the selected keys? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Do you really want to delete this key? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Really revoke all selected user IDs? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Really revoke this user ID? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Do you really want to revoke the entire key? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Do you really want to revoke the selected subkeys? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Do you really want to revoke this subkey? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Owner trust may not be set while using a user provided trust database\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Really update the preferences for the selected user IDs? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Really update the preferences? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Save changes? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "deleting copy of secret key failed: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“%s” is not a fingerprint\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s” is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s” is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s” not found\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Features: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4735,17 +4761,17 @@
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4754,17 +4780,22 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "WARNING: No valid encryption subkey left over.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4774,72 +4805,72 @@
 "versions\n"
 " of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr "Such a user ID already exists on this key!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "Deleted %d signature.\n"
 msgstr1 "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s” compacted: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "User ID “%s”: %d signature removed\n"
 msgstr1 "User ID “%s”: %d signatures removed\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s”: already minimized\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s”: already clean\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4849,40 +4880,54 @@
 "cause\n"
 " some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr "Enter the fingerprint of the additional decryption subkey: "
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, c-format
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "Did you specify the fingerprint of a subkey?\n"
+
+#: g10/keyedit.c:4915
+#, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "key “%s” is already on this keyblock\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4890,256 +4935,256 @@
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 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:5384
+#: g10/keyedit.c:5672
 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:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s”\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, 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:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s” is already revoked\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "invalid value for option ‘%s’\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preference ‘%s’ duplicated\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "too many cipher preferences\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "too many digest preferences\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "too many AEAD preferences\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, 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:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5153,166 +5198,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Possible actions for this %s key: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Finished\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA and RSA%s\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA and Elgamal%s\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, c-format
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (sign only)%s\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, c-format
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (sign only)%s\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (encrypt only)%s\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (encrypt only)%s\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ECC (sign and encrypt)%s\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr " *default*"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (encrypt only)%s\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Existing key%s\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Existing key from card%s\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error reading the card: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serial number of the card: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5328,7 +5373,7 @@
 " <n>m = key expires in n months\n"
 " <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5344,38 +5389,38 @@
 " <n>m = signature expires in n months\n"
 " <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5383,11 +5428,11 @@
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5401,7 +5446,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5417,41 +5462,41 @@
 " “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, 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:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5462,11 +5507,11 @@
 " “%s”\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
@@ -5481,31 +5526,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5517,18 +5562,18 @@
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "WARNING: v4 is specified, but overridden by v5.\n"
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5539,64 +5584,64 @@
 " “%s”\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “%s” already exists\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, 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:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5604,36 +5649,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, 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:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, 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:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5641,74 +5686,90 @@
 msgid "never "
 msgstr "never "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Critical signature policy: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Signature policy: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Critical preferred keyserver: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Critical signature notation: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Signature notation: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d good signature\n"
 msgstr1 "%d good signatures\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 "%d signature not checked due to an error\n"
 msgstr1 "%d signatures not checked due to errors\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 "Warning: %lu key skipped due to its large size\n"
 msgstr1 "Warning: %lu keys skipped due to their large sizes\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Subkey fingerprint:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Key fingerprint ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Card serial no. ="
 
@@ -5785,144 +5846,144 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s” not a key ID: skipping\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "refreshing %d key from %s\n"
 msgstr1 "refreshing %d keys from %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “%s” not found on keyserver\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s”: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘%s’\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr "%s.%s encrypted session key\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s encrypted data\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "encrypted with unknown algorithm %d.%s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generated with unknown digest algorithm %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "encrypted with %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " “%s”\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -5932,179 +5993,185 @@
 "likely that this message is legitimate. This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "operation forced to fail due to unfulfilled compliance rules\n"
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only”\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import” to apply\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s”"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s”"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s”"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " using %s key %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " issuer “%s”\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, 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:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "uncertain"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " aka “%s”"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, 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:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6205,28 +6272,28 @@
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "unknown option ‘%s’\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "unknown weak digest ‘%s’\n"
@@ -6279,7 +6346,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 msgid "Please enter the passphrase for decryption."
 msgstr "Please enter the passphrase for decryption."
 
@@ -6341,7 +6408,7 @@
 "created %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6355,77 +6422,77 @@
 "very large picture, your key will become very large as well!\n"
 "Keeping the image close to 240x288 is a good size to use.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Enter JPEG filename for photo ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "unable to open JPEG file '%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "This JPEG is really large (%d bytes) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Are you sure you want to use it? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "‘%s’ is not a JPEG file\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Is this photo correct (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "no remote program execution supported\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "this platform requires temporary files when calling external programs\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "unable to execute shell '%s': %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "unnatural exit of external program\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "system error while calling external program: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "WARNING: unable to remove temp directory '%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "external program calls are disabled due to unsafe options file permissions\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "unable to display photo ID!\n"
@@ -6507,32 +6574,32 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificates leading to an ultimately trusted key:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: There is no assurance this key belongs to the named user\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: There is limited assurance this key belongs to the named user\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "This key probably belongs to the named user\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "This key belongs to us\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: This key is bad! It has been marked as untrusted!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6542,7 +6609,7 @@
 "*really* know what you are doing, you may answer the next\n"
 "question with yes.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6552,99 +6619,99 @@
 "in the user ID. If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Use this key anyway? (y/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNING: Using untrusted key!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "WARNING: this key might be revoked (revocation key not present)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "checking User ID “%s”\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "option %s given but issuer “%s” does not match\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "issuer “%s” does not match any User ID\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "option %s given but no matching User ID found\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "WARNING: This key has been revoked by its designated revoker!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNING: This key has been revoked by its owner!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " This could mean that the signature is forged.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNING: This subkey has been revoked by its owner!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: This key has been disabled.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Note: This key has expired!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "WARNING: The key's User ID is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNING: This key is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " There is no indication that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNING: We do NOT trust this key!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " The signature is probably a FORGERY.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
@@ -6653,57 +6720,57 @@
 "WARNING: The key's User ID is not certified with sufficiently trusted "
 "signatures!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "can't encrypt to ‘%s’\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "option ‘%s’ given, but no valid default keys given\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "option ‘%s’ given, but option ‘%s’ not given\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "You did not specify a user ID. (you may use “-r”)\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6711,40 +6778,40 @@
 "\n"
 "Enter the user ID. End with an empty line: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "unknown default recipient “%s”\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -6782,7 +6849,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "can't open signed data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "key %s is not suitable for decryption in %s mode\n"
@@ -7005,51 +7072,46 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr "continuing verification anyway due to option %s\n"
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNING: signature digest conflict in message\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "WARNING: signing subkey %s is not cross-certified\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "please see %s for more information\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
 msgstr0 "public key %s is %lu second newer than the signature\n"
 msgstr1 "public key %s is %lu seconds newer than the signature\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 "public key %s is %lu day newer than the signature\n"
 msgstr1 "public key %s is %lu days newer than the signature\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7060,7 +7122,7 @@
 msgstr1 ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7070,55 +7132,55 @@
 msgstr1 ""
 "key %s was created %lu days in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Note: signature key %s expired %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Note: signature key %s has been revoked\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "key %s: no subkey for subkey binding signature\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7127,24 +7189,24 @@
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature from: “%s”\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "signing:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, c-format
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s encryption will be used\n"
@@ -7219,133 +7281,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "can't create lock for ‘%s’\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "can't lock ‘%s’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaction too large\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "can't access '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: failed to create version record: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: invalid trustdb created\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb created\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Note: trustdb not writable\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: invalid trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: failed to create hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: The trustdb is corrupted.\n"
@@ -7778,7 +7840,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
@@ -7808,38 +7870,38 @@
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%d key processed"
 msgstr1 "%d keys processed"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 " (%d validity count cleared)\n"
 msgstr1 " (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, 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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
@@ -7908,7 +7970,7 @@
 msgid "ultimate"
 msgstr "ultimate"
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -7919,12 +7981,12 @@
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "input line %u too long or missing LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "can't open fd %d: %s\n"
@@ -7939,19 +8001,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "Hint: Do not use option %s\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "set debugging flags"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "enable full debugging"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Usage: kbxutil options files (-h for help)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -7962,16 +8024,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%sNumber&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
@@ -8000,10 +8062,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||Please enter the Unblocking Key of your PIV card"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
@@ -8023,119 +8085,119 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN has invalid characters; only digits are allowed\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existing key will be replaced\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "failed to store the key: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "response does not contain the RSA modulus\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "response does not contain the RSA public exponent\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "response does not contain the EC public key\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "please wait while key is being generated ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "key generation completed (%d second)\n"
 msgstr1 "key generation completed (%d seconds)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Please enter the PIN for the key to create qualified signatures."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Please enter the PIN for the standard keys."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "Note: PIN has not yet been enabled."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "the NullPIN has not yet been changed\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8143,7 +8205,7 @@
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8151,27 +8213,27 @@
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -8179,42 +8241,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8222,20 +8284,20 @@
 msgstr0 "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgstr1 "%d Admin PIN attempts remaining before card is permanently locked\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -8243,79 +8305,79 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, 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:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8335,7 +8397,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
@@ -8379,11 +8441,11 @@
 msgid "deny the use of admin card commands"
 msgstr "deny the use of admin card commands"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Usage: @SCDAEMON@ options (-h for help)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8391,315 +8453,315 @@
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error getting key usage information: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr "Tor might be in use - network access is limited"
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "validation model requested by certificate: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "issuer certificate is not marked as a CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "critical marked policy without configured policies"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "failed to open '%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certificate policy not allowed"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "failed to get the fingerprint\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "looking up issuer at external location\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "can't get authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "looking up issuer from the Dirmngr cache\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only key lookup failed: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "checking the CRL failed: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificate with invalid validity: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "required certificate attributes missing: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "intermediate certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( signature created at "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (certificate created at "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (certificate valid from "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( issuer valid from "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "self-signed certificate has a BAD signature"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificate has a BAD signature"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "found another possible matching CA certificate - trying again"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certificate chain longer than allowed by CA (%d)"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "out of core\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "none"
 
@@ -8719,7 +8781,7 @@
 msgid "Error - invalid DN"
 msgstr "Error - invalid DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8734,42 +8796,42 @@
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "looking for another certificate\n"
@@ -8987,17 +9049,17 @@
 msgid "resource problem: out of core\n"
 msgstr "resource problem: out of core\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(this is the RC2 algorithm)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(this does not seem to be an encrypted message)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "encrypted to %s key %s\n"
@@ -9007,7 +9069,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificate ‘%s’ not found: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error locking keybox: %s\n"
@@ -9032,123 +9094,123 @@
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "don't use the terminal at all"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|take policy information from FILE"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "create base-64 encoded output"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|use USER-ID as default secret key"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "do not check CRLs for root certificates"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Usage: @GPGSM@ options files (-h for help)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9158,27 +9220,27 @@
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9198,7 +9260,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "basic certificate checks failed - not imported\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error getting stored flags: %s\n"
@@ -9208,47 +9270,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "no keyboxd running in this session\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error opening key DB: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem looking for existing certificate: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error finding writable keyDB: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error storing certificate: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem re-searching certificate: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Error - "
 
@@ -9284,7 +9346,7 @@
 "\n"
 "%s%sAre you really sure that you want to do this?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9304,59 +9366,59 @@
 "“%s”\n"
 "Note, that this certificate will NOT create a qualified signature!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "hash algorithm used for signer %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "checking for qualified certificate failed: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s signature using %s key %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Signature made "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "date not given"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "algorithm:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, 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:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Good signature from"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " aka"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "This is a qualified signature\n"
@@ -9381,315 +9443,310 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "can't release lock on the certificate cache: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "dropping %u certificates from the cache\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "can't parse certificate '%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "certificate ‘%s’ already cached\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "trusted certificate ‘%s’ loaded\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certificate ‘%s’ loaded\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " SHA1 fingerprint = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " issuer ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " subject ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "error loading certificate '%s': %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanently loaded certificates: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " runtime cached certificates: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " trusted certificates: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificate already cached\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificate cached\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error caching certificate: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error fetching certificate by S/N: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error fetching certificate by subject: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no issuer found in certificate\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error getting authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "creating directory ‘%s’\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "error creating directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignoring database dir ‘%s’\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "error reading directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "removing cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "not removing file ‘%s’\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "new cache dir file ‘%s’ created\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, 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:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "old version of cache directory - cleaning up\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "old version of cache directory - giving up\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, 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:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "invalid line detected in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "duplicate entry detected in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, 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:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "invalid issuer hash in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "no issuer DN in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "invalid timestamp in ‘%s’ line %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "detected errors in cache dir file\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, 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:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "error closing '%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "error renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "can't hash '%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "error setting up MD5 hash context: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "error hashing '%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "invalid formatted checksum for ‘%s’\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, 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:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "opening cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "error opening cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, 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:1174
+#: dirmngr/crlcache.c:1181
 #, 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:1176
+#: dirmngr/crlcache.c:1183
 #, 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:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "no CRL available for issuer id %s\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, 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:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9698,194 +9755,194 @@
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, 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:1325
+#: dirmngr/crlcache.c:1332
 #, 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:1336
+#: dirmngr/crlcache.c:1343
 #, 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:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "WARNING: invalid cache record length for S/N "
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, 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:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "error getting data from cache file: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "got an invalid S-expression from libksba\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "converting S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "unknown hash algorithm ‘%s’\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creating S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error getting update times of CRL: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, 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:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no CRL issuer found in CRL: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader failed: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "removed stale temporary cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error creating temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error finishing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error closing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, 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:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9894,12 +9951,12 @@
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Begin CRL dump (retrieved via %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9907,55 +9964,55 @@
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: The CRL will not be used\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 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:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error reading cache entry from db: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -9969,23 +10026,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "CRL access not possible due to Tor mode"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "CRL access not possible due to disabled %s\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "error retrieving '%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "error initializing reader object: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "certificate search not possible due to disabled %s\n"
@@ -10130,135 +10187,135 @@
 msgid "looking up '%s'\n"
 msgstr "looking up ‘%s’\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "list the contents of the CRL cache"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|load CRL from FILE into cache"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|fetch a CRL from URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "shutdown the dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 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:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr "Network related options"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Configuration for HTTP servers"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "use system's HTTP proxy setting"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr "Configuration for OpenPGP servers"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|use keyserver at URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 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:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr "Configuration for X.509 servers"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "inhibit the use of LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignore LDAP CRL distribution points"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|use this keyserver to lookup keys"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Configuration for OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "allow sending OCSP requests"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignore certificate contained OCSP service URLs"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10267,11 +10324,11 @@
 "@\n"
 "(See the “info” manual for a complete listing of all commands and options)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Usage: @DIRMNGR@ options (-h for help)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10279,103 +10336,103 @@
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "usage: %s options "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, 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:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘%s’\n"
@@ -10430,32 +10487,32 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc failed: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "‘%s’ is not an LDAP URL\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "‘%s’ is an invalid LDAP URL\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search hit the size limit of the server\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: password given without user\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr "%s:%u: ignoring unknown flag ‘%s’\n"
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: skipping this line\n"
@@ -10544,161 +10601,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "not signed by a default OCSP signer's certificate"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "allocating list item failed: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error getting responder ID: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "no suitable certificate found to verify the OCSP response\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "issuer certificate not found: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "caller did not return the target certificate\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "caller did not return the issuing certificate\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "failed to allocate OCSP context: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error getting OCSP status for target certificate: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "certificate status is: %s (this=%s next=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certificate has been revoked at: %s due to: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP responder returned a status in the future\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP responder returned a non-current status\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) failed: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "serialno missing in cert ID"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url failed: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -10708,83 +10765,83 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "accepting root CA not marked as a CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "CRL checking too deeply nested\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "not checking CRL for"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "checking CRL for"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "checking trustworthiness of root certificate failed: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "certificate chain is good\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "quiet"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "print data out hex encoded"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "decode received data lines"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "connect to the dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr "connect to the keyboxd"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|connect to Assuan socket NAME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|connect to Assuan server at ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 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:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "do not use extended connect mode"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|run commands from FILE on startup"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "run /subst on startup"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Usage: @GPG@-connect-agent options (-h for help)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -10792,48 +10849,48 @@
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option “%s” ignored due to “%s”\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "receiving line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "line too long - skipped\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unknown command ‘%s’\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "no keybox daemon running in this session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
@@ -10893,12 +10950,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
@@ -11003,33 +11060,33 @@
 "Syntax: gpg-check-pattern options patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Note: key %s is already stored on the card!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Note: Keys are already stored on the card!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Replace existing key %s ? (y/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s card no. %s detected\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr "User Interaction Flag is set to “%s” - can't change\n"
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11038,43 +11095,43 @@
 "Warning: Setting the User Interaction Flag to “%s”\n"
 " can only be reverted using a factory reset!\n"
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Please use “uif --yes %d %s”\n"
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "authenticate to the card"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "send a reset to the card daemon"
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "change a private data object"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "read a certificate from a data object"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "store a certificate to a data object"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "store a private key to a data object"
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey management commands"
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "manage the command history"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/eo.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/eo.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@ -28,53 +28,53 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "nevalida pasfrazo"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,28 +85,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "pasfrazo estas tro longa\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -116,274 +116,275 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "malbona pasfrazo"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ŝanĝi la pasfrazon"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "neniu skribebla sekreta ŝlosilaro trovita: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Donu la uzantidentigilon: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Donu pasfrazon\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -391,7 +392,7 @@
 msgstr0 "Nomo devas havi almenaŭ 5 signojn\n"
 msgstr1 "Nomo devas havi almenaŭ 5 signojn\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -399,388 +400,394 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ŝanĝi la pasfrazon"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "ne realigita"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|uzi pasfraz-reĝimon N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "uzi gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Uzado: gpg opcioj dosieroj (-h por helpo)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, fuzzy, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu ŝlosiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -790,19 +797,19 @@
 "Opcioj:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr "Uzado: gpg opcioj dosieroj (-h por helpo)"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -810,8 +817,8 @@
 "@Komandoj:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -821,86 +828,88 @@
 "Opcioj:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, fuzzy
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Uzado: gpg opcioj dosieroj (-h por helpo)"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -913,19 +922,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -938,7 +947,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -948,48 +957,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "ŝanĝi la pasfrazon"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "ŝalti ŝlosilon"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1000,8 +1018,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1011,7 +1029,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
@@ -1021,7 +1039,7 @@
 msgid "secret key parts are not available\n"
 msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1039,52 +1057,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
@@ -1105,28 +1123,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas malŝalti kreadon de core-dosieroj: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 #, fuzzy
 msgid "yes"
 msgstr "jes"
@@ -1182,8 +1200,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
@@ -1198,74 +1216,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "ne povas fari tion en neinteraga reĝimo\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "ne povas fari tion en neinteraga reĝimo\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "ne povas fari tion en neinteraga reĝimo\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "ne povas fari tion en neinteraga reĝimo\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1351,7 +1369,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1437,44 +1455,44 @@
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Bona atestilo"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenia helpo disponata"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Bona atestilo"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "Nevalida atestilo"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "nekonata versio"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Nenia helpo disponata por '%s'"
@@ -1484,12 +1502,12 @@
 msgid "ignoring garbage line"
 msgstr "eraro en vostolinio\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "nekonata versio"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
@@ -1524,136 +1542,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "publika ŝlosilo %08lX ne trovita: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "eraro dum kreado de '%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "nevalida kirasoĉapo: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "kirasoĉapo: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "nevalida ĉapo de klarteksta subskribo\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "kirasoĉapo: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1661,13 +1692,13 @@
 "quoted-printable-signo en kiraso - verŝajne cima poŝtotransendilo estis "
 "uzata\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "ne homlegebla"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, fuzzy, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1676,34 +1707,34 @@
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aŭ substrekojn "
 "kaj fini per '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, fuzzy, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aŭ substrekojn "
 "kaj fini per '='\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
@@ -1717,8 +1748,8 @@
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s ne havas sencon kun %s!\n"
@@ -1728,13 +1759,13 @@
 msgid "error from TPM: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
@@ -1744,209 +1775,214 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "krei revokatestilon"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta ŝlosilo ne havebla"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga reĝimo\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan ŝlosilon al '%s'\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1954,102 +1990,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita ĝis %u bitoj\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (nur subskribi)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2057,197 +2093,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "forlasi ĉi tiun menuon"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "montri ĉi tiun helpon"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "ŝanĝi la daton de eksvalidiĝo"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ŝanĝi la posedantofidon"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ŝanĝi la posedantofidon"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "ŝanĝi la posedantofidon"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2308,9 +2349,9 @@
 msgid "subkey"
 msgstr "al"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -2335,96 +2376,85 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encrypt.c:339
+#: g10/encrypt.c:484
 #, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 msgid "using cipher %s.%s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, 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:1071
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encrypt.c:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-ĉifrita por: %s\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2440,7 +2470,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2452,427 +2482,431 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problemo ĉe traktado de ĉifrita paketo\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "neuzebla sekreta ŝlosilo"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "krei revokatestilon"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "skribas sekretan ŝlosilon al '%s'\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ŝlosilo %08lX: PGP-2.x-stila ŝlosilo - ignorita\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "eraro dum kreado de '%s': %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "Uzantidentigilo ne trovita"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Fingrospuro:"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "nevalida kiraso"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|dosiero|fari klartekstan subskribon"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "ĉifri datenojn"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "ĉifri nur kun simetria ĉifro"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "malĉifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "listigi ŝlosilojn"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "listigi ŝlosilojn kaj subskribojn"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli ŝlosilsubskribojn"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "listigi sekretajn ŝlosilojn"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "forigi ŝlosilojn de la sekreta ŝlosilaro"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "subskribi ŝlosilon"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "subskribi ŝlosilon loke"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "krei novan ŝlosilparon"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "subskribi ŝlosilon"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "subskribi ŝlosilon loke"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "subskribi aŭ redakti ŝlosilon"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ŝanĝi la pasfrazon"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "eksporti ŝlosilojn"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "eksporti ŝlosilojn al ŝlosilservilo"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importi ŝlosilojn de ŝlosilservilo"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "aktualigi ĉiujn ŝlosilojn de ŝlosilservilo"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importi/kunfandi ŝlosilojn"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|metodo dosieroj|presi mesaĝo-kompendiojn"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMO|ĉifri por NOMO"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "fari neniajn ŝanĝojn"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "uzi tekstan reĝimon"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importi ŝlosilojn de ŝlosilservilo"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kontroli ŝlosilsubskribojn"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "listigi sekretajn ŝlosilojn"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOMO|ĉifri por NOMO"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2880,7 +2914,7 @@
 "@\n"
 "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2910,13 +2944,13 @@
 " --list-keys nomoj montri ŝlosilojn\n"
 " --fingerprint nomoj montri fingroŝpurojn\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2931,7 +2965,7 @@
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2939,569 +2973,564 @@
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "uzado: gpg opcioj "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu ŝlosilaro estas listigita ŝlosilo"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "agordi liston de preferoj"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de ŝlosilservilo\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "nevalida ŝlosilaro"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, fuzzy, c-format
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "invalid export options\n"
 msgstr "nevalida ŝlosilaro"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "nevalida ŝlosilaro"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "elektita kompendi-metodo ne validas\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, fuzzy, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, fuzzy, c-format
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, fuzzy, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "nevalidaj preferoj\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, fuzzy, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, fuzzy, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "ŝlosilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesaĝon ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -3516,7 +3545,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -3545,339 +3574,344 @@
 msgid "No help available for '%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "ne realigita"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "montri fingrospuron"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "montri fingrospuron"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "neuzebla sekreta ŝlosilo"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "montri fingrospuron"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ŝlosiloj jam traktitaj\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr " Nombro traktita entute: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " ignoritaj novaj ŝlosiloj: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " ignoritaj novaj ŝlosiloj: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importitaj: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " neŝanĝitaj: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " novaj subŝlosiloj: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " novaj subskriboj: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " novaj ŝlosilrevokoj: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " sekretaj ŝlosiloj legitaj: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr "sekretaj ŝlosiloj importitaj: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj ŝlosiloj neŝanĝitaj: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, fuzzy, c-format
 msgid " not imported: %lu\n"
 msgstr " importitaj: %lu"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " novaj subskriboj: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " sekretaj ŝlosiloj legitaj: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ŝlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ŝlosilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ŝlosilo %08lX: publika ŝlosilo ne trovita: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ŝlosilo %08lX: nova ŝlosilo - ignorita\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla ŝlosilaro trovita: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ŝlosilo %08lX: publika ŝlosilo importita\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ŝlosilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ŝlosilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ŝlosilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ŝlosilo %08lX: 1 nova subŝlosilo\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ŝlosilo %08lX: %d novaj subŝlosiloj\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ŝlosilo %08lX: ne ŝanĝita\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ŝlosilo %08lX: sekreta ŝlosilo importita\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3886,198 +3920,198 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Ŝlosilo estas anstataŭigita."
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Ŝlosilo estas kompromitita"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Ŝlosilo estas ne plu uzata"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, fuzzy, c-format
 msgid "reason for revocation: "
 msgstr "Kialo por revoko: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, fuzzy, c-format
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ŝlosilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ŝlosilo %08lX.%lu: Valida subŝlosilrevoko\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ŝlosilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ŝlosilo %08lX: ignoris subŝlosilon\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ŝlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "ŝlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
@@ -4087,35 +4121,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Bona subskribo de \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "Uzantidentigilo \"%s\" estas revokita.\n"
 msgstr1 "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4123,7 +4157,7 @@
 msgstr0 "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
 msgstr1 "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4131,61 +4165,61 @@
 msgstr0 "%d malbonaj subskriboj\n"
 msgstr1 "%d malbonaj subskriboj\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Bona subskribo de \""
 msgstr1 "Bona subskribo de \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "ŝlosilaro '%s' kreita\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "ŝlosilaro '%s' kreita\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revoko"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "mem-subskribo"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4198,69 +4232,69 @@
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4271,7 +4305,7 @@
 "\n"
 "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -4280,7 +4314,7 @@
 "\n"
 "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4291,12 +4325,12 @@
 "\n"
 "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Ĉu vi volas, ke via subskribo eksvalidiĝu je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4307,7 +4341,7 @@
 "\n"
 "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -4316,41 +4350,41 @@
 "\n"
 "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per ŝlosilo %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per ŝlosilo %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝis!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ĉu vi volas, ke via subskribo eksvalidiĝu je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4359,32 +4393,32 @@
 "Kiom zorge vi kontrolis, ke la ŝlosilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4393,274 +4427,283 @@
 "Ĉu vi estas tute certa, ke vi volas subskribi ĉi tiun ŝlosilon\n"
 "per via ŝlosilo: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis ĉi tiun ŝlosilon.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis ĉi tiun ŝlosilon.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis ĉi tiun ŝlosilon.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la ŝlosilon loke"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forviŝi uzantidentigilon"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forviŝi flankan ŝlosilon"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan ŝlosilon"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel ĉefan"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de ŝlosilservilo\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "ŝanĝi la pasfrazon"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "ŝanĝi la posedantofidon"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan ŝlosilon"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "ŝalti ŝlosilon"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "malŝalti ŝlosilon"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Sekreta ŝlosilo estas havebla.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Sekreta ŝlosilo estas havebla.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan ŝlosilon por fari tion.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4668,346 +4711,341 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Ŝlosilo estas revokita.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almenaŭ unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forviŝi la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Ĉu vi vere volas forviŝi ĉi tiun ŝlosilon? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Ĉu vi vere volas revoki ĉi tiun ŝlosilon? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Ĉu vi vere volas revoki la elektitajn ŝlosilojn? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Ĉu vi vere volas revoki ĉi tiun ŝlosilon? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Ĉu vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ĉu skribi ŝanĝojn? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ĉu fini sen skribi ŝanĝojn? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ŝlosilo ne ŝanĝita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr ""
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr ""
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " eksvalidiĝos: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " eksvalidiĝos: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Ĉi tiu ŝlosilo estas malŝaltita"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, 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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5016,36 +5054,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 #, 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ĉu forviŝi ĉi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ĉu forviŝi ĉi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ĉu forviŝi ĉi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ĉu vere forviŝi ĉi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5053,37 +5091,37 @@
 msgstr0 "Forviŝis %d subskribon.\n"
 msgstr1 "Forviŝis %d subskribon.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forviŝita.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "Uzantidentigilo \"%s\" estas revokita.\n"
 msgstr1 "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
@@ -5093,312 +5131,326 @@
 "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:4548
+#: g10/keyedit.c:4654
 #, 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:4565
+#: g10/keyedit.c:4671
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la ŝlosilgrandon"
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4713
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:5007
 #, 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:4726
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ŝanĝas la daton de eksvalidiĝo de flanka ŝlosilo.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 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:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Ŝanĝas la daton de eksvalidiĝo de flanka ŝlosilo.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, 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:5384
+#: g10/keyedit.c:5672
 #, 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:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ĉu surskribi (j/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 #, 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:6011
+#: g10/keyedit.c:6299
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi ŝlosilon nerevokeble"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "mankas sekreta ŝlosilo\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, fuzzy, c-format
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skribas ŝlosilbindan subskribon\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ŝlosilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "ŝlosilgrando rondigita ĝis %u bitoj\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "ĉifri datenojn"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5412,179 +5464,179 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (nur ĉifri)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (nur ĉifri)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) ElGamal (sign and encrypt)\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ElGamal (subskribi kaj ĉifri)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 msgid " *default*"
 msgstr "malĉifri datenojn (implicita elekto)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "malŝalti ŝlosilon"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita ŝlosilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5600,7 +5652,7 @@
 " <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
 " <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5616,40 +5668,40 @@
 " <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
 " <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Ŝlosilo validu ...? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Ŝlosilo validu por ...? (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidiĝos\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidiĝos\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidiĝos je %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5657,12 +5709,12 @@
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, ĝi estos ĝuste traktata ĝis 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ĉu tio estas ĝusta (j/n)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5673,7 +5725,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5689,42 +5741,42 @@
 " \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5735,11 +5787,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5754,35 +5806,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5794,18 +5846,18 @@
 "kreado de la primoj; tio donas al la stokastilo pli bonan ŝancon\n"
 "akiri sufiĉe da entropio.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5813,67 +5865,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Kreado de ŝlosiloj nuligita.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika ŝlosilaro trovita: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta ŝlosiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5882,7 +5934,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5890,7 +5942,7 @@
 "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
 "horloĝeraro)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5898,23 +5950,23 @@
 "ŝlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
 "horloĝeraro)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ĉu vere krei? "
@@ -5923,29 +5975,45 @@
 msgid "never "
 msgstr ""
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr ""
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr ""
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5953,7 +6021,7 @@
 msgstr0 "%d malbonaj subskriboj\n"
 msgstr1 "%d malbonaj subskriboj\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5961,45 +6029,45 @@
 msgstr0 "1 subskribo ne kontrolita pro eraro\n"
 msgstr1 "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Ŝlosilaro"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 #, 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:2120
+#: g10/keylist.c:2386
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr " Ŝlosilo-fingrospuro ="
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 #, fuzzy
 msgid " Subkey fingerprint:"
 msgstr " Ŝlosilo-fingrospuro ="
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Ŝlosilo-fingrospuro ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6080,333 +6148,339 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida ŝlosilidentigilo\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 msgstr1 "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "nevalida ŝlosilaro"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via ŝlosilo %08lX je %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr "%s-ĉifritaj datenoj\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s-ĉifritaj datenoj\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika ŝlosilo estas %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "ĉifrita per %u-bita %s-ŝlosilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid " \"%s\"\n"
 msgstr " alinome \""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "ĉifrita per %s-ŝlosilo, %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publikŝlosila malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "publikŝlosile ĉifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, fuzzy, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "malĉifrado sukcesis\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: ĉifrita mesaĝo estis manipulita!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki ĝin\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidiĝinta subskribo de \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas malŝaltita\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti ĉi tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " alinome \""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " alinome \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "malcerta"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " alinome \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 #, fuzzy
 msgid "binary"
 msgstr "ĉefa"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "nekonata publikŝlosila metodo"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
@@ -6508,27 +6582,27 @@
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "nekonata klaso de subskribo"
@@ -6584,7 +6658,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas ŝaltitan \"critical bit\"\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "ŝanĝi la pasfrazon"
@@ -6648,7 +6722,7 @@
 "%s"
 msgstr "%u-bita %s-ŝlosilo, %08lX, kreita je %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6657,77 +6731,77 @@
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ĉu tio estas ĝusta (j/n)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
@@ -6814,36 +6888,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Atestiloj, kiuj kondukas al absolute fidata ŝlosilo:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke ĉi tiu ŝlosilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke ĉi tiu ŝlosilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Ĉi tiu ŝlosilo verŝajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Ĉi tiu ŝlosilo apartenas al ni\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, fuzzy, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6855,7 +6929,7 @@
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6867,100 +6941,100 @@
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan ŝlosilon!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, fuzzy, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "ŝlosilo %08lX: diferencas de nia kopio\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, fuzzy, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: Ĉi tiu subŝlosilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: Ĉi tiu ŝlosilo estas malŝaltita.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Noto: Ĉi tiu ŝlosilo eksvalidiĝis!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: Ĉi tiu ŝlosilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas ĉi tiun ŝlosilon!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " La subskribo verŝajne estas FALSA.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6970,58 +7044,58 @@
 msgstr ""
 "AVERTO: Ĉi tiu ŝlosilo ne estas atestita kun sufiĉe fidataj subskriboj!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: Ĉi tiu ŝlosilo ne estas atestita kun sufiĉe fidataj subskriboj!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika ŝlosilo estas malŝaltita\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika ŝlosilo jam ĉeestas\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "ne povas konektiĝi al '%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7029,40 +7103,40 @@
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika ŝlosilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Publika ŝlosilo estas malŝaltita.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika ŝlosilo jam agordita\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
@@ -7101,7 +7175,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
@@ -7319,51 +7393,46 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
 msgstr1 "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
 msgstr0 "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
 msgstr1 "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7376,7 +7445,7 @@
 "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
 "horloĝeraro)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7388,51 +7457,51 @@
 "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
 "horloĝeraro)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "NOTO: subskribo-ŝlosilo %08lX eksvalidiĝis je %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, fuzzy, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7440,7 +7509,7 @@
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7449,23 +7518,23 @@
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7546,133 +7615,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: fido-datenaro kreita\n"
@@ -8102,7 +8171,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@ -8132,37 +8201,37 @@
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%lu ŝlosiloj jam traktitaj\n"
 msgstr1 "%lu ŝlosiloj jam traktitaj\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, fuzzy, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -8234,7 +8303,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8245,12 +8314,12 @@
 "Bonvolu memori, ke la subskribodosiero (.sig aŭ .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, aŭ mankas linifino\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -8265,20 +8334,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Uzado: gpg opcioj dosieroj (-h por helpo)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8288,16 +8357,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8332,10 +8401,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8355,158 +8424,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "krei novan ŝlosilparon"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "krei novan ŝlosilparon"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "Kreado de ŝlosiloj malsukcesis: %s\n"
 msgstr1 "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Noto: Ĉi tiu ŝlosilo estas malŝaltita.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, 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:958
+#: scd/app-openpgp.c:965
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
@@ -8514,43 +8583,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8558,22 +8627,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8581,81 +8650,81 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "ŝanĝi la pasfrazon"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "eraro dum legado de ŝlosilbloko: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "nerealigita URI"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -8677,7 +8746,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8726,340 +8795,340 @@
 msgid "deny the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Uzado: gpg opcioj dosieroj (-h por helpo)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "helpo"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " novaj subskriboj: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingrospuro:"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, fuzzy, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "ripetita atestilo - forviŝita"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "ne traktita"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "ne"
@@ -9082,7 +9151,7 @@
 msgid "Error - invalid DN"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9095,42 +9164,42 @@
 "\"%.*s\"\n"
 "%u-bita %s ŝlosilo, ID %08lX, kreita je %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9358,17 +9427,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "ĉifrita per %s-ŝlosilo, %08lX\n"
@@ -9378,7 +9447,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "eraro dum legado de ŝlosilbloko: %s\n"
@@ -9403,134 +9472,134 @@
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn ŝlosilojn"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "aldoni ĉi tiun ŝlosilaron al la listo de ŝlosilaroj"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "neinteraga reĝimo: neniam demandi"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9541,27 +9610,27 @@
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9581,7 +9650,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -9591,47 +9660,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9661,7 +9730,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9676,58 +9745,58 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Subskribo farita je %.*s per %s, ŝlosilo %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "kiraso: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Bona subskribo de \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " alinome \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
@@ -9752,586 +9821,581 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "ripetita atestilo - forviŝita"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "ripetita atestilo - forviŝita"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "ripetita atestilo - forviŝita"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "Fingrospuro:"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Nevalida atestilo"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, fuzzy, c-format
 msgid "creating directory '%s'\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "eraro en vostolinio\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, fuzzy, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "ripetita atestilo - forviŝita"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "kiraso: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, 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:1922
+#: dirmngr/crlcache.c:1933
 #, fuzzy, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "skribas al '%s'\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, 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:2083
+#: dirmngr/crlcache.c:2094
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "skribas al '%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
@@ -10346,24 +10410,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "ŝlosilo '%s' ne trovita: %s\n"
@@ -10520,140 +10584,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "ne povis analizi URI de ŝlosilservilo\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi ĉi tiun ŝlosilservilon por serĉi ŝlosilojn"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "ne povis analizi URI de ŝlosilservilo\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10666,115 +10730,115 @@
 "@\n"
 "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Uzado: gpg opcioj dosieroj (-h por helpo)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "uzado: gpg opcioj "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kiraso: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ne traktita"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10830,32 +10894,32 @@
 msgid "malloc failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = supersalti ĉi tiun ŝlosilon\n"
@@ -10948,163 +11012,163 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "mankas implicita sekreta ŝlosilaro: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11115,135 +11179,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Uzado: gpg opcioj dosieroj (-h por helpo)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -11309,12 +11373,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -11423,88 +11487,101 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "ŝanĝi la daton de eksvalidiĝo"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "elektita kompendi-metodo ne validas\n"
+
+#, fuzzy
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "nevalidaj preferoj\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "skribas al '%s'\n"
 
@@ -12133,10 +12210,6 @@
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "de sekreta aŭ publika listo iri al la alia"
 
-#, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "malbona pasfrazo"
-
 #~ msgid "gpg-agent is not available in this session\n"
 #~ msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
@@ -13005,9 +13078,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "forviŝi subskribojn"
 
-#~ msgid "set preference list"
-#~ msgstr "agordi liston de preferoj"
-
 #~ msgid "updated preferences"
 #~ msgstr "aktualigitaj preferoj"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/es.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/es.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/es.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/es.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
@@ -32,49 +32,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancelar"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Sí"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Guardar en gestor de contraseñas"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Mostrar frase contraseña"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Esconder frase contraseña"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,7 +85,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -94,14 +94,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -109,7 +109,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Calidad:"
 
@@ -119,18 +119,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "barra de calidad, entrada de pin"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 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:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -138,7 +138,7 @@
 "Por favor introduzca la frase contraseña para desbloquear la clave secreta "
 "de esta sesión"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
@@ -151,46 +151,61 @@
 # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
 # ¿Es que son más listos? :-)
 #
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Frase contraseña:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "no coincide - reinténtelo"
 
+# ¿Por qué no frase de paso?
+# Porque todo el mundo sabe lo que es una contraseña
+# y una "frase de paso" no. Soy consciente de que se
+# traduce igual password y passphrase pero el contexto
+# permite saber de lo que se está hablando.
+# No sé, no sé.
+# ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
+# ¿Es que son más listos? :-)
+#
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase"
+msgid "Passphrases match."
+msgstr "Frase contraseña"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (intento %d de %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Repetir:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN demasiado largo"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Frase contraseña demasiado larga"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Caracteres inválidos en el PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN demasiado corto"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "PIN incorrecto"
 
@@ -203,29 +218,29 @@
 # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
 # ¿Es que son más listos? :-)
 #
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Frase contraseña errónea"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error obteniendo el número de serie de la tarjeta: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Por favor vuelva a introducir frase contraseña"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -236,51 +251,51 @@
 msgstr ""
 "Introduzca la frase contraseña para proteger el objeto importado en GnuPG."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "no se puede crear '%s': %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "no se puede abrir '%s': %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "no se encuentra una clave de tarjeta adecuada: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error intentando obtener lista de tarjetas: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -289,21 +304,21 @@
 "Un proceso ssh requirió el uso de la clave%%0A %s%%0A (%s)%%0A¿Quiere "
 "permitirlo?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Permitir"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Denegar"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr ""
 "Por favor introduzca la frase contraseña para la clave ssh %%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -312,79 +327,75 @@
 "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:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "fallo al crear un flujo desde el socket: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Por favor inserte la tarjeta con número de serie"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "PIN del Administrador"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Código de Reinicio"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0A Use el teclado del lector como entrada."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Repita este Código de Reinicio"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Repita este PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Repita este PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Código de Reinicio repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "error escribiendo en %s: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Introduzca nueva frase contraseña"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -392,7 +403,7 @@
 "¡No ha introducido una frase contraseña!%0AnNo se permiten frases contraseña "
 "en blanco."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -401,18 +412,18 @@
 "No ha introducido una frase contraseña -¡esto es en general una mala idea!"
 "%0Apor favor confirme que no quiere ninguna protección para su clave."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Sí, no se necesita protección"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "Una frase contraseña debe tener al menos %u caracter."
 msgstr1 "Una frase contraseña debe tener al menos %u caracteres."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -424,190 +435,196 @@
 "Una frase contraseña debe tener al menos %u dígitos o %%0A caracteres "
 "especiales."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Una frase contraseña no puede ser un término conocido%%0A o ajustarse a "
 "cierto patrón."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Aviso: ha introducido una frase contraseña insegura."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Tomar esta de todas formas"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contraseña"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Opciones útiles para el depurado"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Opciones que controlan la salida de diagnósticos"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|escribir logs en modo servidor en FICHERO"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Opciones que controlan la configuración"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|aceptar algunos comandos via NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "permitir soporte de ssh-agent"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usar ALGO para mostrar las huellas digitales de ssh"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "habilitar soporte de putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "habilitar soporte de putty"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Opciones que controlan la seguridad"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la caché expiran en N segundos"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|las claves SSH caducan en N segundos"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|establecer vida máxima de la clave SSH en N segundos"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el caché de PINs al firmar"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 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:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "no permitir que los clientes marquen claves como \"confiables\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contraseña"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Opciones que fuerzan una política de frases contraseña"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "no permitir evitar la política de frases contraseña"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|establecer longitud mínima para nuevas frases contraseña en N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|pedir al menos N caracteres no alfabéticos para nuevas contraseñas"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|comprobar nuevas frases contraseña con el patrón en FICHERO"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|frase contraseña caduca tras N días"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "no permite reusar antiguas frases contraseña"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
@@ -615,50 +632,50 @@
 
 # usa
 # Vale.
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "usa el agente gpg"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "no permitir que el caller cambie la entrada de pin"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "no acaparar teclado y ratón"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|establecer vida máxima de Pinentry en N segundos"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "permitir que Emacs pida la clave"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Uso: @GPG_AGENT@ opciones (-h para ayuda)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -666,142 +683,142 @@
 "Sintaxis: @GPG_AGENT@ opciones orden argumentos\n"
 "Manejo de claves privadas por @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, 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:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leyendo opciones de '%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "el nombre de socket '%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor único para el socket\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error enlazando el socket con '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "escuchando en el socket '%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "no se puede crear el directorio '%s': %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "creado el directorio '%s'\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() falló para '%s': %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "no puede usar '%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, 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:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -809,11 +826,11 @@
 "@Opciones:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -825,8 +842,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:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -834,8 +851,8 @@
 "@Órdenes:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -845,11 +862,11 @@
 "Opciones:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Uso: gpg-protect-tool opciones (-h para ayuda)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -857,22 +874,22 @@
 "Sintaxis: gpg-protect-tool opciones args\n"
 "Herramienta para el mantenimiento de claves secretas\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 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:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -880,52 +897,54 @@
 "Por favor introduzca la frase contraseña o PIN\n"
 "necesarios para completar esta operación."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelado\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error abriendo '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fichero '%s', línea %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, 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:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "la lista de confianza '%s' del sistema no está disponible\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "huella digital incorrecta en '%s', línea %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, 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:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error al leer '%s', línea %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error al leer la lista de certificados raíz fiables\n"
@@ -938,7 +957,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -947,11 +966,11 @@
 "¿Confía absolutamente en%%0A \"%s\"%%0A para certificar correctamentelos "
 "certificados de otros usuarios?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Sí"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -964,7 +983,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -976,21 +995,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Correcto"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Incorrecto"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -999,15 +1018,29 @@
 "Esta frase contraseña no se ha cambiado%%0Adesde %.4s-%.2s-%.2s.Por favor "
 "cámbiela ahora."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Cambia la frase contraseña"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "La cambiaré más tarde"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Por favor inserte la tarjeta con número de serie"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"Un proceso ssh requirió el uso de la clave%%0A %s%%0A (%s)%%0A¿Quiere "
+"permitirlo?"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -1016,11 +1049,11 @@
 "¿De verdad quiere borrar la clave identificada con el keygrip%%0A %s%%0A "
 "%%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Borrar clave"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1033,8 +1066,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "la clave %s usa un hash inseguro (de %u bits)\n"
@@ -1044,7 +1077,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobación de la firma creada falló: %s\n"
@@ -1054,7 +1087,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:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, 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"
@@ -1069,52 +1102,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "el algoritmo de protección de hash %d (%s) no se puede usar\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error al crear tubería: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "error al crear stream para una tubería: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "fallo esperando que el proceso %d terminara: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "error al ejecutar '%s': probablemente no está instalado\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "error ejecutando '%s': código de salida %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "error al ejecutar '%s': terminado\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "fallo esperando que el proceso termine: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo código de finalización del proceso: %d %s\n"
@@ -1134,28 +1167,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "esperando que el archivo '%s' esté disponible ...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renombrar '%s' a '%s' falló: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "sí|si"
 
@@ -1209,8 +1242,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "error de memoria al reservar %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error reservando memoria: %s\n"
@@ -1225,80 +1258,80 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "ATENCIÓN: \"%s%s\" es una opción obsoleta - no tiene efecto\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "etiqueta de debug '%s' ignorada\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "esperando que el dirmngr arranque... ( %ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "esperando que el agente arranque... ( %ds)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "esperando que el agente arranque... ( %ds)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "conexión establecida al dirmngr\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the keyboxd established\n"
 msgstr "conexión establecida al dirmngr\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the agent established\n"
 msgstr "conexión establecida al dirmngr\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running Dirmngr - starting '%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "no hay dirmngr en ejecución - iniciando '%s'\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "connection to agent is in restricted mode\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "la conexión al agente está en modo restringido\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "error intentando averiguar la versión de '%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "el servidor '%s' es más viejo que nosotros (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "ATENCIÓN: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 "Advertencia: Los servidores no mantenidos pueden carecer de importantes "
 "actualizaciones de seguridad.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Atención: Usa el comando \"%s\" para reiniciarlos.\n"
@@ -1371,7 +1404,7 @@
 msgstr "algoritmo: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmo no disponible: %s"
@@ -1446,39 +1479,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Certificado raíz fiable"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "no se encuentra CRL para el certificado"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "el CRL disponible es demasiado antiguo"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "Comprobación CRL/OCSP de certificados"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Certificados incluidos"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "No auditar entradas de los logs."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Operación desconocida"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent utilizable"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr utilizable"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "No hay ayuda disponible para '%s'."
@@ -1487,11 +1520,11 @@
 msgid "ignoring garbage line"
 msgstr "ignorando línea con basura"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "ninguno"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter inválido radix64 %02x omitido\n"
@@ -1526,136 +1559,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open falló: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "la conversión de '%s' a '%s' falló: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error escribiendo a '%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "borrando fichero de bloqueo residual (creado por %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(¿bloqueo mutuo?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "bloqueo '%s' no hecho: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "esperando al bloqueo %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error al crear '%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "error al cerrar '%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "cabecera de armadura inválida: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara inválida\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "cabecera de armadura desconocida: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "armadura inesperada: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "Línea con guiones inválida: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter inválido radix64 %02X omitido\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobación)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobación prematuro\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "Suma de comprobación mal creada\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Error en suma de comprobación: %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "error en la línea de cierre\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP válidos\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: línea más larga de %d caracteres\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1663,12 +1708,12 @@
 "caracter \"quoted printable\" en la armadura - probablemente se usó\n"
 "un MTA defectuoso\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " ilegible (%zu bytes: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1677,33 +1722,33 @@
 "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notación de usuario debe contener el caracter '@'\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nombre de notación no debe contener más de un caracter '@'\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notación no debe usar ningún caracter de control\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "un nombre de notación no debe contener ningún caracter '='\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
 "un nombre de notación debe tener sólo caracteres imprimibles o espacios\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCIÓN: encontrados datos de notación inválidos\n"
@@ -1717,8 +1762,8 @@
 msgid "Enter passphrase: "
 msgstr "Introduzca la frase contraseña: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s no funciona con el modo %s\n"
@@ -1729,13 +1774,13 @@
 msgid "error from TPM: %s\n"
 msgstr "error al leer de %s: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no hay agente dirmngr activo en esta sesión\n"
@@ -1746,204 +1791,209 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "no se puede usar la opción '%s' en modo %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 #| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 #| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "no establecido"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: sólo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave pública: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error al leer '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error al escribir '%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inválida.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inválidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no válida.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Huella digital CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inválido de huella digital.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, 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:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "¿Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1959,100 +2009,100 @@
 " 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:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿De qué tamaño quiere la clave? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Cambiando el atributo de la clave de tarjeta por: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Clave de firmado\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Clave de cifrado\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Clave de autentificación\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Elección inválida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error al obtener información de la clave: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "¿Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2063,184 +2113,189 @@
 " PIN = '%s' PIN Administrador = '%s'\n"
 "Debería cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Clave de firmado\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Clave de autentificación\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD fallido: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "¿Realmente quiere volver a los valores de fábrica? (escriba \"sí\") "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error de la configuración KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "error de la configuración KDF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "salir de este menú"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "ver órdenes de administrador"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 #, 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:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "cambiar huella digital de una CA"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opción forzar firma del PIN"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "menú para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "verificar PIN y listar todos los datos"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "desbloquear PIN usando Código de Reinicio"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "destruir todas las claves y datos"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "configurar KDF para autentificación de PIN"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "cambia valores de la clave"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "cambia valores de confianza"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/tarjeta> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Órdenes sólo de administrador\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Orden inválida (pruebe \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2298,9 +2353,9 @@
 msgid "subkey"
 msgstr "subclave"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
@@ -2325,82 +2380,77 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
+"del destinatario\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "no se puede usar el cifrado '%s' en modo %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error al crear frase contraseña: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "no puede usar un paquete simétrico ESK debido al modo S2K\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' ya está comprimido\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ATENCIÓN '%s' es un fichero vacío\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "no se puede usar el cifrado '%s' en modo %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "leyendo desde '%s'\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
-"del destinatario\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2409,20 +2459,13 @@
 "AVISO: forzar el algoritmo de compresión %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2438,7 +2481,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2450,398 +2493,404 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "exportar firmas marcadas como sólo locales"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exportar el atributo ID de usuario (generalmente fotográfico)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exportar claves de revocación marcadas como \"confidenciales\""
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "borrar partes inutilizables de la clave al exportar"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "borrar tanto como sea posible de la clave al exportar"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "genera un certificado de revocación"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "usar el formato de backup de claves GnuPG"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "no se permite exportar claves secretas\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - omitido"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "escribiendo en '%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "clave %s: material de la clave en la tarjeta - omitida\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "no se permite exportar claves secretas\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCIÓN: no se ha exportado nada\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "error al crear '%s': %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "ID de usuario no encontrado"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "'%s' recuperado automáticamente vía %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error recuperando '%s' vía %s: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "No hay huella digital"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(revisar el parámetro de la opción '%s')\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "todos los valores pasados a '%s' ignorados\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "parámetros válidos para la opción '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "crea una firma"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "crea una firma en texto claro"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "genera un nuevo par de claves en modo rápido"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "añade una nueva id de usuario en modo rápido"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "revoca una id de usuario en modo rápido"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "cambia la fecha de caducidad de modo rápido"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "generación de claves con todas las funcionalidades"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo público"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "firma una clave en modo rápido"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "firma una clave localmente en modo rápido"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, 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:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "cambia una frase contraseña"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "imprime resúmenes de mensaje"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|decide la política TOFU de una clave"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NOMBRE como clave secreta por defecto"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|cifra para el ususario NOMBRE también"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|establecer alias de email"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Opciones que controlan la seguridad"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Opciones que controlan la salida de diagnósticos"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|volcar salida en FICHERO"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivel de compresión N (0 desactiva)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Opciones que controlan la interactividad y obligación"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|usa MECANISMOS para encontrar claves por emails"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "prohibir todo acceso al dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Opciones que controlan la configuración"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|cifra para ID-USUARIO"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|usa este identificador para firmar o descifrar"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
@@ -2849,7 +2898,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:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2857,7 +2906,7 @@
 "@\n"
 "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2877,11 +2926,11 @@
 " --list-keys nombres muestra las claves\n"
 " --fingerprint nombres muestra las huellas dactilares\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Uso: @GPG@ opciones ficheros (-h para ayuda)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2891,7 +2940,7 @@
 "firma, comprueba, cifra o descifra\n"
 "la operación por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2899,73 +2948,73 @@
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Clave pública: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "uso: %s opciones %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal '%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedad insegura de la extensión '%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal '%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros de la extensión '%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2973,18 +3022,18 @@
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2992,451 +3041,445 @@
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "artículo de configuración desconocido '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "mostrar información de uso de las claves al listarlas"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de política al listar firmas"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones estándar IETF al listar firmas"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "mostrar fechas de caducidad al listar firmas"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "showpref"
+msgid "show preferences"
+msgstr "verpref"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "política TOFU desconocida '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(usa \"ayuda\" para listar las opciones)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, 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:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modo de entrada de pin inválido '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origen incorrecto de la consulta '%s'\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, 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:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importación inválidas\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "opciones de importación inválidas\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opción de filtro inválida: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inválida\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "lista de opciones inválida\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de política al verificar firmas"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones estándar IETF al verificar firmas"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, 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:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "parámetro incorrecto para la opción \"%.50s\"\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, 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:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecutándose con hora del sistema falsificada "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "el algoritmo de resumen seleccionado no inválido\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresión seleccionado es inválido\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, 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:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inválidas\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inválidas\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "preferencias personales de cifrado inválidas\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inválidas\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresión inválidas\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s aún no funciona con %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "no se puede usar el cifrado '%s' en modo %s\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, 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:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "el cifrado simétrico de '%s' falló: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "envío al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepción del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportación de clave fallida: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "exportación como clave ssh fallida: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "búsqueda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovación al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de distribución inválido '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, 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:5286
+#: g10/gpg.c:5338
 #, 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:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
@@ -3447,22 +3490,22 @@
 # 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:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de política de certificado inválida\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de política inválida\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es válida\n"
@@ -3475,7 +3518,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean sólo un aviso"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escribe información de estado en este descriptor de fichero"
 
@@ -3504,157 +3547,157 @@
 msgid "No help available for '%s'"
 msgstr "No hay ayuda disponible para '%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "importar firmas marcadas como sólo locales"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparar daño del servidor de claves públicas al importar"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "no limpiar los valores de confianza durante la importación"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "no actualiza la base de datos de confianza después de importar"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "enable putty support"
 msgid "enable bulk import mode"
 msgstr "habilitar soporte de putty"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "mostrar la clave durante la importación"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key during import"
 msgid "show key but do not actually import"
 msgstr "mostrar la clave durante la importación"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "sólo aceptar actualizaciones de claves ya existentes"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "borrar partes inútiles de la clave después de importar"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "borrar tanto como sea posible de la clave tras importar"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "ejecutar filtros de importación y exportar clave inmediatamente"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "asumir entrada en formato de backup de clave GnuPG"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "reparar claves al importar"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu claves procesadas hasta ahora\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " omitidas las claves PGP-2: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " sin identificador: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importadas: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " sin cambios: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nuevos identificativos: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nuevas subclaves: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nuevas firmas: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " claves secretas leídas: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " no importadas: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " firmas limpiadas: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " IDs de usuario limpiados: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3663,179 +3706,184 @@
 "AVISO: la clave %s contiene preferencias para algoritmos\n"
 "no disponibles en estos IDs de usuario:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": algoritmo de compresión preferido %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "clave %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "rechazado por el filtro de importación"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario válidos\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave pública no encontrada: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error escribiendo anillo '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave pública \"%s\" importada\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "clave %s: clave secreta ya existe\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "clave %s: error enviando al agente: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3844,202 +3892,202 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, 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:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "clave secreta %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No se dio ninguna razón"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "La clave ya no está en uso"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es válido"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "razón para la revocación: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentario a la revocación: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocación importado\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave pública no disponible\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "clave %s: firma directa de clave inválida\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: unión de subclave inválida\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves múltiples\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocación de subclave inválida\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocación de subclave múltiple\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocación añadido\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave añadida\n"
@@ -4049,32 +4097,32 @@
 msgid "error allocating memory: %s\n"
 msgstr "error al reservar memoria: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 #| msgid "revoke signatures"
 msgid " (reordered signatures follow)"
 msgstr "revoca firmas"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s:\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "%d duplicate signature removed\n"
@@ -4082,21 +4130,21 @@
 msgstr0 "ID de usuario \"%s\": %d firma borrada\n"
 msgstr1 "ID de usuario \"%s\": %d firma borrada\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 "1 firma no comprobada por falta de una clave\n"
 msgstr1 "%d firmas no comprobadas por falta de claves\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d firma incorrecta\n"
 msgstr1 "%d firmas incorrectas\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 #| msgid "Good signature from"
 msgid "%d signature reordered\n"
@@ -4104,52 +4152,52 @@
 msgstr0 "Firma correcta de"
 msgstr1 "Firma correcta de"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error al crear caja de claves '%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "error al crear anillo '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "caja de claves '%s' creada\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "anillo '%s' creado\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "recurso de bloque de claves '%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo caché del anillo de claves: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revocación"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "autofirma"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4161,17 +4209,17 @@
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Confío un poco\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Confío totalmente\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4181,50 +4229,50 @@
 "Un nivel mayor que 1 permite que la clave que está firmando pueda\n"
 "hacer firmas de confianza en su nombre.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Salteando el ID de usuario \"%s\", que no es un ID de texto.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Seguro que todavía quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Imposible firmar.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "ID de usuario \"%s\" puede firmarse. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "¿Firmarlo? (s/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4233,11 +4281,11 @@
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4246,11 +4294,11 @@
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "¿Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4259,43 +4307,43 @@
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "¿Quiere firmarlo aún así? (s/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "¡Esta clave ha caducado!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirará el %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "¿Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4305,31 +4353,31 @@
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) No contesto.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) He hecho una comprobación informal.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "¿Su elección? (escriba '?' para más información): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4338,228 +4386,239 @@
 "¿Está realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Esto será una autofirma.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ATENCION: la firma no se marcará como no exportable.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVISO: la firma no se marcará como no revocable.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma se marcará como no exportable.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma se marcará como no revocable.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "¿Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La clave tiene sólo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contraseña que cambiar.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "clave %s: error al cambiar frase contraseña: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "muestra huella digital de la clave"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "mostrar el keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "firmar IDs seleccionadas * ver debajo órdenes relacionadas"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "añadir un identificador de usuario"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "añadir un ID fotográfico"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "añadir una subclave"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "añadir clave a tarjeta"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "añadir una clave de revocación"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Datos descifrados correctamente"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "establecer URL del servidor de claves preferido por los IDs elegidos"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "establecer notación para los IDs de usuario seleccionados"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "cambia la frase contraseña"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "compactar IDs inutilizables y borrar firmas inutilizables de la clave"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "compactar IDs inutilizables y borrar todas las firmas de la clave"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Subclaves secretas disponibles.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4570,291 +4629,282 @@
 "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:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "La clave está revocada."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr ""
 "¿Firmar realmente todos los identificadores de usuario que son sólo texto? "
 "(s/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Clase de firma desconocida '%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Use la orden '%s')\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "¡No puede borrar el último identificador de usuario!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "¿Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "¿Borrar realmente este identificador de usuario? (s/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Realmente cambiar de sitio la clave primaria? (s/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "No se puede abrir '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Error al leer clave de respaldo desde '%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "¿De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "¿Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "¿Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "¿De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "¿De verdad quiere revocar las subclaves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "¿De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se está usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "¿Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "¿Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "¿Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "¿Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "ha fallado el borrado del secreto %s: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "la revocación del identificador de usuario ha fallado: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "la configuración del ID de usuario primario ha fallado: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" no es una huella digital\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ""
 "\"%s\" no es la huella digital primaria\n"
 "\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Identificador de usuario '%s' no válido : %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "No coincide con ningún identificador de usuario."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Nada que firmar.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "No está firmado por usted.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subclave \"%s\" no encontrada\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Resumen: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Características: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Sevidor de claves no-modificar"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Notaciones: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "caducó: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4862,17 +4912,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4881,17 +4931,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVISO: Tu subclave de cifrado caduca pronto.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "AVISO: Tu subclave de cifrado caduca pronto.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4900,74 +4956,74 @@
 "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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de querer añadirla? (s/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma inválida? (s/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "%d firma borrada.\n"
 msgstr1 "%d firmas borradas.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "inválida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" compactado: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "ID de usuario \"%s\": %d firma borrada\n"
 msgstr1 "ID de usuario \"%s\": %d firmas borradas\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\": ya minimizado\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya limpiado\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4976,41 +5032,57 @@
 "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:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(excepto si especifica la clave dando su huella digital)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "La subclave %s ya ha sido revocada.\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5018,238 +5090,238 @@
 "¿Está seguro de querer cambiar la fecha de caducidad para multiples "
 "subclaves? (s/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando el uso de una subclave.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Cambiando uso de clave primaria.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Introduzca la notación: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, 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:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No existe una subclave con ID de usuario '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con índice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caducó el %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 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:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Crear los certificados de revocación realmente? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, 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:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "parámetro incorrecto para la opción '%s'\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferencia '%s' duplicada\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresión\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "item incorrecto '%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5257,19 +5329,19 @@
 "AVISO: ciertos programas OpenPGP no usan claves DSAcon resúmenes de este "
 "tamaño\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certificar"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Autentificación"
 
@@ -5283,182 +5355,182 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Conmutar la capacidad de autenticación\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Acabado\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA y RSA (por defecto)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA y ElGamal\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (sólo firmar)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (sólo firmar)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (sólo cifrar)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (sólo cifrar)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) ElGamal (sign and encrypt)\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ElGamal (firmar y cifrar)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "(por defecto)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (sólo firmar)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) ECC (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (permite elegir capacidades)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) ECC (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (sólo cifrar)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Clave existente\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Clave existente de la tarjeta\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Introduzca keygrip: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 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:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No hay claves con ese keygrip\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error al leer la tarjeta: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Número de serie de la tarjeta: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Claves disponibles:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "¿De qué tamaño quiere la subclave? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Seleccione el tipo de curva elíptica deseado:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5474,7 +5546,7 @@
 " <n>m = la clave caduca en n meses\n"
 " <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5490,38 +5562,38 @@
 " <n>m = la clave caduca en n meses\n"
 " <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave válida ¿durante? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5529,11 +5601,11 @@
 "Su sistema no puede mostrar fechas más allá del 2038.\n"
 "Sin embargo funcionará correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "¿Es correcto? (s/n) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5547,7 +5619,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5563,41 +5635,41 @@
 " \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido en el nombre\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, 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:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Dirección inválida\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido en el comentario\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Está usando el juego de caracteres '%s'.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5608,13 +5680,13 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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 "
 "comentario\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 
@@ -5629,31 +5701,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "¿Cambia (N)ombre, (D)irección o (S)alir? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5666,18 +5738,18 @@
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5688,64 +5760,64 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "¿Continuar? (S/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ya existe una clave para \"%s\"\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "¿Crear de todas formas?(s/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "creando de todas formas\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, 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:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, 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:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "escribiendo clave pública en '%s'\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo público de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5753,7 +5825,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5761,7 +5833,7 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5769,23 +5841,23 @@
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "¿Crear de verdad? (s/N) "
 
@@ -5793,74 +5865,90 @@
 msgid "never "
 msgstr "nunca "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Resumen: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Características: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Sevidor de claves no-modificar"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Política de firmas críticas: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Política de firmas: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Servidor de claves crítico preferido: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Notación de firmas críticas: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Notación de firma: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d firma correcta\n"
 msgstr1 "%d firmas correctas\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 "1 firma no comprobada por causa de un error\n"
 msgstr1 "%d firmas no comprobadas por causa de errores\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 "Advertencia: clave %lu no usada por su gran tamaño\n"
 msgstr1 "Advertencia: claves %lu no usadas por su gran tamaño\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Huella clave primaria:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Huella de subclave:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Huella de clave ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Número de serie de la tarjeta ="
 
@@ -5937,331 +6025,337 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave válido: omitido\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "renovando %d clave desde %s\n"
 msgstr1 "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "ningún servidor de claves conocido\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "solicitando clave de %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: imposible recuperar URI %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s clave de sesión cifrada\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, 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:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave pública es %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "cifrado con clave de %u bits %s, ID %s, creada el %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVISO: se observan varios textos en claro\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contraseña\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contraseña\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave pública: DEK correcta\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCIÓN: la intgridad del mensaje no está protegida\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "no se encontró firma\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " usando %s clave %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " emisor \"%s\"\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "incierto"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " alias \"%s\""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", algoritmo de clave pública "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, 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:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
@@ -6364,28 +6458,28 @@
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "opción ambigua '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "opción desconocida '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "algoritmo débil de resumen desconocido '%s'\n"
@@ -6440,7 +6534,7 @@
 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:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6506,7 +6600,7 @@
 "creada el %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6520,71 +6614,71 @@
 "Si usa una foto muy grande, ¡su clave será también muy grande!\n"
 "Una imagen cercana a 240x288 tiene un tamaño adecuado.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduzca nombre del fichero JPEG para ID fotográfico: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "Imposible abrir fichero JPEG '%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "¡Este JPEG es realmente grande (%d bytes)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "¿Seguro que quiere usarlo? (s/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s' no es un fichero JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "¿Es correcta la foto? (s/n) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma necesita ficheros temporales para llamar a programas "
 "externos\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "no se puede ejecutar el intérprete de órdenes '%s': %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "el programa externo finalizó anormalmente\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "error del sistema llamando al programa externo: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "AVISO: no se puede borrar fichero temporal (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "AVISO: no se puede borrar el directorio temporal '%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6592,7 +6686,7 @@
 "llamadas a programas externos inhabilitadas por permisos inseguros de "
 "ficheros.\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "¡no puedo mostrar ID fotográfico!\n"
@@ -6675,36 +6769,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: No hay seguridad de que esta clave pertenezca realmente\n"
 "al usuario que se nombra\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Hay poca seguridad de que esta clave pertenezca realmente\n"
 "al usuario que se nombra\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta clave probablemente pertenece al usuario que se nombra\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: ¡Esta clave es mala! ¡Está marcada como no confiable!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6714,7 +6808,7 @@
 "lo que está haciendo,\n"
 "puede contestar sí a la siguiente pregunta.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6724,27 +6818,27 @@
 "identificador de usuario. Si *realmente* sabe lo que está haciendo,\n"
 "puede contestar sí a la siguiente pregunta.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "¿Usar esta clave de todas formas? (s/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCIÓN: ¡Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: la clave puede estar revocada (falta clave de revocación)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
@@ -6752,13 +6846,13 @@
 "se ha dado la opción %s, pero no se ha dado la opción '%s'\n"
 "\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but no matching User ID found\n"
@@ -6766,68 +6860,68 @@
 "se ha dado la opción %s, pero no se ha dado la opción '%s'\n"
 "\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATENCIÓN: ¡Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Esto puede significar que la firma está falsificada.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta clave está deshabilitada.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Nota: ¡Esta clave ha caducado!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCIÓN: ¡Esta clave no está certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCIÓN: ¡Esta clave no está certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCIÓN: ¡Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " La firma es probablemente una FALSIFICACIÓN.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6838,7 +6932,7 @@
 "ATENCIÓN: ¡Esta clave no está certificada con firmas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6846,56 +6940,56 @@
 "ATENCIÓN: ¡Esta clave no está certificada con firmas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave pública deshabilitada\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave pública ya presente\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr ""
 "no se puede cifrar a '%s'\n"
 "\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr ""
 "se ha dado la opción %s, pero no se han dado claves predeterminadas válidas\n"
 "\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr ""
 "se ha dado la opción %s, pero no se ha dado la opción '%s'\n"
 "\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Destinatarios actuales:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6903,40 +6997,40 @@
 "\n"
 "Introduzca ID de usuario. Acabe con una línea vacía: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave pública ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Clave pública deshabilitada.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave pública ya establecida\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "desconocido el destinatario predefinido \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Nota: la clave %s no usa %s\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@ -6974,7 +7068,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposible abrir datos firmados fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "la clave %s no se puede usar para cifrar en modo %s\n"
@@ -7207,52 +7301,47 @@
 "la clave %s %s requiere un resumen de %zu bits o mayor (el resumen es de "
 "%s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "por favor vea %s para más información\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: la subclave de cifrado %s tiene un certificado cruzado inválido\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
 msgstr0 "la clave pública %s es %lu segundo más nueva que la firma\n"
 msgstr1 "la clave pública %s es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 "la clave pública %s es %lu día más nueva que la firma\n"
 msgstr1 "la clave pública %s es %lu días más nueva que la firma\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7265,7 +7354,7 @@
 "la clave %s fue creada %lu segundos en el futuro (viaje en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7277,51 +7366,51 @@
 "la clave %s fue creada %lu segundos en el futuro (viaje en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "NOTA: clave de firmado %s caducada el %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTA: la clave de firmado %s ha sido revocada\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, 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"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %%- de la url de política . Se usa sin "
 "expandir.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7329,7 +7418,7 @@
 "AVISO: no puedo expandir el %%- de la url de política (demasiado larga).\n"
 "Se usa sin expandir.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7338,12 +7427,12 @@
 "AVISO: no puedo expandir el %%- de la URL del servidor de claves\n"
 "preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7351,12 +7440,12 @@
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7432,134 +7521,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronización: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "no se puede crear el bloqueo para '%s'\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "no se puede bloquear '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transacción en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡el directorio no existe!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "no se puede acceder a '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, 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:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza inválida\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inválida\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, 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:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versión: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error al leer registro de versión: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versión: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, 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:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, 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:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versión del fichero %d inválida\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error al leer registro libre: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, 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:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al añadir un registro: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: base de datos de confianza corrupta.\n"
@@ -8008,7 +8097,7 @@
 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:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobación de base de datos de confianza el: %s\n"
@@ -8042,31 +8131,31 @@
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%d clave procesada"
 msgstr1 "%d claves procesadas"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 " (%d validación de cuenta borrada)\n"
 msgstr1 " (%d validaciones de cuenta borradas)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8074,7 +8163,7 @@
 "nivel: %d validez: %3d firmada: %3d confianza: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8145,7 +8234,7 @@
 msgid "ultimate"
 msgstr " absoluta "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8156,12 +8245,12 @@
 "Por favor recuerde que el fichero de firma (.sig o .asc)\n"
 "debería ser el primero que se da en la línea de órdenes.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la línea %u es demasiado larga o no tiene avance de línea (LF)\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "no se puede abrir fd %d: %s\n"
@@ -8178,19 +8267,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "opción ambigua '%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "establece los parámetros de depuración"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "habilita depuración completa"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Uso: kbxutil opciones ficheros (-h para ayuda)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8201,16 +8290,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%sNúmero&#x1f;: %s%%0ATitular&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Intentos disponibles: %d"
@@ -8252,10 +8341,10 @@
 msgstr ""
 "|P|Por favor introduzca PIN Unblocking Code (PUK) para claves estándar."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la función de manejo del PIN devolvió un error: %s\n"
@@ -8277,121 +8366,121 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "la clave existente será reemplazada\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "escribiendo clave nueva\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el módulo RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, 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-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "la generación de la clave falló\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "generación de clave completada (%d segundo)\n"
 msgstr1 "generación de clave completada (%d segundos)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave pública\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Introduzca un PIN para la clave que crea firmas cualificadas."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Por favor introduzca PIN de Administrador"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Por favor, introduzca PIN para claves estándar."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "el PIN-Nulo no ha sido cambiado\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "el PIN-Nulo no ha sido cambiado\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8399,7 +8488,7 @@
 "|NP|Por favor introduzca un nuevo PIN Unblocking Code (PUK) para la clave "
 "que crea firmas cualificadas."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8407,27 +8496,27 @@
 "|P|Introduzca el PIN Unblocking Code (PUK) para que la clave pueda crear "
 "firmas cualificadas."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo al leer clave pública: %s\n"
@@ -8435,42 +8524,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "usando PIN por defecto %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Por favor desbloquee la tarjeta"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificación CHV%d falló: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "¡la tarjeta está bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8482,20 +8571,20 @@
 "%d intentos quedan para PIN de administrador antes de "
 "bloquearpermanentemente la clave\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, 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:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, 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"
@@ -8503,79 +8592,79 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nuevo Código de Reinicio"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 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:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Por favor introduzca el PIN y el Nuevo PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "error al leer datos de la aplicación\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error al leer huella digital DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creación\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "curva no soportada\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, 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:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, 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:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, 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:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
@@ -8595,7 +8684,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "ejecutar en modo multi servidor (primer plano)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|poner el nivel de depurado a NIVEL"
 
@@ -8639,11 +8728,11 @@
 msgid "deny the use of admin card commands"
 msgstr "denegar órdenes de administración de la tarjeta"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Uso: @SCDAEMON@ opciones (-h para ayuda)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8651,315 +8740,315 @@
 "Sintaxis: scdaemon opciones orden args\n"
 "Demonio de la tarjeta inteligente para @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "manejador del descriptor %d iniciado\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "manejador del descriptor %d terminado\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "error obteniendo información sobre uso de la clave: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "el certificado: %s requiere un modelo de validación"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "cadena"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "el certificado del emisor no está marcado como CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "política marcada como crítica sin políticas configuradas"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "fallo al abrir '%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "no se permite política de certificado"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "fallo obteniendo huella digital\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "buscando al emisor en una localización externa\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "numero de emisores coincidentes: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "no se ha podido obtener authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "buscando emisor en el caché de Dirmngr\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "número de certificados coincidentes: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, 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:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "fallo al reservar handle de keyDB\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "el certificado ha sido revocado"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "el estado del certificado es desconocido"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "la comprobación de CRL falló: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "validez del certificado incorrecta: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "el certificado aún no es válido"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "el certificado raíz no es válido aún"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "el certificado intermedio aún no es válido"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "certificado caducado"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "el certificado raíz ha caducado"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "el certificado intermedio ha caducado"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "faltan los atributos requeridos del certificado: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "el certificado tiene una validez incorrecta"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "la firma no se creo durante el tiempo de validez del certificado"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "el certificado no se creo durante el tiempo de validez el emisor"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "certificado intermedio no creado durante el tiempo de validez del emisor"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( firmas creadas en "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (certificado creado en "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (certificado válido desde "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( emisor válido desde "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "huella digital=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "certificado raíz marcado ahora como fiable\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "no se encuentra el emisor de este certificado"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "certificado auto firmado con firma INCORRECTA"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "el certificado raíz no está marcado como fiable"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, 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:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "cadena de certificados demasiado larga\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "no se encuentra emisor del certificado"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "el certificado tiene una firma INCORRECTA"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "encontrado otro posible certificado de CA coincidente - reintentando"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, 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:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificado correcto\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificado intermedio correcto\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certificado raíz correcto\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "cambiando al modelo en cadena"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "modelo de validación usado: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "memoria desbordada\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(es el algoritmo MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ninguno"
 
@@ -8979,7 +9068,7 @@
 msgid "Error - invalid DN"
 msgstr "Error - DN inválido"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8994,42 +9083,42 @@
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, 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:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "el certificado no es utilizable para cifrar\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "el certificado no es utilizable para firmar\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9250,17 +9339,17 @@
 msgid "resource problem: out of core\n"
 msgstr "problema de recursos: memoria desbordada\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(el algoritmo RC2)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(no parece un mensaje cifrado)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9271,7 +9360,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificado '%s' no encontrado: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error bloqueando keybox: %s\n"
@@ -9296,103 +9385,103 @@
 msgid "no valid recipients given\n"
 msgstr "no se dieron receptores válidos\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "lista claves externas"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "lista de cadenas de certificados"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "importa certificado"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "exporta certificado"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "registrar tarjeta inteligente"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "pasar una orden a dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "invocar gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|número de certificados que incluir"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|tomar política de información de FICHERO"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "asumir entrada en formato PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "asumir entrada en formato base-64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "asumir entrada en formato binario"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "crea una salida en base-64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|usa ID-USUARIO como clave secreta por defecto"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|añade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "recuperar certificados de emisor perdidos"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|usa la codificación NOMBRE para frases contraseña PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "nunca consultar una CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "no comprobar CRLs para certificados raíz"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "comprabar validez usando OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "no comprobar políticas de certificados"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -9402,23 +9491,23 @@
 # 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:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|escribir inform de auditoría a FICHERO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Uso: @GPGSM@ opciones ficheros (-h para ayuda)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9428,27 +9517,27 @@
 "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:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modelo de validación desconocido '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importando certificados comunes '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no puedo firmar usando '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "orden inválida (no hay orden implícita)\n"
@@ -9468,7 +9557,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "fallaron comprobaciones básicas sobre el certificado - no importado\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error obteniendo parámetros almacenados: %s\n"
@@ -9478,48 +9567,48 @@
 msgid "error importing certificate: %s\n"
 msgstr "error importando el certificado: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error al leer la entrada: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "no hay agente dirmngr activo en esta sesión\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error al abrir base de datos de claves: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problema buscando el certificado existente: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error obteniendo keyDB para escribir: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error almacenando certificado: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problema re-buscando el certificado: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error almacenando parámetros: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Error - "
 
@@ -9554,7 +9643,7 @@
 "\n"
 "%s%sEstá realmente seguro de querer hacer esto?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9574,60 +9663,60 @@
 "\"%s\"\n"
 "¡Observe que este certificado NO creará una firma cualificada!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "resumen %d (%s) para firmante %d no puede utilizarse; usando %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "algoritmo de hash usado para el firmante %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "la comprobación de la firma cualificada falló: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Firmado el "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "no hay fecha"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 #| msgid "algorithm: %s"
 msgid "algorithm:"
 msgstr "algoritmo: %s"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, 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:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Firma correcta de"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " alias"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Es una firma cualificada\n"
@@ -9653,317 +9742,312 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "no puedo desactivar el bloqueo en la cache de certificados: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "quitando %u certificados del almacén\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "no puedo leer el certificado '%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "el certificado '%s' ya estaba almacenado\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "certificado fiable '%s' borrado\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certificado '%s' cargado\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " huella digital SHA1 = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " emisor ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " asunto ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "error al cargar certificado '%s': %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr " certificados cargados permanentemente: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "certificados almacenados para esta sesión: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " certificados confiados: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificado ya almacenado\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificado almacenado\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error al almacenar certificado: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "huella digital SHA1 no válida '%s'\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error al descargar certificado con S/N: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error al descargar certificado por asunto: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no se encuentra el emisor de este certificado\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error al obtener authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "creando directorio '%s'\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "error al crear directorio '%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorando directorio de base de datos '%s'\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "error al leer directorio '%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "removiendo archivo de cache '%s'\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "no se remueve el archivo '%s'\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error cerrando archivo de cache: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "creado nuevo archivo de cache '%s'\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, 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:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "versión antigua del directorio de cache - limpiando\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, 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:614
+#: dirmngr/crlcache.c:621
 #, 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:622
+#: dirmngr/crlcache.c:629
 #, 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:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "entrada duplicada detectada en '%s', línea %u\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, 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:672
+#: dirmngr/crlcache.c:679
 #, 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:678
+#: dirmngr/crlcache.c:685
 #, 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:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "fecha no válida en '%s', línea %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "errores detectados en el archivo de cache\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, 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:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "error al cerrar '%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "error al renombrar '%s' a '%s': %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "no se puede hacer el hash de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, 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:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "error al hacer el hash de '%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "formato inválido de huella digital para '%s'\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, 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:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "abriendo archivo de cache '%s'\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "error al abrir archivo de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, 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:1174
+#: dirmngr/crlcache.c:1181
 #, 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:1176
+#: dirmngr/crlcache.c:1183
 #, 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:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, 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:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9972,7 +10056,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:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
@@ -9980,194 +10064,194 @@
 "una actualización\n"
 "\n"
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, 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:1336
+#: dirmngr/crlcache.c:1343
 #, 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:1348
+#: dirmngr/crlcache.c:1355
 #, 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:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, 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:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "respuesta S-expression de libksba no válida\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "algoritmo hash inválido '%s'\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "fallo al crear S-expression: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ha fallado ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, 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:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error al obtener un objeto CRL: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, 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:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "buscando el certificado de emisor CRL por authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "ha fallado la verificación CRL de la firma: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ha fallado ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ha fallado ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, 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:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "ha fallado crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, 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:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "extensión crítica CRL desconocida %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error al leer las extensiones CRL: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creando fichero de cache '%s'\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problema al renombrar '%s' a '%s': %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10176,12 +10260,12 @@
 "ha fallado la actualización del archivo DIR - la entrada de cache se perderá "
 "al reiniciar el programa\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Comienzo del dump CRL (obtenido mediante %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10190,57 +10274,57 @@
 "luego de una actualización!\n"
 
 # qué es una 'extensión crítica desconocida'? dice que falta?
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: No se usará el CRL\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 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:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "error al leer entrada de cache: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problema al leer clave de cache: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, 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:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Terminar el dump de CRL\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "ha fallado crl_fetch via DP: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "ha fallado crl_cache_insert via DP: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "ha fallado crl_cache_insert via emisor: %s\n"
@@ -10256,23 +10340,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "el acceso a CRL no es posible a causa del modo Tor\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "el acceso CRL no es posible debido a que %s está desactivado\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "error recuperando '%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "error al inicializar objeto lector: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr ""
@@ -10419,137 +10503,137 @@
 msgid "looking up '%s'\n"
 msgstr "buscando '%s'\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "listar los contenidos del cache CRL"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|carga CRL de FILE en la cache"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|carga un CRL de una URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "apaga el dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "descargar la memoria cache"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "permitir el chequeo online de versiones de software"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 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:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "enrutar todo el tráfico a través de Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Configuración de servidores HTTP"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "inhibir el uso de HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorar puntos de distribución CRL HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirigir todos los pedidos HTTP a URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "usar configuración del proxy HTTP del sistema"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Configuración de servidores HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|usar servidor de claves en URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 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:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Configuración de servidores HTTP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "inhibir el uso de LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorar puntos de distribución CRL LDAP"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|usar HOST para las consultas LDAP"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "no usar hosts de reserva con --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|usa este servidor para buscar claves"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|lee lista de servidores LDAP de FILE"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|establecer vida máxima de LDAP en N segundos"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Configuración de OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "permitir el envío de búsquedas OSCP"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorar URLs de servicio contenidas en los certificados OSCP"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|usar contestador OSCP en la URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|respuesta OCSP firmada por FPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "forzar la carga de CRLs caducados"
 
@@ -10557,7 +10641,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:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10566,11 +10650,11 @@
 "@\n"
 "(Véase en la página del manual la lista completa de órdenes y opciones)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Uso: @DIRMNGR@ opciones (-h para ayuda)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10578,103 +10662,103 @@
 "Sintaxis: @DIRMNGR@ opciones orden argumentos\n"
 "Acceso al servidor de claves, CRL y OCSP para @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "los niveles de debug válidos son: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "uso: %s opciones "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fallo al intentar descargar CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "falló el procesamiento CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: línea demasiado larga - omitida\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: se detectó huella digital no válida\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, 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:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 recibido - ninguna acción definida\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM recibido - apagando ...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM recibido - todavía %d conexiones activas\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "apagado forzado\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT recibido - apagado inmediato\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "señal %d recibida - ninguna acción definida\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error mientras se accedía '%s': http status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' redirigida a '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas redirecciones\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10730,32 +10814,32 @@
 msgid "malloc failed: %s\n"
 msgstr "ha fallado malloc: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s' no es una URL LDAP\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' no es una URL LDAP válida\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search ha llegado al límite de tamaño del servidor\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: se dio contraseña sin usuario\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: omitir esta línea\n"
@@ -10847,163 +10931,163 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "no firmada por un certificado predeterminado de firma OCSP"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "fallo al colocar item en la lista: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error intentando obtener identificador de responder: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "no se ha encontrado un certificado adecuado para verificar la respuesta "
 "OCSP\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "no se encuentra el emisor de este certificado: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "el caller no devolvió el certificado del target\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "el caller no devolvió el certificado emisor\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "fallo al asignar el contexto OCSP: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no hay un OCSP responder predeterminado\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no hay ningún firmante OCSP predeterminado definido\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "usar el contestador OCSP predeterminado '%s'\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "usar OCSP responder '%s'\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error al obtener status OCSP para certificado de destino: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "el status del certificado es: %s (esta=%s próxima=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "bien"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "el certificado ha sido revocado el: %s a causa de: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "el OCSP respondor ha devuelto un estado en el futuro\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "el OCSP respondor ha devuelto un estado no actual\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "el OCSP respondor ha devuelto un estado demasiado antiguo\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "ha fallado assuan_inquire(%s): %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "falta el número de serie en el ID del certificado"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "ha fallado assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "ha fallado fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error al enviar datos: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "ha fallado start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "ha fallado fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "se ha excedido el número de respuestas(max_replies) %d\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no puedo colocar la estructura de control: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "fallo al reservar el contexto assuan: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "ha fallado la inicialización del servidor: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problema de aceptación Assuan: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "ha fallado el procesado Assuan: %s\n"
@@ -11013,85 +11097,85 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "aceptando CA raíz que no está marcado como CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "El chequeo CRL tiene demasiados bucles\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "no se chequeará CRL para"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "comprobando CRL para"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "ha fallado el chequeo de confianza del certificado raíz: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "cadena de certificados es buena\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "silencioso"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "escribir datos de salida en hexadecimal"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "decodificar líneas de datos recibidos"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "conecta al dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "conecta al dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|conectar al socket Assuan NOMBRE"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|conectar al servidor Assuan en ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 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:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "no usar el modo de conexión extendido"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|ejecuta órdenes de FICHERO al empezar"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "ejecutar /subst al empezar"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Uso: @GPG@-connect-agent opciones (-h para ayuda)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11099,49 +11183,49 @@
 "Sintaxis: @GPG@-connect-agent opciones\n"
 "Conectar a un agente que se está ejecutando y mandar órdenes\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, 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:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallo recibiendo la línea: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "línea demasiado larga -omitida\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "orden desconocida '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallo mandando la línea: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "no hay agente dirmngr activo en esta sesión\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error enviando opciones estándar: %s\n"
@@ -11214,12 +11298,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Note que las especificación de grupo se ignoran\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error al cerrar '%s'\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error al leer '%s'\n"
@@ -11326,90 +11410,110 @@
 "Compara frase contraseña dada en entrada estándar con un fichero de "
 "patrones\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "NOTA: ¡ya hay claves almacenadas en la tarjeta!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "NOTA: ¡ya hay claves almacenadas en la tarjeta!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "¿Reemplazar las claves existentes? (s/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "añadir un certificado a la cache"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "configurar KDF para autentificación de PIN"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "añadir un certificado a la cache"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "añadir un certificado a la cache"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "el algoritmo de resumen seleccionado no inválido\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "preferencias personales de cifrado inválidas\n"
+
+#, fuzzy
+#~| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "no se puede usar el cifrado '%s' en modo %s\n"
+
+#~ 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"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "error escribiendo en el fichero temporal: %s\n"
 
@@ -12222,18 +12326,6 @@
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "cambiar entre lista de claves secretas y públicas"
 
-# ¿Por qué no frase de paso?
-# Porque todo el mundo sabe lo que es una contraseña
-# y una "frase de paso" no. Soy consciente de que se
-# traduce igual password y passphrase pero el contexto
-# permite saber de lo que se está hablando.
-# No sé, no sé.
-# ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
-# ¿Es que son más listos? :-)
-#
-#~ msgid "Passphrase"
-#~ msgstr "Frase contraseña"
-
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "usar ficheros temporales para pasar datos a los ayudantes delservidor de "
@@ -13535,9 +13627,6 @@
 #~ msgid "pref"
 #~ msgstr "pref"
 
-#~ msgid "showpref"
-#~ msgstr "verpref"
-
 #~ msgid "setpref"
 #~ msgstr "estpref"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/et.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/et.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/et.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/et.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@ -26,52 +26,52 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "vigane parool"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -82,28 +82,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "liiga pikk parool\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -113,273 +113,274 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "halb parool"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Sisestage parool\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -387,7 +388,7 @@
 msgstr0 "Nimes peab olema vähemalt 5 sümbolit\n"
 msgstr1 "Nimes peab olema vähemalt 5 sümbolit\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -395,390 +396,396 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Kasutan seda võtit ikka? "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "ole mõnevõrra vaiksem"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "ei ole toetatud"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|kasuta parooli moodi N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "kasuta gpg-agenti"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Kasuta: gpg võtmed failid (-h näitab abiinfot)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: kataloogi ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -788,19 +795,19 @@
 "Võtmed:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -808,8 +815,8 @@
 "@Käsud:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -819,86 +826,88 @@
 "Võtmed:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Katkesta"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -911,19 +920,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -936,7 +945,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -946,48 +955,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuda parooli"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "luba võti"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -998,8 +1016,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1009,7 +1027,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
@@ -1019,7 +1037,7 @@
 msgid "secret key parts are not available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1037,52 +1055,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
@@ -1103,28 +1121,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "jah"
 
@@ -1179,8 +1197,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
@@ -1195,74 +1213,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1346,7 +1364,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1430,44 +1448,44 @@
 msgid "Root certificate trustworthy"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Võtme leiate: "
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "tundmatu versioon"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "`%s' kohta abiinfo puudub"
@@ -1477,12 +1495,12 @@
 msgid "ignoring garbage line"
 msgstr "viga lõpetaval real\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "tundmatu"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
@@ -1517,149 +1535,162 @@
 msgid "iconv_open failed: %s\n"
 msgstr "faili ei õnnestu avada: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "ei leia avalikku võtit %08lX: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "viga `%s' loomisel: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "vigane pakendi päis: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "pakendi päis: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "vigane avateksti allkirja päis\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "pakendi päis: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "avateksti allkirjad üksteise sees\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega märgitud rida: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne faililõpp (puudub CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne faililõpp (poolik CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "enneaegne faililõpp (lõpetaval real)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "viga lõpetaval real\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d sümbolit\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "kvooditud sümbol pakendis - tõenäoliselt on kasutatud vigast MTA programmi\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "pole inimese poolt loetav"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1668,27 +1699,27 @@
 "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n"
 "ning lõpus peab olema '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1698,7 +1729,7 @@
 "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n"
 "ning lõpus peab olema '='\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
@@ -1712,8 +1743,8 @@
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1724,13 +1755,13 @@
 msgid "error from TPM: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@ -1741,209 +1772,214 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "ei töödeldud"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku võtit pole: %s\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1951,102 +1987,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2054,197 +2090,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "välju sellest menüüst"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "näita seda abiinfot"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Võtme leiate: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuupäeva"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2306,9 +2347,9 @@
 msgid "subkey"
 msgstr "Avalik võti: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
@@ -2333,81 +2374,76 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-keys\".\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "S2K moodi tõttu ei saa sümmeetrilist ESK paketti kasutada\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "kasutan šiffrit %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2415,19 +2451,13 @@
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krüptitud kasutajale: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2444,7 +2474,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2455,432 +2485,436 @@
 msgid "problem handling encrypted packet\n"
 msgstr "probleem krüptitud paketi käsitlemisel\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 "`%s' jaoks pole tühistamise võtmeid\n"
 "\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "mittekasutatav salajane võti"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "genereeri tühistamise sertifikaat"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "kirjutan salajase võtme faili `%s'\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "viga `%s' loomisel: %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "Kasutaja id puudub"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast võtit `%s' ei leitud: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|fail|loo avateksti allkiri"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "krüpteeri andmed"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "dekrüpteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "näita võtmeid"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "näita võtmeid ja allkirju"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "näita võtmeid ja sõrmejälgi"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "näita salajasi võtmeid"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "eemalda võtmed salajaste võtmete hoidlast"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "allkirjasta või toimeta võtit"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "ekspordi võtmed"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "ekspordi võtmed võtmeserverisse"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "otsi võtmeid võtmeserverist"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "uuenda võtmeid võtmeserverist"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "impordi/mesti võtmed"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo failid|trüki teatelühendid"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "ära tee mingeid muutusi"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "küsi enne ülekirjutamist"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis väljund"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|määra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "näita salajasi võtmeid"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2888,7 +2922,7 @@
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2918,13 +2952,13 @@
 " --list-keys nimed näita võtmeid\n"
 " --fingerprint nimed näita sõrmejälgi\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2939,7 +2973,7 @@
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2947,571 +2981,565 @@
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Avalik võti: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Šiffer: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Räsi: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "kasuta: gpg võtmed "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "sea eelistuste nimekiri"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud šifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "valitud lühendi algoritm ei ole lubatud\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud šifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku šifri eelistused\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "vigased isikliku šifri eelistused\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku lühendi eelistused\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -3525,7 +3553,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -3556,340 +3584,345 @@
 msgid "No help available for '%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "ei ole toetatud"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "näita sõrmejälge"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "näita sõrmejälge"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "mittekasutatav salajane võti"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "näita sõrmejälge"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "jätan bloki tüübiga %d vahele\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu võtit on seni töödeldud\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Töödeldud kokku: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " vahele jäetud uusi võtmeid: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " vahele jäetud uusi võtmeid: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " imporditud: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " muutmata: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " uusi kasutajaid: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " uusi alamvõtmeid: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " uusi allkirju: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " uusi tühistamisi: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " loetud salajasi võtmeid: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " salajasi võtmeid imporditud: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi võtmeid: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " pole imporditud: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " uusi allkirju: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " loetud salajasi võtmeid: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "`%s' jätsin vahele: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "võti %08lX: HKP alamvõtme rike parandatud\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "võti %08lX: uus võti - jätsin vahele\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "võti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "võti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "võti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "võti %08lX: salajane võti on imporditud\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3898,200 +3931,200 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "salajast võtit `%s' ei leitud: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Põhjus puudub"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Võti on asendatud"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Võti on kompromiteeritud"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Võti ei ole enam kasutusel"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "tühistamise põhjus: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "tühistamise kommentaar: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "võti %08lX: vigane alamvõtme seos\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "võti %08lX: vigane mitme alamvõtme seos\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "võti %08lX: vigane alamvõtme tühistamine\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, 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:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "võti %08lX: jätsin vahele kasutaja ID '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "võti %08lX: jätsin alamvõtme vahele\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
@@ -4101,35 +4134,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "`%s' jätsin vahele: %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "Kasutaja ID \"%s\" on tühistatud."
 msgstr1 "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4137,7 +4170,7 @@
 msgstr0 "1 allkiri jäi testimata, kuna võti puudub\n"
 msgstr1 "1 allkiri jäi testimata, kuna võti puudub\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4145,61 +4178,61 @@
 msgstr0 "%d halba allkirja\n"
 msgstr1 "%d halba allkirja\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Korrektne allkiri kasutajalt \""
 msgstr1 "Korrektne allkiri kasutajalt \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "võtmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "võtmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "tühistamine"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "iseenda allkiri"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4212,68 +4245,68 @@
 "passe, kontrollige erinevatest allikatest näpujälgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Usaldan vähesel määral\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Usaldan täiesti\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4282,11 +4315,11 @@
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4295,11 +4328,11 @@
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4308,44 +4341,44 @@
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud võtmega %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "See võti on aegunud!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See võti aegub %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4355,32 +4388,32 @@
 "kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Ma ei ole üldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Ma olen kontrollinud väga hoolikalt.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4389,275 +4422,284 @@
 "Olete tõesti kindel, et soovite seda võtit oma\n"
 "võtmega allkirjastada: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei märgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei märgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri märgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda võtit üldse kontrollinud.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda võtit väga hoolikalt.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "salvesta ja välju"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "näita võtit ja kasutaja IDd"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "tühista allkirjad"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne võti"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "lisa tühistamise võti"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "märgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "näita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "näita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tühista kasutaja ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "tühista sekundaarne võti"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "luba võti"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri võti"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näita foto ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Salajane võti on kasutatav.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Salajane võti on kasutatav.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast võtit.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4665,309 +4707,299 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Võti on tühistatud."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te tõesti soovite seda võtit kustutada? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas tühistan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te tõesti soovite seda võtit tühistada? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te tõesti soovite seda võtit tühistada? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas tõesti uuendan seaded? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Väljun salvestamata? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Teatelühend: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Omadused: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tühistatud "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " aegub: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " aegub: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "See võti on blokeeritud"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4975,19 +5007,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "tühistatud "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4996,18 +5028,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5016,35 +5053,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5052,38 +5089,38 @@
 msgstr0 "Kustutatud %d allkiri.\n"
 msgstr1 "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "Kasutaja ID \"%s\" on tühistatud."
 msgstr1 "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5092,41 +5129,56 @@
 "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:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(kui te just ei määra võtit sõrmejäljega)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5134,267 +5186,267 @@
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan üle (j/E)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr " allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "kirjutan võtit siduva allkirja\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "võtme suurus ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "krüpteeri andmed"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5408,179 +5460,179 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (vaikimisi)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "blokeeri võti"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud võtmepikkus on %u bitti\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5596,7 +5648,7 @@
 " <n>m = võti aegub n kuuga\n"
 " <n>y = võti aegub n aastaga\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5612,40 +5664,40 @@
 " <n>m = allkiri aegub n kuuga\n"
 " <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Võti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5653,12 +5705,12 @@
 "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
 "Siiski käsitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see õige (j/e)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5669,7 +5721,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5685,42 +5737,42 @@
 " \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Pärisnimi: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu sümbol kommentaaris\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5731,11 +5783,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5750,35 +5802,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Palun parandage kõigepealt viga\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5790,18 +5842,18 @@
 "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5809,67 +5861,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Kasutan seda võtit ikka? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Võtme genereerimine katkestati.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5879,35 +5931,35 @@
 "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
 "kasutades võtit \"--edit-key\".\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, 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:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, 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:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon tõesti? "
@@ -5916,27 +5968,43 @@
 msgid "never "
 msgstr "mitte kunagi"
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Teatelühend: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Omadused: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kriitiline allkirja poliitika: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5944,7 +6012,7 @@
 msgstr0 "%d halba allkirja\n"
 msgstr1 "%d halba allkirja\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5952,41 +6020,41 @@
 msgstr0 "1 allkiri jäi vea tõttu kontrollimata\n"
 msgstr1 "1 allkiri jäi vea tõttu kontrollimata\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Võtmehoidla"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Primaarse võtme sõrmejälg:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Primaarse võtme sõrmejälg:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Alamvõtme sõrmejälg:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Võtme sõrmejälg ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6066,333 +6134,339 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "küsin võtit %08lX võtmeserverist %s\n"
 msgstr1 "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 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:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s krüpteeritud sessiooni võti\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s krüpteeritud andmed\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik võti on %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid " \"%s\"\n"
 msgstr " ka \""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krüpteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krüpteeritud ühe parooliga\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei õnnestu töödelda\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " ka \""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " ka \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Võtme leiate: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "ebakindel"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " ka \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tundmatu avaliku võtme algoritm"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
@@ -6497,27 +6571,27 @@
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "tundmatu allkirja klass"
@@ -6576,7 +6650,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "muuda parooli"
@@ -6640,7 +6714,7 @@
 "%s"
 msgstr "%u-bitine %s võti, ID %08lX, loodud %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6654,74 +6728,74 @@
 "väga suurt pilti, on ka kõti väha suur!\n"
 "Mõistlik pildi suurus võiks olla umbes 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "faili ei õnnestu avada: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto õige (j/E/v)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "mittelokaalse programmi käivitamist ei toetata\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "see platvorm nõuab väliste programmide käivitamiseks ajutiste failide "
 "kasutamist\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "väline programm lõpetas erandlikult\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "süsteemi viga välise programmi kasutamisel: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "HOIATUS: ei õnnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6729,7 +6803,7 @@
 "väliste programmide käivitamine on blokeeritud, kuna seadete failil on\n"
 "ebaturvalised õigused\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa näidata!\n"
@@ -6816,32 +6890,32 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikaadid täiesti usaldatava võtmeni:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "See võti kuulub tõenäoliselt omanikule\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "See võti kuulub meile\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6853,7 +6927,7 @@
 "võite järgnevale küsimusele vastata jaatavalt\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6865,99 +6939,99 @@
 "võite järgnevale küsimusele vastata jaatavalt\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Kasutan seda võtit ikka? "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "HOIATUS: Kasutan mitteusaldatavat võtit!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "HOIATUS: see võti võib olla tühistatud (tühistamise võtit pole)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "võti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See võti on omaniku poolt tühistatud!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " See võib tähendada, et allkiri on võltsing.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamvõti on omaniku poolt tühistatud!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Märkus: See võti on blokeeritud.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Märkus: See võti on aegunud!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " Ei ole midagi, mis näitaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda võtit!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Allkiri on tõenäoliselt VÕLTSING.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6968,7 +7042,7 @@
 "HOIATUS: Seda võtit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6976,51 +7050,51 @@
 "HOIATUS: Seda võtit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei määranud kasutaja IDd. (võite kasutada võtit \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7028,40 +7102,40 @@
 "\n"
 "Sisestage kasutaja ID. Lõpetage tühja reaga: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Avalik võti on blokeeritud.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
@@ -7100,7 +7174,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
@@ -7328,52 +7402,47 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "HOIATUS: allkirja lühend on teatega konfliktne\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun täiendavat infot\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "HOIATUS: allkirjastamise alamvõtmel %08lX on vigane rist-sertifikaat\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
 msgstr1 "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
 msgstr0 "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
 msgstr1 "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7382,7 +7451,7 @@
 msgstr0 "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 msgstr1 "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7390,51 +7459,51 @@
 msgstr0 "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 msgstr1 "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, 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"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "HOIATUS: noteerimise %%-asendus ebaõnnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7442,7 +7511,7 @@
 "HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7451,24 +7520,24 @@
 "HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7550,134 +7619,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "`%s' ei õnnestu avada\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei õnnestu: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: trustdb on loodud\n"
@@ -8109,7 +8178,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb järgmine kontroll %s\n"
@@ -8139,14 +8208,14 @@
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%lu võtit on seni töödeldud\n"
 msgstr1 "%lu võtit on seni töödeldud\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8154,23 +8223,23 @@
 msgstr0 "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 msgstr1 "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid võtmeid pole\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, 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"
@@ -8244,7 +8313,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8255,12 +8324,12 @@
 "Palun pidage meeles, et allkirja fail (.sig või .asc)\n"
 "peab olema käsureal esimene fail.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk või seavahetus puudub\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
@@ -8276,20 +8345,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Kasuta: gpg võtmed failid (-h näitab abiinfot)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8299,16 +8368,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8343,10 +8412,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8366,158 +8435,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "genereeri uus võtmepaar"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "genereeri uus võtmepaar"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "Võtme genereerimine ebaõnnestus: %s\n"
 msgstr1 "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Märkus: See võti on blokeeritud.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, 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:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@ -8525,43 +8594,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8569,22 +8638,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8592,81 +8661,81 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "mittetoetatud URI"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, 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:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -8687,7 +8756,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8736,333 +8805,333 @@
 msgid "deny the use of admin card commands"
 msgstr "vastuolulised käsud\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Kasuta: gpg võtmed failid (-h näitab abiinfot)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " uusi allkirju: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näita sõrmejälge"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "ei töödeldud"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "ei"
@@ -9085,7 +9154,7 @@
 msgid "Error - invalid DN"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9098,42 +9167,42 @@
 "\"%.*s\"\n"
 "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "halb sertifikaat"
@@ -9359,17 +9428,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
@@ -9379,7 +9448,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
@@ -9404,134 +9473,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "näita salajasi võtmeid"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "ära kasuta terminali"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis väljund"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega šifri algoritmi NIMI"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta šifri algoritmi NIMI"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "pakettmood: ära küsi kunagi"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "eelda enamus küsimustele jah vastust"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "eelda enamus küsimustele ei vastust"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9542,27 +9611,27 @@
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9582,7 +9651,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -9592,47 +9661,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9662,7 +9731,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9677,58 +9746,58 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Allkiri aegus %s\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "pakend: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " ka \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9755,588 +9824,583 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "näita sõrmejälge"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "halb sertifikaat"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "viga lõpetaval real\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "viga lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, 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:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "faili ei õnnestu avada: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, 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:2083
+#: dirmngr/crlcache.c:2094
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@ -10351,24 +10415,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
@@ -10524,140 +10588,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda võtmeserverit"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10670,115 +10734,115 @@
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Kasuta: gpg võtmed failid (-h näitab abiinfot)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "kasuta: gpg võtmed "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei töödeldud"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10834,32 +10898,32 @@
 msgid "malloc failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " j = jäta see võti vahele\n"
@@ -10951,164 +11015,164 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "kasutan šiffrit %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11119,135 +11183,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "välju"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -11313,12 +11377,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -11427,88 +11491,106 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "muuda aegumise kuupäeva"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "valitud lühendi algoritm ei ole lubatud\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "vigased isikliku šifri eelistused\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "kirjutan faili `%s'\n"
 
@@ -12161,10 +12243,6 @@
 #~ msgstr "lülita salajaste või avalike võtmete loendi vahel"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "halb parool"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
@@ -13096,9 +13174,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "kustuta allkirjad"
 
-#~ msgid "set preference list"
-#~ msgstr "sea eelistuste nimekiri"
-
 #~ msgid "updated preferences"
 #~ msgstr "uuendatud eelistused"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/fi.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/fi.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/fi.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/fi.po Changed

@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -42,52 +42,52 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -98,28 +98,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "salasana on liian pitkä\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -129,273 +129,274 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "väärä salasana"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%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:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Syötä salasana\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -403,7 +404,7 @@
 msgstr0 "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 msgstr1 "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -411,391 +412,397 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "ei tuettu"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|käytä salasanoissa toimintatapaa N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "käytä gpg-agentia"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Käyttö: gpg valitsimet tiedostot (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -805,19 +812,19 @@
 "Valitsimet:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -825,8 +832,8 @@
 "@Komennot:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -836,86 +843,88 @@
 "Valitsimet:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Peru"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -928,19 +937,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -953,7 +962,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -963,48 +972,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "ota avain käyttöön"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1015,8 +1033,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1026,7 +1044,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
@@ -1036,7 +1054,7 @@
 msgid "secret key parts are not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1054,52 +1072,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@ -1120,28 +1138,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, 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:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "kyllä|kylla|joo"
 
@@ -1196,8 +1214,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@ -1212,74 +1230,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1363,7 +1381,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1447,44 +1465,44 @@
 msgid "Root certificate trustworthy"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Avain saatavilla kohteessa: "
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "tuntematon versio"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Ei ohjetta aiheesta \"%s\""
@@ -1494,12 +1512,12 @@
 msgid "ignoring garbage line"
 msgstr "virhe trailer-rivissä\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "tuntematon "
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
@@ -1534,136 +1552,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "virhe luotaessa \"%s\": %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "epäkelpo ascii-koodausotsake: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "ascii-koodausotsake: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "ascii-koodausotsake: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "odottamaton ascii-koodaus:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1672,13 +1703,13 @@
 "viallista\n"
 "MTA:ta on käytetty\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "ei ihmisten luettavissa"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1687,27 +1718,27 @@
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1717,7 +1748,7 @@
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
@@ -1731,8 +1762,8 @@
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1743,13 +1774,13 @@
 msgid "error from TPM: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@ -1760,209 +1791,214 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, 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:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1970,102 +2006,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2073,197 +2109,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2325,9 +2366,9 @@
 msgid "subkey"
 msgstr "JulkAvain: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
@@ -2352,98 +2393,88 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, 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:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2460,7 +2491,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2473,430 +2504,434 @@
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "salaista avainta ei voi käyttää"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "luo mitätöintivarmenne"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "virhe luotaessa \"%s\": %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "Käyttäjätunnusta ei löytynyt"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|tiedosto|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo tiedostot|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, 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:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2905,7 +2940,7 @@
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2934,13 +2969,13 @@
 " --list-keys nimet näytä avaimet\n"
 " --fingerprint nimet näytä sormenjäljet\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2955,7 +2990,7 @@
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2963,572 +2998,566 @@
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "käyttö: gpg valitsimet "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, 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:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, 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:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "näytä valinnat"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "valittu tiivistealgoritmi ei kelpaa\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -3542,7 +3571,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -3573,342 +3602,347 @@
 msgid "No help available for '%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "ei tuettu"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "näytä sormenjälki"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "näytä sormenjälki"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "salaista avainta ei voi käyttää"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "näytä sormenjälki"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " tuotu: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " muuttamatonta: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " uusia aliavaimia: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " ei tuotu: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3917,202 +3951,202 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "mitätöinnin syy: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "mitätöintikommentti: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
@@ -4122,36 +4156,36 @@
 msgid "error allocating memory: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "Käyttäjätunnus \"%s\" on mitätöity."
 msgstr1 "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4159,7 +4193,7 @@
 msgstr0 "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 msgstr1 "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4167,61 +4201,61 @@
 msgstr0 "%d väärää allekirjoitusta\n"
 msgstr1 "%d väärää allekirjoitusta\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Allekirjoitus täsmää lähettäjään \""
 msgstr1 "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "mitätöinti"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "oma-allekirjoitus"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4234,68 +4268,68 @@
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4304,13 +4338,13 @@
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
 "(k/E) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4319,11 +4353,11 @@
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4332,44 +4366,44 @@
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4378,32 +4412,32 @@
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4412,275 +4446,284 @@
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4688,309 +4731,299 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " %08lX allekirjoitti tämän %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Tiiviste: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Ominaisuudet: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "mitätöity "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " vanhenee: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " vanhenee: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4998,19 +5031,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "mitätöity "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5019,18 +5052,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5039,35 +5077,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5075,38 +5113,38 @@
 msgstr0 "%d allekirjoitus poistettu.\n"
 msgstr1 "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "Käyttäjätunnus \"%s\" on mitätöity."
 msgstr1 "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, 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:4468
+#: g10/keyedit.c:4574
 #, 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:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5116,41 +5154,56 @@
 "voi\n"
 " saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 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:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5158,271 +5211,271 @@
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, 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:5829
+#: g10/keyedit.c:6117
 #, 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:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, 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:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, 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:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, 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:6459
+#: g10/keyedit.c:6747
 #, 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:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5436,179 +5489,179 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) RSA (salaus ja allekirjoitus)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (oletusarvo)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "poista avain käytöstä"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5624,7 +5677,7 @@
 " <n>m = Avain vanhenee n kuukauden kuluttua\n"
 " <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5640,40 +5693,40 @@
 " <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 " <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5681,12 +5734,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:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5697,7 +5750,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5715,42 +5768,42 @@
 " \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5761,11 +5814,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5780,35 +5833,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5820,18 +5873,18 @@
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5839,67 +5892,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "luo uusi avainpari"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5908,7 +5961,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5916,7 +5969,7 @@
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5924,23 +5977,23 @@
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
@@ -5949,27 +6002,43 @@
 msgid "never "
 msgstr "ei koskaan"
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Tiiviste: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Ominaisuudet: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kriittinen allekirjoituskäytäntö: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Allekirjoituskäytäntö: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5977,7 +6046,7 @@
 msgstr0 "%d väärää allekirjoitusta\n"
 msgstr1 "%d väärää allekirjoitusta\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5985,41 +6054,41 @@
 msgstr0 "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 msgstr1 "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Avaimen sormenjälki ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6099,327 +6168,333 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "pyydetään avainta %08lX kohteesta %s\n"
 msgstr1 "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid " \"%s\"\n"
 msgstr " aka \""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " aka \""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " aka \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "ei tiedossa"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " aka \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, 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:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tuntematon julkisen avaimen algoritmi"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
@@ -6427,12 +6502,12 @@
 "VAROITUS: useita allekirjoituksia havaittu. Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
@@ -6540,27 +6615,27 @@
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
@@ -6617,7 +6692,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "muuta salasanaa"
@@ -6681,7 +6756,7 @@
 "%s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6696,73 +6771,73 @@
 "käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n"
 "Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\" ei ole JPEG-tiedosto\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Onko tämä oikein (k/E/l)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "tämä ympäristö vaatii väliaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "ulkoisen ohjelman luonnoton päättyminen\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "järjestelmävirhe kutsuttaessa ulkoista ohjelmaa: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6770,7 +6845,7 @@
 "ulkoisen ohjelman kutsuminen poistettu käytöstä johtuen turvattomista \n"
 "asetustiedoston oikeuksista\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
@@ -6857,36 +6932,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Tämä on oma avain\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6898,7 +6973,7 @@
 "kysymykseen kyllä\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6910,87 +6985,87 @@
 "kysymykseen kyllä\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
 "saatavilla)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Huom: Tämä avain on vanhentunut!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
@@ -6998,17 +7073,17 @@
 " Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7019,7 +7094,7 @@
 "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
 "allekirjoituksella!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7027,51 +7102,51 @@
 "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
 "allekirjoituksella!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7079,40 +7154,40 @@
 "\n"
 "Syötä käyttäjätunnus. Lopeta tyhjällä rivillä: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "ohitettu: julkinen avain on jo asetettu\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -7152,7 +7227,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -7377,53 +7452,48 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 msgstr1 "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
 msgstr0 "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 msgstr1 "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7436,7 +7506,7 @@
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7448,53 +7518,53 @@
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "HUOM: avain on mitätöity!"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "VAROITUS: %%-laajennus ei onnistu (liian suuri). Käytetään "
 "laajentamatonta.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7502,7 +7572,7 @@
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7511,24 +7581,24 @@
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7611,134 +7681,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-tapahtuma on liian suuri\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: luotu trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: trustdb luotu\n"
@@ -8171,7 +8241,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
@@ -8201,14 +8271,14 @@
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "tähän mennessä käsitelty %lu avainta\n"
 msgstr1 "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8216,23 +8286,23 @@
 msgstr0 "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 msgstr1 "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -8306,7 +8376,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8317,12 +8387,12 @@
 "Muista, että allekirjoitustiedosto (.sig tai .asc)\n"
 "tulee antaa komentorivillä ensimmäisenä.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -8338,20 +8408,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Käyttö: gpg valitsimet tiedostot (-h näyttää ohjeen)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8361,16 +8431,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8405,10 +8475,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8428,158 +8498,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "Avaimen luonti epäonnistui: %s\n"
 msgstr1 "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, 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:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -8587,43 +8657,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8631,22 +8701,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8654,82 +8724,82 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI-muotoa ei tueta"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -8750,7 +8820,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8799,333 +8869,333 @@
 msgid "deny the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Käyttö: gpg valitsimet tiedostot (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "apua"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " uusia allekirjoituksia: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näytä sormenjälki"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "ei käsitelty"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "ei"
@@ -9148,7 +9218,7 @@
 msgid "Error - invalid DN"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9161,42 +9231,42 @@
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "virheellinen varmenne"
@@ -9422,17 +9492,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
@@ -9442,7 +9512,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -9467,134 +9537,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9605,27 +9675,27 @@
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9645,7 +9715,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -9655,47 +9725,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9725,7 +9795,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9740,59 +9810,59 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "ascii-koodaus: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " aka \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9819,590 +9889,585 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "näytä sormenjälki"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "virheellinen varmenne"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "lukuvirhe: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, 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:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "unknown hash algorithm '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -10417,24 +10482,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
@@ -10590,140 +10655,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10737,115 +10802,115 @@
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Käyttö: gpg valitsimet tiedostot (-h näyttää ohjeen)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "käyttö: gpg valitsimet "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei käsitelty"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10901,32 +10966,32 @@
 msgid "malloc failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" ei ole JPEG-tiedosto\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = ohita tämä avain\n"
@@ -11018,164 +11083,164 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "HUOM: avain on mitätöity!"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11186,135 +11251,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -11380,12 +11445,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -11494,88 +11559,105 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "muuta voimassoloaikaa"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "valittu tiivistealgoritmi ei kelpaa\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
@@ -12235,10 +12317,6 @@
 #~ msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "väärä salasana"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
 #~ "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
@@ -13200,9 +13278,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "poista allekirjoitus"
 
-#~ msgid "set preference list"
-#~ msgstr "näytä valinnat"
-
 #~ msgid "updated preferences"
 #~ msgstr "päivitä valinnat"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/fr.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/fr.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/fr.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/fr.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible d'obtenir le verrou pinentry : %s\n"
@@ -29,60 +29,60 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Annuler"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|Code personnel :"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Annuler"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "phrase de passe incorrecte"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -93,7 +93,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -104,14 +104,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -119,7 +119,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Qualité :"
 
@@ -129,13 +129,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:1219
+#: agent/call-pinentry.c:1216
 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:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -143,7 +143,7 @@
 "Veuillez entrer votre code personnel, afin de débloquer la clef secrète "
 "pendant cette session"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -151,76 +151,82 @@
 "Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
 "pendant cette session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Phrase secrète :"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "ne correspond pas — veuillez réessayer"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase"
+msgid "Passphrases match."
+msgstr "Phrase secrète"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (essai %d sur %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Répéter :"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "Code personnel trop long"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Phrase secrète trop longue"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Caractères incorrects dans le code personnel"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "Code personnel trop court"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Mauvais code personnel"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Mauvaise phrase secrète"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erreur de lecture du numéro de série de la carte : %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Veuillez répéter cette phrase secrète"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -232,52 +238,52 @@
 "Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
 "système GnuPG."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "impossible de créer « %s » : %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossible d'ouvrir « %s » : %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "aucune clef de carte convenable n'a été trouvée : %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "erreur de lecture des options stockées : %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -286,20 +292,20 @@
 "Un processus SSH demande à utiliser la clef%%0A %s%%0A (%s)%%0AVoulez-vous "
 "l'autoriser ?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Autoriser"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Refuser"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Veuillez entrer la phrase secrète pour la clef SSH%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -308,81 +314,77 @@
 "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:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "échec de création du flux à partir de cette socket : %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Veuillez insérer la carte de numéro de série"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Code personnel d'administration"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "CDP"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Code de réinitialisation"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AUtilisez le pavé numérique du lecteur en entrée."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Répétez ce code de réinitialisation"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Répétez ce code de déblocage personnel"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Répétez ce code personnel"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr ""
 "les codes de réinitialisation ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr ""
 "les codes de déblocage personnels ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "Les codes personnels ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Veuillez entrer le code personnel%s%s%s pour déverrouiller la carte"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "erreur d'écriture sur %s : %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Entrez la nouvelle phrase secrète"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -390,7 +392,7 @@
 "Aucune phrase secrète n'a été entrée.%0AUne phrase secrète vide n'est pas "
 "autorisée."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -399,18 +401,18 @@
 "Aucune phrase secrète n'a été entrée — c'est souvent une mauvaise idée."
 "%0AVeuillez confirmer que vous ne voulez aucune protection pour la clef."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Oui, aucune protection n'est nécessaire"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "Une phrase secrète devrait contenir au moins %u caractère."
 msgstr1 "Une phrase secrète devrait contenir au moins %u caractères."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -422,7 +424,7 @@
 "Une phrase secrète devrait contenir au moins %u chiffres%%0Aou caractères "
 "spéciaux."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, fuzzy, c-format
 #| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
@@ -430,221 +432,227 @@
 "Une phrase secrète ne devrait ni être un mot commun,%%0Ani correspondre à un "
 "certain schéma."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 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:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "La prendre quand même"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Veuillez entrer la nouvelle phrase secrète"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Options pratiques pour le débogage"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "exécuter en mode démon (arrière-plan)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "ne pas détacher de la console"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sortie de commandes à la sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "sortie de commandes à la csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FICHIER|lire les options depuis le FICHIER"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Options contrôlant la sortie de diagnostique"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Options contrôlant la configuration"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "ne pas utiliser le SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROG|utiliser PROG comme SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PROG|utiliser PROG comme SCdaemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorer les demandes de modification du TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorer les demandes de modification d'aff. X"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "activer la prise en charge de SSH"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "activer la prise en charge de putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "activer la prise en charge de putty"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Options contrôlant la sécurité"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|oublier les codes personnels après N secondes"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|oublier les clefs SSH après N secondes"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|définir la durée maximale du cache de code personnel à N secondes"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|définir la durée maximale du cache de clef SSH à N secondes"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "ne pas utiliser le cache de code pour signer"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, 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:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ne pas marquer les clefs comme de confiance"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "permettre de préconfigurer la phrase secrète"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Options d'application d'une politique de phrase secrète"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "pas de contournement de politique de phrase secrète"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|définir la taille minimale des nouvelles phrases secrètes à N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 "|N|nécessiter au moins N caractères non alphabétiques pour les nouvelles "
 "phrases secrètes"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 "|FICHIER|vérifier la nouvelle phrase secrète par rapport aux motifs du "
 "FICHIER"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|la phrase secrète expire après N jours"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Options contrôlant la sécurité"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "ne pas capturer le clavier et la souris"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROG|utiliser PROG pour entrer le code personnel"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 #, fuzzy
 #| msgid "|N|set LDAP timeout to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
@@ -652,21 +660,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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -674,145 +682,145 @@
 "Syntaxe : @GPG_AGENT@ options commande arguments\n"
 "Gestionnaire de clefs secrètes pour @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "niveau de débogage « %s » incorrect\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "lecture des options de « %s »\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Attention : « %s » est une option déconseillée\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de créer la socket : %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, 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:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erreur de lecture du « nonce » de la socket\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erreur de lien de la socket à « %s » : %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "écoute sur la socket « %s »\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "répertoire « %s » créé\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "échec de stat() pour « %s » : %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, 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:2755
+#: agent/gpg-agent.c:2876
 #, 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:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "échec de npth_pselect : %s — attente 1 s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrêté\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -820,12 +828,12 @@
 "@Options :\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -833,8 +841,8 @@
 "Syntaxe : gpg-preset-passphrase options KEYGRIP\n"
 "Maintenance du cache des mots de passe\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -842,8 +850,8 @@
 "@Commandes :\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -853,11 +861,11 @@
 "Options :\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -865,16 +873,16 @@
 "Syntaxe : gpg-protect-tool options arguments\n"
 "Outils de maintenance des clefs secrètes\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -882,7 +890,7 @@
 "Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
 "système GnuPG."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -890,52 +898,54 @@
 "Veuillez entrer la phrase secrète ou le code personnel\n"
 "nécessaires pour terminer cette opération."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "annulé\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fichier « %s », ligne %d : %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, 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:207
+#: agent/trustlist.c:226
 #, 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:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "mauvaise empreinte dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "option de clef incorrecte dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erreur de lecture de « %s », ligne %d : %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "erreur de lecture de la liste de certificats racine de confiance\n"
@@ -948,7 +958,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -957,11 +967,11 @@
 "Attribuez-vous une confiance ultime%%0A « %s »%%0Apour certifier "
 "correctement les certificats de l'utilisateur ?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Oui"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Non"
@@ -974,7 +984,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -986,22 +996,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Exact"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Faux"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -1010,15 +1020,29 @@
 "Cette phrase secrète n'a pas été modifiée%%0Adepuis le %.4s-%.2s-%.2s. "
 "Veuillez la modifier maintenant."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Modifier la phrase secrète"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Je la modifierai plus tard"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Veuillez insérer la carte de numéro de série"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"Un processus SSH demande à utiliser la clef%%0A %s%%0A (%s)%%0AVoulez-vous "
+"l'autoriser ?"
+
+#: agent/findkey.c:1766
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1026,11 +1050,11 @@
 "%%0A?"
 msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Supprimer la clef"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1045,8 +1069,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, 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"
@@ -1057,7 +1081,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "échec de vérification de la signature créée : %s\n"
@@ -1067,7 +1091,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:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, 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"
@@ -1083,53 +1107,53 @@
 msgstr ""
 "l'algorithme de protection de hachage %d (%s) n'est pas pris en charge\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur de création d'un tube : %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "erreur de création d'un flux pour un tube : %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur de création de processus fils : %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "échec d'attente de fin du processus %d : %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "erreur d'exécution de « %s » : il n'est sans doute pas installé\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "erreur d'exécution de « %s » : code de retour %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "erreur d'exécution de « %s » : terminé\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "échec d'attente de fin du processus %d : %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erreur de lecture du code de retour du processus %d : %s\n"
@@ -1149,29 +1173,29 @@
 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:416
+#: common/sysutils.c:420
 #, 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:448
+#: common/sysutils.c:452
 #, 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:905
+#: common/sysutils.c:885
 #, 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:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "impossible de renommer « %s » en « %s » : %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "oui"
 
@@ -1225,8 +1249,8 @@
 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:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erreur d'allocation de suffisamment de mémoire : %s\n"
@@ -1241,80 +1265,80 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "attente pour permettre au dirmngr d'arriver… (%d s)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "connexion au dirmngr établie\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the keyboxd established\n"
 msgstr "connexion au dirmngr établie\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the agent established\n"
 msgstr "connexion au dirmngr établie\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running Dirmngr - starting '%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "pas d'instance de Dirmngr en cours d'exécution — démarrage de « %s »\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "connection to agent established\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "connexion à l'agent établie\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring '%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "erreur de création du porte-clefs « %s » : %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: "
 msgid "WARNING: %s\n"
 msgstr "Attention : "
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1388,7 +1412,7 @@
 msgstr "algorithme : %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algorithme non pris en charge : %s"
@@ -1463,39 +1487,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Certificat racine digne de confiance"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "aucune liste de révocations trouvée pour le certificat"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "la liste de révocations de certificat est trop vieille"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "vérification de liste de révocations par OCSP pour le certificat"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Certificats inclus"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Aucune entrée de journal d'audit."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Opération inconnue"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "gpg-agent utilisable"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr utilisable"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Pas d'aide disponible pour « %s »."
@@ -1504,11 +1528,11 @@
 msgid "ignoring garbage line"
 msgstr "ligne inutile ignorée"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "aucun"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractère %02x incorrect en radix64, ignoré\n"
@@ -1543,136 +1567,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "échec de iconv_open : %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "impossible de convertir « %s » en « %s » : %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erreur d'écriture sur « %s » : %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "suppression du vieux fichier verrou (créé par %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "attente du verrou (appartenant à %d%s) %s…\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(peut-être un verrou mort) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "verrou « %s » non effectif : %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "attente du verrou %s…\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "erreur de création de « %s » : %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "erreur de fermeture de « %s » : %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure : %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "en-tête d'armure incorrect : "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "en-tête d'armure : "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "en-tête de signature en texte clair incorrect\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "en-tête d'armure inconnu : "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriquées\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "armure inattendue : "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "ligne protégée par « - » incorrecte : "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractère %02X incorrect en radix64, ignoré\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier prématurée (pas de CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier prématurée (dans le CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "CRC mal défini\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erreur de CRC ; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier prématurée (dans le pied)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de pied\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donnée OpenPGP valable n'a été trouvée.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure incorrecte : ligne plus longue que %d caractères\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1680,13 +1716,13 @@
 "caractère Quoted-Printable dans l'armure provenant sans\n"
 "doute d'un serveur de courriers électroniques défectueux\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "non lisible par l'utilisateur"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1695,28 +1731,28 @@
 "un nom de notation ne doit contenir que des caractères imprimables ou des "
 "espaces, et se terminer avec « = »\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation d'utilisateur doit contenir un caractère « @ »\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notation ne doit pas contenir plus d'un caractère « @ »\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 #| msgid "a notation name must not contain more than one '@' character\n"
 msgid "a notation name may not contain an '=' character\n"
 msgstr "un nom de notation ne doit pas contenir plus d'un caractère « @ »\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1726,7 +1762,7 @@
 "un nom de notation ne doit contenir que des caractères imprimables ou des "
 "espaces, et se terminer avec « = »\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "Attention : des données de notation incorrectes ont été trouvées.\n"
@@ -1740,8 +1776,8 @@
 msgid "Enter passphrase: "
 msgstr "Entrez la phrase secrète : "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1753,13 +1789,13 @@
 msgid "error from TPM: %s\n"
 msgstr "erreur de lecture de %s : %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problème avec l'agent : %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1772,206 +1808,211 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "impossible d'utiliser %s en mode %s.\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armure : %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Quel est votre choix ? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "non positionné"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "non forcé"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forcé"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 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:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur : le caractère « < » ne peut pas être utilisé.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur : les espaces doubles ne sont pas permises.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Nom du détenteur de la carte : "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Prénom du détenteur de la carte : "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL pour récupérer la clef publique : "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "erreur de lecture de « %s » : %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erreur d'écriture de « %s » : %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Données d'identification (nom du compte) : "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Données DO privées : "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Préférences de langue : "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 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:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 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:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Erreur : réponse incorrecte.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorité de certification : "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur : formatage incorrect de l'empreinte.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opération sur la clef impossible : %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Faut-il remplacer la clef existante ? (o/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1987,84 +2028,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:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de clef désirez-vous ? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 #| msgid " (1) Signature key\n"
 msgid "Signature key\n"
 msgstr " (1) Clef de signature\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 #| msgid " (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr " (2) Clef de chiffrement\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 #, fuzzy
 #| msgid " (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr " (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clef désiré :\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Choix incorrect.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
@@ -2072,29 +2113,29 @@
 "erreur de lecture des renseignements actuellement contenus\n"
 "dans la clef : %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2105,191 +2146,196 @@
 " code personnel = « %s » code personnel d'admin. = « %s ».\n"
 "Vous devriez les modifier avec la commande --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Clef de signature\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Clef de chiffrement\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Veuillez sélectionner l'endroit où stocker la clef :\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "échec de KEYTOCARD : %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 #| msgid "Continue? (Y/n) "
 msgid "Continue? (y/N) "
 msgstr "Faut-il continuer ? (O/n) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, 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:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "erreur de fermeture de %s : %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "afficher les commandes d'administration"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "afficher toutes les données disponibles"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "modifier le nom du détenteur de la carte"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "modifier l'URL pour récupérer la clef"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 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:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "modifier l'identifiant de connexion"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "modifier les préférences de langue"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 #, 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:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "modifier une empreinte d'autorité de certification"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 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:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "générer de nouvelles clefs"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour modifier ou déverrouiller le code personnel"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "vérifier le code personnel et afficher toutes les données"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 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:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "modifier la confiance du propriétaire"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "modifier la confiance du propriétaire"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/carte> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Commande incorrecte (essayez « help »)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clef « %s » introuvable : %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2348,9 +2394,9 @@
 msgid "subkey"
 msgstr "sous-clef"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "échec de la mise à jour : %s\n"
@@ -2376,83 +2422,78 @@
 msgstr ""
 "utiliser d'abord l'option « --delete-secret-keys » pour la supprimer.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"Attention : forcer le chiffrement symétrique %s (%d) est en\n"
+" désaccord avec les préférences du destinataire\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur de création de la phrase secrète : %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "impossible d'utiliser un paquet ESK symétrique en mode S2K\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "« %s » est déjà compressé\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "Attention : « %s » est un fichier vide\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "lecture de « %s »\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"Attention : forcer le chiffrement symétrique %s (%d) est en\n"
-" désaccord avec les préférences du destinataire\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2461,20 +2502,13 @@
 "Attention : forcer l'algorithme de compression %s (%d) est en\n"
 " désaccord avec les préférences du destinataire\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffré pour : « %s »\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2491,7 +2525,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2504,417 +2538,423 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problème de gestion des paquets chiffrés\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "exporter les signatures marquées comme locales seulement"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exporter les attributs d'identité (en général les photos d'identité)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exporter les clefs de révocation marquées comme « sensibles »"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "supprimer les parties inutilisables de la clef pendant l'exportation"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "supprimer autant que possible de la clef pendant l'exportation"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "générer un certificat de révocation"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "il est interdit d'exporter les clefs secrètes\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " — ignoré"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "écriture de « %s »\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "clef %s : matériel de clef sur la carte — ignorée\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les clefs secrètes\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clef %s : clef de type PGP 2.x — ignorée\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "Attention : rien n'a été exporté\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "erreur de création de « %s » : %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "identité introuvable"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "« %s » automatiquement récupéré par %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, 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:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Aucune empreinte"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clef secrète « %s » introuvable : %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, 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:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, 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:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "faire une signature"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "faire une signature en texte clair"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "afficher les clefs"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "afficher les clefs et les signatures"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "afficher et vérifier les signatures de clefs"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "afficher les clefs et les empreintes"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "afficher les clefs secrètes"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clefs"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, 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:488
+#: g10/gpg.c:497
 #, 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:491
+#: g10/gpg.c:500
 #, 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:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "générer une paire de clefs complètes"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "supprimer les clefs du porte-clefs public"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "supprimer les clefs du porte-clefs secret"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "signer rapidement une clef"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "signer rapidement une clef localement"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, 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:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "signer une clef"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "signer une clef localement"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clef"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "modifier une phrase secrète"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exporter les clefs"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exporter les clefs vers un serveur de clefs"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importer les clefs d'un serveur de clefs"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "chercher les clefs avec un serveur de clefs"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "mettre à jour les clefs depuis un serveur"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importer ou fusionner les clefs"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "afficher l'état de la carte"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "modifier les données d'une carte"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "modifier le code personnel d'une carte"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "indiquer les fonctions de hachage"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "exécuter en mode serveur"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|chiffrer aussi pour l'identité NOM"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|configurer les alias d'adresse"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser le comportement strict d'OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "ne rien modifier"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "demander avant d'écraser un fichier"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Options contrôlant la sécurité"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Options contrôlant la sortie de diagnostique"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "créer une sortie ASCII avec armure"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FICHIER|écrire la sortie dans le FICHIER"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Options contrôlant l'interactivité et la mise en application"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MÉCANISMES|utiliser les MÉCANISMES pour localiser les clefs"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importer les clefs d'un serveur de clefs"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "afficher et vérifier les signatures de clefs"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "désactiver tous les accès au dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Options contrôlant la configuration"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "afficher les clefs secrètes"
 
 # NOTE: Extra initial space to realign the output (maybe wchar issue)
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2923,7 +2963,7 @@
 "(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2953,11 +2993,11 @@
 " --list-keys noms montrer les clefs\n"
 " --fingerprint noms montrer les empreintes\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Utilisation : @GPG@ options fichiers (-h pour l'aide)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2967,7 +3007,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:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2975,87 +3015,87 @@
 "\n"
 "Algorithmes pris en charge :\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Clef publique : "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Chiffrement : "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hachage : "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compression : "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "utilisation : %s options %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, 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:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, 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:1719
+#: g10/gpg.c:1728
 #, 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:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, 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:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -3063,21 +3103,21 @@
 "Attention : le propriétaire du répertoire contenant le fichier de\n"
 " configuration « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -3085,488 +3125,482 @@
 "Attention : les droits du répertoire contenant le fichier de configuration\n"
 " « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "élément de configuration « %s » inconnu\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "montrer les photos d'identité en affichant les clefs"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "montrer les URL de politique en affichant les signatures"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "montrer toutes les notations en affichant les signatures"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "utiliser les notations aux normes IETF en affichant les signatures"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en affichant les signatures"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en affichant les signatures"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "indiquer la validité de l'identité en affichant les clefs"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 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:2081
+#: g10/gpg.c:2092
 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:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "montrer les dates d'expiration en affichant les signatures"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "montrer le nom du porte-clefs en affichant les clefs"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "afficher les préférences (expert)"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas permise en mode %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, 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:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "mode pinentry « %s » incorrect\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, 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:3314
+#: g10/gpg.c:3327
 #, 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:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'analyser l'URL du serveur de clefs\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s : %d : options d'importation incorrectes\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "options d'importation incorrectes\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s : %d : options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s : %d : options de liste incorrectes\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "montrer les photos d'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "montrer les URL de politique en vérifiant les signatures"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "montrer toutes les notations en vérifiant les signatures"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 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:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "indiquer la validité de l'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 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:3423
+#: g10/gpg.c:3441
 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:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s : %d : options de vérification incorrectes\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "options de vérification incorrectes\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, 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:3647
+#: g10/gpg.c:3668
 #, 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:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, 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:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Attention : %s remplace %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s.\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s.\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Attention : exécution avec un système de temps contrefait : "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "la fonction de hachage sélectionnée est incorrecte\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression sélectionné est incorrect\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, 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:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "« completes-needed » doit être supérieur à 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "« marginals-needed » doit être supérieur à 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "préférences par défaut incorrectes\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "préférences personnelles de chiffrement incorrectes\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "préférences personnelles de chiffrement incorrectes\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "préférences personnelles de hachage incorrectes\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "préférences personnelles de compression incorrectes\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "taille incorrecte ; utilisation de %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne fonctionne pas encore avec %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "échec du chiffrement symétrique de « %s » : %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "échec d'envoi vers le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "échec de réception depuis le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "échec de recherche au sein du serveur de clefs : %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "échec de déconstruction d'une armure : %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "échec de construction d'une armure : %s \n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algorithme de hachage « %s » incorrect\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, 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:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message…\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, 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:5702
+#: g10/gpg.c:5762
 #, 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:5735
+#: g10/gpg.c:5795
 #, 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"
@@ -3579,7 +3613,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "convertir les conflits de date en avertissements"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
@@ -3608,166 +3642,166 @@
 msgid "No help available for '%s'"
 msgstr "Pas d'aide disponible pour « %s »"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "importer des signatures marquées comme locales seulement"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "réparer les données endommagées du serveur pks pendant l'importation"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 #| msgid "do not update the trustdb after import"
 msgid "do not clear the ownertrust values during import"
 msgstr "ne pas mettre à jour la base de confiance après l'importation"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "ne pas mettre à jour la base de confiance après l'importation"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "enable putty support"
 msgid "enable bulk import mode"
 msgstr "activer la prise en charge de putty"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key during import"
 msgstr "afficher l'empreinte de la clef"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key but do not actually import"
 msgstr "afficher l'empreinte de la clef"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "n'accepter que les mises à jour des clefs existantes"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "nettoyer les parties inutilisables de la clef après l'importation"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "supprimer autant que possible de la clef après l'importation"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 #, fuzzy
 #| msgid "assume input is in binary format"
 msgid "assume the GnuPG key backup format"
 msgstr "entrée supposée au format binaire"
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "repair keys on import"
 msgstr "afficher l'empreinte de la clef"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a été ignoré\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu clefs traitées jusqu'à présent\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr " Quantité totale traitée : %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " nouvelles clefs ignorées : %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " nouvelles clefs ignorées : %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " sans identité : %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importées : %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " non modifiées : %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nouvelles identités : %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nouvelles sous-clefs : %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nouvelles signatures : %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr "nouvelles révocations de clef : %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " clefs secrètes lues : %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " clefs secrètes importées : %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " clefs secrètes non modifiées : %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " non importées : %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " signatures nettoyées : %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " identités nettoyées : %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3776,178 +3810,183 @@
 "Attention : la clef %s contient des préférences pour des\n"
 " algorithmes indisponibles pour ces identités :\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " « %s » : préférence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " « %s » : préférence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " « %s » : préférence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " « %s » : préférence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "vous devriez mettre à jour vos préférences et redistribuer cette\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "clef pour éviter d'éventuels problèmes d'algorithmes non appropriés\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre à jour vos préférences avec :\n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clef %s : pas d'identité\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "clef %s : %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "rejetée par le filtre d’importation"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clef %s : corruption de sous-clef PKS réparée\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clef %s : identité « %s » non autosignée acceptée\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clef %s : pas d'identité valable\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela pourrait provenir d'une autosignature manquante\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clef %s : clef publique introuvable : %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clef %s : nouvelle clef — ignorée\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-clefs accessible en écriture n'a été trouvé : %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clef %s : clef publique « %s » importée\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clef %s : ne correspond pas à notre copie\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clef %s : « %s » 1 nouvelle identité\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clef %s : « %s » %d nouvelles identités\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clef %s : « %s » 1 nouvelle signature\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clef %s : « %s » %d nouvelles signatures\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clef %s : « %s » %d signature nettoyée\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clef %s : « %s » %d signatures nettoyées\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clef %s : « %s » %d identité nettoyée\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clef %s : « %s » %d identités nettoyées\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clef %s : « %s » n'est pas modifiée\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clef %s : clef secrète importée\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3956,204 +3995,204 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "clef secrète %s : %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "impossible d'importer des clefs secrètes\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Aucune cause indiquée"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "La clef a été remplacée"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "La clef a été compromise"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "La clef n'est plus utilisée"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "L'identité n'est plus valable"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "cause de révocation : "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "commentaire de révocation : "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clef %s : « %s » certificat de révocation importé\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clef %s : pas d'identité pour la signature\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clef %s : algorithme à clef publique non pris en charge\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "clef %s : signature directe de clef incorrecte\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clef %s : lien à la sous-clef incorrect\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clef %s : révocation de sous-clef incorrecte\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, 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:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clef %s : identité « %s » ignorée\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clef %s : sous-clef ignorée\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "clef %s : identités en double détectées — fusionnées\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clef %s : ajout du certificat de révocation « %s »\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clef %s : ajout de la signature directe de clef\n"
@@ -4163,32 +4202,32 @@
 msgid "error allocating memory: %s\n"
 msgstr "erreur d'allocation de mémoire : %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 #| msgid "Good signature from"
 msgid " (reordered signatures follow)"
 msgstr "Bonne signature de"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 #| msgid "key %s: %s\n"
 msgid "key %s:\n"
 msgstr "clef %s : %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "%d duplicate signature removed\n"
@@ -4196,7 +4235,7 @@
 msgstr0 "Identité « %s » : %d signature supprimée\n"
 msgstr1 "Identité « %s » : %d signature supprimée\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4204,7 +4243,7 @@
 msgstr0 "1 signature non vérifiée à cause d'une clef manquante\n"
 msgstr1 "1 signature non vérifiée à cause d'une clef manquante\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4212,7 +4251,7 @@
 msgstr0 "%d mauvaises signatures\n"
 msgstr1 "%d mauvaises signatures\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 #| msgid "Good signature from"
 msgid "%d signature reordered\n"
@@ -4220,52 +4259,52 @@
 msgstr0 "Bonne signature de"
 msgstr1 "Bonne signature de"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erreur de création du trousseau local « %s » : %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "erreur de création du porte-clefs « %s » : %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "le trousseau local « %s » a été créé\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "le porte-clefs « %s » a été créé\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "ressource de bloc de clef « %s » : %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "échec de reconstruction du cache de porte-clefs : %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "révocation"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "autosignature"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4276,17 +4315,17 @@
 "vérifier les clefs des autres utilisateurs (en regardant les passeports, en\n"
 "vérifiant les empreintes depuis diverses sources, etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = je fais très légèrement confiance\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = je fais entièrement confiance\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4296,52 +4335,52 @@
 "Une profondeur supérieure à 1 permet à la clef que vous signez de faire\n"
 "des signatures de confiance de votre part.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Veuillez entrer un domaine pour restreindre cette signature, ou appuyer\n"
 "sur la touche entrée pour aucun domaine.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'identité « %s » est révoquée."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voulez-vous vraiment toujours la signer ? (o/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Impossible de signer.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'identité « %s » est expiré."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'identité « %s » n'est pas autosignée."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "L'identité « %s » peut être signée. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Faut-il la signer ? (o/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4350,11 +4389,11 @@
 "L'autosignature de « %s »\n"
 "est une signature de type PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez-vous la modifier en autosignature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4363,13 +4402,13 @@
 "Votre signature actuelle de « %s »\n"
 "a expiré.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous créer une nouvelle signature pour remplacer celle qui a\n"
 "expiré ? (o/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4378,43 +4417,43 @@
 "Votre signature actuelle de « %s »\n"
 "est locale.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez-vous la rendre complètement exportable ? (o/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "« %s » a déjà été signée localement par la clef %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "« %s » a déjà été signée par la clef %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voulez-vous quand même encore la signer ? (o/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien à signer avec la clef %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Cette clef a expiré."
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette clef va expirer le %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en même temps ? (O/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4423,31 +4462,31 @@
 "Avec quel soin avez-vous vérifié que la clef à signer appartient bien à\n"
 "la personne sus-nommée ? Si vous ne savez quoi répondre, entrez « 0 ».\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Je ne répondrai pas.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Je n'ai pas vérifié du tout.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) J'ai partiellement vérifié.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) J'ai complètement vérifié.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Quel est votre choix ? (Entrez « ? » pour plus de renseignements) : "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4456,239 +4495,250 @@
 "Voulez-vous vraiment signer cette clef avec votre\n"
 "clef « %s » (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Ce sera une autosignature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "Attention : la signature ne sera pas marquée comme non exportable.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "Attention : La signature ne sera pas marquée comme non révocable.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marquée comme non exportable.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marquée comme non révocable.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout vérifié cette clef.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "J'ai partiellement vérifié cette clef.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai complètement vérifié cette clef.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Voulez-vous vraiment signer ? (o/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "échec de la signature : %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La clef ne possède que des éléments partiels ou stockés sur carte\n"
 "— pas de phrase secrète à modifier.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "clef %s : erreur de modification de la phrase secrète : %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la clef"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 #| msgid "Enter the keygrip: "
 msgid "show the keygrip"
 msgstr "Entrez le keygrip : "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "afficher la clef et les identités"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "sélectionner l'identité N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "sélectionner la sous-clef N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "vérifier les signatures"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 "signer les identités sélectionnées * voir ci-dessous les commandes "
 "similaires"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "signer les identités sélectionnées localement"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les identités sélectionnées avec une signature de confiance"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "signer les identités sélectionnées avec une signature non révocable"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "ajouter une identité"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identité"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "supprimer les identités sélectionnées"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "ajouter une sous-clef"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "ajouter une clef à une carte à puce"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "déplacer une clef vers une carte à puce"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "déplacer une clef de sauvegarde vers une carte à puce"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "supprimer les sous-clefs sélectionnées"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "ajouter une clef de révocation"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Déchiffrement des données réussi"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "supprimer les signatures des identités sélectionnées"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "modifier la date d'expiration de la clef ou des sous-clefs sélectionnées"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "marquer l'identité sélectionnée comme principale"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "afficher les préférences (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "afficher les préférences (bavard)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "définir la liste de préférences pour les identités sélectionnées"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "définir le serveur de clefs favori pour les identités sélectionnées"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "définir une notation pour les identités sélectionnées"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "modifier la phrase secrète"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "modifier la confiance du propriétaire"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "révoquer les signatures des identités sélectionnées"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "révoquer les identités sélectionnées"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "révoquer la clef ou des sous-clefs sélectionnées"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "activer la clef"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "désactiver la clef"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identité sélectionnées"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "compacter les identités inutilisables et supprimer les\n"
 " signatures inutilisables de la clef"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "compacter les identités inutilisables et supprimer toutes\n"
 " les signatures de la clef"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "La clef secrète est disponible.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "La clef secrète est disponible.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "La clef secrète est nécessaire pour faire cela.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4700,298 +4750,289 @@
 " confiance (tsign), « nr » pour les signatures non révocables\n"
 " (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "La clef est révoquée."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 #| msgid "Really sign all user IDs? (y/N) "
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Conseil : sélectionner les identités à signer\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Type de signature « %s » inconnu\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez sélectionner au moins une identité.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Faut-il vraiment supprimer toutes les identités sélectionnées ? (o/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Faut-il vraiment supprimer cette identité ? (o/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez sélectionner exactement une clef.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "La commande attend un nom de fichier comme argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Impossible d'ouvrir « %s » : %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Erreur de lecture de la clef de sauvegarde sur « %s » : %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Vous devez sélectionner au moins une clef.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette clef ? (o/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Voulez-vous vraiment révoquer toutes les identités sélectionnées ? (o/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Voulez-vous vraiment révoquer cette identité ? (o/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment révoquer toute la clef ? (o/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment révoquer les sous-clefs sélectionnées ? (o/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment révoquer cette sous-clef ? (o/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "La confiance du propriétaire pourrait ne pas être définie à partir de\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Définir la liste de préférences en :\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Faut-il vraiment mettre à jour les préférences pour les\n"
 "identités sélectionnées ? (o/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Faut-il enregistrer les modifications ? (o/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Faut-il quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "échec de suppression de %s secrète : %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, 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"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "« %s » n’est pas l’empreinte principale\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valeur incorrecte\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "Pas d’identités correspondantes."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Rien à signer.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non signée par vous.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, 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:3218
+#: g10/keyedit.c:3431
 #, 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:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Hachage : "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Fonctionnalités : "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Serveur de clefs sans modification"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Serveur de clefs favori : "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Notations : "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "créé : %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "révoquée : %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "expirée : %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expire : %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation : %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "nº de carte : "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "confiance : %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "validité : %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Cette clef a été désactivée"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4999,17 +5040,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "révoquée"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expirée"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5019,17 +5060,23 @@
 "commande\n"
 " risque de rendre une autre identité principale par défaut.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5038,38 +5085,38 @@
 "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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "Cette identité existe déjà pour cette clef.\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5077,20 +5124,20 @@
 msgstr0 "%d signature supprimée.\n"
 msgstr1 "%d signature supprimée.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "incorrecte"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identité « %s » compactée : %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5098,17 +5145,17 @@
 msgstr0 "Identité « %s » : %d signature supprimée\n"
 msgstr1 "Identité « %s » : %d signature supprimée\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identité « %s » : déjà minimisée\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identité « %s » : déjà nettoyée\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5117,46 +5164,62 @@
 "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:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez l'identité du révocateur désigné : "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(à moins d'indiquer la clef par son empreinte)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "La sous-clef %s est déjà révoquée.\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5166,254 +5229,254 @@
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modification de la date d'expiration de la clef principale.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, 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:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Veuillez sélectionner exactement une identité.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de clefs favori : "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Entrez la notation : "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Faut-il continuer ? (o/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'identité d'indice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas d'identité avec le hachage %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, 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:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-clef d'indice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identité : « %s »\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expiré le %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 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:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (non révocable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, 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:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "pas de clef secrète\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'identité « %s »\" est déjà révoquée.\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clef %s est déjà révoqué.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-clef %s est déjà révoquée.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, 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:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "préférence « %s » en double\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "trop de préférences de chiffrement\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "trop de préférences de hachage\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "trop de préférences de compression\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "trop de préférences de chiffrement\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, 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:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "écriture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "écriture de l'autosignature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de lien à la clef\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "taille incorrecte ; utilisation de %u bits\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5421,19 +5484,19 @@
 "Attention : certains programmes OpenPGP ne peuvent pas gérer\n"
 " de clef DSA avec cette taille de hachage\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certifier"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Authentifier"
 
@@ -5447,180 +5510,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Actions possibles pour une clef %s : "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises : "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Inverser la capacité de signature\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Inverser la capacité de chiffrement\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Inverser la capacité d'authentification\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Terminé\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA et RSA (par défaut)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA et Elgamal\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) sign, encrypt\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) signer, chiffrer\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (signature seule)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) ECC (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) ECC (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (chiffrement seul)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Clef existante\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Clef existante sur la carte\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Entrez le keygrip : "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 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:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Pas de clef avec ce keygrip\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "erreur de lecture de la carte : %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numéro de série de la carte : %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Clefs disponibles :\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5636,7 +5699,7 @@
 " <n>m = la clef expire dans n mois\n"
 " <n>y = la clef expire dans n ans\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5653,38 +5716,38 @@
 " <n>m = la signature expire dans n mois\n"
 " <n>y = la signature expire dans n ans\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "valeur incorrecte\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "La clef n'expire pas du tout\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clef expire le %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5692,11 +5755,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:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5710,7 +5773,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5726,41 +5789,41 @@
 " « Heinrich Heine (le poète) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Nom réel : "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Caractère incorrect dans le nom\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Adresse électronique : "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse électronique valable\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Commentaire : "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Caractère incorrect dans le commentaire\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères « %s ».\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5771,13 +5834,13 @@
 " « %s »\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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 "
 "commentaire\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Cette identité existe déjà pour cette clef.\n"
 
@@ -5792,34 +5855,34 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcAaOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Veuillez d'abord corriger l'erreur\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5831,18 +5894,18 @@
 "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:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Échec de génération de la clef : %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5853,66 +5916,66 @@
 " « %s »\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Faut-il continuer ? (O/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Une clef pour « %s » existe déjà\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Faut-il quand même créer ? (o/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "création quand même\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, 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:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "La génération de clef a été annulée.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, 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:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "écriture de la clef publique dans « %s »\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, 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:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 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:5639
+#: g10/keygen.c:5730
 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"
@@ -5921,7 +5984,7 @@
 "pouvez\n"
 "utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5929,7 +5992,7 @@
 "la clef a été créée %lu seconde dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5937,25 +6000,25 @@
 "la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Faut-il vraiment la créer ? (o/N) "
 
@@ -5963,27 +6026,43 @@
 msgid "never "
 msgstr "jamais "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Hachage : "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Fonctionnalités : "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Serveur de clefs sans modification"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Politique de signature critique : "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Politique de signature : "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Serveur de clefs critique favori : "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Notation de signature critique : "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Notation de signature : "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5991,7 +6070,7 @@
 msgstr0 "%d mauvaises signatures\n"
 msgstr1 "%d mauvaises signatures\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5999,7 +6078,7 @@
 msgstr0 "1 signature non vérifiée à cause d'une erreur\n"
 msgstr1 "1 signature non vérifiée à cause d'une erreur\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, fuzzy, c-format
 #| msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgid "Warning: %lu key skipped due to its large size\n"
@@ -6007,33 +6086,33 @@
 msgstr0 "Attention : %lu clefs ignorées en raison de leur grande taille\n"
 msgstr1 "Attention : %lu clefs ignorées en raison de leur grande taille\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Porte-clefs"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de clef principale :"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr "Empreinte clef princip. :"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Empreinte de sous-clef :"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Empreinte de la clef ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Nº de série de carte ="
 
@@ -6113,7 +6192,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6121,319 +6200,325 @@
 msgstr0 "rafraîchissement de %d clefs à partir de %s\n"
 msgstr1 "rafraîchissement de %d clefs à partir de %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clef « %s » introuvable sur le serveur de clefs\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "clef introuvable sur le serveur de clefs\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requête de la clef %s sur %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, 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:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 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:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la clef %s à %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requête de la clef sur « %s »\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "clef de session chiffrée %s\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "données chiffrées avec %s\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, 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:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clef publique est %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %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:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " « %s »\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffré avec une clef %s, identifiant %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Attention : plusieurs textes en clair ont été vus\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffré avec %lu phrases secrètes\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffré avec 1 phrase secrète\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "échec du déchiffrement par clef publique : %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, 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:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, 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:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Attention : le message chiffré a été manipulé.\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : « %.*s »\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "aucune signature trouvée\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de « %s »"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expirée de « %s »"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de « %s »"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " avec la clef %s %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 #| msgid " aka \"%s\""
 msgid " issuer \"%s\"\n"
 msgstr " alias « %s »"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Clef disponible sur : "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "doute"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " alias « %s »"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expiré le %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "signature %s, algorithme de hachage %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "mode texte"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", algorithme de clef "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature : %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas détachée\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
@@ -6441,12 +6526,12 @@
 "Attention : plusieurs signatures ont été détectées.\n"
 " Seule la première sera vérifiée.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien type (PGP 2.x)\n"
@@ -6557,29 +6642,29 @@
 msgid "uncompressed|none"
 msgstr "non compressé|non|sans"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "option « %s » ambiguë\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 #| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6636,7 +6721,7 @@
 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:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6712,7 +6797,7 @@
 "créée le %7$s%8$s.\n"
 "%9$s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6726,75 +6811,75 @@
 "clef publique. Si l'image est très grosse, la clef le sera aussi.\n"
 "Une taille de l'ordre de 240x288 est conseillée.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Entrez le nom du fichier JPEG pour la photo d'identité : "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "impossible d'ouvrir le fichier JPEG « %s » : %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Ce JPEG est vraiment très grand (%d octets).\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voulez-vous vraiment l'utiliser ? (o/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "« %s » n'est pas un fichier JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Cette photo est-elle correcte (o/N/q) ? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "aucun programme d'exécution à distance n'est pris en charge\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "cette plateforme a besoin de fichiers temporaires pour appeler des\n"
 "programmes externes\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "impossible d'exécuter l'interpréteur de commandes « %s » : %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "sortie non naturelle du programme externe\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "erreur système pendant l'appel du programme externe : %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr ""
 "Attention : impossible de supprimer le fichier temporaire\n"
 " (%s) « %s » : %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr ""
 "Attention : impossible de supprimer le répertoire temporaire « %s » :\n"
 " %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6802,7 +6887,7 @@
 "les appels aux programmes externes sont désactivés car les droits\n"
 "du fichier d'options ne sont pas sûrs\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identité.\n"
@@ -6886,37 +6971,37 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une clef de confiance ultime :\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s : aucune assurance que la clef appartienne vraiment à l'utilisateur "
 "nommé.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s : faible assurance que la clef appartienne vraiment à l'utilisateur "
 "nommé.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Cette clef appartient sans doute à l'utilisateur nommé\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Cette clef nous appartient\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, fuzzy, c-format
 #| msgid "root certificate has now been marked as trusted\n"
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "le certificat racine a maintenant été marqué de confiance\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 #| msgid ""
 #| "It is NOT certain that the key belongs to the person named\n"
@@ -6932,7 +7017,7 @@
 "faites, vous pouvez répondre oui à la prochaine question.\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6943,107 +7028,107 @@
 "faites, vous pouvez répondre oui à la prochaine question.\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Faut-il quand même utiliser cette clef ? (o/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "Attention : utilisation d'une clef sans confiance.\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "Attention : cette clef est peut-être révoquée (clef de révocation absente)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "identité : « %s »\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "line %d: invalid date given\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "ligne %d : date donnée incorrect\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "clef %s : ne correspond pas à notre copie\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "line %d: invalid date given\n"
 msgid "option %s given but no matching User ID found\n"
 msgstr "ligne %d : date donnée incorrect\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "Attention : cette clef a été révoquée par son révocateur désigné.\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "Attention : cette clef à été révoquée par son propriétaire.\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr ""
 " Cela pourrait signifier que la signature est contrefaite.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "Attention : cette sous-clef à été révoquée par son propriétaire.\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Remarque : cette clef a été désactivée.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Remarque : cette clef a expiré.\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "Attention : cette clef n'est pas certifiée avec une signature de confiance.\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "Attention : cette clef n'est pas certifiée avec une signature de confiance.\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Rien n'indique que la signature appartient à son propriétaire.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "Attention : nous n'avons PAS confiance en cette clef.\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " La signature est sans doute CONTREFAITE.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7053,62 +7138,62 @@
 msgstr ""
 "Attention : cette clef n'a pas suffisamment de signatures de confiance.\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "Attention : cette clef n'a pas suffisamment de signatures de confiance.\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 " Aucune certitude que la signature appartienne à son "
 "propriétaire.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s : ignoré : %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s : ignoré : la clef publique est désactivée\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s : ignoré : clef publique déjà présente\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to '%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "impossible de se connecter à « %s » : %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 #| msgid "line %d: invalid date given\n"
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "ligne %d : date donnée incorrect\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 #| msgid "line %d: invalid date given\n"
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "ligne %d : date donnée incorrect\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vous n'avez pas indiqué d'identité (vous pouvez utiliser « -r »).\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Destinataires actuels :\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7116,41 +7201,41 @@
 "\n"
 "Entrez l'identité, en terminant par une ligne vide : "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Cette identité n'existe pas.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "ignoré : la clef publique est déjà définie en destinataire par défaut\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "La clef publique est désactivée.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "ignoré : clef publique déjà activée\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinataire par défaut « %s » inconnu\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valable\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, 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:1760
+#: g10/pkclist.c:1786
 #, 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"
@@ -7190,7 +7275,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossible d'ouvrir les données signées fd=%d : %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -7439,40 +7524,35 @@
 msgstr ""
 "la clef %s %s nécessite un hachage d'au moins %zu bits (le hachage est %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "impossible d'utiliser %s en mode %s.\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Attention : conflit de hachage de signature dans le message\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "Attention : la sous-clef de signature %s n'a pas de certificat croisé\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "veuillez consulter %s pour plus de renseignements\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "Attention : la sous-clef de signature %s a un certificat croisé incorrect\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu second newer than the signature\n"
@@ -7482,7 +7562,7 @@
 msgstr1 ""
 "la clef publique %s est plus récente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu day newer than the signature\n"
@@ -7492,7 +7572,7 @@
 msgstr1 ""
 "la clef publique %s est plus récente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7507,7 +7587,7 @@
 "la clef %s a été créée %lu seconde dans le futur\n"
 "(faille temporelle ou problème d'horloge)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7521,47 +7601,47 @@
 "la clef %s a été créée %lu seconde dans le futur\n"
 "(faille temporelle ou problème d'horloge)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Remarque : la clef de signature %s a expiré le %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 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:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, 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"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
@@ -7569,7 +7649,7 @@
 " la notation (chaîne trop grande).\n"
 " Utilisation de la version non expansée.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7578,7 +7658,7 @@
 " l'URL de politique (chaîne trop grande).\n"
 " Utilisation de la version non expansée.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7588,12 +7668,12 @@
 " l'URL du serveur de clef favori (chaîne trop grande).\n"
 " Utilisation de la version non expansée.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de : « %s »\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7601,12 +7681,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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "signature :"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7685,134 +7765,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance : échec de synchronisation : %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "impossible de créer un verrou pour « %s »\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "impossible de verrouiller « %s »\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "enregistrement de base de confiance %lu : échec d'écriture (n=%d) : %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le répertoire n'existe pas.\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "impossible d'accéder à « %s » : %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s : impossible de créer un enregistrement de version : %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s : base de confiance incorrecte créée\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s : base de confiance créée\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Remarque : la base de confiance n'est pas accessible en écriture\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s : base de confiance incorrecte\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, 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:880
+#: g10/tdbio.c:850
 #, 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:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s : erreur de lecture d'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, 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:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance : échec de lseek : %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance : échec de lecture (n=%d) : %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, 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:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s : enregistrement de version avec le numéro %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s : version %d du fichier incorrecte\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s : erreur de lecture d'enregistrement libre : %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, 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:1836
+#: g10/tdbio.c:1806
 #, 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:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s : impossible d'ajouter un enregistrement : %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Erreur : la base de confiance est corrompue\n"
@@ -8258,7 +8338,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "inutile de vérifier la base de confiance\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, 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"
@@ -8292,7 +8372,7 @@
 msgid "checking the trustdb\n"
 msgstr "vérification de la base de confiance\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8300,7 +8380,7 @@
 msgstr0 "%lu clefs traitées jusqu'à présent\n"
 msgstr1 "%lu clefs traitées jusqu'à présent\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8308,17 +8388,17 @@
 msgstr0 "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 msgstr1 "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune clef de confiance ultime n'a été trouvée\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8326,7 +8406,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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8399,7 +8479,7 @@
 msgid "ultimate"
 msgstr " ultime "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8410,14 +8490,14 @@
 "Veuillez vérifier que le fichier de signature (.sig ou .asc)\n"
 "est bien le premier fichier indiqué sur la ligne de commande.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "la ligne d'entrée %u est trop longue ou un caractère de changement de\n"
 "ligne manque\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "impossible d'ouvrir le descripteur %d : %s\n"
@@ -8434,19 +8514,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "option « %s » ambiguë\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "activer les options de débogage"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "activer le débogage complet"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Utilisation : kbxutil options fichiers (-h pour l'aide)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8457,16 +8537,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8509,10 +8589,10 @@
 "|P|Veuillez entrer le code de déblocage personnel (CDP) pour les clefs "
 "standards."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "le rappel du code personnel a renvoyé une erreur : %s\n"
@@ -8538,58 +8618,58 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "la clef existe déjà\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "la clef existante sera remplacée\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "génération d'une nouvelle clef\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "écriture d'une nouvelle clef\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "impossible de stocker la clef : %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "la réponse ne contient pas le module RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, 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-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, 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-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "échec de génération de la clef\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8597,12 +8677,12 @@
 msgstr0 "la génération de clef est terminé (%d secondes)\n"
 msgstr1 "la génération de clef est terminé (%d secondes)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, 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-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 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 "
@@ -8610,58 +8690,58 @@
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Veuillez entrer le code personnel d'administration"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Veuillez entrer le code personnel pour les clefs standards."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "le code personnel nul n'a pas encore été modifié\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, 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:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8669,7 +8749,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:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8677,27 +8757,27 @@
 "|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:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur de lecture du nouveau code personnel : %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte : %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, 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:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "échec de lecture de clef publique : %s\n"
@@ -8705,48 +8785,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, 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:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Veuillez entrer le code personnel"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "échec de vérification CHV%d : %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "la carte est irrémédiablement bloquée.\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, 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"
@@ -8759,20 +8839,20 @@
 "il reste %d tentatives de code personnel d'administration\n"
 "avant que la carte ne soit irrémédiablement bloquée\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, 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:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Veuillez entrer le code personnel"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Veuillez entrer le code de réinitialisation pour la carte"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8782,77 +8862,77 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nouveau code de réinitialisation"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code personnel d'administration"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code personnel"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 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:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Veuillez entrer le code personnel et le nouveau code personnel"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "erreur de lecture des données d'application\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "erreur de lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "la date de création est manquant\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI non pris en charge"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP incorrecte (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, 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:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures créées jusqu'à présent : %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8860,7 +8940,7 @@
 "la vérification du code personnel d'administration est actuellement\n"
 "interdite avec cette commande\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8882,7 +8962,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "exécuter en mode multiserveur (premier plan)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
 
@@ -8926,11 +9006,11 @@
 msgid "deny the use of admin card commands"
 msgstr "refus d'utiliser les commandes d'administration de la carte"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Utilisation : @SCDAEMON@ options (-h pour l'aide)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8938,325 +9018,325 @@
 "Syntaxe : scdaemon options commande arguments\n"
 "Démon de carte à puce pour @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "gestionnaire pour le descripteur %d démarré\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestionnaire pour le descripteur %d terminé\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erreur de lecture des renseignements d'utilisation de clef : %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "modèle de validation demandé par le certificat : %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "chaîne"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "invite"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, 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:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "politique de signature marquée critique sans politiques configurées"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "échec d'ouverture de « %s » : %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "politique de certificat non autorisée"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "impossible d'obtenir l'empreinte\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "recherche d'émetteur à l'extérieur\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "nombre d'émetteurs correspondants : %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "impossible d'obtenir authorityInfoAccess : %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "recherche d'émetteur dans le cache du Dirmngr\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "nombre de certificats correspondants : %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, 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:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "impossible d'allouer la gestion de base de clefs\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "le certificat a été révoquée"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "l'état du certificat est inconnu"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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:1261
+#: sm/certchain.c:1308
 #, 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:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificat avec validité incorrecte : %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificat pas encore valable"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "certificat racine pas encore valable"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "certificat intermédiaire pas encore valable"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "le certificat a expiré"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "le certificat racine a expiré"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "le certificat intermédiaire a expiré"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, 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:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "certificat avec validité incorrecte"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "signature non créée pendant la durée de vie du certificat"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificat non créé pendant la durée de vie de l'émetteur"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 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:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( signature créée le "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " ( certificat créé le "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (certificat valable depuis "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( émetteur valable depuis "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "empreinte=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "aucun émetteur trouvé dans le certificat"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "certificat autosigné avec une mauvaise signature"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "le certificat racine n'est pas marqué de confiance"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, 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:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "chaîne de certificats trop longue\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certificat d'émetteur introuvable"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificat avec une mauvaise signature"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 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:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, 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:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "le certificat est correct\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "le certificat intermédiaire est correct\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "le certificat racine est correct\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "basculement en modèle chaîne"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "modèle de validation utilisé : %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "hors limite\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(c'est l'algorithme MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "aucun"
 
@@ -9276,7 +9356,7 @@
 msgid "Error - invalid DN"
 msgstr "Erreur — DN incorrect"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9292,46 +9372,46 @@
 "numéro de série %s, identifiant 0x%08lX,\n"
 "créé le %s, expire le %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, 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:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "le certificat n'est pas utilisable pour le chiffrement\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "le certificat n'est pas utilisable pour la signature\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9553,17 +9633,17 @@
 msgid "resource problem: out of core\n"
 msgstr "problème de ressources : hors limite\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(c'est l'algorithme RC2)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(ça ne ressemble pas à un message chiffré)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9574,7 +9654,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificat « %s » introuvable : %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erreur de verrouillage du trousseau local : %s\n"
@@ -9599,123 +9679,123 @@
 msgid "no valid recipients given\n"
 msgstr "aucune destinataire valable donnée\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "afficher les clefs externes"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "afficher la chaîne de certificats"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "importer les certificats"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "exporter les certificats"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "enregistrer une carte à puce"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "passer une commande au dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "appeler gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|nombre de certificats à inclure"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "entrée supposée au format PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "entrée supposée au format base-64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "entrée supposée au format binaire"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "créer une sortie encodée en base-64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "récupérer certificats d'émetteur manquants"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|utiliser l’encodage NOM pour les phrases secrète PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "ne pas consulter liste de révocations de cert."
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "ne pas vérifier les listes de révocations de certificat racine"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "vérifier la validité avec OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "ne pas vérifier les politiques de certificat"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de hachage NOM"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "mode automatique : aucune question"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "oui comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "non comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Utilisation : @GPGSM@ options fichiers (-h pour l'aide)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9725,27 +9805,27 @@
 "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:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modèle de validation « %s » inconnu\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importation des certificats commun « %s »\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossible de signer en utilisant « %s » : %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@ -9765,7 +9845,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "échec des vérifications de base du certificat — non importé\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erreur de lecture des options stockées : %s\n"
@@ -9775,50 +9855,50 @@
 msgid "error importing certificate: %s\n"
 msgstr "erreur d'importation du certificat : %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur de lecture de l'entrée : %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr ""
 "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 #| msgid "error opening '%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problème de recherche de certificat existant : %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "impossible de trouver une base de clefs inscriptible : %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erreur de stockage du certificat : %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problème de nouvelle recherche de certificat : %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "erreur de stockage des options : %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Erreur — "
 
@@ -9857,7 +9937,7 @@
 "\n"
 "%s%sVoulez-vous vraiment faire cela ?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9878,46 +9958,46 @@
 "« %s »\n"
 "Remarquez que ce certificat ne va pas créer de signature qualifiée."
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "l'algorithme de hachage %d (%s) pour le signataire %d n'est pas pris en "
 "charge ; utilisation de %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "algorithme de hachage utilisé pour le signataire %d : %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "échec de vérification de certificat qualifié : %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Signature faite le %s avec la clef %s d'identifiant %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Signature faite le "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "date non donnée"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 #| msgid "algorithm: %s"
 msgid "algorithm:"
 msgstr "algorithme : %s"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9925,17 +10005,17 @@
 "signature incorrecte : l'attribut de hachage du message ne correspond pas à "
 "celui calculé\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Bonne signature de"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " alias"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "C'est une signature qualifiée\n"
@@ -9962,323 +10042,318 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "impossible de libérer le verrou du cache de certificat : %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "abandon de %u certificats du cache\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "impossible d'analyser le certificat « %s » : %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "certificat « %s » déjà en cache\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "certificat de confiance « %s » chargé\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certificat « %s » chargé\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " empreinte SHA1 = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " émetteur ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " sujet ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "erreur de chargement du certificat « %s » : %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificats chargés de façon permanente : %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " certificats actuellement en cache : %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, 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:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificat déjà en cache\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificat en cache\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erreur de mise en cache du certificat : %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "chaîne « %s » d'empreinte SHA1 incorrecte\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, 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:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, 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:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "aucun émetteur trouvé dans le certificat\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erreur de lecture d'authorityKeyIdentifier : %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "création du répertoire « %s »\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "erreur de création du répertoire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "répertoire de base de données « %s » ignoré\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "erreur de lecture du répertoire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "suppression du fichier de cache « %s »\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "pas de suppression du fichier « %s »\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erreur de fermeture du fichier de cache : %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "nouveau répertoire de cache « %s » créé\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, 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:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "ancienne version du répertoire de cache — nettoyage\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "ancienne version du répertoire de cache — abandon\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, 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:622
+#: dirmngr/crlcache.c:629
 #, 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:631
+#: dirmngr/crlcache.c:638
 #, 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:646
+#: dirmngr/crlcache.c:653
 #, 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:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "hachage d'émetteur incorrect dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "aucun DN d'émetteur dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "date incorrecte dans « %s » ligne %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, 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:698
+#: dirmngr/crlcache.c:705
 #, 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:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "erreur de fermeture de « %s » : %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "erreur en renommant « %s » en « %s » : %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "impossible de hacher « %s » : %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, 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:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "erreur du hachage de « %s » : %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "formatage incorrect de la somme de contrôle pour « %s »\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, 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:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "ouverture du fichier de cache « %s »\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "erreur d'ouverture du fichier de cache « %s » : %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, 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:1174
+#: dirmngr/crlcache.c:1181
 #, 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:1176
+#: dirmngr/crlcache.c:1183
 #, 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:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, 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:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -10287,225 +10362,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:1316
+#: dirmngr/crlcache.c:1323
 #, 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:1325
+#: dirmngr/crlcache.c:1332
 #, 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:1336
+#: dirmngr/crlcache.c:1343
 #, 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:1348
+#: dirmngr/crlcache.c:1355
 #, 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:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, 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:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "expression symbolique incorrecte obtenue de libksba\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "algorithme de hachage « %s » inconnu\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "échec de création d'expression symbolique : %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "échec de ksba_crl_parse : %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, 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:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, 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:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, 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:2025
+#: dirmngr/crlcache.c:2036
 #, 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:2071
+#: dirmngr/crlcache.c:2082
 #, 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:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "échec de ksba_crl_new : %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "échec de ksba_crl_set_reader : %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "vieux fichier de cache temporaire « %s » supprimé\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "échec de crl_parse_insert : %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, 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:2352
+#: dirmngr/crlcache.c:2372
 #, 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:2362
+#: dirmngr/crlcache.c:2383
 #, 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:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "création du fichier de cache « %s »\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problème en renommant « %s » en « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10514,14 +10589,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:2496
+#: dirmngr/crlcache.c:2518
 #, 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:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10529,59 +10604,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:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 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:2532
+#: dirmngr/crlcache.c:2561
 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:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " Attention : taille d'enregistrement de cache incorrecte\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problème de lecture d'enregistrement de cache : %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problème de lecture d'enregistrement de clef : %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, 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:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Fin du vidage de liste de révocations de certificat\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "échec de crl_fetch par points de distribution : %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "échec de crl_cache_insert par émetteur : %s\n"
@@ -10599,25 +10674,25 @@
 "accès à la liste de révocations de certificat impossible car %s est "
 "désactivé\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 "accès à la liste de révocations de certificat impossible car %s est "
 "désactivé\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "erreur de récupération de « %s » : %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "recherche de certificats impossible car %s est désactivé\n"
@@ -10765,147 +10840,147 @@
 msgid "looking up '%s'\n"
 msgstr "recherche de « %s »\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "afficher le contenu du cache de la liste de révocations de certificat"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr ""
 "|FICHIER|charger la liste de révocations de certificat du FICHIER dans le "
 "cache"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|récupérer une liste de révocations de certificat d'une URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "arrêter le dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "vider le cache"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 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:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Configuration pour les serveurs HTTP"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "interdire l'utilisation d'HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 "ignorer les points de distribution de liste de révocations de certificat en "
 "HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Configuration pour les serveurs HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|utiliser le serveur de clefs à l'URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 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:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Configuration pour les serveurs HTTP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "interdire l'utilisation de LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 "ignorer les points de distribution de liste de révocations de certificat en "
 "LDAP"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Configuration pour OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "permettre l'envoi de requêtes OCSP"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorer les URL de service OCSP contenues dans le certificat"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|utiliser le répondeur OCSP à l'URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|EMPR|réponse OCSP signée par EMPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10915,11 +10990,11 @@
 "(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Utilisation : @DIRMNGR@ options (-h pour l'aide)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10928,105 +11003,105 @@
 "Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
 "@GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "les niveaux de débogage possibles sont : %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "utilisation : %s options "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, 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:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, 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:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s : %u : ligne trop longue — ignorée\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s : %u : empreinte incorrecte détectée\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s : %u : erreur de lecture : %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, 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:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 reçu — aucune action définie\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM reçu — arrêt…\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM reçu — encore %d connexions actives\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arrêt forcé\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT reçu — arrêt immédiat\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d reçu — aucune action définie\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erreur d'accès à « %s » : état HTTP %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL « %s » redirigée vers « %s » (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "trop de redirections\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11082,32 +11157,32 @@
 msgid "malloc failed: %s\n"
 msgstr "échec de malloc : %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "« %s » n'est pas une URL LDAP\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "« %s » est une URL LDAP incorrecte\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search a atteint la taille limite du serveur\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s : %u : mot de passe donné sans utilisateur\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s : %u : ignorer cette ligne\n"
@@ -11198,162 +11273,162 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "non signée par un certificat de signataire OCSP par défaut"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "erreur d'allocation d'élément de liste : %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "aucun certificat convenable n'a été trouvée pour vérifier la réponse OCSP\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certificat d'émetteur introuvable : %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "l'appelant n'a pas renvoyé le certificat cible\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "l'appelant n'a pas renvoyé le certificat émetteur\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "échec d'allocation du contexte OCSP : %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "aucun répondeur OCSP par défaut défini\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "aucun signataire OCSP par défaut défini\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "utilisation du répondeur OCSP « %s » par défaut\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "utilisation du répondeur OCSP « %s »\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "erreur de lecture de l'état OCSP pour le certificat cible : %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "l'état du certificat est : %s (celui-ci=%s prochain=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "correct"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "le certificat a été révoquée le : %s à cause de : %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "le répondeur OCSP a renvoyé un état dans le futur\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "le répondeur OCSP a renvoyé un état non actuel\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "échec d'assuan_inquire(%s) : %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "serialno manquant dans l'identifiant de certificat"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "échec d'assuan_inquire : %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "échec de fetch_cert_by_url : %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "erreur d'envoi de données : %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "échec de start_cert_fetch : %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "échec de fetch_next_cert : %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d dépassé\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossible d'allouer une structure de contrôle : %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "échec d'allocation du contexte Assuan : %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossible d'initialiser le serveur : %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problème d'accept_assuan : %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "problème de traitement Assuan : %s\n"
@@ -11365,90 +11440,90 @@
 "acceptation de l'autorité de certification racine non marquée comme une "
 "autorité de certification"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr ""
 "vérification de liste de révocations de certificat imbriquée trop "
 "profondément\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "pas de vérification de liste de révocations de certificat pour"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "vérification de liste de révocations de certificat pour"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr ""
 "échec de vérification du niveau de confiance du certificat racine : %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "la chaîne de certificats est correcte\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "silencieux"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "afficher les données encodées au format hexadécimal"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "décoder les lignes de données reçues"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "se connecter au dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "se connecter au dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NOM|se connecter à la socket Assuan NOM"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADR|se connecter au serveur Assuan à ADR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 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:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "ne pas utiliser le mode de connexion étendu"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHIER|exécuter les commandes du FICHIER au démarrage"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "exécuter /subst au démarrage"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Utilisation : @GPG@-connect-agent options (-h pour l'aide)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11456,50 +11531,50 @@
 "Syntaxe : @GPG@-connect-agent options\n"
 "Se connecter à un agent en fonctionnement et envoyer des commandes\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option « %s » ignorée à cause de « %s »\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "échec de réception de ligne : %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "ligne trop longue — ignorée\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "commande « %s » inconnue\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "échec d'envoi de ligne : %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr ""
 "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erreur d'envoi d'options standards : %s\n"
@@ -11573,13 +11648,13 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, 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:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11690,92 +11765,113 @@
 "Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "carte OpenPGP nº %s détectée\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "ajouter un certificat au cache"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "ajouter un certificat au cache"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "ajouter un certificat au cache"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "la fonction de hachage sélectionnée est incorrecte\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "préférences personnelles de chiffrement incorrectes\n"
+
+#, fuzzy
+#~| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr ""
+#~ "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
+
+#~ 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"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "erreur d'écriture du fichier temporaire : %s\n"
 
@@ -12598,9 +12694,6 @@
 #~ "passer de la liste de clefs secrètes à celle de clefs privées ou vice "
 #~ "versa"
 
-#~ msgid "Passphrase"
-#~ msgstr "Phrase secrète"
-
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "utiliser des fichiers temporaires pour passer les données aux assistants "

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/gl.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/gl.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/gl.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/gl.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, 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,53 +26,53 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "contrasinal incorrecto"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -83,28 +83,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "contrasinal demasiado longo\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -114,274 +114,275 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal erróneo"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "contrasinal erróneo"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "liña longa de máis\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non válido no nome\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI erróneo"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal erróneo"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduza o ID de usuario: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduza o contrasinal\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -389,7 +390,7 @@
 msgstr0 "O nome debe ter alomenos 5 caracteres\n"
 msgstr1 "O nome debe ter alomenos 5 caracteres\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -397,237 +398,243 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "¿Empregar esta chave de tódolos xeitos?"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "Options used for startup"
 msgstr "habilitar depuración total"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "ser un pouquiño máis calado"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "non está soportado"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "emprega-lo gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -635,155 +642,155 @@
 "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:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Uso: gpg opcións ficheiros (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Revocación de certificado válida"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, 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:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -793,19 +800,19 @@
 "Opcións:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -813,8 +820,8 @@
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -824,86 +831,88 @@
 "Opcións:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Cancelar"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -916,19 +925,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -941,7 +950,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -951,48 +960,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "habilitar unha chave"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1003,8 +1021,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1014,7 +1032,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
@@ -1024,7 +1042,7 @@
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1042,52 +1060,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "o algoritmo de protección %d%s non está soportado\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@ -1108,28 +1126,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "non é posible deshabilita-los volcados de 'core': %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "si|sim"
 
@@ -1184,8 +1202,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@ -1200,74 +1218,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1353,7 +1371,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1439,44 +1457,44 @@
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chave dispoñible en: "
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Certificado correcto"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "Certificado non válido"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versión descoñecida"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Non hai axuda dispoñible para `%s'"
@@ -1486,12 +1504,12 @@
 msgid "ignoring garbage line"
 msgstr "error nunha liña adicional\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "descoñecido"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "carácter radix64 non válido %02x omitido\n"
@@ -1526,136 +1544,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "non se atopou a chave pública %08lX: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "erro ao crear `%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "cabeceira de armadura non válida: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "cabeceira de sinatura en claro non válida\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "sinaturas en texto claro aniñadas\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "liña escapada cunha barra non válida: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "carácter radix64 non válido %02x omitido\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "fin de ficheiro prematura (nas liñas adicionais)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "error nunha liña adicional\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: liña máis longa ca %d caracteres\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1663,13 +1694,13 @@
 "carácter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "non lexible por humanos"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1678,27 +1709,27 @@
 "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notación non pode empregar ningún carácter de control\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1708,7 +1739,7 @@
 "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atopáronse datos de notación non válidos\n"
@@ -1722,8 +1753,8 @@
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1734,13 +1765,13 @@
 msgid "error from TPM: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
@@ -1751,209 +1782,214 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "¿A súa selección? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave pública correspondente: %s\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1961,102 +1997,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 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:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (só asinar)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Selección non válida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2064,197 +2100,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "saír deste menú"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispoñible en: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiración"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2317,9 +2358,9 @@
 msgid "subkey"
 msgstr "Pública: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualización fallou: %s\n"
@@ -2344,80 +2385,75 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK 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:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 msgid "using cipher %s.%s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2426,19 +2462,13 @@
 "forza-lo algoritmo de compresión %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2455,7 +2485,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2466,429 +2496,433 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "non se atoparon chaves de revocación para `%s'\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta non utilizable"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "xerar un certificado de revocación"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "gravando a chave secreta en `%s'\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: omitido: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "erro ao crear `%s': %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "Non se atopou o id de usuario"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Pegada dactilar:"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|ficheiro|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar só con cifrado simétrico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro público"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "actualizar tódalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo ficheiros|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "non facer ningún cambio"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "crear saída con armadura en ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "usar modo de texto canónico"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, 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:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2896,7 +2930,7 @@
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2926,13 +2960,13 @@
 " --list-keys nomes amosa-las chaves\n"
 " --fingerprint nomes amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2947,7 +2981,7 @@
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2955,571 +2989,565 @@
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Pública: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "uso: gpg opcións "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro está unha chave listada"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "estabrece-la lista de preferencias"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, 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:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, 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:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, 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:3354
+#: g10/gpg.c:3367
 #, 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:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, 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:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, 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:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, 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:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "o algoritmo de resumo seleccionado non é válido\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, 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:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non válidas\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "preferencias de cifrado personais non válidas\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non válidas\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresión personais non válidas\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "tamaño de chave non válido; empregando %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD 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/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, 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:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualización no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, 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:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, 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:5702
+#: g10/gpg.c:5762
 #, 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:5735
+#: g10/gpg.c:5795
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@ -3533,7 +3561,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la información de estado a este DF"
 
@@ -3564,339 +3592,344 @@
 msgid "No help available for '%s'"
 msgstr "Non hai axuda dispoñible para `%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "non está soportado"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "amosar fingerprint"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "amosar fingerprint"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chave secreta non utilizable"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "amosar fingerprint"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total procesado: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " sin IDs de usuario: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importadas: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " sin cambios: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " novas sub-chaves: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " novas sinaturas: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " novas revocacións de chaves: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " non importadas: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " novas sinaturas: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "omítese `%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupción da sub-chave HKP\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario válidos\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave pública non atopada: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave pública \"%s\" importada\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3905,212 +3938,212 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "A chave é obsoleta"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non é válido"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motivo para a revocación: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentario de revocación: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocación importado\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, 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:3670
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligazón de sub-chave incorrecta\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, 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:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, 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:3770
+#: g10/import.c:3866
 #, 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:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocación engadido\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@ -4120,35 +4153,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Sinatura correcta de \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "omítese `%s': %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "O ID de usuario \"%s\" está revocado."
 msgstr1 "O ID de usuario \"%s\" está revocado."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4156,7 +4189,7 @@
 msgstr0 "1 sinatura non verificada debido a unha chave que falta\n"
 msgstr1 "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4164,61 +4197,61 @@
 msgstr0 "%d sinaturas erróneas\n"
 msgstr1 "%d sinaturas erróneas\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Sinatura correcta de \""
 msgstr1 "Sinatura correcta de \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revocación"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "auto-sinatura"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4230,68 +4263,68 @@
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Confío marxinalmente\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Confío totalmente\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Está seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" está caducado."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "O ID de usuario \"%s\" non está asinado por el mesmo."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "O ID de usuario \"%s\" non está asinado por el mesmo."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4300,11 +4333,11 @@
 "A auto-sinatura de \"%s\"\n"
 "é unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "¿Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4313,11 +4346,11 @@
 "A súa sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "¿Quere emitir unha nova sinatura que substitúa á caducada? (s/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4326,43 +4359,43 @@
 "A súa sinatura actual en \"%s\"\n"
 "é unha sinatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "¿Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "¿Quere asinalo outra vez de tódolos xeitos? (s/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "¡Esta chave caducou!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "¿Quere que a súa sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4371,32 +4404,32 @@
 "¿Con canto tino comprobou que a chave que vai asinar realmente pertence á\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Fixen algunhas comprobacións.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Fixen comprobacións moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "¿A súa elección? (introduza '?' para ter máis información): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4405,281 +4438,290 @@
 "¿Esta seguro de que quere asinar esta chave\n"
 "coa súa chave: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "gardar e saír"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notación de sinaturas: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "engadir unha identificación fotográfica"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocación"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificación fotográfica"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "A chave secreta está disponible.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "A chave secreta está disponible.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Cómpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4687,311 +4729,301 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "A chave está revocada."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "clase de sinatura descoñecida"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "¡Non pode borra-lo último ID de usuario!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "¿Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "¿Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "¿Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "¿Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "¿Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "¿Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "¿Garda-los cambios? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "¿Saír sin gardar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valor non válido\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Resumo: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Características: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Notación: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revocada "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " caduca: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " caduca: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Esta chave está desactivada"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4999,19 +5031,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "revocada "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5020,18 +5052,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5040,37 +5077,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5078,38 +5115,38 @@
 msgstr0 "Borrada %d sinatura.\n"
 msgstr1 "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non válida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "O ID de usuario \"%s\" está revocado."
 msgstr1 "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5119,45 +5156,60 @@
 "designado\n"
 " pode facer que algunhas versións de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(a menos que especifique a chave por pegada dactilar)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "o ID de usuario \"%s\" xa está revocado\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5165,271 +5217,271 @@
 msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "¿Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿Está seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 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:6071
+#: g10/keyedit.c:6359
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de chave non válido; empregando %u bits\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5443,180 +5495,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (só asinar)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) ElGamal (sign and encrypt)\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ElGamal (asinar e cifrar)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (por defecto)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "deshabilitar unha chave"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamaño de chave requerido son %u bits\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5632,7 +5684,7 @@
 " <n>m = a chave caduca en n meses\n"
 " <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5648,40 +5700,40 @@
 " <n>m = a sinatura caduca en n meses\n"
 " <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "¿Por canto tempo é válida a chave? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "¿Por canto tempo é válida a sinatura? (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "valor non válido\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5689,12 +5741,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:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "¿Isto é correcto? (s/n) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5705,7 +5757,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5722,42 +5774,42 @@
 " \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Caracter non válido no nome\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Carácter non válido no comentario\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5768,12 +5820,12 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5788,35 +5840,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5828,18 +5880,18 @@
 "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:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5847,69 +5899,69 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "¿Crear de tódolos xeitos? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "¿Crear de tódolos xeitos? "
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeración de chaves.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, 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:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 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:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5919,7 +5971,7 @@
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5927,7 +5979,7 @@
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5935,23 +5987,23 @@
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "¿Crear realmente? "
@@ -5960,27 +6012,43 @@
 msgid "never "
 msgstr "nunca "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Resumo: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Características: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Normativa de sinaturas críticas: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Notación de sinaturas críticas: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5988,7 +6056,7 @@
 msgstr0 "%d sinaturas erróneas\n"
 msgstr1 "%d sinaturas erróneas\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5996,41 +6064,41 @@
 msgstr0 "1 sinatura non verificada debido a un erro\n"
 msgstr1 "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Pegada dactilar ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6111,334 +6179,340 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non é un ID de chave válido\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "solicitando a chave %08lX de %s\n"
 msgstr1 "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 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:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa súa chave %08lX no %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "chave de sesión cifrada con %s\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid " \"%s\"\n"
 msgstr " alias \""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave pública: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave pública: DEK correcto\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, 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:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificación de sinatura suprimida\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " alias \""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " alias \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Chave dispoñible en: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "incerto"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " alias \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "descoñecido"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública descoñecido"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non é unha sinatura separada\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
@@ -6545,27 +6619,27 @@
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "clase de sinatura descoñecida"
@@ -6623,7 +6697,7 @@
 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:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "cambia-lo contrasinal"
@@ -6687,7 +6761,7 @@
 "%s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6701,74 +6775,74 @@
 "pública. Se emprega unha imaxe moi grande, a súa chave tamén se ha volver\n"
 "moi grande. Un bo tamaño para empregar é un semellante a 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduza o nome do ficheiro JPEG: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\" non é un ficheiro JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "¿É esta foto correcta (s/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "non se soporta a execución remota de programas\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma precisa de ficheiros temporais ao chamar a programas "
 "externos\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "saída non natural do programa externo\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "erro do sistema ao chamar a un programa externo: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6776,7 +6850,7 @@
 "as chamadas a programas externos están desactivadas debido a opcións de "
 "permisos de ficheiros non seguras\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "¡non se pode amosa-la identificación fotográfica!\n"
@@ -6863,36 +6937,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicacións de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicacións de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Esta chave perténcenos a nós\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, fuzzy, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6904,7 +6978,7 @@
 "respostar á seguinte pregunta cun \"si\"\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6916,102 +6990,102 @@
 "respostar á seguinte pregunta cun \"si\"\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "¿Empregar esta chave de tódolos xeitos?"
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: ¡Emprégase unha chave que non é de confianza!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, fuzzy, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX "
 "ausente.\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, fuzzy, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Isto pode significar que a sinatura está falsificada.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: ¡Esta subchave está revocada polo propietario!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave está desactivada.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Nota: ¡Esta chave xa caducou!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "AVISO: ¡Esta chave non está certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: ¡Esta chave non está certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Non hai indicacións de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: ¡Esta chave NON é de confianza!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Probablemente, a sinatura estea FALSIFICADA.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7022,7 +7096,7 @@
 "AVISO: ¡Esta chave non está certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7030,51 +7104,51 @@
 "AVISO: ¡Esta chave non está certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Non é seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave pública está desactivada\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave pública xa está presente\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7082,41 +7156,41 @@
 "\n"
 "Introduza o ID de usuario. Remate cunha liña en branco: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave pública xa está estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desactivada.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave pública xa estabrecida\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "non hai enderezos válidos\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -7155,7 +7229,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -7378,54 +7452,49 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar máis información\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
 msgstr1 "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
 msgstr0 "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
 msgstr1 "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7438,7 +7507,7 @@
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7450,85 +7519,85 @@
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTA: a chave está revocada"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, 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"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "AVISO: non se pode expandir-%% a notación (grande de máis). Úsase sen "
 "expandir.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de máis).\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de máis).\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7611,135 +7680,135 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronización: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transacción da base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡o directorio non existe!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, 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:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non válida\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, 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:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, 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:985
+#: g10/tdbio.c:955
 #, 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:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, 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:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non é un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, 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:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versión do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, 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:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: creouse a base de datos de confianza\n"
@@ -8172,7 +8241,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
@@ -8202,14 +8271,14 @@
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%lu chaves procesadas hasta polo momento\n"
 msgstr1 "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8217,23 +8286,23 @@
 msgstr0 "procesáronse %d chaves (marcáronse %d contas de validez)\n"
 msgstr1 "procesáronse %d chaves (marcáronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, 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"
@@ -8307,7 +8376,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8318,13 +8387,13 @@
 "Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) debería\n"
 "se-lo primeiro ficheiro que se indique na liña de comandos.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "a liña de entrada %u é longa de máis ou fáltalle a marca de fin de liña\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -8340,20 +8409,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "axusta-los valores de depuración"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "habilitar depuración total"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Uso: gpg opcións ficheiros (-h para ve-la axuda)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8363,16 +8432,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8407,10 +8476,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8430,158 +8499,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, 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-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "A xeración da chave fallou: %s\n"
 msgstr1 "A xeración da chave fallou: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Nota: Esta chave está desactivada.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, 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:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, 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:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -8589,43 +8658,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, 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:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8633,22 +8702,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8656,81 +8725,81 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI non soportado"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
@@ -8752,7 +8821,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8801,340 +8870,340 @@
 msgid "deny the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Uso: gpg opcións ficheiros (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "axuda"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, 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:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, 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:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, 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:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave está revocada"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " novas sinaturas: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "Creouse o certificado de revocación.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Pegada dactilar:"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, fuzzy, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificado duplicado - borrado"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "non procesado"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "non|nom"
@@ -9157,7 +9226,7 @@
 msgid "Error - invalid DN"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9170,42 +9239,42 @@
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9433,17 +9502,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
@@ -9453,7 +9522,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -9478,134 +9547,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrición)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocación de certificado válida"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear saída con armadura en ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "engadir este chaveiro á lista de chaveiros"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maioría das preguntas"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "asumir `non' na maioría das preguntas"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9616,27 +9685,27 @@
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9656,7 +9725,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -9666,47 +9735,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema ao comproba-la revocación: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9736,7 +9805,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9751,58 +9820,58 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "o algoritmo de protección %d%s non está soportado\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "A sinatura caducou o %s\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "armadura: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Sinatura correcta de \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " alias \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9829,592 +9898,587 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "certificado duplicado - borrado"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "certificado duplicado - borrado"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certificado duplicado - borrado"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "Pegada dactilar:"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Certificado non válido"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "error nunha liña adicional\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "certificado duplicado - borrado"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "erro de lectura: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "erro lendo `%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, 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:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, 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:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, 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:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problema ao comproba-la revocación: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -10429,24 +10493,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
@@ -10604,140 +10668,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10750,115 +10814,115 @@
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Uso: gpg opcións ficheiros (-h para ve-la axuda)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "uso: gpg opcións "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "liña longa de máis\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "non procesado"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10914,32 +10978,32 @@
 msgid "malloc failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" non é un ficheiro JPEG\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omitir esta chave\n"
@@ -11032,163 +11096,163 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "NOTA: a chave está revocada"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, 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:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11199,135 +11263,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "liña longa de máis\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -11393,12 +11457,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
@@ -11507,88 +11571,106 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "cambia-la fecha de expiración"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "o algoritmo de resumo seleccionado non é válido\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "preferencias de cifrado personais non válidas\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "escribindo a `%s'\n"
 
@@ -12253,10 +12335,6 @@
 #~ msgstr "cambiar entre o listado de chaves públicas e secretas"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "contrasinal erróneo"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "AVISO: as opcións de `%s' aínda non están activas nesta execución\n"
 
@@ -13222,9 +13300,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "borrar sinaturas"
 
-#~ msgid "set preference list"
-#~ msgstr "estabrece-la lista de preferencias"
-
 #~ msgid "updated preferences"
 #~ msgstr "preferencias actualizadas"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/gnupg2.pot -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/gnupg2.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.6\n"
+"Project-Id-Version: GNU gnupg 2.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
@@ -29,49 +29,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr ""
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -82,27 +82,27 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -112,263 +112,263 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr ""
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+msgid "Passphrases match."
+msgstr ""
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr ""
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr ""
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr ""
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr ""
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr ""
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr ""
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr ""
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, c-format
 msgid "error writing to pipe: %s\n"
 msgstr ""
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr ""
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -376,473 +376,479 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr ""
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr ""
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+msgid "enable Win32-OpenSSH support"
+msgstr ""
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr ""
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr ""
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
 msgstr ""
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr ""
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
 " "
 msgstr ""
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr ""
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr ""
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr ""
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -855,18 +861,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr ""
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -879,7 +885,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -889,46 +895,55 @@
 #. 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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr ""
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
 "%%0A?"
 msgstr ""
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr ""
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -939,8 +954,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -950,7 +965,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
@@ -960,7 +975,7 @@
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -975,52 +990,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr ""
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr ""
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr ""
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr ""
@@ -1040,28 +1055,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr ""
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr ""
 
@@ -1115,8 +1130,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr ""
@@ -1131,72 +1146,72 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr ""
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr ""
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr ""
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr ""
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr ""
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr ""
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr ""
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr ""
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr ""
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr ""
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr ""
@@ -1269,7 +1284,7 @@
 msgstr ""
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1344,39 +1359,39 @@
 msgid "Root certificate trustworthy"
 msgstr ""
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr ""
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr ""
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr ""
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr ""
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr ""
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr ""
@@ -1385,11 +1400,11 @@
 msgid "ignoring garbage line"
 msgstr ""
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr ""
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr ""
@@ -1424,179 +1439,191 @@
 msgid "iconv_open failed: %s\n"
 msgstr ""
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr ""
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr ""
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr ""
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr ""
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr ""
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr ""
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr ""
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr ""
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr ""
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr ""
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr ""
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr ""
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr ""
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr ""
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
@@ -1610,8 +1637,8 @@
 msgid "Enter passphrase: "
 msgstr ""
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr ""
@@ -1621,13 +1648,13 @@
 msgid "error from TPM: %s\n"
 msgstr ""
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr ""
@@ -1637,197 +1664,202 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr ""
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr ""
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr ""
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr ""
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr ""
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr ""
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
-#: g10/card-util.c:140 g10/card-util.c:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr ""
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr ""
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr ""
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr ""
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr ""
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr ""
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1835,99 +1867,99 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr ""
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr ""
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr ""
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr ""
 
-#: g10/card-util.c:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1935,176 +1967,181 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr ""
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr ""
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr ""
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr ""
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr ""
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr ""
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr ""
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr ""
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr ""
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr ""
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr ""
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr ""
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr ""
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr ""
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr ""
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr ""
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr ""
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2162,9 +2199,9 @@
 msgid "subkey"
 msgstr ""
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
@@ -2189,93 +2226,82 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encrypt.c:332 g10/sign.c:1622
-#, c-format
-msgid "error creating passphrase: %s\n"
-msgstr ""
-
-#: g10/encrypt.c:339
+#: g10/encrypt.c:109
 #, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:136 g10/encrypt.c:683
 #, c-format
-msgid "using cipher %s.%s\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
 msgstr ""
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
 #, c-format
-msgid "'%s' already compressed\n"
+msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
 #, c-format
-msgid "WARNING: '%s' is an empty file\n"
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
+#: g10/encrypt.c:181 sm/encrypt.c:771
 #, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
-msgid "(use option \"%s\" to override)\n"
+msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:484
 #, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:514
 #, c-format
-msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgid "using cipher %s.%s\n"
 msgstr ""
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
-msgid "reading from '%s'\n"
+msgid "'%s' already compressed\n"
 msgstr ""
 
-#: g10/encrypt.c:777
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid "WARNING: '%s' is an empty file\n"
 msgstr ""
 
-#: g10/encrypt.c:832 sm/encrypt.c:767
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, c-format
-msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
+#: g10/encrypt.c:867
 #, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgid "reading from '%s'\n"
 msgstr ""
 
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:1071
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encrypt.c:1164
+#: g10/encrypt.c:1179
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2290,7 +2316,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2301,392 +2327,394 @@
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr ""
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr ""
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+msgid "export only revocation certificates"
+msgstr ""
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+msgid "export secret keys using the GnuPG format"
+msgstr ""
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr ""
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr ""
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr ""
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr ""
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr ""
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr ""
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr ""
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr ""
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr ""
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr ""
 
-#: g10/getkey.c:2098
+#: g10/getkey.c:2107
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr ""
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:3830
+#: g10/getkey.c:3868
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr ""
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr ""
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr ""
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr ""
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr ""
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr ""
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr ""
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr ""
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr ""
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr ""
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr ""
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr ""
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr ""
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr ""
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr ""
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr ""
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr ""
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr ""
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr ""
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr ""
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr ""
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
 msgstr ""
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr ""
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr ""
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr ""
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr ""
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr ""
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr ""
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr ""
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr ""
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr ""
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr ""
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
 msgstr ""
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr ""
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2698,571 +2726,564 @@
 " --fingerprint names show fingerprints\n"
 msgstr ""
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr ""
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr ""
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr ""
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr ""
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr ""
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+msgid "show preferences"
+msgstr ""
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr ""
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ""
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ""
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr ""
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3949
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr ""
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:4008
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:4012
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:4016
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4012
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr ""
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr ""
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr ""
 
-#: g10/gpg.c:4134
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
@@ -3275,7 +3296,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -3302,328 +3323,333 @@
 msgid "No help available for '%s'"
 msgstr ""
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr ""
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr ""
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr ""
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr ""
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "show key but do not actually import"
 msgstr ""
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr ""
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr ""
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr ""
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr ""
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr ""
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr ""
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr ""
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr ""
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr ""
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr ""
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr ""
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr ""
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr ""
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3632,197 +3658,197 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr ""
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr ""
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr ""
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr ""
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr ""
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr ""
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr ""
@@ -3832,100 +3858,100 @@
 msgid "error allocating memory: %s\n"
 msgstr ""
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr ""
 
-#: g10/key-check.c:405
+#: g10/key-check.c:406
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
 msgstr ""
 
-#: g10/key-check.c:571
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr ""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr ""
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr ""
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr ""
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3933,389 +3959,398 @@
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr ""
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr ""
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above? If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr ""
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr ""
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr ""
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr ""
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr ""
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr ""
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr ""
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4323,681 +4358,690 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr ""
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr ""
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr ""
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ""
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr ""
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr ""
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr ""
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr ""
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3849
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr ""
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr ""
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr ""
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, 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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr ""
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr ""
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr ""
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 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:4548
+#: g10/keyedit.c:4654
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4713
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4735
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, c-format
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr ""
+
+#: g10/keyedit.c:4915
+#, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr ""
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr ""
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr ""
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr ""
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr ""
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr ""
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr ""
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5011,166 +5055,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr ""
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr ""
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, c-format
 msgid " (%d) DSA (sign only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, c-format
 msgid " (%d) RSA (sign only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, c-format
 msgid " (%d) Existing key%s\n"
 msgstr ""
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr ""
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr ""
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr ""
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr ""
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr ""
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr ""
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5180,7 +5224,7 @@
 " <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5190,48 +5234,48 @@
 " <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr ""
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5242,7 +5286,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5252,41 +5296,41 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5294,11 +5338,11 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5313,31 +5357,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3130
+#: g10/keygen.c:3114
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5345,18 +5389,18 @@
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5364,97 +5408,97 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr ""
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr ""
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 
-#: g10/keygen.c:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr ""
 
@@ -5462,74 +5506,90 @@
 msgid "never "
 msgstr ""
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr ""
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr ""
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr ""
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr ""
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr ""
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -5606,322 +5666,328 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr ""
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr ""
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr ""
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr ""
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr ""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr ""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:660
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr ""
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr ""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr ""
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr ""
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 
-#: g10/mainproc.c:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr ""
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr ""
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ""
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
@@ -6021,27 +6087,27 @@
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr ""
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr ""
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr ""
@@ -6094,7 +6160,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 msgid "Please enter the passphrase for decryption."
 msgstr ""
 
@@ -6150,7 +6216,7 @@
 "%s"
 msgstr ""
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6159,75 +6225,75 @@
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr ""
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr ""
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr ""
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr ""
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr ""
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr ""
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr ""
@@ -6306,231 +6372,231 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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 ""
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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 ""
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr ""
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr ""
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr ""
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr ""
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr ""
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr ""
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr ""
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr ""
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
 "signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr ""
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr ""
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr ""
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr ""
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr ""
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr ""
@@ -6568,7 +6634,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr ""
@@ -6773,51 +6839,46 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr ""
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6826,7 +6887,7 @@
 msgstr0 ""
 msgstr1 ""
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -6834,76 +6895,76 @@
 msgstr0 ""
 msgstr1 ""
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr ""
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr ""
 
-#: g10/sig-check.c:543
+#: g10/sig-check.c:537
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr ""
 
-#: g10/sig-check.c:646
+#: g10/sig-check.c:640
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:1241
+#: g10/sig-check.c:1235
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr ""
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, c-format
 msgid "%s.%s encryption will be used\n"
 msgstr ""
@@ -6975,133 +7036,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr ""
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr ""
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr ""
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr ""
@@ -7518,7 +7579,7 @@
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -7548,37 +7609,37 @@
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7647,7 +7708,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -7655,12 +7716,12 @@
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr ""
@@ -7675,19 +7736,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr ""
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr ""
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -7696,16 +7757,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -7734,10 +7795,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr ""
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -7757,150 +7818,150 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr ""
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr ""
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr ""
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr ""
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr ""
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr ""
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr ""
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr ""
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr ""
@@ -7908,42 +7969,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr ""
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7951,20 +8012,20 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr ""
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -7972,78 +8033,78 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8063,7 +8124,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8107,324 +8168,324 @@
 msgid "deny the use of admin card commands"
 msgstr ""
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr ""
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr ""
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr ""
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr ""
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr ""
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr ""
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr ""
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr ""
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr ""
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr ""
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr ""
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr ""
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr ""
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr ""
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr ""
 
@@ -8444,7 +8505,7 @@
 msgid "Error - invalid DN"
 msgstr ""
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8454,42 +8515,42 @@
 "created %s, expires %s.\n"
 msgstr ""
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr ""
@@ -8705,17 +8766,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr ""
@@ -8725,7 +8786,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr ""
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr ""
@@ -8750,150 +8811,150 @@
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr ""
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr ""
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr ""
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr ""
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 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:831
+#: sm/gpgsm.c:851
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -8913,7 +8974,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr ""
@@ -8923,47 +8984,47 @@
 msgid "error importing certificate: %s\n"
 msgstr ""
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr ""
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr ""
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr ""
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -8993,7 +9054,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9008,58 +9069,58 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr ""
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr ""
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr ""
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr ""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr ""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9084,574 +9145,569 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr ""
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr ""
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr ""
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr ""
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr ""
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr ""
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr ""
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr ""
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:434
+#: dirmngr/crlcache.c:441
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr ""
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr ""
@@ -9665,23 +9721,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr ""
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr ""
@@ -9822,248 +9878,248 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
 "options)\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr ""
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr ""
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr ""
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr ""
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr ""
@@ -10118,32 +10174,32 @@
 msgid "malloc failed: %s\n"
 msgstr ""
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr ""
@@ -10232,161 +10288,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr ""
@@ -10396,130 +10452,130 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr ""
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr ""
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr ""
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr ""
@@ -10579,12 +10635,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr ""
@@ -10685,76 +10741,76 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr ""
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr ""
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr ""
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/hu.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/hu.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/hu.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/hu.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 2.2.20\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@ -26,52 +26,52 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "érvénytelen jelszó"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -82,28 +82,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "A jelszó túl hosszú!\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -113,273 +113,274 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelszó"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "rossz jelszó"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor túl hosszú!\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelszó túl hosszú!\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Érvénytelen karakter a névben!\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hibás MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelszó"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "Nem írható titkoskulcs-karikát találtam: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Írja be a jelszót!\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -387,7 +388,7 @@
 msgstr0 "A név legalább 5 karakter kell legyen!\n"
 msgstr1 "A név legalább 5 karakter kell legyen!\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -395,390 +396,396 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Mégis használjuk ezt a kulcsot? "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "bőbeszédű mód"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "még szűkszavúbb mód"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatbázis frissítése"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "nem támogatott"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N. sorszámú jelszómód használata"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "gpg ügynök használata"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, 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:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozható létre: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, 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:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: Könyvtárat létrehoztam.\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, 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:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -788,19 +795,19 @@
 "Opciók:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -808,8 +815,8 @@
 "@Parancsok:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -819,86 +826,88 @@
 "Opciók:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Mégsem"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -911,19 +920,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -936,7 +945,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -946,48 +955,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "kulcs engedélyezése"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -998,8 +1016,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1009,7 +1027,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
@@ -1019,7 +1037,7 @@
 msgid "secret key parts are not available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1037,52 +1055,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "%d%s védő algoritmus nem támogatott.\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
@@ -1103,28 +1121,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core fájlokat: %s.\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "igen"
 
@@ -1179,8 +1197,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
@@ -1195,74 +1213,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1346,7 +1364,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1430,44 +1448,44 @@
 msgid "Root certificate trustworthy"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kulcs található: "
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "ismeretlen verzió"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
@@ -1477,12 +1495,12 @@
 msgid "ignoring garbage line"
 msgstr "Hiba a záró sorban!\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "Ismeretlen módú"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
@@ -1517,149 +1535,162 @@
 msgid "iconv_open failed: %s\n"
 msgstr "Nem tudom megnyitni az állományt: %s.\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, 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:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "Hiba \"%s\" létrehozásakor: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "Hiba \"%s\" olvasásakor: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "Páncél: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "Érvénytelen páncélfejléc: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "Páncélfejléc: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "Érvénytelen aláírásfejléc!\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "Páncélfejléc: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "Egymásba ágyazott olvashatószöveg-aláírások!\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "Váratlan páncél:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "Érvénytelen kötőjeles sor: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "Korai állományvég (nincs CRC).\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "Korai állományvég (a CRC-ben).\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "Hibás formájú CRC.\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "Korai állományvég (a lezárásban).\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "Hiba a záró sorban!\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "Érvénytelen páncél: %d karakternél hosszabb sor.\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable karakter a páncélban - valószínűleg egy bugos MTA bűne.\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "nem olvasható forma"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1668,27 +1699,27 @@
 "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = "
 "jellel kell befejeződjön.\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jelölés értékében nem szerepelhet vezérlőkarakter!\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1698,7 +1729,7 @@
 "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = "
 "jellel kell befejeződjön.\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "FIGYELEM: Érvénytelen jelölő adatot találtam.\n"
@@ -1712,8 +1743,8 @@
 msgid "Enter passphrase: "
 msgstr "Írja be a jelszót: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1724,13 +1755,13 @@
 msgid "error from TPM: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
@@ -1741,209 +1772,214 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, 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:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Mit választ? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenciák frissítése"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1951,102 +1987,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerekítve %u bitre.\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 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:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (csak aláírás)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Érvénytelen választás.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2054,197 +2090,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, 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:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "kilépés ebből a menüből"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "megmutatja ezt a súgót"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs található: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "lejárat megváltoztatása"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "új kulcspár létrehozása"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, 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:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 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:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2306,9 +2347,9 @@
 msgid "subkey"
 msgstr "Nyilvános kulcsú (pubkey): "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
@@ -2333,101 +2374,91 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr ""
+"Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "Nem tudok szimmetrikus ESK csomagot használni a S2K mód miatt!\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "%s rejtjelezést használok.\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, 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:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr ""
-"Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "Olvasok a \"%s\" állományból.\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, 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:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkosítva \"%s\" számára\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2444,7 +2475,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2456,430 +2487,434 @@
 msgid "problem handling encrypted packet\n"
 msgstr "Probléma a titkosított csomag kezelésekor!\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Az aláírást \"nem visszavonhatónak\" jelöljük.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "Nem találtam visszavonó kulcsot a következőhöz: \"%s\".\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "használhatatlan titkos kulcs"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "visszavonási igazolás készítése"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "Írom a titkos kulcsot a %s állományba.\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "Írok a \"%s\" állományba.\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem exportáltam.\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "Hiba \"%s\" létrehozásakor: %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "ismeretlen kulcs"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem található: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "különálló aláírás készítése"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|fájl|olvasható szöveg aláírása"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "különálló aláírás készítése"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "adat titkosítása"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "titkosítás csak szimmetrikus rejtjelezővel"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "adat visszafejtése (alapértelmezés)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "aláírás ellenőrzése"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "kulcsok listázása"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "kulcsok és aláírások listázása"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsaláírások ellenőrzése"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "kulcsok és ujjlenyomatok listázása"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "titkos kulcsok listázása"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "kulcs aláírása vagy szerkesztése"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelszóváltoztatás"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "kulcsok exportálása"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "kulcsok exportálása kulcsszerverre"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "kulcsok importálása kulcsszerverről"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "kulcsok keresése kulcsszerveren"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs frissítése kulcsszerverről"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "kulcsok importálása/összefűzése"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "bizalmi adatbázis frissítése"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo fájlok|üzenet kivonatának kiírása"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NÉV|titkosítás NÉV részére"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "ne csináljon semmi változtatást"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "felülírás előtt rákérdezés"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "ascii páncélozott kimenet létrehozása"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "kanonikus szöveges mód használata"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, 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:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "kulcsok importálása kulcsszerverről"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kulcsaláírások ellenőrzése"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "titkos kulcsok listázása"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NÉV|titkosítás NÉV részére"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2887,7 +2922,7 @@
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2917,13 +2952,13 @@
 " --list-keys nevek kulcsok kiíratása\n"
 " --fingerprint nevek ujjlenyomatok kiíratása\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2938,7 +2973,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:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2946,572 +2981,565 @@
 "\n"
 "Támogatott algoritmusok:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Nyilvános kulcsú (pubkey): "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Rejtjelező (cipher): "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Kivonatoló (hash): "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Tömörítő (compression): "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "Használat: gpg opciók "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, 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:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "preferencialista beállítása"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, 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:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, 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:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, 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:3647
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, 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:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s értelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "Érvénytelen alapértelmezett preferenciák!\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, 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:4134
-#, fuzzy, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Páncél eltávolítása nem sikerült: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, 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:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti gépelni az üzenetet...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, 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:5702
+#: g10/gpg.c:5762
 #, 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:5735
+#: g10/gpg.c:5795
 #, 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"
@@ -3525,7 +3553,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "időbélyeg-konfliktus esetén csak figyelmeztessen"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra"
 
@@ -3556,339 +3584,344 @@
 msgid "No help available for '%s'"
 msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "bizalmi adatbázis frissítése"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "bizalmi adatbázis frissítése"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "nem támogatott"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "használhatatlan titkos kulcs"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d típusú blokkot kihagyom.\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr " Összesen feldolgoztam: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " új kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " új kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " felh. azonosító nélkül: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importálva: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " változatlan: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " új felh. azonosítók: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " új alkulcsok: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " új aláírások: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " új kulcsvisszavonások: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " importált titkos kulcsok: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "változatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " nem importált: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " új aláírások: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcssérülés kijavítva.\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem önaláírt felh. azonosító (\"%s\") elfogadva.\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs érvényes felhasználói azonosító.\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hiányzó önaláírás.\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilvános kulcs nem található: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: új kulcs - kihagytam.\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem írható kulcskarikát találtam: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilvános kulcs importálva.\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 új felhasználói azonosító.\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 új aláírás.\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 új alkulcs.\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d új alkulcs.\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem változott.\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs importálva.\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3897,204 +3930,204 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "\"%s\" titkos kulcs nem található: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "A kulcsot lecserélték."
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "A kulcs kompromittálódott."
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "A kulcs már nem használatos."
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "A felhasználói azonosító már nem érvényes."
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Visszavonás oka: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Megjegyzés a visszavonáshoz: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavonó igazolást importáltam.\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, 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:3670
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, 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:3742
+#: g10/import.c:3838
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavonáshoz.\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: Érvénytelen alkulcsvisszavonás.\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, 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:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonosítót: '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefűztem.\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavonó igazolást hozzáadtam.\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
@@ -4104,35 +4137,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "\"%s\" felhasználói azonosítót visszavonták."
 msgstr1 "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4140,7 +4173,7 @@
 msgstr0 "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
 msgstr1 "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4148,61 +4181,61 @@
 msgstr0 "%d rossz aláírás.\n"
 msgstr1 "%d rossz aláírás.\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Jó aláírás a következőtől: \""
 msgstr1 "Jó aláírás a következőtől: \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "\"%s\" kulcskarikát létrehoztam.\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "\"%s\" kulcskarikát létrehoztam.\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "visszavonás"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "önaláírás"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4215,68 +4248,68 @@
 "különböző forrásból származó digitális ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = részlegesen megbízom benne\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = teljesen megbízom benne\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy továbbra is alá akarja írni? (i/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Nem tudom aláírni.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhasználói azonosító lejárt."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhasználóazonosítón nincs önaláírás."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "\"%s\" felhasználóazonosítón nincs önaláírás."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4285,11 +4318,11 @@
 "\"%s\" önaláírása\n"
 "PGP 2.x stílusú.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretné átalakítani OpenPGP önaláírássá? (i/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4298,11 +4331,11 @@
 "Az Ön jelenlegi aláírása a(z) \"%s\"\n"
 "kulcson lejárt.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy új aláírást, amellyel lecseréli a lejártat? (i/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4311,43 +4344,43 @@
 "Az Ön jelenlegi aláírása a(z) \"%s\"\n"
 "kulcson helyi aláírás.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretné átalakítani teljes, exportálható aláírássá? (i/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" már alá lett írva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" már alá lett írva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Még egyszer alá akarja írni? (i/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Ez a kulcs lejárt!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lejár: %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretné, ha az aláírása ugyanekkor járna le? (I/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4356,32 +4389,32 @@
 "Mennyire gondosan ellenőrizte, hogy a kulcs, melyet aláírni készül, valóban\n"
 "a fent nevezett személyhez tartozik? Ha nem tudja a választ, írjon \"0\"-t!\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Nem válaszolok.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Egyáltalán nem ellenőriztem.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) A szokásos ellenőrzéseket végeztem.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Nagyon alaposan ellenőriztem.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Mi a válasza? (Adjon meg \"?\"-et magyarázathoz!): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4390,275 +4423,284 @@
 "Teljesen biztos abban, hogy alá akarja írni ezt a kulcsot\n"
 "az Ön kulcsával: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy önaláírás lesz.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az aláírás nem lesz \"nem exportálhatóként\" megjelölve.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az aláírás nem lesz \"nem visszavonhatóként\" megjelölve.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Az aláírást \"nem exportálhatónak\" jelöljük.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Az aláírást \"nem visszavonhatónak\" jelöljük.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egyáltalán nem ellenőriztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szokásos módon ellenőriztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellenőriztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "mentés és kilépés"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Aláírás-jelölés: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "N. felhasználói azonosító kiválasztása"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhasználói azonosító kiválasztása"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "aláírások visszavonása"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi aláírása"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "felhasználói azonosító hozzáadása"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "fotóazonosító hozzáadása"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhasználói azonosító törlése"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "másodlagos kulcs törlése"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "visszavonó kulcs hozzáadása"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhasználóazonosító megjelölése elsődlegesként"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "preferenciák listázása (szakértő)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "preferenciák listázása (részletes)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "jelszóváltoztatás"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhasználói azonosító visszavonása"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "másodlagos kulcs visszavonása"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs engedélyezése"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tiltása"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fotóazonosító megmutatása"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkezésre áll.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Titkos kulcs rendelkezésre áll.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez szükség van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4666,309 +4708,299 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "A kulcsot visszavonták."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Valóban aláírja az összes felhasználóazonosítót? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Valóban aláírja az összes felhasználóazonosítót? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "ismeretlen aláírásosztály"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Legalább egy felhasználóazonosítót ki kell választania!\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Valóban eltávolítja az összes kijelölt felhasználóazonosítót? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legalább egy kulcsot ki kell választania!\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Legalább egy kulcsot ki kell választania!\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Valóban törli ezt a kulcsot? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Valóban visszavonja ezt a felhasználóazonosítót? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Valóban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Valóban visszavonja a kijelölt kulcsokat? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Valóban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista beállítása"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Valóban frissítsem a preferenciákat? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a változtatásokat? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kilépjek mentés nélkül? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "A kulcsblokk törlése sikertelen: %s.\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, 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"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Érvénytelen érték!\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Nincs ilyen felhasználói azonosító.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " aláírva %08lX által %s%s időpontban.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Kivonat: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Jellemzők: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Jelölés: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (érzékeny)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozható létre: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "visszavont "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " lejár: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " lejár: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4976,19 +5008,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "visszavont "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4997,18 +5029,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5018,35 +5055,35 @@
 "okozhatja,\n"
 " hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Továbbra is hozzá akarja adni? (i/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Törli ezt a jó aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Valóban törli ezt az önaláírást? (i/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5054,38 +5091,38 @@
 msgstr0 "Töröltem %d aláírást.\n"
 msgstr1 "Töröltem %d aláírást.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nem töröltem semmit.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "érvénytelen páncél"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "\"%s\" felhasználói azonosítót visszavonták."
 msgstr1 "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, 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:4468
+#: g10/keyedit.c:4574
 #, 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:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5095,310 +5132,325 @@
 " azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 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:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(Kivéve, ha megad egy kulcsot az ujjlenyomatával.)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
+
+#: g10/keyedit.c:5007
 #, 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:4726
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 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:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Felülírjam (i/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhasználóazonosító: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az aláírás lejárt %s időpontban.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 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:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " visszavonva %08lX által %s időpontban.\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "A következő aláírásokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, 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:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, 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:6459
+#: g10/keyedit.c:6747
 #, 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:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, 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:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "Sima aláírást írok.\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "Önaláírást írok.\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "Összefűző aláírást írok.\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsméretet felkerekítettem %u bitre.\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkosítása"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5412,180 +5464,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (csak titkosítás)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (csak aláírás)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (csak aláírás)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (csak titkosítás)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) ElGamal (sign and encrypt)\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ElGamal (aláírás és titkosítás)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (alapértelmezés)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, 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:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "kulcs tiltása"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A kívánt kulcsméret %u bit.\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5601,7 +5653,7 @@
 " <n>m = a kulcs n hónapig érvényes\n"
 " <n>y = a kulcs n évig érvényes\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5617,40 +5669,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:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Meddig érvényes a kulcs? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig érvényes az aláírás? (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "Érvénytelen érték!\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem jár le.\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem jár le.\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lejár: %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5658,12 +5710,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:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez így helyes (i/n)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5674,7 +5726,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5691,42 +5743,42 @@
 " \"Heinrich Heine (a költő) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Teljes név: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Érvénytelen karakter a névben!\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-mail cím: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Ez nem érvényes e-mail cím.\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Megjegyzés: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Érvénytelen karakter a megjegyzésben!\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5737,11 +5789,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5756,32 +5808,32 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "(N)év, (E)-mail megváltoztatása vagy (K)ilépés? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "(N)év, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
 
-#: g10/keygen.c:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Kérem, előbb javítsa ki a hibát!\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5793,18 +5845,18 @@
 "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:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5812,69 +5864,69 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Mégis létrehozzam? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Mégis létrehozzam? "
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Kulcs létrehozása megszakítva.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, 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:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 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:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5884,38 +5936,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, 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:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, 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:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Valóban létrehozzam? "
@@ -5924,27 +5976,43 @@
 msgid "never "
 msgstr "soha "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Kivonat: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Jellemzők: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kritikus aláírási eljárásmód: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Aláírási eljárásmód: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kritikus aláírás-jelölés: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5952,7 +6020,7 @@
 msgstr0 "%d rossz aláírás.\n"
 msgstr1 "%d rossz aláírás.\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5960,41 +6028,41 @@
 msgstr0 "1 aláírást nem ellenőriztem hiba miatt.\n"
 msgstr1 "1 aláírást nem ellenőriztem hiba miatt.\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Elsődlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr "Elsődlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6074,338 +6142,344 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 msgstr1 "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 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:1619
+#: g10/keyserver.c:1621
 #, 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:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa méretű (%d) titkosított munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s titkosított munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s titkosított adat.\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilvános kulcs: %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "Titkosítva %u bites %s kulccsal, azonosító: %08lX, létrehozva: %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid " \"%s\"\n"
 msgstr " azaz \""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilvános kulcsú visszafejtés sikertelen: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilvános kulccsal titkosított adat: jó DEK.\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, 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:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "Visszafejtés rendben.\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkosított üzenetet manipulálták!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti fájlnév: '%.*s'.\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ aláírás a következőtől: \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lejárt aláírás a következőtől: \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Aláírás-ellenőrzés elnyomva.\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " azaz \""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " azaz \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Kulcs található: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "bizonytalan"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " azaz \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "Bináris"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "Szövegmódú"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "Ismeretlen módú"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "ismeretlen nyilvános kulcsú algoritmus"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellenőrizni az aláírást: %s.\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "Nem különálló aláírás.\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, 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:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Régi stílusú (PGP 2.x) aláírás.\n"
@@ -6512,27 +6586,27 @@
 msgid "uncompressed|none"
 msgstr "tömörítetlen"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "ismeretlen aláírásosztály"
@@ -6590,7 +6664,7 @@
 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:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "jelszóváltoztatás"
@@ -6656,7 +6730,7 @@
 "%s"
 msgstr "%u bites %s kulcs, azonosító: %08lX, létrehozva: %s."
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6670,74 +6744,74 @@
 "képet használ, a kulcsa is nagyon nagy lesz!\n"
 "A 240x288 körüli képméret jól használható.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Adja meg egy JPEG fájl nevét a fotóazonosítóhoz: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "Nem tudom megnyitni az állományt: %s.\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\" nem JPEG állomány.\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ez a fotó megfelelő (i/N/k)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "Külső program meghívása nem támogatott.\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Ez a platform átmeneti állományokat igényel külső programok hívásához.\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "Nem tudom végrehajtani a következő \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "A külső program nem természetes módon ért véget.\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "Rendszerhiba külső program hívásakor: %s.\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "FIGYELEM: nem tudom törölni a \"%s\" átmeneti könyvtárat: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6745,7 +6819,7 @@
 "A külső programok hívása tiltott, mert az \"options\" állomány engedélyei\n"
 "nem biztonságosak.\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjeleníteni a fotóazonosítót!\n"
@@ -6832,34 +6906,34 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Alapvetően megbízható kulcshoz vezető igazolások:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Ez a kulcs valószínűleg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Ez a kulcs hozzánk tartozik.\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6871,7 +6945,7 @@
 "a következő kérdésre válaszolhat igennel.\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6883,100 +6957,100 @@
 "a következő kérdésre válaszolhat igennel.\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Mégis használjuk ezt a kulcsot? "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "FIGYELEM: Nem bízunk a kulcsban, amit használunk!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "FIGYELEM: a kulcsot visszavonhatták (visszavonó kulcs nincs jelen).\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "Felhasználóazonosító: \""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Ez jelentheti azt, hogy az aláírás hamis.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Megjegyzés: Ez a kulcs le lett tiltva.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Megjegyzés: Ez a kulcs lejárt!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hitelesítve megbízható aláírással!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hitelesítve megbízható aláírással!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "FIGYELEM: NEM bízunk ebben a kulcsban!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Az aláírás valószínűleg HAMIS.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6986,59 +7060,59 @@
 msgstr ""
 "FIGYELEM: Ez a kulcs nincs igazolva kellőképpen megbízható aláírással!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "FIGYELEM: Ez a kulcs nincs igazolva kellőképpen megbízható aláírással!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Nem biztos, hogy az aláírás a tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: Kihagyva: Nyilvános kulcs nincs engedélyezve.\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: kihagyva: nyilvános kulcs már szerepel\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nem adott meg felhasználói azonosítót! (Használhatja a \"-r\" opciót.)\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7046,41 +7120,41 @@
 "\n"
 "Adja meg a felhasználói azonosítót! Üres sorral fejezze be: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Nincs ilyen felhasználói azonosító.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "Kihagyva: Nyilvános kulcs már be lett állítva alapértelmezett címzettnek.\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Nyilvános kulcs nincs engedélyezve.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "Kihagyva: Nyilvános kulcs már be lett állítva.\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "Nincsenek érvényes címzettek!\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, 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:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@ -7120,7 +7194,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@ -7343,52 +7417,47 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "FIGYELEM: Aláíráskivonat-konfliktus az üzenetben.\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = további információkat kérek\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "FIGYELEM: %08lX aláíró alkulcson érvénytelen kereszthitelesítés van.\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
 msgstr1 "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
 msgstr0 "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
 msgstr1 "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7399,7 +7468,7 @@
 msgstr1 ""
 "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7409,53 +7478,53 @@
 msgstr1 ""
 "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "MEGJEGYZÉS: Aláíró kulcs (%08lX) lejárt: %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, 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"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "FIGYELEM: Nem tudom kifejteni a %% jeleket a jelölésben (túl hosszú).\n"
 "Kifejtés nélkül használom.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7464,7 +7533,7 @@
 "hosszú).\n"
 "Kifejtés nélkül használom.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7474,12 +7543,12 @@
 "hosszú).\n"
 "Kifejtés nélkül használom.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, 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:1153
+#: g10/sign.c:1161
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7487,12 +7556,12 @@
 "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
 "a címzett preferenciáival.\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "Aláírom:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7575,134 +7644,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, 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"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "Bizalmi adatbázis tranzakciója túl nagy.\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Könyvtár nem létezik!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, 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:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem sikerült verziórekordot létrehoznom: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: Érvénytelen bizalmi adatbázis jött létre.\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatbázis létrejött.\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: Érvénytelen bizalmi adatbázis.\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verziórekord frissítésekor: %s.\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verziórekord olvasásakor: %s.\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verziórekord írásakor: %s.\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatbázis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatbázis.\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verziórekord, rekordszám: %lu.\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: Érvénytelen állományverzió (%d).\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, 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:1872
+#: g10/tdbio.c:1842
 #, 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:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: Bizalmi adatbázis létrejött.\n"
@@ -8135,7 +8204,7 @@
 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:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatbázis következő ellenőrzése: %s.\n"
@@ -8165,14 +8234,14 @@
 msgid "checking the trustdb\n"
 msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "Eddig %lu kulcsot dolgoztam fel.\n"
 msgstr1 "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8180,23 +8249,23 @@
 msgstr0 "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
 msgstr1 "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem találtam alapvetően megbízható kulcsot.\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, 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"
@@ -8270,7 +8339,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8281,12 +8350,12 @@
 "Ne felejtse el, hogy az aláírást tartalmazó állományt (.sig vagy .asc)\n"
 "kell az első helyre írni a parancssorban!\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "A bemeneti sor (%u) túl hosszú, vagy hiányzik a soremelés.\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
@@ -8302,20 +8371,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Használat: gpg opciók fájlok (-h a súgóhoz)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8325,16 +8394,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8369,10 +8438,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8392,158 +8461,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "új kulcspár létrehozása"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "új kulcspár létrehozása"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "Kulcsgenerálás sikertelen: %s\n"
 msgstr1 "Kulcsgenerálás sikertelen: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "jelszóváltoztatás"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Megjegyzés: Ez a kulcs le lett tiltva.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "jelszóváltoztatás"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, 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:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, 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:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@ -8551,43 +8620,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8595,22 +8664,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, 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:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8618,81 +8687,81 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "nem támogatott URI"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, 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:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
@@ -8713,7 +8782,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8762,333 +8831,333 @@
 msgid "deny the use of admin card commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Használat: gpg opciók fájlok (-h a súgóhoz)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 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:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, 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:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " új aláírások: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "rossz igazolás"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, 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:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "aláírás ellenőrzése"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "rossz igazolás"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "nem feldolgozott"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "nem"
@@ -9111,7 +9180,7 @@
 msgid "Error - invalid DN"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9125,42 +9194,42 @@
 "\"%.*s\"\n"
 "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "rossz igazolás"
@@ -9386,17 +9455,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
@@ -9406,7 +9475,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
@@ -9431,134 +9500,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Nincs leírás.)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok listázása"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "ne használja a terminált egyáltalán"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii páncélozott kimenet létrehozása"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, 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:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "kulcskarika hozzáadása a kulcskarikalistához"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "kötegelt mód: soha nem kérdez"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "igen válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "nem válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9569,27 +9638,27 @@
 "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:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "Írok a \"%s\" állományba.\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, 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:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9609,7 +9678,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@ -9619,47 +9688,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9689,7 +9758,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9704,58 +9773,58 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "%d%s védő algoritmus nem támogatott.\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "Páncél: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Jó aláírás a következőtől: \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " azaz \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9782,588 +9851,583 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "rossz igazolás"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "visszavonási igazolás készítése"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "Hiba a záró sorban!\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "Hiba \"%s\" olvasásakor: %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, 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:1010
+#: dirmngr/crlcache.c:1017
 #, 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:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, 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:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "Írok a \"%s\" állományba.\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "visszavonási igazolás készítése"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, 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:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, 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:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "Írok a \"%s\" állományba.\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@ -10378,24 +10442,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
@@ -10551,140 +10615,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10697,115 +10761,115 @@
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Használat: gpg opciók fájlok (-h a súgóhoz)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "Használat: gpg opciók "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "A sor túl hosszú!\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nem feldolgozott"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10861,32 +10925,32 @@
 msgid "malloc failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" nem JPEG állomány.\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " h = kulcs kihagyása\n"
@@ -10978,164 +11042,164 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "visszavonási igazolás készítése"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "Nincs alapértelmezett titkoskulcs-karika: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "%s rejtjelezést használok.\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, 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:2984
+#: dirmngr/server.c:3135
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11146,135 +11210,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "kilépés|kilepes"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "A sor túl hosszú!\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@ -11340,12 +11404,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -11454,88 +11518,106 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, 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"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "lejárat megváltoztatása"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr ""
+#~ "Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
+
+#~ 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"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "Írok a \"%s\" állományba.\n"
 
@@ -12193,10 +12275,6 @@
 #~ msgstr "váltás a titkos és a nyilvános kulcs listázása között"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "rossz jelszó"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
 #~ "FIGYELEM: \"%s\" opciói csak a következő futáskor lesznek érvényesek!\n"
@@ -13154,9 +13232,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "aláírások törlése"
 
-#~ msgid "set preference list"
-#~ msgstr "preferencialista beállítása"
-
 #~ msgid "updated preferences"
 #~ msgstr "preferenciák frissítése"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/id.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/id.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/id.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/id.po Changed

@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -20,7 +20,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -31,52 +31,52 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "passphrase tidak valid"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -87,28 +87,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "passphrase terlalu panjang\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -118,273 +118,274 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "passphrase yang buruk"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Masukkan passphrase\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -392,7 +393,7 @@
 msgstr0 "Nama harus berukuran minimum 5 karakter\n"
 msgstr1 "Nama harus berukuran minimum 5 karakter\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -400,390 +401,396 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Tetap gunakan kunci ini? "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "tidak didukung"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|gunakan passphrase mode N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "gunakan gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Pemakaian: gpg pilihan file (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -793,19 +800,19 @@
 "Pilihan:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr "Pemakaian: gpg pilihan file (-h untuk bantuan)"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -813,8 +820,8 @@
 "@Perintah:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -824,86 +831,88 @@
 "Pilihan:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, fuzzy
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Pemakaian: gpg pilihan file (-h untuk bantuan)"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Batal"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -916,19 +925,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -941,7 +950,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -951,48 +960,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "ubah passphrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "aktifkan kunci"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1003,8 +1021,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1014,7 +1032,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
@@ -1024,7 +1042,7 @@
 msgid "secret key parts are not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1042,52 +1060,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@ -1108,28 +1126,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "y|ya"
 
@@ -1184,8 +1202,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -1200,74 +1218,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1351,7 +1369,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1435,44 +1453,44 @@
 msgid "Root certificate trustworthy"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kunci tersedia di:"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versi tidak dikenal"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Tidak tersedia bantuan untuk `%s'"
@@ -1482,12 +1500,12 @@
 msgid "ignoring garbage line"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "tidak dikenal"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
@@ -1522,136 +1540,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "kesalahan penciptaan : `%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1659,13 +1690,13 @@
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1674,27 +1705,27 @@
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1704,7 +1735,7 @@
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
@@ -1718,8 +1749,8 @@
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1730,13 +1761,13 @@
 msgid "error from TPM: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@ -1747,209 +1778,214 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1957,102 +1993,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (hanya menandai)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2060,197 +2096,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2312,9 +2353,9 @@
 msgid "subkey"
 msgstr "Pubkey: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
@@ -2339,101 +2380,91 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr ""
+"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr ""
-"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, 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:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2450,7 +2481,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2462,428 +2493,432 @@
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "buat sertifikat revokasi"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "kesalahan penciptaan : `%s': %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "User id tidak ditemukan"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|file|buat signature teks"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "ekspor kunci ke keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "impor kunci dari keyserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "cari kunci di keyserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo file|cetak digest pesan"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "impor kunci dari keyserver"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2891,7 +2926,7 @@
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2921,13 +2956,13 @@
 " --list-keys nama tampilkan kunci\n"
 " --fingerprint nama tampilkan fingerprint\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2942,7 +2977,7 @@
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2950,574 +2985,567 @@
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "pemakaian: gpg pilihan "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Tidak ada signature koresponden di ring rahasia\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "set daftar preferensi"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "algoritma digest yang dipilih tidak valid\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "preferensi cipher personal tidak valid\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, 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:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -3531,7 +3559,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -3562,339 +3590,344 @@
 msgid "No help available for '%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "perbarui database trust"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "perbarui database trust"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "tidak didukung"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "tampilkan fingerprint"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "tampilkan fingerprint"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "tampilkan fingerprint"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " lewati kunci baru: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " lewati kunci baru: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " tanpa ID user: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " diimpor: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " tidak berubah: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " ID user baru: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " subkey baru: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " signature baru: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " tidak diimpor: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " signature baru: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3903,201 +3936,201 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@ -4107,35 +4140,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Signature baik dari \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "User ID \"%s\" dibatalkan."
 msgstr1 "User ID \"%s\" dibatalkan."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4143,7 +4176,7 @@
 msgstr0 "1 signature tidak diperiksa karena tidak ada kunci\n"
 msgstr1 "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4151,61 +4184,61 @@
 msgstr0 "%d signature yang buruk\n"
 msgstr1 "%d signature yang buruk\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Signature baik dari \""
 msgstr1 "Signature baik dari \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "pembatalan"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "self-signature"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4218,68 +4251,68 @@
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4288,11 +4321,11 @@
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4301,13 +4334,13 @@
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4316,43 +4349,43 @@
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4362,32 +4395,32 @@
 "menandai benar benar milik\n"
 "orang tersebut? Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4396,275 +4429,284 @@
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4672,309 +4714,299 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Fitur: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revoked "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " berakhir: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " berakhir: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4982,19 +5014,19 @@
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "revoked "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5003,18 +5035,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5024,35 +5061,35 @@
 "dapat menyebabkan beberapa versi\n"
 " PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5060,38 +5097,38 @@
 msgstr0 "Menghapus %d signature.\n"
 msgstr1 "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "User ID \"%s\" dibatalkan."
 msgstr1 "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5101,46 +5138,61 @@
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5148,267 +5200,267 @@
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5422,180 +5474,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) ElGamal (sign and encrypt)\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (default)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notasi signature: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "tiadakan kunci"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5611,7 +5663,7 @@
 " <n>m = kunci berakhir dalam n bulan\n"
 " <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5627,40 +5679,40 @@
 " <n>m = signature berakhir dalam n bulan\n"
 " <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5668,12 +5720,12 @@
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5684,7 +5736,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5700,42 +5752,42 @@
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 " \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5745,11 +5797,11 @@
 "Anda memilih USER-ID ini:\n"
 " \"%s\"\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5764,35 +5816,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5804,18 +5856,18 @@
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5823,69 +5875,69 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5895,37 +5947,37 @@
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, 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:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, 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:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
@@ -5934,27 +5986,43 @@
 msgid "never "
 msgstr "tidak pernah..."
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Fitur: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kebijakan signature kritis: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5962,7 +6030,7 @@
 msgstr0 "%d signature yang buruk\n"
 msgstr1 "%d signature yang buruk\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5970,41 +6038,41 @@
 msgstr0 "1 signature tidak diperiksa karena kesalahan\n"
 msgstr1 "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Fingerprint kunci primer ="
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Fingerprint subkunci ="
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Fingerprint kunci ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6084,335 +6152,341 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "meminta kunci %08lX dari %s\n"
 msgstr1 "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid " \"%s\"\n"
 msgstr " alias \""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " alias \""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " alias \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "uncertain"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " alias \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritma pubkey tidak dikenal"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
@@ -6515,27 +6589,27 @@
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "kelas signature tidak dikenal"
@@ -6592,7 +6666,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "ubah passphrase"
@@ -6656,7 +6730,7 @@
 "%s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6672,73 +6746,73 @@
 "gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
 "Jagalah agar gambar mendekati ukuran 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Masukkan nama file JPEG sebagai ID foto: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\" bukan sebuah file JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Apakah foto ini benar (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platform ini membutuhkan file temp ketika memanggil program eksternal\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "program eksternal berhenti secara tidak natual\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "kesalahan sistem ketika memanggil program eksternal: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6746,7 +6820,7 @@
 "pemanggilan program eksternal ditiadakan karena permisi opsi file tidak "
 "aman\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
@@ -6833,34 +6907,34 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Kunci ini milik kita\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6872,7 +6946,7 @@
 "pertanyaan berikut dengan ya\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6884,102 +6958,102 @@
 "pertanyaan berikut dengan ya\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Tetap gunakan kunci ini? "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Hal ini dapat berarti bahwa signature adalah palsu.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6989,58 +7063,58 @@
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7048,40 +7122,40 @@
 "\n"
 "Masukkan user ID. Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -7120,7 +7194,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -7345,54 +7419,49 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Peringatan: konflik digest signature dalam pesan\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
 "tidak valid\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 msgstr1 "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
 msgstr0 "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 msgstr1 "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7403,7 +7472,7 @@
 msgstr1 ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7413,53 +7482,53 @@
 msgstr1 ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar). "
 "Menggunakan yang tidak di-expand.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7467,7 +7536,7 @@
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar). "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7476,23 +7545,23 @@
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar). "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7575,134 +7644,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: tercipta trustdb\n"
@@ -8134,7 +8203,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@ -8164,14 +8233,14 @@
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%lu kunci telah diproses\n"
 msgstr1 "%lu kunci telah diproses\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8179,23 +8248,23 @@
 msgstr0 "%d kunci diproses (%d hitungan validitas dihapus)\n"
 msgstr1 "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -8269,7 +8338,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8280,12 +8349,12 @@
 "Tolong ingat bahwa file signature (.sig atau .asc)\n"
 "haruslah file pertama yang diberikan pada perintah baris.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -8301,20 +8370,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Pemakaian: gpg pilihan file (-h untuk bantuan)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8324,16 +8393,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8368,10 +8437,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8391,158 +8460,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "Pembuatan kunci gagal: %s\n"
 msgstr1 "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, 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:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -8550,43 +8619,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8594,22 +8663,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8617,81 +8686,81 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI tidak didukung"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -8712,7 +8781,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8761,333 +8830,333 @@
 msgid "deny the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Pemakaian: gpg pilihan file (-h untuk bantuan)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "bantuan"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " signature baru: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "tampilkan fingerprint"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "buat sertifikat revokasi"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "tidak diproses"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "n|t|tidak"
@@ -9110,7 +9179,7 @@
 msgid "Error - invalid DN"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9123,42 +9192,42 @@
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "sertifikat yang buruk"
@@ -9385,17 +9454,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
@@ -9405,7 +9474,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
@@ -9430,134 +9499,134 @@
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9568,27 +9637,27 @@
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9608,7 +9677,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -9618,47 +9687,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9688,7 +9757,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9703,58 +9772,58 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Signature kadaluwarsa %s\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "armor: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Signature baik dari \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " alias \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9781,588 +9850,583 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "tampilkan fingerprint"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "sertifikat yang buruk"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, fuzzy, c-format
 #| msgid "enarmoring failed: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, fuzzy, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, fuzzy, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, 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:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -10377,24 +10441,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
@@ -10550,140 +10614,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10696,115 +10760,115 @@
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Pemakaian: gpg pilihan file (-h untuk bantuan)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "pemakaian: gpg pilihan "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "tidak diproses"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10860,32 +10924,32 @@
 msgid "malloc failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" bukan sebuah file JPEG\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = lewati kunci ini\n"
@@ -10977,164 +11041,164 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "menggunakan cipher %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11145,135 +11209,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "memeriksa trustdb\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Pemakaian: gpg pilihan file (-h untuk bantuan)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -11339,12 +11403,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -11453,88 +11517,106 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "ubah tanggal kadaluarsa"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "algoritma digest yang dipilih tidak valid\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "preferensi cipher personal tidak valid\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr ""
+#~ "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "menulis ke `%s'\n"
 
@@ -12190,10 +12272,6 @@
 #~ msgstr "ubah tampilan kunci rahasia dan publik"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "passphrase yang buruk"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
@@ -13157,9 +13235,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "hapus signature"
 
-#~ msgid "set preference list"
-#~ msgstr "set daftar preferensi"
-
 #~ msgid "updated preferences"
 #~ msgstr "perbarui preferensi"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/it.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/it.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/it.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/it.po Changed

@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.3.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
 "PO-Revision-Date: 2021-04-15 10:09+0900\n"
 "Last-Translator: Denis <student@alice.it>\n"
 "Language-Team: \n"
@@ -16,7 +16,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossibile acquisire il blocco pinentry: %s\n"
@@ -27,49 +27,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in gestione password"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Vuoi davvero rendere la tua passphrase visibile sullo schermo?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Rendere visibile la passphrase"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Nascondi passphrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "Suggerisci"
 
@@ -80,21 +80,21 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -102,7 +102,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Qualità:"
 
@@ -112,11 +112,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -124,7 +124,7 @@
 "Inserisci il tuo PIN, in modo che la chiave segreta possa essere sbloccata "
 "per questa sessione"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -132,76 +132,82 @@
 "Inserisci la tua passphrase, in modo che la chiave segreta possa essere "
 "sbloccata per questa sessione"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "non corrisponde - riprova"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase Entry"
+msgid "Passphrases match."
+msgstr "Voce passphrase"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (provare %d di %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Ripeti:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN troppo lungo"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Passphrase troppo lunga"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Caratteri non validi nel PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN troppo corto"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "PIN non valido"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Passphrase non valido"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "Nota: richiesta dal browser Web."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "Nota: richiesta da un sito remoto."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "errore durante il recupero del numero di serie della scheda: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Inserisci di nuovo questa passphrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -210,7 +216,7 @@
 "Immettere la passphrase per proteggere l'oggetto importato all'interno %s "
 "sistema."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
@@ -218,45 +224,45 @@
 "Questa chiave (o sottochiave) non è protetta con una passphrase. Immettere "
 "una nuova passphrase per esportarla."
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le chiavi ssh maggiori di %d bit non sono supportate\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "impossibile creare '%s': %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossibile aprire '%s': %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nessuna chiave della scheda adatta trovata: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "errore durante il recupero dell'elenco delle schede: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -265,20 +271,20 @@
 "Un processo ssh ha richiesto l'utilizzo della chiave%%0A %s%%0A (%s)%%0ASi "
 "desidera consentire questa operazione?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Permettere"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Rifiutare"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Immettere la passphrase per la chiave ssh%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -287,84 +293,80 @@
 "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:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "impossibile creare il flusso dal socket: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Inserire la scheda con il numero di serie"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "PIN amministratore"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Resetta codice"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Premere il pulsante ACK sulla scheda/token."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Utilizzare il pinpad del lettore per l'input."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Ripeti questo codice di reimpostazione"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Ripeti questo PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Ripeti questo PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reimpostare il codice non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Immettere il PIN%s%s%s per sbloccare la scheda"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "errore durante la scrittura in %s: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, 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:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -374,18 +376,18 @@
 "prega di confermare che non si desidera disporre di alcuna protezione sulla "
 "chiave."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Sì, la protezione non è necessaria"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "Una passphrase deve avere almeno lunga %u carattere."
 msgstr1 "Una passphrase deve avere almeno lunga %u caratteri."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -395,230 +397,236 @@
 msgstr1 ""
 "Una passphrase deve contenere almeno %u cifre o%%0Acaratteri speciali."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, 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:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Avviso: è stata immessa una passphrase non sicura."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Prendi questo comunque"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Immettere la passphrase a%0Aproteggere la nuova chiave"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr "Opzioni utilizzate per l'avvio"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "eseguire in modalità daemon (sfondo)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "eseguire in modalità server (in primo piano)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "non scollegarsi dalla console"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "uscita del comando sh-stile"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "uscita del comando in csh-stile"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|opzioni di lettura da FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Opzioni che controllano l'output diagnostico"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|scrittura dei registri in modalità server in FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Opzioni che controllano la configurazione"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "non utilizzare il SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "| PGM| utilizzare PGM come programma SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|utilizzare PGM come programma tpm2daemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accettare alcuni comandi tramite NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorare le richieste di modifica del TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorare le richieste di modifica della visualizzazione X"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "abilitare il supporto ssh"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usa ALGO per mostrare le impronte digitali ssh"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "abilitare il supporto putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "abilitare il supporto putty"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Opzioni che controllano la sicurezza"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|scadenza PIN memorizzati nella cache dopo N secondi"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|Chiavi SSH di N-scadenza dopo N secondi"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|imposta la durata massima della cache del PIN su N secondi"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set durata massima del tasto SSH su N secondi"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "non utilizzare la cache PIN durante la firma"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "non consentire l'uso di una cache di password esterna"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 "non consentire ai client di contrassegnare le chiavi come \"attendibili\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "consentire la preimpostazione della passphrase"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Opzioni che applicano un criterio di passphrase"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "non consentire l'esclusione dei criteri di passphrase"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|Lunghezza minima richiesta per le nuove passphrase su N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|Per una nuova passphrase è necessario almeno N caratteri non alfa"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE||controlla le nuove passphrase rispetto al modello in FILE"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "| La passphrase dopo N giorni"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "non consentono il riutilizzo di vecchie passphrase"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr "Opzioni che controllano la voce PIN"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr "non utilizzare mai la voce PIN-Entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "non consentire al chiamante di eseguire l'override del pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "lasciare che PIN-Entry prenda la tastiera e mouse"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "| PGM|utilizzare PGM come programma PIN-Entry"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Il timeout di Pinentry è impostato su N secondi"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "consentire la passphrase tramite Emacs"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Segnalare i bug a <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Utilizzo: @GPG_AGENT@ opzioni (-h per assistenza)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -626,141 +634,141 @@
 "Sintassi: @GPG_AGENT@ opzioni comando args\n"
 "Gestione delle chiavi segrete per @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "'%s' a livello di debug non valido specificato\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "opzioni di lettura da '%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Nota: '%s' non è considerato un'opzione\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare il socket: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "il nome socket '%s' è troppo lungo\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "un gpg-agent è già in esecuzione - non iniziare uno nuovo\n"
 
-#: agent/gpg-agent.c:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "errore durante il recupero di un errore per il socket\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "errore durante l'associazione del socket a '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "impossibile impostare le autorizzazioni di '%s': %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ascolto sul socket '%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "impossibile creare la directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory '%s' creata\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() non riuscito per '%s': %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "impossibile utilizzare '%s' come home directory\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "errore durante la lettura del nonce su fd %d: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "gestore 0x%lx per fd %d avviato\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "gestore 0x%lx per fd %d terminato\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "gestore ssh 0x%lx per fd %d avviato\n"
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "gestore ssh 0x%lx per fd %d terminato\n"
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect non riuscito: %s - 1s in attesa\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrestato\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "nessun gpg-agent in esecuzione in questa sessione\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -768,11 +776,11 @@
 "@Optioni:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg opzioni files (-h per l'aiuto)\n"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -780,8 +788,8 @@
 "Sintassi: gpg-preset-passphrase opzioni KEYGRIP\n"
 "Manutenzione della cache delle password\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -789,8 +797,8 @@
 "@Comandi:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -800,11 +808,11 @@
 "Opzioni:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Utilizzo: gpg-protect-tool opzioni (-h per assistenza)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -812,16 +820,16 @@
 "Sintassi: gpg-protect-tool opzioni args\n"
 "Strumento di manutenzione della chiave segreta\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "Immettere la passphrase per rimuovere la protezione dell'oggetto PKCS.12."
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Immettere la passphrase per proteggere il nuovo oggetto PKCS.12."
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -829,7 +837,7 @@
 "Immettere la passphrase per proteggere l'oggetto importato all'interno del "
 "sistema GnuPG."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -837,52 +845,54 @@
 "Inserisci la passphrase o il PIN\n"
 "necessario per completare questa operazione."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "annullato\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore durante la richiesta della passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "errore durante l'apertura di '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', riga %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "istruzione \"%s\" ignorata in '%s', riga %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "elenco di attendibilità del sistema '%s' non disponibile\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "impronta digitale non valido in '%s', riga %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "keyflag non valido in '%s', riga %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "errore durante la lettura di '%s', riga %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -896,7 +906,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -905,11 +915,11 @@
 "Alla fine ti fidi di %% 0A \"% s\" %%0Aper certificare correttamente i "
 "certificati utente?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Sì"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -922,7 +932,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -934,22 +944,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Corretto"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Sbagliato"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -958,15 +968,29 @@
 "Questa passphrase non è stata modificata%%0Ada %.4s-%.2s-%.2s. Si prega di "
 "cambiarlo ora."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Modifica passphrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Lo cambierò più tardi"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Inserire la scheda con il numero di serie"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "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/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -974,11 +998,11 @@
 msgstr ""
 "Si desidera eliminare la chiave identificata da keygrip%%0A %s%%0A %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Elimina chiave"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -992,8 +1016,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA richiede che la lunghezza dell'hash sia un multiplo di 8 bit\n"
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "La chiave %s utilizza un hash unsafe (%u bit)\n"
@@ -1003,7 +1027,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash di bit %zu non è valido per una chiave %u bit %s\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
@@ -1013,7 +1037,7 @@
 msgid "secret key parts are not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "l'algoritmo a chiave pubblica %d (%s) non è supportato\n"
@@ -1028,52 +1052,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algoritmo hash di protezione %d (%s) non supportato\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore durante la creazione di una pipe: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "errore durante la creazione di un flusso per una pipe: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "errore durante il processo di forking: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "in attesa della terminazione del processo %d non riuscita: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "errore durante l'esecuzione di '%s': probabilmente non installato\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "errore durante l'esecuzione di '%s': stato di uscita %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "errore durante l'esecuzione di '%s': terminato\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "attesa della terminazione dei processi non riuscita: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore durante l'osando di fine del processo %d: %s\n"
@@ -1093,28 +1117,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Avviso: proprietà non sicura su %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Avviso: autorizzazioni non sicure su %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "in attesa che il file '%s' diventi accessibile …\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %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 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "sì"
 
@@ -1169,8 +1193,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "fuori dal core durante l'allocazione di %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "errore durante l'allocazione di memoria sufficiente: %s\n"
@@ -1185,74 +1209,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVVISO: \"%s%s\" è un'opzione obsoleta - non ha alcun effetto\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "flag di debug sconosciuto '%s' ignorato\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "in attesa che il dirmngr venga fuori ... (%ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "in attesa che il keyboxd venga fuori ... (%ds)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "in attesa che l'agente venga su ... (%ds)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "connessione al dirmngr stabilito\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "connessione alla cassetta delle chiavi stabilita\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr "collegamento con l'agente stabilito\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "nessuna corsa %s - a partire da '%s'\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "la connessione all'agente è in modalità con restrizioni\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "errore durante il recupero della versione da '%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "il server '%s' è precedente a noi (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "AVVISO: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, 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"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Nota: utilizzare il comando \"%s\" per riavviarli.\n"
@@ -1325,7 +1349,7 @@
 msgstr "algoritmo: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmo non supportato: %s"
@@ -1400,39 +1424,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Certificato radice attendibile"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "nessun CRL trovato per il certificato"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "il CRL disponibile è troppo vecchio"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "Controllo CRL/OCSP dei certificati"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Certificati inclusi"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Nessuna voce del log di controllo."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Operazione sconosciuta"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agente utilizzabile"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr utilizzabile"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Nessuna Guida disponibile per '%s'."
@@ -1441,11 +1465,11 @@
 msgid "ignoring garbage line"
 msgstr "ignorando la linea spazzatura"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "nessuno"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "carattere radix64 non valido %02x ignorato\n"
@@ -1482,136 +1506,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open non riuscito: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversione da '%s' a '%s' non riuscita: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "impossibile creare il file temporaneo '%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "errore durante la scrittura in '%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "rimozione del file di blocco non più utilizzato (creato da %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "in attesa di blocco (in attesa di %d%s) %s...\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "blocco '%s' non effettuato: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "attesa del blocco %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s è troppo vecchio (è necessario %s, con %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "errore durante la creazione di '%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "errore durante la chiusura di '%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "intestazione armatura sconosciuta: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "armatura inaspettata: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "carattere radix64 non valido %02x ignorato\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "malformato CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Errore CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematuro (nel rimorchio)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea più lunga di %d caratteri\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1619,12 +1655,12 @@
 "carattere quoted printable nell'armatura - probabilmente è stato usato\n"
 "un MTA buggato\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " non leggibile (%zu byte: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1633,33 +1669,33 @@
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "il nome di una notazione non deve contenere più di un carattere '@'\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, 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"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
 "un nome di notazione deve contenere solo caratteri o spazi stampabili\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
@@ -1673,8 +1709,8 @@
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s non è conforme alla modalità %s\n"
@@ -1684,13 +1720,13 @@
 msgid "error from TPM: %s\n"
 msgstr "errore da TPM: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con l'agente: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "nessun dirmngr in esecuzione in questa sessione\n"
@@ -1702,198 +1738,203 @@
 "l'opzione keyserver \"honor-keyserver-url\" non può essere utilizzata in "
 "modalità Tor\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKD utilizza un risultato memorizzato nella cache"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "Tor non è in esecuzione"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Tor non è configurato correttamente"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNS non è configurato correttamente"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "reindirizzamento HTTP inaccettabile dal server"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "il reindirizzamento HTTP dal server è stato pulito"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "server utilizza un certificato non valido"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "Nota: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Scheda OpenPGP non disponibile: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Scheda OpenPGP n. %s rilevata\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "impossibile eseguire questa operazione in modalità batch\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Questo comando è disponibile solo per le schede della versione 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reimposta codice non più disponibile o meno\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "non impostato"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Sig."
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Sig.ra."
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "non forzato"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "costretto"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Errore: al momento è consentito solo ASCII semplice.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Errore: il carattere \"<\" non può essere utilizzato.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Errore: gli spazi doppi non sono consentiti.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Cognome del titolare della carta: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Nome del titolare della carta: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Errore: nome combinato troppo lungo (limite è di %d caratteri).\n"
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL per recuperare la chiave pubblica: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "errore durante la lettura di '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "errore durante la scrittura di '%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Dati di accesso (nome account): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Dati DO privati: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Preferenze lingua: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Errore: lunghezza della stringa di preferenza non valida.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Errore: caratteri non validi nella stringa di preferenza.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutazione (M - Mr., F - Ms., o spazio): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "|FPR|Risposta OCSP firmata da FPR\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Impronta digitale CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Errore: impronta digitale formattata non valida.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operazione chiave non possibile: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "non una scheda OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "errore durante il recupero delle informazioni sulla chiave corrente: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Sostituire la chiave esistente? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1906,104 +1947,104 @@
 " Controllare la documentazione della scheda per vedere quale\n"
 " sono supportati i tipi e le dimensioni chiave.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Che chiave vuoi? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes deve essere compreso nell'intervallo %u-%u\n"
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Modifica dell'attributo chiave della scheda per: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Chiave di firma\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Chiave di crittografia\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Chiave di autenticazione\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr ""
 "errore durante la modifica dell'attributo chiave per la chiave %d: %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "errore durante il recupero delle informazioni sulla scheda: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Questo comando non è supportato da questa scheda\n"
 
-#: g10/card-util.c:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Eseguire il backup off-card della chiave di crittografia? (Y/n) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Nota: le chiavi sono già memorizzate sulla scheda!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Sostituire le chiavi esistenti? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2014,177 +2055,182 @@
 " PIN : '%s' PIN di amministrazione = '%s'\n"
 "È necessario modificarli utilizzando il comando --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "Selezionare il tipo di chiave da generare:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Chiave di firma\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Chiave di crittografia\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Chiave di autenticazione\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Si prega di selezionare dove memorizzare la chiave:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD non riuscito: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Nota: Questo comando distrugge tutti i tasti memorizzati sulla scheda!\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Continuare? (Y/n) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Fare davvero un reset di fabbrica? (immettere \"sì\") "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "errore per l'installazione KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "errore per l'installazione UIF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "mostra comandi di amministrazione"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "elencare tutti i dati disponibili"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "cambiare il nome del titolare della carta"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "modificare l'URL per recuperare la chiave"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "recuperare la chiave specificata nell'URL della scheda"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "modificare il nome di accesso"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "modificare le preferenze della lingua"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "cambiare il saluto del titolare della carta"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "modificare un'impronta digitale CA"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "attivare/disattivare il flag PIN di forza della firma"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "genera nuove chiavi"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "per modificare o sbloccare il PIN"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "verificare il PIN ed elencare tutti i dati"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "sbloccare il PIN utilizzando un codice di ripristino"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "distruggere tutte le chiavi e i dati"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "installazione KDF per l'autenticazione PIN (on/single/off)"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "modificare l'attributo chiave"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "modificare il contrassegno interazione utente"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Comando solo amministratore\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "I comandi di amministrazione sono consentiti\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "I comandi di amministrazione non sono consentiti\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Comando non valido (prova \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "impossibile aprire '%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave \"%s\" non trovata: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2247,9 +2293,9 @@
 msgid "subkey"
 msgstr "sottochiave"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
@@ -2274,81 +2320,76 @@
 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:332 g10/sign.c:1622
-#, c-format
-msgid "error creating passphrase: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
-
-#: g10/encrypt.c:339
+#: g10/encrypt.c:109
 #, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"impossibile usare un pacchetto ESK simmetrico a causa della modalità S2K\n"
-
-#: g10/encrypt.c:370
-#, c-format
-msgid "using cipher %s.%s\n"
-msgstr "utilizzando il cifrario %s.%s\n"
-
-#: g10/encrypt.c:382 g10/encrypt.c:874
-#, c-format
-msgid "'%s' already compressed\n"
-msgstr "'%s' già compresso\n"
-
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
-#, c-format
-msgid "WARNING: '%s' is an empty file\n"
-msgstr "AVVISO: '%s' è un file vuoto\n"
+"AVVISO: l'imposizione della crittografia simmetrica %s (%d) viola le "
+"preferenze del destinatario\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
+#: g10/encrypt.c:136 g10/encrypt.c:683
 #, c-format
 msgid "cipher algorithm '%s' may not be used for encryption\n"
 msgstr ""
 "l'algoritmo di cifratura '%s' non può essere utilizzato per la crittografia\n"
 
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(utilizzare l'opzione \"%s\" per ignorare)\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
 #, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:181 sm/encrypt.c:771
 #, 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"
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "AVVISO: la chiave %s non è adatta per la crittografia in modalità %s\n"
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
-msgid "reading from '%s'\n"
-msgstr "lettura da '%s'\n"
+msgid "error creating passphrase: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr ""
-"AVVISO: l'imposizione della crittografia simmetrica %s (%d) viola le "
-"preferenze del destinatario\n"
+"impossibile usare un pacchetto ESK simmetrico a causa della modalità S2K\n"
 
-#: g10/encrypt.c:832 sm/encrypt.c:767
+#: g10/encrypt.c:514
 #, c-format
-msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "AVVISO: la chiave %s non è adatta per la crittografia in modalità %s\n"
+msgid "using cipher %s.%s\n"
+msgstr "utilizzando il cifrario %s.%s\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
+msgid "'%s' already compressed\n"
+msgstr "'%s' già compresso\n"
+
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "AVVISO: '%s' è un file vuoto\n"
+
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
+#, 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:867
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "lettura da '%s'\n"
 
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2357,19 +2398,12 @@
 "AVVISO: l'algoritmo di compressione %s (%d) viola le preferenze dei "
 "destinatari\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s è crittografato per: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "l'opzione '%s' non può essere utilizzata in modalità %s\n"
@@ -2385,7 +2419,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2398,389 +2432,395 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "esportare firme contrassegnate come solo locali"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "esportare gli ID utente degli attributi (in genere gli ID foto)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "esportare le chiavi di revoca contrassegnate come \"sensibili\""
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "rimuovere parti inutilizzabili dalla chiave durante l'esportazione"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "rimuovere il più possibile dalla chiave durante l'esportazione"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "genera un certificato di revoca"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "utilizzare il formato di backup della chiave GnuPG"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "esportazione di chiavi segrete non consentita\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - saltato"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "scrittura in '%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chiave %s: materiale della chiave su scheda - ignorato\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "esportazione di chiavi segrete non consentita\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %s: chiave di stile PGP 2.x - ignorata\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non è stato esportato nulla\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "errore durante la creazione di '%s': %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "ID utente non trovato"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "recuperato automaticamente '%s' tramite %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "errore durante il recupero di '%s' tramite %s: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Nessuna impronta digitale"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, 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:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta \"%s\" non trovata: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(controllare l'argomento dell'opzione '%s')\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Avviso: impossibile utilizzare '%s' come chiave predefinita: %s\n"
 
-#: g10/getkey.c:2098
+#: g10/getkey.c:2107
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "utilizzo di \"%s\" come chiave segreta predefinita per la firma\n"
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "tutti i valori passati a '%s' ignorati\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave non valida %s resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3830
+#: g10/getkey.c:3868
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "utilizzando la sottochiave %s anziché la chiave primaria %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valori validi per l'opzione '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "fare una firma"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "creare una firma di testo non crittografato"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "elencare e controllare le firme delle chiavi"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "generare rapidamente una nuova coppia di chiavi"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "aggiungere rapidamente un nuovo id utente"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "revocare rapidamente un id utente"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "impostare rapidamente una nuova data di scadenza"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "generazione completa della coppia di chiavi in primo piano"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "firmare rapidamente un tasto"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "firmare rapidamente una chiave localmente"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
 msgstr "revocare rapidamente una firma chiave"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "esporta le chiavi a un keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importa le chiavi da un keyserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "cerca delle chiavi su un keyserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un keyserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "stampare lo stato della scheda"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "modificare i dati su una scheda"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "modificare il PIN di una carta"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "stampare digest dei messaggi"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "eseguire in modalità server"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALORE|impostare il criterio TOFU per una chiave"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "Anche nome-crittografare all'ID utente NOME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|configurare gli alias di posta elettronica"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "utilizzare un comportamento OpenPGP rigoroso"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr "Opzioni che controllano l'input"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr "Opzioni che controllano l'output"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|scrittura dell'output in FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Impostare il livello di compressione su N (0 disabilita)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr "Opzioni che controllano l'importazione e l'esportazione delle chiavi"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 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"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "importare la chiave mancante da una firma"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "includere la chiave pubblica nelle firme"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "disabilitare tutti gli accessi al dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr "Opzioni di controllo delle inserzioni chiave"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
 msgstr "Opzioni per specificare le chiavi"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt per USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|utilizzare USER-ID per firmare o decrittografare"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr "Opzioni per l'uso automatico"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr "Altre Opzioni"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2788,7 +2828,7 @@
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2808,11 +2848,11 @@
 " --list-keys nomi mostra le chiavi\n"
 " --fingerprint nomi mostra le impronte digitali\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Utilizzo: @GPG@ opzioni file (-h per assistenza)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2822,7 +2862,7 @@
 "Firmare, controllare, crittografare o decrittografare\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2830,73 +2870,73 @@
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "utilizzo: %s opzioni %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nessun segno = trovato nella definizione di gruppo '%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVVISO: proprietà non sicura nel file di configurazione '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVVISO: proprietà non sicura nell'estensione '%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVVISO: autorizzazioni non sicure per il file di configurazione '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVVISO: autorizzazioni non sicure per l'estensione '%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2904,21 +2944,21 @@
 "AVVISO: proprietà della directory di inclusione non sicura nel file di "
 "configurazione '%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "AVVISO: proprietà della directory di inclusione non sicura nell'estensione "
 "'%s'\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "AVVISO: autorizzazioni della directory di inclusione non sicure nella "
 "directory homedir '%s'\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2926,480 +2966,477 @@
 "AVVISO: autorizzazioni della directory di inclusione non sicure nella "
 "directory homedir '%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "AVVISO: autorizzazioni della directory di inclusione non sicure per "
 "l'estensione '%s'\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "elemento di configurazione sconosciuto '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "visualizzare gli ID foto durante le elenchi dei tasti"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr ""
 "mostra le informazioni sull'utilizzo delle chiavi durante le inserzioni "
 "chiave"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "mostra URL dei criteri durante gli elenchi delle firme"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "mostra tutte le notazioni durante gli elenchi delle firme"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "mostra notazioni standard IETF durante gli elenchi delle firme"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante gli elenchi delle firme"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostra gli URL preferiti del keyserver durante gli elenchi delle firme"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "mostra validità ID utente durante le inserzioni chiave"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostra ID utente revocati e scaduti negli elenchi di chiavi"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostra sottochiavi revocate e scadute negli elenchi di chiavi"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "mostra date di scadenza durante le inserzioni delle firme"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "mostrare il nome del keyring negli elenchi delle chiavi"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "mostra date di scadenza durante le inserzioni delle firme"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "elenca le preferenze (per esperti)"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "criterio TOFU sconosciuto '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(utilizzare \"help\" per elencare le scelte)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non è permesso in modalità %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Nota: %s non è per uso normale!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' non è una scadenza di firma valida\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" non è un indirizzo di posta elettronica corretto\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modalità pinentry non valida '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origine richiesta non valida '%s'\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' non è un set di caratteri valido\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile analizzare l'URL del server dei chiavi\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opzione di filtro non valida: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "visualizzare gli ID foto durante la verifica della firma"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "mostra URL dei criteri durante la verifica della firma"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "mostra tutte le notazioni durante la verifica della firma"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "mostra notazioni standard IETF durante la verifica della firma"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante la verifica della firma"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostra gli URL preferiti del keyserver durante la verifica della firma"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "mostra validità DELL'ID utente durante la verifica della firma"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostra ID utente revocati e scaduti nella verifica della firma"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "mostra solo l'ID utente primario nella verifica della firma"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: elenco di individuazione automatica della chiave non valido\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "elenco di individuazione automatica delle chiavi non valido\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argomento non valido per l'opzione \"%.50s\"\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVVISO: in esecuzione con l'ora di sistema falso: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "non verrà eseguito con memoria non protetta a causa di %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/gpg.c:3949
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "l'algoritmo AEAD selezionato non è valido\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritmo di compressione selezionato non valido\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere compreso tra 1 e 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Nota: la modalità S2K semplice (0) è fortemente sconsigliata\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:4012
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "preferenze AEAD personali non valide\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "dimensione del blocco non valida - utilizzando %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:4134
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "L'algoritmo AEAD '%s' non può essere utilizzato %s modalità\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "l'algoritmo di compressione '%s' non può essere utilizzato in modalità %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "crittografia simmetrica di '%s' non riuscita: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "non è possibile utilizzare --symmetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "non è possibile utilizzare --symmetric --encrypt in modalità %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "non è possibile utilizzare --symmetric --sign --encrypt in modalità %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "esportazione come chiave ssh non riuscita: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo hash non valido '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "errore durante l'analisi della specifica della chiave '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, 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:5342
+#: g10/gpg.c:5394
 #, 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:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, 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:5702
+#: g10/gpg.c:5762
 #, 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:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL del keyserver preferito specificato non è valido\n"
@@ -3412,7 +3449,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -3441,154 +3478,154 @@
 msgid "No help available for '%s'"
 msgstr "Nessuna Guida disponibile per '%s'."
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "importare firme contrassegnate come solo locali"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "riparare i danni dal keyserver pks durante l'importazione"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "non cancellare i valori ownertrust durante l'importazione"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "non aggiornare il trustdb dopo l'importazione"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr "abilitare la modalità di importazione in blocco"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "mostra chiave durante l'importazione"
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "show key but do not actually import"
 msgstr "mostrare la chiave, ma in realtà non importare"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "accettare solo gli aggiornamenti alle chiavi esistenti"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "rimuovere le parti inutilizzabili dalla chiave dopo l'importazione"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "rimuovere il più possibile dalla chiave dopo l'importazione"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "ignorare le firme chiave che non sono auto-firme"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 "eseguire immediatamente i filtri di importazione e la chiave di esportazione"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "assumere il formato di backup della chiave GnuPG"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "ripristinare le chiavi all'importazione"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chiavi elaborate finora\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " Chiavi PGP-2 ignorate: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " senza user ID: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importate: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " non modificate: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nuovi user ID: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nuove subchiavi: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nuove firme: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " chiavi segrete lette: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " chiavi segrete importate: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " importate: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " firme pulite: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " ID utente puliti: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3597,178 +3634,183 @@
 "AVVISO: la chiave %s contiene le preferenze per\n"
 "algoritmi su questi ID utente:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": preferenza per l'algoritmo di crittografia %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\": preferenza per l'algoritmo AEAD %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " \"%s\": preferenza per l'algoritmo digest %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": preferenza per l'algoritmo di compressione %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "si consiglia vivamente di aggiornare le preferenze e\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, 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:1426
+#: g10/import.c:1427
 #, 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %s: nessun ID utente\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "chiave %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "rifiutato dallo screener di importazione"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %s: danneggiamento della sottochiave PKS riparato\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %s: accettato ID utente non autofirmato \"%s\"\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %s: nessun ID utente valido\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %s: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %s: nuova chiave - ignorata\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "errore durante la scrittura della chiave '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %s: chiave pubblica \"%s\" importata\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %s: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %s: \"%s\" 1 nuovo ID utente\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %s: \"%s\" %d nuovi ID utente\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %s: \"%s\" 1 nuova firma\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %s: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %s: \"%s\" 1 nuova sottochiave\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %s: \"%s\" %d nuove sottochiavi\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %s: \"%s\" %d firma pulita\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %s: \"%s\" %d firme pulite\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %s: \"%s\" %d ID utente pulito\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %s: \"%s\" %d ID utente puliti\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %s: \"%s\" non modificata\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %s: chiave segreta importata\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "chiave %s: chiave segreta già esistente\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "chiave %s: errore durante l'invio all'agente: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3777,203 +3819,203 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Per eseguire la migrazione di '%s', con ogni smart card: %s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "chiave segreta %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importazione di chiavi segrete non consentita\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %s: chiave segreta con crittografia non valida %d - ignorata\n"
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Questa chiave è stata sostituita"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Questa chiave è stata compromessa"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "La chiave non è più usata"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "L'user ID non è più valido"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "ragione della revoca: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "commento alla revoca: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %s: nessuna chiave pubblica - impossibile applicare il certificato di "
 "revoca\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %s: impossibile individuare il blocco di chiave originale: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %s: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %s: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %s: certificato di revoca \"%s\" importato\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %s: nessun ID utente per la firma\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %s: algoritmo a chiave pubblica non supportato sull'ID utente \"%s\"\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %s: autode firma non valida sull'ID utente \"%s\"\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %s: algoritmo a chiave pubblica non supportato\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "chiave %s: firma diretta della chiave non valida\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %s: nessuna sottochiave per l'associazione della chiave\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %s: associazione di sottochiavi non valida\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %s: rimossa l'associazione di più sottochiavi\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %s: nessuna sottochiave per la revoca della chiave\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %s: revoca della sottochiave non valida\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %s: rimossa la revoca di più sottochiavi\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %s: ID utente ignorato \"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %s: sottochiave ignorata\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %s: firma non esportabile (classe 0x%02X) - ignorata\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %s: certificato di revoca nella posizione errata - ignorato\n"
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %s: certificato di revoca non valido: %s - ignorato\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %s: firma della sottochiave nella posizione errata - ignorata\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %s: classe di firma imprevista (0x%02X) - ignorata\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %s: rilevato ID utente duplicato - unito\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "chiave %s: rilevate sottochiavi duplicate - unite\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVVISO: la chiave %s può essere revocata: recupero della chiave di revoca "
 "%s\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVVISO: la chiave %s può essere revocata: chiave di revoca %s non presente.\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %s: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %s: aggiunta firma chiave diretta\n"
@@ -3983,14 +4025,14 @@
 msgid "error allocating memory: %s\n"
 msgstr "errore durante l'allocazione della memoria: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@ -3998,16 +4040,16 @@
 "impossibile controllare la firma con l'algoritmo digest del messaggio non "
 "supportato %d: %s.\n"
 
-#: g10/key-check.c:571
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr " (seguono le firme riordinate)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "chiave %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
@@ -4016,28 +4058,28 @@
 "\n"
 msgstr1 "%d firme duplicate rimosse\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 "%d firma non controllata a causa di una chiave mancante\n"
 msgstr1 "%d firme non controllate a causa di chiavi mancanti\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d firma non valida\n"
 msgstr1 "%d firme non valide\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Firma %d riordinata\n"
 msgstr1 "Firme %d riordinata\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -4046,45 +4088,45 @@
 "Avviso: errori rilevati e controllati solo auto-firme, eseguire '%s' per "
 "controllare tutte le firme.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "errore durante la creazione della casella della chiave '%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "errore durante la creazione della chiave '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox '%s' creato\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "chiave '%s' creata\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "risorsa keyblock '%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revoca"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "autofirma"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4096,17 +4138,17 @@
 "(guardando i passaporti, controllando le impronte digitali da fonti diverse, "
 "ecc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d - Mi fido marginalmente\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d - Mi fido completamente\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4116,51 +4158,51 @@
 "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
+#: g10/keyedit.c:427
 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
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Ignorare l'ID utente \"%s\", che non è un ID di testo.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" è stato revocato."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Impossibile firmarla.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" è scaduto."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non è autofirmato."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "L'ID utente \"%s\" è firmabile. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Firmarlo? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4169,11 +4211,11 @@
 "L'autofirma su \"%s\"\n"
 "è una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4182,11 +4224,11 @@
 "La tua firma attuale su \"%s\"\n"
 "è scaduta\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4195,43 +4237,43 @@
 "La tua firma attuale su \"%s\"\n"
 "è una firma locale.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era già firmato localmente dalla chiave %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" è già stato firmato dalla chiave %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 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:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Questa chiave è scaduta!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadrà il %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4241,31 +4283,31 @@
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "La tua scelta? (inserire '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4274,237 +4316,251 @@
 "Sei sicuro di voler firmare questa chiave con il tuo\n"
 "chiave \"%s\" (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Questa sarà un'auto-firma.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVVISO: la firma non verrà contrassegnata come non esportabile.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVVISO: la firma non verrà contrassegnata come non revocabile.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma verrà contrassegnata come non esportabile.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma verrà contrassegnata come non revocabile.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Non ho controllato questa chiave a tutti.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Ho controllato questa chiave casualmente.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Ho controllato questa chiave con molta attenzione.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Davvero firmare? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 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:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "chiave %s: errore durante la modifica della passphrase: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "mostra impronta digitale chiave"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "mostrare il keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "selezionare la sottochiave N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "controllare le firme"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 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:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "firmare gli ID utente selezionati localmente"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmare gli ID utente selezionati con una firma di trust"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmare gli ID utente selezionati con una firma non-revocabile"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "eliminare gli ID utente selezionati"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "aggiungere una sottochiave"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "aggiungere una chiave a una smart card"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "spostare un tasto in una smart card"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr "convertire una chiave in un modulo TPM utilizzando il TPM locale"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "spostare una chiave di backup in una smart card"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "eliminare le sottochiavi selezionate"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Decrittografia dei dati riuscita"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "eliminare le firme dagli ID utente selezionati"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "modificare la data di scadenza della chiave o delle sottochiavi selezionate"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "contrassegnare l'ID utente selezionato come primario"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "impostare l'elenco delle preferenze per gli ID utente selezionati"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "impostare l'URL del server delle chiavi preferito per gli ID utente "
 "selezionati"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "impostare una notazione per gli ID utente selezionati"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocare le firme sugli ID utente selezionati"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "revocare gli ID utente selezionati"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "revoca della chiave o delle sottochiavi selezionate"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "chiave di abilitazione"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "tasto di disattivazione"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "mostra GLI ID foto selezionati"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 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:1348
+#: g10/keyedit.c:1353
 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:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Sono disponibili sottochiavi segrete.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+#, fuzzy
+#| msgid "Note: Only the secret part of the shown subkey will be deleted.\n"
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+"Nota: verrà eliminata solo la parte segreta della sottochiave visualizzata.\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4517,285 +4573,276 @@
 "revocabili\n"
 " (nrsign), o qualsiasi altra combinazione (ltsign, tnrsign, ecc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "La chiave è stata revocata."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Firmare davvero tutti gli ID utente di testo? (y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmare davvero tutti gli ID utente? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Tipo di firma sconosciuto '%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Utilizzare il comando '%s'.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Rimuovere davvero tutti gli ID utente selezionati? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 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:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Spostare davvero la chiave primaria? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "È necessario selezionare esattamente una chiave.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Il comando prevede un argomento filename\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Impossibile aprire '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Errore durante la lettura della chiave di backup da '%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero eliminare le chiavi selezionate? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero eliminare questa chiave? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revocare davvero tutti gli ID utente selezionati? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revocare davvero questo ID utente? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare l'intera chiave? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Si desidera davvero revocare le sottochiavi selezionate? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Si desidera davvero revocare questa sottochiave? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 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:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Impostare l'elenco delle preferenze su:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiornare davvero le preferenze per gli ID utente selezionati? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiornare davvero le preferenze? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Salvare le modifiche? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Uscire senza salvare? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "eliminazione del segreto %s non riuscita: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, 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:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "non può revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoca dell'ID utente non riuscita: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "impostazione dell'ID utente primario non riuscita: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" non è un'impronta digitale\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" non è l'impronta digitale primaria\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ID utente '%s' non valido: %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "Nessun ID utente corrispondente."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Niente da firmare.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non firmato da te.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoca della firma della chiave non riuscita: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' non è un'ora di scadenza valida\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" non è un'impronta digitale corretta\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "sottochiave \"%s\" non trovata\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Caratteristiche: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Server delle chiavi preferito: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Notazioni: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La seguente chiave è stata revocata su %s dalla chiave %s %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave può essere revocata dalla chiave %s %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(sensibile)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creato: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "revocato: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "scaduto: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "scadenza: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "utilizzo: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "scheda-no: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "attendibilità: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "validità: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4804,17 +4851,17 @@
 "corretta\n"
 "finchè non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "revocato"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "scaduto"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4824,17 +4871,23 @@
 " potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVVISO: la sottochiave di crittografia scade a breve.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Si consiglia di modificare anche la sua data di scadenza.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "AVVISO: la sottochiave di crittografia scade a breve.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4843,75 +4896,75 @@
 "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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "Tale ID utente esiste già in questa chiave!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "Firma %d eliminata.\n"
 msgstr1 "Firme %d eliminate.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "non valido"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utente \"%s\" compattato: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "ID utente \"%s\": firma %d rimossa\n"
 msgstr1 "ID utente \"%s\": firme %d rimosse\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID utente \"%s\": già ridotto a icona\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID utente \"%s\": già pulito\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4921,286 +4974,302 @@
 " designato può causarne il rifiuto da parte di alcune versioni\n"
 " di PGP.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "questa chiave è già stata designata come revocatore\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di voler nominare questa chiave come revocatore designato? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "La sottochiave %s è già stata revocata.\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Si è sicuri di voler modificare l'ora di scadenza per più sottochiavi? (y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modifica dell'ora di scadenza per una sottochiave.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Modifica dell'utilizzo di una sottochiave.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Modifica dell'utilizzo della chiave primaria.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la sottochiave di firma %s è già certificata incrociata\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la sottochiave %s non firma e pertanto non deve essere certificata\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ignorare l'autode firma v3 sull'ID utente \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Immettere l'URL del server di chiavi preferito: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerlo sostituire? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerlo eliminare? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Immettere la notazione: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Procedere? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun ID utente con hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nessuna sottochiave con ID di chiave '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessuna sottochiave con indice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utente: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmato dalla chiave %s su %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sono stati firmati questi ID utente sulla chiave %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (non revocabile)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocato dalla chiave %s su %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "tentativo di revocare un ID non utente: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" è già stato revocato\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Impossibile revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La chiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sottochiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Visualizzazione dell'ID foto %s della dimensione %ld per la chiave %s (uid "
 "%d)\n"
 
-#: g10/keygen.c:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "valore non valido per l'opzione '%s'\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferenza '%s' duplicata\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "troppe preferenze di cifratura\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "troppe preferenze di digest\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "troppe preferenze di compressione\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "troppe preferenze AEAD\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "elemento '%s' non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5208,19 +5277,19 @@
 "AVVISO: alcuni programmi OpenPGP non sono in grado di gestire una chiave DSA "
 "con questa dimensione del digest\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certifica"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Crittografa"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Autentica"
 
@@ -5234,166 +5303,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Azioni possibili per una chiave %s: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Azioni correnti consentite: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Attivare o disattivare la funzionalità di firma\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Attivare/disattivare la funzionalità di crittografia\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Attivare/disattivare la funzionalità di autenticazione\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Finito\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA e RSA%s\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA ed Elgamal%s\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, c-format
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (solo segno)%s\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, c-format
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (solo segno)%s\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (solo crittografa)%s\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (solo crittografia)%s\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ECC (firmare e crittografare)%s\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr " *predefinito*"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (solo crittografia)%s\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Chiave esistente%s\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Chiave esistente dalla carta%s\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Immettere il keygrip: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Keygrip non valido (previsto 40 cifre esadecimali)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Nessuna chiave con questa chiave\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "errore durante la lettura della scheda: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numero di serie della scheda: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Chiavi disponibili:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "arrotondato a %u bit\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "Le chiavi %s possono essere lunghe tra %u e %u bit.\n"
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Quale dimensione della chiave si desidera per la sottochiave? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Selezionare la curva ellittica desiderata:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5409,7 +5478,7 @@
 " <n>m = la chiave scadrà dopo n mesi\n"
 " <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5425,38 +5494,38 @@
 " <n>m = la chiave scadrà dopo n mesi\n"
 " <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La firma è valida per? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade affatto\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "La firma non scade affatto\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scade alle %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma scade alle %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5464,11 +5533,11 @@
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "È corretto? (y/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5482,7 +5551,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5498,41 +5567,41 @@
 " \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "I caratteri '%s' e '%s' non possono essere visualizzati nel nome\n"
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Si sta utilizzando il set di caratteri '%s'.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5543,11 +5612,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Tale ID utente esiste già in questa chiave!\n"
 
@@ -5562,31 +5631,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5598,18 +5667,18 @@
 "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:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5620,66 +5689,66 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Continuare? (Y/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Esiste già una chiave per \"%s\"\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Creare comunque? (y/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "creazione comunque\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, 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:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "impossibile creare il file di backup '%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Nota: backup della chiave della scheda salvata in '%s'\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "scrittura di chiave pubblica in '%s'\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "errore durante la scrittura della chiave pubblica '%s': %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5688,7 +5757,7 @@
 "consiglia di utilizzare\n"
 "il comando \"--edit-key\" per generare una sottochiave a questo scopo.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5696,7 +5765,7 @@
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5704,23 +5773,23 @@
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Nota: la creazione di sottochiavi per le chiavi v3 non è conforme a OpenPGP\n"
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Le parti segrete della chiave primaria vengono archiviate su scheda.\n"
 
-#: g10/keygen.c:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Davvero creare? (y/N) "
 
@@ -5728,34 +5797,50 @@
 msgid "never "
 msgstr "mai "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Caratteristiche: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Politica critica di firma: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Server chiave preferito critico: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Annotazione critica della firma: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d buona firma\n"
 msgstr1 "%d buone firme\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
@@ -5764,40 +5849,40 @@
 "Firme %d non controllate a causa di errori\n"
 "\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 "Avviso: chiave %lu ignorata a causa delle dimensioni grandi\n"
 msgstr1 "Avviso: chiavi %lu ignorate a causa delle dimensioni grandi\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Impronta digitale della subchiave:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Impronta digitale della chiave ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Numero seriale della scheda ="
 
@@ -5874,7 +5959,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" non è un ID chiave:\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5883,139 +5968,139 @@
 "aggiornamento della chiavi %d da %s\n"
 "\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVVISO: impossibile aggiornare la chiave %s tramite %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave \"%s\" non trovata nel keyserver\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "chiave non trovata nel keyserver\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiesta della chiave %s da %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "nessun keyserver noto\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" ignorato: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "invio della chiave %s a %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "richiesta di chiave da '%s'\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVVISO: impossibile recuperare l'URI %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr "%s.%s chiave di sessione crittografata\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s dati crittografati della commissione\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "crittografato con algoritmi sconosciuti %d.%s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generata con algoritmo digest sconosciuto %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica è %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "crittografato con %s chiave, ID %s, creato %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 "crittografata con chiave %s, ID %s\n"
 "\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVVISO: più testo in chiaro visti\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrità del messaggio non era protetta\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -6025,179 +6110,185 @@
 "probabile che questo messaggio sia legittimo. Questo perché indietro\n"
 "quindi la protezione dell'integrità non è stata ampiamente utilizzata.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Utilizzare comunque l'opzione '%s' per decrittografare.\n"
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decrittazione costretto a fallire!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Nota: mittente richiesto \"solo per i tuoi occhi\"\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "nessuna firma trovata\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma BAD da \"%s\""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \"%s\""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \"%s\""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire questi dati di firma ambigui\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firma effettuata %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " utilizzando la chiave %s %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma effettuata %s utilizzando l'ID chiave %s %s\n"
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " autorità emittente \"%s\"\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Nota: utilizzare '%s' per utilizzare queste informazioni\n"
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "incerta"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " aka \"%s\""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVVISO: questa chiave non è adatta per l'accesso in modalità %s\n"
 
-#: g10/mainproc.c:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadrà il %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "Firma %s, algoritmo digest %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", algoritmo a chiave "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, 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:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non è una firma separata\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
@@ -6301,28 +6392,28 @@
 msgid "uncompressed|none"
 msgstr "non compresso|nessuno"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "opzione ambigua '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "opzione sconosciuta '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "digest debole sconosciuto '%s'\n"
@@ -6377,7 +6468,7 @@
 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:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6444,7 +6535,7 @@
 "creato %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6461,71 +6552,71 @@
 "molto\n"
 "grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "impossibile aprire il file JPEG '%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Questo JPEG è davvero grande (%d byte) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sei sicuro di volerlo usare? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s' non è un file JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Questa foto è giusta? (s/N/q) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "l'esecuzione remota dei programmi non è gestita\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, 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/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "impossibile eseguire la shell '%s': %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "uscita anormale del programma esterno\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "errore di sistema chiamando il programma esterno: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "AVVISO: impossibile rimuovere il file temporaneo (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "AVVISO: impossibile rimuovere la directory temporanea '%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6533,7 +6624,7 @@
 "le chiamate a programmi esterni sono disattivate a causa dei permessi non\n"
 "sicuri del file delle opzioni\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
@@ -6616,37 +6707,37 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: non esiste alcuna garanzia che questa chiave appartenga all'utente "
 "denominato\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: garanzia limitata che questa chiave appartenga all'utente denominato\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Questa chiave probabilmente appartiene all'utente denominato\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, 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:487
+#: g10/pkclist.c:491
 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"
@@ -6657,7 +6748,7 @@
 "\"davvero, sai quello che stai facendo, potresti rispondere al prossimo\n"
 "domanda con sì.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6667,102 +6758,102 @@
 "nell'ID utente. Se sai davvero quello che stai facendo,\n"
 "si può rispondere alla prossima domanda con sì.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Utilizzare comunque questa chiave? (y/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ATTENZIONE: questa chiave può essere stata revocata (la chiave di revoca\n"
 "non è presente).\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "controllo dell'ID utente \"%s\"\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "opzione %s data ma l'emittente \"%s\" non corrisponde\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "l'emittente \"%s\" non corrisponde ad alcun ID utente\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "opzione %s ma non è stato trovato alcun ID utente corrispondente\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave è stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Questo potrebbe significare che la firma è contraffatta.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave è stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: questa chiave è stata disabilitata.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave è scaduta!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENZIONE: questa chiave ID utente non è certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non è certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " La firma è probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
@@ -6771,60 +6862,60 @@
 "ATTENZIONE: l'ID utente della chiave non è certificato con firme "
 "sufficientemente attendibili!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non è certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Non è sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltata: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltata: chiave pubblica già presente\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "impossibile crittografare in '%s'\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr ""
 "l'opzione '%s' specificata, ma non sono state fornite chiavi predefinite "
 "valide\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr ""
 "l'opzione '%s' specificata, ma l'opzione '%s' non è stata specificata\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Destinatari correnti:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6832,40 +6923,40 @@
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltata: chiave pubblica già impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica è disabilitata.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "saltata: chiave pubblica già impostata\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario predefinito sconosciuto \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Nota: la chiave %s non ha funzionalità %s\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Nota: la chiave %s non ha preferenze per %s\n"
@@ -6904,7 +6995,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossibile aprire i dati firmati fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "la chiave %s non è adatta per la decrittografia in modalità %s\n"
@@ -7137,53 +7228,48 @@
 msgstr ""
 "La chiave %s %s richiede un bit %zu o un hash superiore (l'hash è %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "impossibile utilizzare la chiave %s per l'accesso in modalità %s\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "AVVISO: la sottochiave di firma %s non è certificata incrociata\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "per ulteriori informazioni, vedere %s\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVVISO: la firma della sottochiave %s ha una certificazione incrociata non "
 "valida\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
 msgstr0 "la chiave pubblica %s è %lu seconda più recente della firma\n"
 msgstr1 "le chiavi pubbliche %s sono %lu seconda più recente della firma\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 "la chiave pubblica %s è %lu più recente della firma\n"
 msgstr1 "le chiavi pubbliche %s sono %lu più recente della firma\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7196,7 +7282,7 @@
 "le chiavi %s sono stata create %lu secondo in futuro (problema di curvatura "
 "dell'ora o orologio)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7208,54 +7294,54 @@
 "le chiavi %s sono state create %lu giorni in futuro (problema di curvatura "
 "dell'ora o orologio)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Nota: chiave di firma %s scaduta %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Nota: la chiave di firma %s è stata revocata\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "firma chiave non valida dalla chiave %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:543
+#: g10/sig-check.c:537
 #, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
 msgstr "firma dati non valida dalla chiave %s: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:646
+#: g10/sig-check.c:640
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "presupponendo una firma non valida dalla chiave %s a causa di un bit critico "
 "sconosciuto\n"
 
-#: g10/sig-check.c:1241
+#: g10/sig-check.c:1235
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chiave %s: nessuna sottochiave per la firma di revoca della sottochiave\n"
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "chiave %s: nessuna sottochiave per la firma di associazione della "
 "sottochiave\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7263,7 +7349,7 @@
 "AVVISO: impossibile espandere l'URL del criterio %%(troppo grande). "
 "Utilizzo nonexpanded.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7272,24 +7358,24 @@
 "AVVISO: impossibile espandere %%l'URL del keyserver preferito (troppo "
 "grande). Utilizzo nonexpanded.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s/%s da: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "AVVISO: l'algoritmo digest %s (%d) viola le preferenze dei destinatari\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, c-format
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s verrà utilizzata la crittografia di Questo tipo\n"
@@ -7367,133 +7453,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "impossibile creare il blocco per '%s'\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "impossibile bloccare '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "impossibile accedere a '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: è stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Nota: trustdb non scrivibile\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, 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:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, 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:985
+#: g10/tdbio.c:955
 #, 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:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non è un file di trustdb\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Errore: trustdb danneggiato.\n"
@@ -7941,7 +8027,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "non è necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimo controllo del trustdb sarà fatto il %s\n"
@@ -7972,31 +8058,31 @@
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "Chiave %d elaborata"
 msgstr1 "Chiavi %d elaborate"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 " (%d conteggio di validità cancellato)\n"
 msgstr1 " (%d conteggi di validità cancellati)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica della chiave attendibile %s non trovata\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8004,7 +8090,7 @@
 "profondità: %d valido: %3d firmato: %3d trust: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8075,7 +8161,7 @@
 msgid "ultimate"
 msgstr "ultimo"
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8086,12 +8172,12 @@
 "Ricorda che il file con la firma (.sig or .asc) deve\n"
 "essere il primo file indicato sulla riga di comando.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "impossibile aprire fd %d: %s\n"
@@ -8107,19 +8193,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "Suggerimento: non utilizzare l'opzione %s\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "impostare i flag di debug"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "abilitare il debug completo"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Utilizzo: kbxutil opzioni file (-h per assistenza)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8130,16 +8216,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%sNumero: %s%%0ATitolare: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Tentativi rimanenti: %d"
@@ -8168,10 +8254,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||Immettere la chiave di sblocco della scheda PIV"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Errore di richiamata PIN: %s\n"
@@ -8191,57 +8277,57 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "Il PIN ha caratteri non validi; sono consentite solo cifre\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "chiave già esistente\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "chiave esistente verrà sostituita\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "generazione di una nuova chiave\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "genera una nuova coppia di chiavi\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "impossibile archiviare la chiave: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "risposta non contiene il modulo RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "risposta non contiene l'esponente pubblico RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "risposta non contiene la chiave pubblica CE\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "si prega di attendere mentre la chiave viene generata …\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "generazione della chiave non riuscita\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8251,62 +8337,62 @@
 "\n"
 "\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "risposta non contiene i dati della chiave pubblica\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Immettere il PIN per la chiave per creare firme qualificate."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Inserisci il PIN di amministratore"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Inserisci il codice di sblocco del PIN (PUK) per i tasti standard."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Si prega di inserire il PIN per le chiavi standard."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Modulo RSA mancante o non di dimensione %d bit\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Esponente pubblico RSA mancante o superiore a %d bit\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "Nota: il PIN non è ancora stato abilitato."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "il NullPIN non è ancora stato modificato\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Immettere un nuovo PIN per le chiavi standard."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|N|Inserisci un nuovo codice di sblocco del PIN (PUK) per i tasti standard."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Immettere un nuovo PIN per la chiave per creare firme qualificate."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8314,7 +8400,7 @@
 "|NP|Inserisci un nuovo codice di sblocco PIN (PUK) per la chiave per creare "
 "firme qualificate."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8322,27 +8408,27 @@
 "|P|Inserisci il codice di sblocco del PIN (PUK) per la chiave per creare "
 "firme qualificate."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore durante il recupero del nuovo PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossibile memorizzare l'impronta digitale: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossibile memorizzare la data di creazione: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "errore durante il recupero dello stato CHV dalla scheda\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lettura della chiave pubblica non riuscita: %s\n"
@@ -8350,44 +8436,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%sNumero: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "utilizzando il PIN predefinito come %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Si prega di sbloccare la carta"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "Il PIN per CHV%d è troppo breve; la lunghezza minima è %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifica CHV%d non riuscita: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "carta è bloccata in modo permanente!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8399,20 +8485,20 @@
 "%d tentativi di PIN di amministrazione rimanenti prima che la schede vengano "
 "bloccate in modo permanente\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "l'accesso ai comandi di amministrazione non è configurato\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Inserisci il PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Inserisci il Codice reset per la carta"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Il codice di reimpostazione è troppo breve; la lunghezza minima è %d\n"
@@ -8420,72 +8506,72 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nuovo codice di ripristino"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuovo PIN di amministrazione"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Nuovo PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Inserisci il PIN di amministratore e il nuovo PIN di amministrazione"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Inserisci il PIN e il nuovo PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "errore durante la lettura dei dati dell'applicazione\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "errore durante la lettura dell'impronta digitale DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "timestamp di creazione mancante\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA primo %s mancante o non di dimensione %d bit\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "curva non supportata\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "struttura non valida della scheda OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "impronta digitale sulla carta non corrisponde a quello richiesto\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "scheda non supporta l'algoritmo digest %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firme create finora: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8493,7 +8579,7 @@
 "la verifica del PIN di amministrazione è attualmente vietata tramite questo "
 "comando\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossibile accedere a %s - scheda OpenPGP non valida?\n"
@@ -8513,7 +8599,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "eseguire in modalità multi server (in primo piano)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL| impostare il livello di debug su LEVEL"
 
@@ -8557,11 +8643,11 @@
 msgid "deny the use of admin card commands"
 msgstr "negare l'uso dei comandi della scheda di amministrazione"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Utilizzo: @SCDAEMON@ opzioni (-h per assistenza)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8569,321 +8655,321 @@
 "Sintassi: scdaemon opzioni comando args\n"
 "Daemon smartcard per @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "gestore per fd %d avviato\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestore per fd %d terminato\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr ""
 "errore durante il recupero delle informazioni sull'utilizzo della chiave: "
 "%s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "modello di convalida richiesto dal certificato: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "catena"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la versione %s del protocollo di gpg-agent non è gestita"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "certificato dell'autorità emittente non è contrassegnato come CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "criteri contrassegnati critici senza criteri configurati"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "impossibile aprire '%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Nota: i criteri di certificato non critici non sono consentiti"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "criteri certificato non consentiti"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "non è riuscito a ottenere l'impronta digitale\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "ricerca dell'emittente in una posizione esterna\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "numero di emittenti corrispondenti: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "impossibile ottenere authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "ricerca dell'autorità emittente dalla cache di Dirmngr\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "numero di certificati corrispondenti: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "ricerca chiave solo cache dirmngr non riuscita: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "impossibile allocare l'handle keyDB\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "certificato è stato revocato"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "lo stato del certificato è sconosciuto"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "assicurarsi che il \"dirmngr\" sia installato correttamente\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "controllo del CRL non riuscito: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificato con validità non valida: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificato non ancora valido"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "certificato radice non ancora valido"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "certificato intermedio non ancora valido"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "certificato è scaduto"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "certificato radice scaduto"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "certificato intermedio scaduto"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "attributi obbligatori del certificato mancanti: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "certificato con validità non valida"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "firma non creata durante la durata del certificato"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificato non creato durante la durata dell'emittente"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "certificato intermedio non creato durante la durata dell'autorità emittente"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( firma creata alle "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (certificato creato alle "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (certificato valido da "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( emittente valido da "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "impronta digitale=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "certificato radice è stato contrassegnato come attendibile\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "contrassegno interattivo come attendibile non abilitato in gpg-agent\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "nessuna autorità emittente trovata nel certificato"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "certificato autofirmato ha una firma BAD"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "certificato radice non contrassegnato come attendibile"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo dell'elenco di attendibilità non riuscito: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "catena di certificati troppo lunga\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certificato dell'autorità emittente non trovato"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificato ha una firma BAD"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "trovato un altro possibile certificato CA corrispondente - riprovare"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "catena di certificati più lunga di quella consentita dalla CA (%d)"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificato è buono\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificato intermedio è buono\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certificato radice è buono\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "passaggio al modello a catena"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "modello di convalida utilizzato: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash di bit %u non è valido per una chiave %u bit %s\n"
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "fuori dal nucleo\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(questo è l'algoritmo MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "nessuno"
 
@@ -8903,7 +8989,7 @@
 msgid "Error - invalid DN"
 msgstr "Errore - DN non valido"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8918,46 +9004,46 @@
 "S/N %s, ID 0x%08lX,\n"
 "creato %s, scade %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, 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:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificato non avrebbe dovuto essere utilizzato per la crittografia\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificato non avrebbe dovuto essere utilizzato per la firma\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificato non è utilizzabile per la crittografia\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificato non è utilizzabile per la firma\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "alla ricerca di un altro certificato\n"
@@ -9182,17 +9268,17 @@
 msgid "resource problem: out of core\n"
 msgstr "problema delle risorse: fuori dal nucleo\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(questo è l'algoritmo RC2)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(questo non sembra essere un messaggio crittografato)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "crittografato per %s chiave %s\n"
@@ -9202,7 +9288,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificato '%s' non trovato: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "errore durante il blocco della keybox: %s\n"
@@ -9227,123 +9313,123 @@
 msgid "no valid recipients given\n"
 msgstr "nessun destinatario valido dato\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "elencare le chiavi esterne"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "catena di certificati valida"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "importa certificati"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "esporta certificati"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "registrare una smart card"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "passare un comando al dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "richiamare gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|numero di certificati da includere"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|prendere le informazioni sui criteri da FILE"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "presupporre che l'input sia in formato PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "presupporre che l'input sia in formato base 64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "presupporre che l'input sia in formato binario"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "creare output codificato in base 64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|utilizzare USER-ID come chiave segreta predefinita"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|aggiungere il tasto all'elenco dei keyring"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "recupera i certificati degli emittenti mancanti"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "Nome: utilizzare il nome di codifica per le passphrase PKCS-12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "non consultare mai una CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "non controllare i certificati radice nei CRL"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "verificare la validità utilizzando OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "non controllare le politiche dei certificati"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NAME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di message digest NAME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "risponde \"sì\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|scrittura di un registro di controllo in FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Utilizzo: @GPGSM@ opzioni file (-h per assistenza)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9354,27 +9440,27 @@
 "protocollo S/MIME\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Nota: impossibile eseguire la crittografia in '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modello di convalida sconosciuto '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importazione di certificati comuni '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossibile firmare utilizzando '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "comando non valido (non esiste alcun comando implicito)\n"
@@ -9394,7 +9480,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "controlli certificati di base non riusciti - non importati\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "errore durante il recupero dei flag memorizzati: %s\n"
@@ -9404,47 +9490,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "errore durante l'importazione del certificato: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "errore durante la lettura dell'input: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "nessuna cassetta delle chiavi in esecuzione in questa sessione\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "errore durante l'apertura della chiave DB: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problema durante la ricerca del certificato esistente: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "errore durante la ricerca della chiave scrivibile keyDB: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "errore durante l'archiviazione del certificato: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problema durante la ri-ricerca del certificato: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "errore durante l'archiviazione dei flag: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Errore - "
 
@@ -9480,7 +9566,7 @@
 "\n"
 "%s%sSono davvero sicuri di voler eseguire questa operazione?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9500,43 +9586,43 @@
 "\"%s\"\n"
 "Si noti che questo certificato NON creerà una firma qualificata!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "algoritmo hash %d (%s) per firmatario %d non supportato; utilizzando %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "algoritmo hash utilizzato per firmatario %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "controllo del certificato qualificato non riuscito: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s firma con %s chiave %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Firma fatta "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "data non specificata"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "algoritmo:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9544,17 +9630,17 @@
 "firma non valida: l'attributo digest del messaggio non corrisponde a uno "
 "calcolato\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Buona firma da"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " aka"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Questa è una firma qualificata\n"
@@ -9582,321 +9668,316 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "impossibile rilasciare il blocco sulla cache dei certificati: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "eliminazione di %u certificati dalla cache\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "impossibile analizzare il certificato '%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "certificato '%s' già memorizzato nella cache\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "certificato attendibile '%s' caricato\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certificato '%s' caricato\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " impronta digitale SHA1 - %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " emittente ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " oggetto ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "errore durante il caricamento del certificato '%s': %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificati caricati in modo permanente: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " certificati runtime memorizzati nella cache: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " certificati attendibili: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificato già memorizzato nella cache\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificato memorizzato nella cache\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "errore durante la memorizzazione nella cache del certificato: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "stringa di impronta digitale SHA1 non valida '%s'\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "errore durante il recupero del certificato da parte di S/N: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "errore durante il recupero del certificato per oggetto: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "nessuna autorità emittente trovata nel certificato\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "errore durante il recupero di authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "creazione della directory '%s'\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "errore durante la creazione della directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorare il dir del database '%s'\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "errore durante la lettura della directory '%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "rimozione del file di cache '%s'\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "non rimuove il file '%s'\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "errore durante la chiusura del file della cache: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "impossibile aprire il file dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr ""
 "errore durante la creazione del nuovo file di dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr ""
 "errore durante la scrittura del nuovo file di dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:434
+#: dirmngr/crlcache.c:441
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr ""
 "errore durante la chiusura del nuovo file di dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "nuovo file dir della cache '%s' creato\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "impossibile riass desiderare il file di dir della cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "il primo record di '%s' non è la versione\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "vecchia versione della directory della cache - pulizia\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "vecchia versione della directory della cache - rinuncia\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "campo aggiuntivo rilevato nel record crl '%s' della riga %u\n"
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "riga non valida rilevata nella riga '%s' %u\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "voce duplicata rilevata '%s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "tipo di record non supportato nella riga '%s' %u ignorato\n"
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "hash dell'autorità emittente non valido '%s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "nessun DN emittente '%s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "timestamp non valido '%s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "AVVISO: hash del file di cache non valido %s' nella riga %u\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "errori rilevati nel file dir della cache\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "si prega di controllare il motivo ed eliminare manualmente quel file\n"
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "impossibile creare il file dir della cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "errore durante la chiusura di '%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "errore durante la ridenominazione di '%s' in '%s': %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "impossibile eseguire l'hashing '%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "errore durante l'impostazione del contesto hash MD5: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "errore durante l'hashing di '%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "checksum formattato non valido per '%s'\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "troppi file della cache aperti; non può più aprire\n"
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "apertura del file di cache '%s'\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "errore durante l'apertura del file di cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, 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:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "chiamata unlock_db_file su un file chiuso\n"
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "chiamata unlock_db_file su un file sbloccato\n"
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "impossibile creare un nuovo oggetto cache: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "nessun CRL disponibile per l'ID emittente %s\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, 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:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9905,209 +9986,209 @@
 "force-crl-refresh attivo e %d minuti per l'ID autorità emittente %s; "
 "aggiornamento richiesto\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, 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:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "impossibile utilizzare il CRL disponibile per l'ID emittente %s\n"
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, 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:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "AVVISO: lunghezza del record della cache non valida per S/N "
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "problema durante la lettura del record della cache per S/N %s: %s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr "S/N %s non valido. motivo: %02X data%15s\n"
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "S/N %s è valido, non è elencato nel CRL\n"
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "errore durante il recupero dei dati dal file di cache: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "ha ottenuto un'espressione S non valida da libksba\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "conversione dell'espressione S non riuscita: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "algoritmo hash sconosciuto '%s'\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creazione dell'espressione S non riuscita: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "errore durante l'aggiornamento del CRL: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "orari di aggiornamento di questo CRL: this:%s next-%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "errore durante il recupero dell'elemento CRL: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "errore durante l'inserimento dell'elemento nel file di cache temporaneo: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "nessuna autorità emittente CRL trovata nel CRL: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, 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:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "Verifica della firma CRL non riuscita: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "errore durante il controllo della validità del certificato dell'autorità "
 "emittente CRL: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "rimosso il file di cache temporanea non più obsoleto '%s'\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "problema durante la rimozione del file di cache temporanea non più obsoleto "
 "'%s': %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "errore durante la creazione del file di cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 "errore durante il completamento del file di cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "errore durante la chiusura del file della cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "nuovo CRL ancora troppo vecchio; è scaduto su %s\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "estensione CRL critica sconosciuta %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "errore durante la lettura delle estensioni CRL: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creazione del file di cache '%s'\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problema durante la ridenominazione di '%s' in '%s': %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10116,12 +10197,12 @@
 "aggiornamento del file DIR non riuscito - la voce della cache andrà persa "
 "con il successivo avvio del programma\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Inizio dump CRL (recuperato tramite %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10129,58 +10210,58 @@
 " ERRORE: il CRL non verrà utilizzato perché era ancora troppo vecchio dopo "
 "un aggiornamento!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERRORE: il CRL non verrà utilizzato\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 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:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " AVVISO: lunghezza del record della cache non valida\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problema durante la lettura del record della cache: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problema durante la lettura della chiave della cache: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "errore durante la lettura della voce della cache dal database: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Fine dump CRL\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch tramite DP non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert tramite DP non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert tramite autorità emittente non riuscita: %s\n"
@@ -10196,23 +10277,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "Accesso CRL non possibile a causa della modalità Tor\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "Accesso CRL non possibile a causa della disabilitata di %s\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "errore durante il recupero di '%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "errore durante l'inizializzazione dell'oggetto lettore: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr ""
@@ -10359,141 +10440,141 @@
 msgid "looking up '%s'\n"
 msgstr "ricerca di '%s'\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "elencare il contenuto della cache CRL"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|carica CRL da FILE nella cache"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|recupero di un CRL dall'URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "arrestare il dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "svuotare la cache"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "consentire il controllo della versione del software online"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|Non restituire più di N elementi in una query"
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr "Opzioni relative alla rete"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "instradare tutto il traffico di rete tramite Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Configurazione per i server HTTP"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "inibire l'uso di HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorare i punti di distribuzione CRL HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|reindirizza tutte le richieste HTTP all'URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "utilizzare l'impostazione proxy HTTP del sistema"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Configurazione per i server HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "| URL: utilizzare keyserver all'URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|utilizzare i certificati CA in FILE per HKP su TLS"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Configurazione per i server HTTP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "inibire l'uso di LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorare i punti di distribuzione CRL LDAP"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|utilizzare HOST per le query LDAP"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "non utilizzare host di fallback con --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|utilizzare questo keyserver per cercare le chiavi"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|lettura dell'elenco dei server LDAP da FILE"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|imposta il timeout LDAP su N secondi"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Configurazione per OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "consentire l'invio di richieste OCSP"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorare gli URL del servizio OCSP contenuti nel certificato"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|utilizzare risponditore OCSP all'URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|Risposta OCSP firmata da FPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "forzare il caricamento di CRL obsoleti"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10503,11 +10584,11 @@
 "(Vedere il manuale \"info\" per un elenco completo di tutti i comandi e le "
 "opzioni)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Utilizzo: @DIRMNGR@ opzioni (-h per assistenza)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10515,104 +10596,104 @@
 "Sintassi: @DIRMNGR@ opzioni comando args\n"
 "Accesso keyserver, CRL e OCSP per @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "i livelli di debug validi sono: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "utilizzo: %s opzioni "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "due punti non sono consentiti nel nome del socket\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "recupero CRL da '%s' non riuscito: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "elaborazione CRL da '%s' non riuscita: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: riga troppo lunga - ignorata\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: rilevata impronta digitale non valida\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s: %u: errore di lettura: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s: %u: Garbage alla fine della riga ignorato\n"
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 ricevuto - nessuna azione definita\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM ricevuto - arresto …\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM ricevuto - connessioni ancora %d attive\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arresto forzato\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT ricevuto - arresto immediato\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "segnale %d ricevuto - nessuna azione definita\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "errore durante l'accesso a '%s': stato http %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' reindirizzato a '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "troppi reindirizzamenti\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "reindirizzamento modificato in '%s'\n"
@@ -10667,32 +10748,32 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc non riuscito: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s' non è un URL LDAP\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' è un URL LDAP non valido\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search raggiunto il limite di dimensioni del server\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: password fornita senza utente\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr "%s:%u: ignorare la bandiera sconosciuta '%s'\n"
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: ignorare questa riga\n"
@@ -10783,165 +10864,165 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "non firmato da un certificato del firmatario OCSP predefinito"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "allocazione della voce di elenco non riuscita: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "errore durante il recupero dell'ID risponditore: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, 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:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certificato dell'autorità emittente non trovato: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "chiamante non ha restituito il certificato di destinazione\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "chiamante non ha restituito il certificato di emissione\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "impossibile allocare il contesto OCSP: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "nessun risponditore OCSP predefinito definito\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "nessun firmatario OCSP predefinito definito\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "utilizzando il risponditore OCSP predefinito '%s'\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "utilizzo del risponditore OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr ""
 "errore durante il recupero dello stato OCSP per il certificato di "
 "destinazione: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "lo stato del certificato è: %s (questo: %s successivo= %s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "buono"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "il certificato è stato revocato alle: %s a causa di: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "Il risponditore OCSP ha restituito uno stato in futuro\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "Il risponditore OCSP ha restituito uno stato non corrente\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "Il risponditore OCSP ha restituito uno stato troppo vecchio\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) non riuscito: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "serialno mancante nell'ID certificato"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire non riuscito: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url non riuscito: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "errore durante l'invio dei dati: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch non riuscito: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert non riuscito: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d superato\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossibile allocare la struttura di controllo: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "impossibile allocare il contesto assuan: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossibile inizializzare il server: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "impossibile eseguire i comandi di registro con Assuan: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problema di accettazione assuan: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Elaborazione Assuan non riuscita: %s\n"
@@ -10951,83 +11032,83 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "accettazione della CA principale non contrassegnata come CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "Controllo CRL troppo profondo\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "non controlla CRL per"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "controllo CRL per"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "controllo dell'affidabilità del certificato radice non riuscito: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "catena di certificati è buono\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificato non deve essere stato utilizzato per la firma CRL\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "tranquilla"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "stampare i dati esendo codificati"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "decodificare le righe di dati ricevute"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "collegare al dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr "connettersi alla cassetta delle chiavi"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|connessione al socket Assuan NOME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|connessione al server Assuan presso ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "eseguire il server Assuan specificato sulla riga di comando"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "non utilizzare la modalità di connessione estesa"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|esegui comandi da FILE all'avvio"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "eseguire /subst all'avvio"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Utilizzo: @GPG@-connect-agent opzioni (-h per assistenza)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11035,48 +11116,48 @@
 "Sintassi: @GPG@-connect-agent opzioni\n"
 "Connettersi a un agente in esecuzione e inviare comandi\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "l'opzione \"%s\" richiede un programma e argomenti facoltativi\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "opzione \"%s\" ignorata a causa di \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "linea di ricezione non riuscita: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "linea troppo lunga - saltata\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linea accorciata a causa del carattere Nul incorporato\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "comando sconosciuto '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "riga di invio non riuscita: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "nessun daemon keybox in esecuzione in questa sessione\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "errore durante l'invio delle opzioni standard: %s\n"
@@ -11136,12 +11217,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Si noti che le specifiche del gruppo vengono ignorate\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "errore durante la chiusura di '%s'\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "errore durante l'analisi di '%s'\n"
@@ -11247,34 +11328,34 @@
 "Sintassi: gpg-check-pattern opzioni patternfile\n"
 "Controllare una passphrase data su stdin rispetto al patternfile\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Nota: il %s chiave è già memorizzato sulla carta!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Nota: le chiavi sono già memorizzate sulla carta!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Sostituire le chiavi %s ? (y/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s la scheda n. %s rilevata\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 "Il contrassegno interazione utente è impostato su \"%s\" - non può cambiare\n"
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11284,47 +11365,61 @@
 " può essere ripristinato solo utilizzando un ripristino delle "
 "impostazioni di fabbrica!\n"
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Utilizzare \"uif --yes %d %s\"\n"
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "eseguire l'autenticazione nella scheda"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "inviare un ripristino al daemon della carta"
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "configurazione KDF per l'autenticazione PIN"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "modificare un oggetto dati privato"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "leggere un certificato da un oggetto dati"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "archiviare un certificato in un oggetto dati"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "archiviare una chiave privata in un oggetto dati"
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Comandi di gestione Yubikey"
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "gestire la cronologia dei comandi"
 
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "l'algoritmo AEAD selezionato non è valido\n"
+
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "preferenze AEAD personali non valide\n"
+
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "L'algoritmo AEAD '%s' non può essere utilizzato %s modalità\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
+#~ "del destinatario\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "errore durante la scrittura nel file temporaneo: %s\n"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/ja.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/ja.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/ja.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/ja.po Changed

@@ -5,14 +5,14 @@
 # Yoshihiro Kajiki <kajiki@ylug.org>, 1999.
 # Takashi P.KATOH, 2002.
 # NIIBE Yutaka <gniibe@fsij.org>, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-# 2020, 2021.
+# 2020, 2021, 2022, 2023.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 2.3.4\n"
+"Project-Id-Version: gnupg 2.4.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
-"PO-Revision-Date: 2022-04-25 15:44+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
+"PO-Revision-Date: 2023-05-25 11:12+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: none\n"
 "Language: ja\n"
@@ -21,7 +21,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "pinentryのロックの獲得に失敗しました: %s\n"
@@ -32,49 +32,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|キャンセル(_C)"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|パスワードマネージャに保管(_S)"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "本当に画面にパスフレーズを見えるようにしますか?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|パスフレーズを見えるようにする"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|パスフレーズを隠す"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "キャプスロックがオンです"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "提示する"
 
@@ -85,27 +85,27 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "ランダムなパスフレーズを提示する"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "注意: ブランクはパスフレーズの一部とはなりません。"
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "パスフレーズが認められません"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "品質:"
 
@@ -115,11 +115,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -127,7 +127,7 @@
 "あなたのPINを入力してください(このセッションで秘密鍵のロックを解除するために"
 "使われます)"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -135,76 +135,80 @@
 "あなたのパスフレーズを入力してください(このセッションで秘密鍵のロックを解除す"
 "るために使われます)"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "パスフレーズ:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "一致しません - もう一度"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+msgid "Passphrases match."
+msgstr "パスフレーズが一致。"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (現在 %d / 最大 %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "繰り返し:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PINが長すぎます"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "パスフレーズが長すぎます"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "PINに無効な文字があります"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PINが短すぎます"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "不正なPINです"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "パスフレーズが不正です"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "注意: ウェブブラウザからのリクエストです。"
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "注意: リモートサイトからのリクエストです。"
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "カード・シリアル番号の取得エラー: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "このパスフレーズをもう一度入力してください"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -213,7 +217,7 @@
 "%sシステムにインポートされたオブジェクトを保護するためにパスフレーズを入力し"
 "てください"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
@@ -221,45 +225,45 @@
 "この鍵(もしくは副鍵)はパスフレーズで保護されていません。エクスポートするため"
 "に新しいパスフレーズを入力してください。"
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "'%s'が作成できません: %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s'が開けません: %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "適当なカードの鍵が見つかりません: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "カードのリスト の取得エラー: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -268,20 +272,20 @@
 "sshプロセスが以下の鍵の使用を要求しました:%%0A %s%%0A (%s)%%0Aこの使用を認"
 "めますか?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "許可する"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "拒否する"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "以下のssh鍵に対するパスフレーズを入力してください:%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -290,84 +294,79 @@
 "パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A %s"
 "%%0A %s%%0Aを保護します。"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "以下のシリアル番号のカードを挿入してください"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "管理者PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "リセット・コード"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "カード/トークンのACKボタンを押してください。"
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "リーダーのピンパッドを入力に使ってください。"
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "このリセット・コードをもう一度入力してください"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "このPUKをもう一度入力してください"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "このPINをもう一度入力してください"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "リセット・コードが正しく繰り返されていません。もう一度"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUKが正しく繰り返されていません。もう一度"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PINが正しく繰り返されていません。もう一度"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "カードのロックを解除するためにPIN%s%s%sを入力してください"
 
-#: agent/genkey.c:154
-#, fuzzy, c-format
-#| msgid "error writing to %s: %s\n"
+#: agent/genkey.c:155
+#, c-format
 msgid "error writing to pipe: %s\n"
-msgstr "'%s'の書き込みエラー: %s\n"
+msgstr "パイプへの書き込みエラー: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "新しいパスフレーズを入力してください"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "パスフレーズが入力されませんでした!%0A空のパスフレーズは認められません。"
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -376,247 +375,251 @@
 "パスフレーズが入力されませんでした - 通常これは良くない考えです!%0A鍵に何の保"
 "護も必要としないことを確認ください。"
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "はい、保護は必要ありません"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "パスフレーズは最低でも%u文字以上でなければなりません。"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr0 "パスフレーズは最低でも%u文字の数字か特殊文字を含むべきです。"
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "パスフレーズには、よく知られている用語や特定のパターンにマッチするものは%%0A"
 "避けましょう。"
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 安全とは言えないパスフレーズが入力されました。"
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "それでもこれを使います"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "新しい鍵を保護するために、%0Aパスフレーズを入力してください。"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "新しいパスフレーズを入力してください"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr "起動に使われるオプション"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "デーモン・モードで実行 (バックグラウンド)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "サーバ・モードで実行 (フォアグラウンド)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "コンソールからデタッチしない"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sh-形式のコマンド出力"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "csh-形式のコマンド出力"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|FILEからオプションを読み込みます"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "診断出力を制御するオプション"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "冗長"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "いくらかおとなしく"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "コンフィグレーションを制御するオプション"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "SCdaemonを使わない"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|PGMをSCdaemonプログラムとして使う"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|PGMをtpm2daemonプログラムとして使う"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|NAMEからのコマンドを受け付ける"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "TTYの変更要求を無視する"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "Xディスプレイの変更要求を無視する"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
-msgstr "sshサポートを有功にする"
+msgstr "sshサポートを有効にする"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|ssh署名の表示にALGOを使う"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
-msgstr "puttyサポートを有功にする"
+msgstr "puttyサポートを有効にする"
+
+#: agent/gpg-agent.c:234
+msgid "enable Win32-OpenSSH support"
+msgstr "Win32-OpenSSH サポートを有効する"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "セキュリティを制御するオプション"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|N秒後に保持したPINを無効とする"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|N秒後にSSH鍵を無効とする"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|最大PINキャッシュ存続時間をN秒とする"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|最大SSH鍵存続時間をN秒とする"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "署名に対してPINの保持を使わない"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "外部のパスワードキャッシュの使用を認めない"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "クライアントが鍵に\"trusted\"マークをつけることを認めない"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "パスフレーズの事前設定を認める"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "パスワード・ポリシーの強制オプション"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "パスワード・ポリシーを迂回することを認めない"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|新しいパスフレーズの必要とする最低長をNとする"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 "|N|新しいパスフレーズとしてアルファベットでないキャラクタを最低N必要とする"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|新しいパスフレーズをFILEのパターンに対してチェックする"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N日後にパスフレーズを期限切れとする"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "古いパスフレーズを再使用することを認めない"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr "PIN-Entryを制御するオプション"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr "PIN-Entryを決して使わない"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "pinentryより優先してパスフレーズ入力を認めない"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "PIN-Entryにキーボードとマウスを占有させる"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|PGMをPIN入力プログラムとして使う"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|PinentryのタイムアウトをN秒とする"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "Emacsを通じてパスフレーズを催促することを認める"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "バグは <@EMAIL@> までご報告ください。\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "使い方: @GPG_AGENT@ オプション (ヘルプは -h)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -624,141 +627,141 @@
 "形式: @GPG_AGENT@ オプション コマンド 引数\n"
 "@GnuPG@の秘密鍵の管理\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "無効なdebug-level '%s'が与えられました\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "'%s' からオプションを読み込みます\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注意: '%s'はオプションとは考えられません\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "*警告*: \"%s\"は、廃止されたオプションです\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "ソケットが作成できません: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "ソケット名'%s'は長すぎます\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "稼働中の %s からソケットを奪おうとします\n"
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
 
-#: agent/gpg-agent.c:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ソケットのナンス取得エラー\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "'%s'でソケットのバインドのエラー: %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "'%s'の許可が設定できません: %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ソケット'%s'でlisten\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "ディレクトリ'%s'が作成できません: %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "ディレクトリ'%s'が作成されました\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s'でstat()が失敗しました: %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "'%s'をホーム・ディレクトリに使えません\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %dでナンスの読み込みエラー: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "ハンドラ0x%lx (fd %d に対する)が開始\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 停止しました\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "このセッションでgpg-agentは実行されていません\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -766,11 +769,11 @@
 "@オプション:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr "使い方: gpg-preset-passphrase オプション KEYGRIP (ヘルプは -h)\n"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -778,8 +781,8 @@
 "形式: gpg-preset-passphrase オプション KEYGRIP\n"
 "パスワードキャッシュの管理\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -787,8 +790,8 @@
 "@コマンド:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -798,11 +801,11 @@
 "オプション:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "使い方: gpg-protect-tool オプション (ヘルプは -h)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -810,16 +813,16 @@
 "形式: gpg-protect-tool オプション 引数\n"
 "秘密鍵管理ツール\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "パスフレーズを入力してください。PKCS#12オブジェクトを解除します。"
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "パスフレーズを入力してください。新しいPKCS#12オブジェクトを解除します。"
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -827,7 +830,7 @@
 "GnuPGシステムにインポートされたオブジェクトを保護するためにパスフレーズを入力"
 "してください"
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -835,52 +838,54 @@
 "パスフレーズまたはPINを入力してください。\n"
 "この操作を完了するのに必要です。"
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "キャンセルされました\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "パスフレーズを問い合わせする際、エラー: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "'%s'を開く際、エラー: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "ファイル'%s'(行 %d): %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "ステートメント \"%s\" は'%s'で無視されました(行 %d)\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "システム信用リスト'%s'が得られません\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "'%s'の不正なフィンガープリント (行 %d)\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "'%s'の無効な鍵フラグ(行 %d)\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "'%s'の読み込みエラー(行 %d): %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "信用されたルート証明書のリストの読み込みエラ−\n"
@@ -893,18 +898,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "究極的にこれを信用し%%0A \"%s\"%%0A正にユーザの証明書と保証しますか?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "はい"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "いいえ"
@@ -917,7 +922,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -929,20 +934,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "正しい"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "誤り"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注意: パスフレーズは変更されていません。%0A今、変更してください。"
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -951,26 +956,36 @@
 "このパスフレーズは%.4s-%.2s-%.2sから変更されていません。%%0A今、変更してくだ"
 "さい。"
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "パスフレーズを変更する"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "後で変更する"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "以下のシリアル番号のカードを挿入してください"
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"以下の鍵の使用を要求しました:%%0A %s%%0A (%s)%%0Aこの使用を認めますか?"
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "鍵を削除する"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -983,8 +998,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSAは8ビットの倍数のハッシュ長を必要とします\n"
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s 鍵は安全でない(%uビット)ハッシュを使用しています\n"
@@ -994,7 +1009,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zuビットのハッシュは%uビットの%s鍵には無効です\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "作成された署名の検査に失敗しました: %s\n"
@@ -1004,7 +1019,7 @@
 msgid "secret key parts are not available\n"
 msgstr "秘密部分が得られません\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公開鍵アルゴリズム%d (%s)はサポートされていません\n"
@@ -1019,52 +1034,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "保護ハッシュ・アルゴリズム%d (%s)はサポートされていません\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "パイプの作成エラー: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "パイプのストリーム作成エラー: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "プロセスforkエラー: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "プロセス%dの終了待ちが失敗: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "'%s'の実行エラー: おそらくインストールされていません\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "'%s'の実行エラー: exitステイタス %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "'%s'の実行エラー: 終了しました\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "プロセスの終了待ちが失敗: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "プロセス %d のexitコード取得エラー: %s\n"
@@ -1084,28 +1099,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "コア・ダンプを無効にできません: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告: '%s'の安全でない所有 \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: '%s'の安全でない許可 \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ファイル'%s'がアクセスできるのを待ちます...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "'%s'から'%s'へ名前変更に失敗: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1159,8 +1174,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "%luバイトの確保においてメモリが足りません"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "十分なメモリの確保のエラー: %s\n"
@@ -1177,73 +1192,73 @@
 msgstr ""
 "*警告*: \"%s%s\"は、使われなくなったオプションです - なんの効果もありません\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "不明のdebugフラグ'%s'は無視されました\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "dirmngrの起動のため、%d秒待ちます\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "keyboxd の起動のため、%d秒待ちます...\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "agent の起動のため、%d秒待ちます...\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "dirmngrへの接続が確立しました\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "keyboxdへの接続が確立しました\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr "agentへの接続が確立しました\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "%sが動いていません - 開始します'%s'\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "エージェントへの接続は制限モードです。\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "%s'からバージョン取得エラー: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "サーバ'%s'はこちらより古いです(%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "*警告*: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 "注意: 古いサーバは、重要なセキュリティの修正が欠如しているかもしれません。\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "注意: \"%s\"コマンドを使って再起動してください。\n"
@@ -1316,7 +1331,7 @@
 msgstr "アルゴリズム: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "サポートされていないアルゴリズム: %s"
@@ -1391,39 +1406,39 @@
 msgid "Root certificate trustworthy"
 msgstr "信頼できるルート証明書"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "証明書に対するCRLがありません"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "利用できるCRLは古すぎます"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "証明書のCRL/OCSP確認"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "含まれる証明書"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "監査ログのエントリはありません。"
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "不明な操作"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent利用可能"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr利用可能"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "'%s'のヘルプはありません。"
@@ -1432,11 +1447,11 @@
 msgid "ignoring garbage line"
 msgstr "ガベージ行を無視します"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "未設定"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "無効な64進文字%02Xをスキップしました\n"
@@ -1471,136 +1486,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_openに失敗しました: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "'%s'から'%s'への変換に失敗: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "一時ファイル'%s'が作成できません: %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "'%s'の書き込みエラー: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "古い lockfile (%d により作成)を除去します\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "lockを待ちます (%d%s により保持) %s...\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(デッドロック?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock '%s' は作成されませんでした: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "lock %s を待ちます...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "'%s'の作成エラー: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "'%s'でクローズのエラー: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "外装: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "無効な外装ヘッダー: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "外装ヘッダー: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "無効なクリア・テクスト署名ヘッダー\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "不明の外装ヘッダー: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "入れ子のクリア・テクスト署名\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "予期せぬ外装: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "無効なダッシュでエスケープされた行: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無効な64進文字%02Xをスキップしました\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "ファイル末尾が早すぎます (CRCがありません)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "ファイル末尾が早すぎます (CRCの途中)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "CRCの書式が正しくありません\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRCエラー。%06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "ファイル末尾が早すぎます (後尾部の中にあります)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "後尾の行にエラーがあります\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "有効なOpenPGPデータが見つかりません。\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無効な外装: 行の長さが%d文字を超えています\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1608,12 +1635,12 @@
 "外装の中にquoted printable文字があります。おそらくバグのあるMTAが使われたので"
 "しょう\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " 人には読めません (%zuバイト: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1621,32 +1648,32 @@
 msgstr ""
 "注釈名には印字可能な文字か空白のみを使い、'='で終わらなければなりません\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ユーザ注釈名は、'@'文字を含まなければなりません\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ユーザ注釈名は、一つより大きい'@'文字を含んではなりません\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "注釈名の値に制御文字を使ってはいけません\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "ユーザ注釈名は、'='の文字を含んではなりません\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "注釈名には印字可能な文字か空白のみを使わなければなりません\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "*警告*: 無効な注釈データを発見\n"
@@ -1660,8 +1687,8 @@
 msgid "Enter passphrase: "
 msgstr "パスフレーズを入力: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%sは%sモードに準拠しません\n"
@@ -1671,13 +1698,13 @@
 msgid "error from TPM: %s\n"
 msgstr "TPMからのエラー: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "エージェントに問題: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "このセッションでdirmngrは実行されていません\n"
@@ -1689,197 +1716,202 @@
 "鍵サーバのオプション\"honor-keyserver-url\"をTorモードで使うことはできませ"
 "ん\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKDはキャッシュされた結果を使います"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "Torが動いていません"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Torが正しく設定されていません"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNSが正しく設定されていません"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "サーバからの受け容れることのできないHTTPりダイレクト"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "サーバからの受け容れることのできないHTTPりダイレクトは一掃しました"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "サーバは無効な証明書を使っています"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "注意: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGPカードが利用できません: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGPカードno. %sを検出\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "これはバッチ・モードではできません\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "このコマンドが使えるのはバージョン2のカードだけです\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "リセット・コードが(もはや)利用可能ではありません\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "あなたの選択は? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "未設定"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "強制なし"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "強制"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr "一覧が正しくないように見える場合、コマンド \"%s\" を試してください\n"
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "エラー： 普通のASCIIだけが今、許可されています。\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "エラー: \"<\"文字は使えません。\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "エラー: 二重の空白は禁止です。\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "カード所有者の姓 (surname): "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "カード所有者の名 (given name): "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "エラー: つないだ名前が長すぎます (上限%d文字)。\n"
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "公開鍵を取得するURL: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "'%s'の読み込みエラー: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "'%s'の書き込みエラー: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "ログイン・データ (アカウント名): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "プライベート DO データ: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "言語の優先指定: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "エラー: 優先指定の文字列の長さが無効です。\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "エラー: 優先指定の文字列に無効な文字があります。\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "敬称 (M = Mr., F = Ms., あるいは空白): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "エラー: 無効な応答。\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CAのフィンガープリント: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "エラー: 無効な形式のフィンガープリント。\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "鍵は操作できません: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "OpenPGPカードでありません"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "現行鍵情報の取得エラー: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "既存の鍵を置き換えしますか? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1890,100 +1922,100 @@
 " ません。鍵生成が成功しない場合、あなたのカードに関する技術文書を\n"
 " 確認し、サポートされる鍵タイプや鍵長について確認ください。\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "鍵長は? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%uビットに切り上げます\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "こちらのカード鍵の属性を変更します: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "署名鍵\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "暗号化鍵\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "認証鍵\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "ご希望の鍵の種類を選択してください:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "無効な選択です。\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "鍵%dの属性を変更する際にエラー: %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "カード情報の取得エラー: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "このカードでは、このコマンドはサポートされていません。\n"
 
-#: g10/card-util.c:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "暗号化鍵のカード外バックアップを作成しますか? (Y/n) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注意: 秘密鍵はもうカードに保管してあります!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "既存の鍵を置き換えますか? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1994,176 +2026,181 @@
 " PIN = '%s' 管理者PIN = '%s'\n"
 "次のコマンドを使って変更すべきです --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "生成する鍵の型を選択してください:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) 署名鍵\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) 暗号化鍵\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) 認証鍵\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "鍵を保管する場所を選択してください:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARDが失敗しました: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注意: このコマンドはカードに保管してあるすべての鍵を破壊します!\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "続けますか? (y/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "工場出荷リセットを行いますか? (本当なら \"yes\" と入力) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "KDF設定のエラー: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "UIF設定のエラー: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "このメニューを終了"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "管理コマンドを表示"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "このヘルプを表示"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "全有効データを表示"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "カード所有者の名前の変更"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "鍵を取得するURLの変更"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "カードURLで指定された鍵の取得"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "ログイン名の変更"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "言語の優先指定の変更"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "カード所有者の敬称の変更"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "CAフィンガープリントの変更"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "署名強制PINフラグを反転"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "新しい鍵を生成"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "PINブロックの解除や変更のメニュー"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "PINを確認しすべてのデータを表示する"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "PINをリセット・コードでブロックを解除する"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "すべての鍵とデータを破壊します"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "PIN認証のKDFを設定する (on/single/off)"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "鍵の属性の変更"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "ユーザインタラクションフラグの変更"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr "OpenPGP app にスイッチします"
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "管理者専用コマンド\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "管理者コマンドが許可されています\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "管理者コマンドは禁止されています\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "無効なコマンド (\"help\"を参照)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "このコマンドで--outputは機能しません\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "'%s'が開けません\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "鍵\"%s\"が見つかりません: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2221,9 +2258,9 @@
 msgid "subkey"
 msgstr "副鍵: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新に失敗しました: %s\n"
@@ -2248,77 +2285,71 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "まず\"--delete-secret-keys\"オプションでこれを削除してください。\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "暗号アルゴリズム'%s'を暗号化に使うことはできません\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr "(オーバーライドするには、オプション\"%s\"を使います)\n"
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
+
+#: g10/encrypt.c:181 sm/encrypt.c:771
+#, c-format
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "*警告*: 鍵%sは、%sモードでは、暗号化に適しません\n"
+
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "パスフレーズの作成エラー: %s\n"
 
-#: g10/encrypt.c:339
+#: g10/encrypt.c:484
 #, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "S2Kモードのため、共通鍵ESKパケットを使えません\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
+msgstr "S2Kモードのため、SKESKパケットを使えません\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "暗号方式 %s.%s を使います\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s'はもう圧縮済みです\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "*警告*: '%s'は空のファイルです\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "暗号アルゴリズム'%s'を暗号化に使うことはできません\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr "(オーバーライドするには、オプション\"%s\"を使います)\n"
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
-
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "'%s'から読み込み\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, c-format
-msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "*警告*: 鍵%sは、%sモードでは、暗号化に適しません\n"
-
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2326,17 +2357,12 @@
 msgstr ""
 "*警告*: 圧縮アルゴリズム %s (%d) の強制が、受取人の優先指定をそむきます\n"
 
-#: g10/encrypt.c:1071
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
-
-#: g10/encrypt.c:1164
+#: g10/encrypt.c:1179
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s 暗号化 受信者:\"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "オプション'%s'を%sモードで使うことはできません\n"
@@ -2351,7 +2377,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "不明のアルゴリズム%dによる暗号化\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2362,386 +2388,388 @@
 msgid "problem handling encrypted packet\n"
 msgstr "暗号化パケットの取扱いで障害\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "ローカルのみと指定された署名をエクスポートします"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "ユーザIDの属性(通常フォトID)をエクスポートします"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "\"sensitive\"(機密)と指定された失効鍵をエクスポートします"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "エクスポートの際、利用できない部分を除去する"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "エクスポートの際、できるだけ除去する"
 
-#: g10/export.c:132
+#: g10/export.c:138
+msgid "export only revocation certificates"
+msgstr "失効証明書だけをエクスポートする"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "GnuPGの鍵のバックアップフォーマットを使います"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+msgid "export secret keys using the GnuPG format"
+msgstr "GnuPG フォーマットで秘密鍵をエクスポートをする"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - スキップされました"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "'%s'への書き込み\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
-msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
+msgstr "鍵%s: 鍵マテリアルはカード上にあります - スキップします\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "秘密鍵のエクスポートは認められません\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "鍵%s: PGP 2.x形式の鍵です - スキップします\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "*警告*: 何もエクスポートされていません\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "'%s'の作成エラー: %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "ユーザIDが見つかりません"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "'%s'を %s から自動取得\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "'%s'を %s から取得する際のエラー: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "フィンガープリントがありません"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "%s から失効した鍵の新しいコピーを確認します。\n"
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(オプション'%s'の引数を確認ください)\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "警告: デフォルトの秘密鍵として '%s' を用いません: %s\n"
 
-#: g10/getkey.c:2098
+#: g10/getkey.c:2107
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "デフォルトの署名用の秘密鍵として\"%s\"を用います\n"
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "'%s'に渡されたすべての値は無視されました\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
 
-#: g10/getkey.c:3830
+#: g10/getkey.c:3868
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "副鍵%s(主鍵%sではなく)を用います\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "オプション'%s'に有効な値:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "署名を作成"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "クリア・テクスト署名を作成"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "分遣署名を作成"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "データを暗号化"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "暗号化には共通鍵暗号方式のみを使用"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "データを復号 (デフォルト)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "署名を検証"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "鍵の一覧"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "鍵と署名の一覧"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "鍵署名の検査と一覧"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "鍵とフィンガープリントの一覧"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "秘密鍵の一覧"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "新しい鍵ペアを生成"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "すばやく新しい鍵ペアを生成"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "すばやく新しいユーザIDを追加"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "すばやくユーザIDを失効"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "すばやく新しい有効期限を設定"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "全機能の鍵ペアを生成"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "失効証明書を生成"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "公開鍵リングから鍵を削除"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "秘密鍵リングから鍵を削除"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "すばやく鍵に署名"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "すばやく鍵へローカルに署名"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
 msgstr "すばやく鍵への署名を失効"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "鍵に署名"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "鍵へローカルに署名"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "鍵への署名や編集"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "パスフレーズの変更"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "鍵をエクスポートする"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "鍵サーバに鍵をエクスポートする"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "鍵サーバから鍵をインポートする"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "鍵サーバの鍵を検索する"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "鍵サーバから鍵を全部更新する"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "鍵のインポート/マージ"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "カード・ステイタスを表示"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "カードのデータを変更"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "カードのPINを変更"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "信用データベースを更新"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "メッセージ・ダイジェストを表示"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "サーバ・モードで実行"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|TOFUポリシーを鍵に設定する"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|デフォルトの秘密鍵としてNAMEを用いる"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|ユーザID NAMEにも暗号化する"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|電子メールエイリアスを設定する"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "厳密なOpenPGPの振舞を採用"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "無変更"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "上書き前に確認"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr "入力を制御するオプション"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr "出力を制御するオプション"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "ASCII形式の外装を作成"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|出力をFILEに書き出す"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "正準テキスト・モードを使用"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr "鍵のインポートとエクスポートを制御するオプション"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|メールアドレスによって鍵を特定する際、MECHANISMSを使用する"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "署名から手元にない鍵をインポートする"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "署名に公開鍵を含める"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "dirmngrへのすべてのアクセスを無効とする"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr "鍵のリスティングをを制御するオプション"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
 msgstr "鍵を指定するオプション"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|USER-ID用に暗号化"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr "無人使用のためのオプション"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr "そのほかのオプション"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2749,7 +2777,7 @@
 "@\n"
 "(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2769,11 +2797,11 @@
 " --list-keys 名前 鍵を表示\n"
 " --fingerprint 名前 フィンガープリントを表示\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "使い方: @GPG@ オプション ファイル (ヘルプは -h)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2783,7 +2811,7 @@
 "署名、検査、暗号化または復号\n"
 "デフォルトの操作は、入力データに依存\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2791,558 +2819,551 @@
 "\n"
 "サポートしているアルゴリズム:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "公開鍵: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "暗号方式: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "ハッシュ: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "圧縮: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "使い方: %s オプション %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "対立するコマンド\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'の安全でない所有\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'の安全でない所有\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'の安全でない許可\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'の安全でない許可\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "不明のコンフィグレーション項目'%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "鍵の一覧時にフォトIDを表示する"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "署名の一覧時にポリシーURLを表示する"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "署名の一覧時にすべての注釈を表示する"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "署名の一覧時にIETF標準注釈を表示する"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "署名の一覧時にユーザの注釈を表示する"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "署名の一覧時に優先鍵サーバURLを表示する"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "鍵の一覧時にユーザIDの有効性を表示する"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "署名の一覧時に無効なアルゴリズムの署名を表示する"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "鍵の一覧に鍵リングの名前を表示する"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "署名の一覧時に有効期限の日付を表示する"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+msgid "show preferences"
+msgstr "優先指定の表示"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "不明のTOFUポリシー'%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%sモードでこのコマンドは禁止です。\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注意: 普通%sは使いません!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s'は、有効な署名表現ではありません\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\"は正しいメール・アドレスではありません\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無効な pinentry mode '%s'です\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "無効な送信元要求 '%s' です\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s'は、有効な文字集合ではありません\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "鍵サーバのURLを解析不能\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無効な鍵サーバ・オプションです\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無効なインポート・オプションです\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "無効なインポート・オプションです\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "無効なフィルタ・オプションです: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無効なエクスポート・オプションです\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "無効なエクスポート・オプションです\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無効な一覧オプションです\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "無効な一覧オプションです\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "署名の検証時にフォトIDを表示する"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "署名の検証時にポリシーURLを表示する"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "署名の検証時にすべての注釈を表示する"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "署名の検証時にIETF標準注釈を表示する"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "署名の検証時にユーザの注釈を表示する"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "署名の検証時に優先鍵サーバURLを表示する"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "署名の検証時にユーザIDの有効性を表示する"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "署名の検証時にプライマリ・ユーザIDだけをを表示する"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無効な検証オプションです\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無効な検証オプションです\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-pathを%sに設定不能\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無効な auto-key-locate リストです\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無効な auto-key-locate リストです\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"には無効な引数です\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "*警告*: %sは%sより優先\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%sは%sとともに使うことはできません!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%sは%sとともに使っても無意味です!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s のため、セキュアでないメモリで実行しません\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "選択された暗号アルゴリズムは無効です\n"
 
-#: g10/gpg.c:3949
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "選択されたAEADアルゴリズムは無効です\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "選択された圧縮アルゴリズムは無効です\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "選択された証明書ダイジェスト・アルゴリズムは無効です\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-neededは正の値が必要です\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neededは1より大きな値が必要です\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意: 単純なS2Kモード(0)の使用には強く反対します\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:4016
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無効なデフォルトの優先指定\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無効な個人用暗号方式の優先指定\n"
 
-#: g10/gpg.c:4012
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "無効な個人用AEAD方式の優先指定\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無効な個人用ダイジェストの優先指定\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無効な個人用圧縮の優先指定\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "無効なチャンク長 - %dビットにします\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%sは%sではまだ機能しません\n"
 
-#: g10/gpg.c:4134
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "AEADアルゴリズム'%s'を%sモードで使うことはできません\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信用データベースの初期化に失敗しました: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "鍵サーバへの送信に失敗しました: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "鍵サーバからの受信に失敗しました: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "鍵のエクスポートに失敗しました: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "鍵サーバの検索に失敗しました: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "鍵サーバの更新に失敗しました: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "外装除去に失敗しました: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "外装に失敗しました: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "鍵指定'%s'の構文解析エラー: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, 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:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 "*警告*: コマンドが指定されていません。なにを意味しているのか当ててみま"
 "す ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "開始します。メッセージを打ってください ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "あたえられた証明書ポリシーURLは無効です\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "あたえられた署名ポリシーURLは無効です\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "指定された優先鍵サーバURLは無効です\n"
@@ -3355,7 +3376,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "日時の矛盾を警告だけにします"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|このFDにステイタス情報を書き出す"
 
@@ -3384,153 +3405,153 @@
 msgid "No help available for '%s'"
 msgstr "'%s'のヘルプはありません"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "ローカルだけとマークされた署名をインポートします"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "インポートの際、にpksキーサーバからのダメージを修正します"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "インポートの際、所有者信用の値をクリアしない"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "インポート後、信用データベースを更新しない"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr "バルクのインポートモードを有効にする"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "インポートの際、鍵を表示"
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "show key but do not actually import"
 msgstr "鍵を表示するが実際にはインポートしない"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "既存の鍵に対する更新のみ認めます"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "インポート後、利用できない部分を鍵から除去します"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "インポート後、できるだけ除去します"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "自己署名ではない鍵への署名は無視します"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "インポート・フィルタを実行し鍵をすぐにエクスポートします"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "GnuPGの鍵のバックアップフォーマットを仮定します"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "インポートの際、鍵を修復する"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "型%dのブロックをスキップします\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "これまで%lu個の鍵を処理\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr " 処理数の合計: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " スキップしたPGP-2鍵: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " スキップした新しい鍵: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " ユーザIDなし: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " インポート: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " 変更なし: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " 新しいユーザID: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " 新しい副鍵: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " 新しい署名: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " 新しい鍵の失効: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " 秘密鍵の読み込み: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " 秘密鍵のインポート: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " 無変更の秘密鍵: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " 未インポート: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " 掃除された署名: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " 掃除されたユーザID: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3539,175 +3560,180 @@
 "*警告*: 鍵%sには、これらのユーザIDに対して使用不可のアルゴリズムの優先指定が"
 "あります\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": 暗号アルゴリズムの優先指定 %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\": AEADアルゴリズムの優先指定 %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " \"%s\": ダイジェスト・アルゴリズムの優先指定 %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": 圧縮アルゴリズムの優先指定 %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "あなたの優先指定を更新し、この鍵を再配布することが強く推奨されます\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "それによって、潜在的なアルゴリズム不一致の問題を避けられます\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "鍵%s: ユーザIDがありません\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "鍵 %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "インポートの検査で拒否されました"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "鍵%s: PKSの副鍵変造を修復\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "鍵%s: 受理した未自己署名のユーザID\"%s\"\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "鍵%s: 有効なユーザIDがありません\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "これはおそらく自己署名のないせいでしょう\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "鍵%s: 新しい鍵です - スキップします\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "鍵リング'%s'の書き込みエラー: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "鍵%s: 公開鍵\"%s\"をインポートしました\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "鍵%s: こちらの複製と合いません\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "鍵%s: \"%s\" 新しいユーザIDを%d個\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "鍵%s: \"%s\" 新しい署名を1個\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "鍵%s: \"%s\" 新しい署名を%d個\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "鍵%s: \"%s\" 新しい副鍵を1個\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "鍵%s: \"%s\" 新しい副鍵を%d個\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "鍵%s:\"%s\"変更なし\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "鍵%s: 秘密鍵をインポートしました\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "鍵 %s: 秘密鍵はもうあります\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr "鍵 %s: カード参照が鍵マテリアルで上書きされます\n"
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3716,197 +3742,197 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "'%s'の移行には、スマードカードそれぞれで、以下を実行してください: %s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "秘密鍵 %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "秘密鍵のインポートは禁止です\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "理由は指定されていません"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "鍵がとりかわっています"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "鍵(の信頼性)が損なわれています"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "鍵はもはや使われていません"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "ユーザIDがもはや有効でありません"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "失効理由: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "失効のコメント: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "鍵%s: 無効な直接鍵署名\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "鍵%s: 無効な副鍵の対応です\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "鍵%s: 多重副鍵の対応を削除します\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "鍵%s: 無効な副鍵失効です\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "鍵%s: スキップした副鍵\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "鍵%s: 重複した副鍵の検出 - マージ\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "鍵%s:\"%s\"失効証明書の追加\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "鍵%s: 直接鍵署名を追加\n"
@@ -3916,52 +3942,52 @@
 msgid "error allocating memory: %s\n"
 msgstr "メモリの確保のエラー: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "サポートしていない公開鍵アルゴリズム(%d)の署名は確認できません: %s.\n"
 
-#: g10/key-check.c:405
+#: g10/key-check.c:406
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
 msgstr ""
 "サポートしていないメッセージ・ダイジェスト(%d)の署名は確認できません: %s.\n"
 
-#: g10/key-check.c:571
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr "(順番を変えた署名が続きます)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "鍵 %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "%d個の重複した署名が除去されました\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 "鍵がないため%d個の署名は検査しません\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d個の不正な署名\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "%d個の正しい署名\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -3970,45 +3996,45 @@
 "警告: エラーがあり、自己署名だけ確認しました。'%s'を実行してすべての署名を確"
 "認ください。\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "keybox'%s'の作成エラー: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "鍵リング'%s'の作成エラー: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox'%s'が作成されました\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "鍵リング'%s'ができました\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "keyblock リソース'%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "失効"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "自己署名"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4019,17 +4045,17 @@
 "(パスポートを見せてもらったり、他から得たフィンガープリントを検査したり、など"
 "など)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = まぁまぁ信用する\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = 充分に信用する\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4038,50 +4064,50 @@
 "信用署名の深さを入力してください。\n"
 "深さが1より大きいと、署名しようとしている鍵で信用署名を作れます。\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "署名を制限するドメインを入力するか、空行を入力してください。\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "ユーザID\"%s\"をスキップします、テキストのIDではありません。\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ユーザID\"%s\"は、失効されています。"
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "それでもこの鍵に署名したいですか? (y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " 署名不能。\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ユーザID \"%s\"は、期限切れです。"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ユーザID \"%s\"は、自己署名されていません。"
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "ユーザID \"%s\"は署名可能です。 "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "署名しますか? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4090,11 +4116,11 @@
 "\"%s\"に対する自己署名は、\n"
 "PGP 2.x形式の署名です。\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGPの自己署名に格上げしたいですか? (y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4103,11 +4129,11 @@
 "\"%s\"に対するあなたの今の署名\n"
 "は期限切れです。\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "新しい署名を発行し、期限切れ署名と置き換えたいですか? (y/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4116,43 +4142,43 @@
 "\"%s\"に対するあなたの今の署名\n"
 "はローカルな署名です。\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "エクスポート可能な署名に格上げしたいですか? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\"は鍵%sでもうローカルに署名してあります\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\"は鍵%sでもう署名してあります\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "それでも再署名したいですか? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "鍵%sで署名すべきものはありません\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "この鍵は期限切れです!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "この鍵は%sで期限が切れます。\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "同時に署名も期限切れとしたいですか? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4161,31 +4187,31 @@
 "署名しようとしている鍵が実際に上記の名前の人のものかどうか、どの程度\n"
 "注意して検証しましたか? 答がわからなければ、\"0\"を入力してください。\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) 答えません。%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) 全然、検査していません。%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) 一応、検査しました。%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) かなり注意して検査しました。%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "選択は? (詳細は '?'): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4194,228 +4220,237 @@
 "本当にこの鍵にあなたの鍵\"%s\"で署名してよいですか\n"
 "(%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "自己署名になるでしょう。\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "*警告*: 署名は、エクスポート不可に設定されません。\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "*警告*: 署名は、失効不可に設定されません。\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "署名は、エクスポート不可に設定されます。\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "署名は、失効不可に設定されます。\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "この鍵は全然、検査していません。\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "この鍵は一応、検査しました。\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "この鍵は、かなり注意して検査しました。\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "本当に署名しますか? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "署名に失敗しました: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "鍵にはスタブあるいはカード上の項目しかありません - パスフレーズは変更されませ"
 "ん。\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "鍵 %s: パスフレーズの変更エラー: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "保存して終了"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "鍵のフィンガープリントを表示"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "keygripを表示"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "鍵とユーザIDの一覧"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "ユーザID Nの選択"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "副鍵Nの選択"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "署名の確認"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "選択したユーザIDに署名する * 以下の関連コマンドを参照 "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "選択したユーザIDにローカルに署名"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "選択したユーザIDに信用署名を署名する"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "選択したユーザIDに失効不可の署名をする"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "ユーザIDの追加"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "フォトIDの追加"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "選択したユーザIDの削除"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "副鍵を追加"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "スマートカードへ鍵の追加"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "鍵をスマートカードへ移動"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr "TPM形式にローカルなTPMを使って鍵を変換する"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "バックアップ鍵をスマートカードへ移動"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "選択した副鍵の削除"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "失効鍵の追加"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr "追加の復号用の副鍵を足す"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "選択したユーザIDから署名を削除する"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "鍵または選択した副鍵の有効期限を変更する"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "選択したユーザIDを主にする"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "優先指定の一覧 (エキスパート)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "優先指定の一覧 (冗長)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "選択したユーザIDに優先指定リストを設定"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "選択したユーザIDに優先鍵サーバのURLを設定"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "選択したユーザIDに注釈を設定する"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "パスフレーズの変更"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "所有者信用の変更"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "選択したユーザIDの署名を失効"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "選択したユーザIDの失効"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "鍵の失効または選択した副鍵の失効"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "鍵を有効にする"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "鍵を無効にする"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "選択したフォトIDを表示"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "使えないユーザIDをコンパクトにし、使えない署名を鍵から除去"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "使えないユーザIDをコンパクトにし、すべての署名を鍵から除去"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "秘密鍵が利用できます。\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "秘密副鍵が利用できます。\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr "注意: 秘密鍵のローカルなコピーは\"save\"だけで削除されます。\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "この実行には秘密鍵がいります。\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4426,284 +4461,274 @@
 " 't' で始まると信用署名 (tsign)、'nr' で始まると失効不可署名\n"
 " (nrsign)、もしくはこれらの組み合わせ (ltsign, tnrsign, など)となります。\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "鍵は、失効されています。"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "本当に全てのテキストユーザIDに署名しますか? (y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "本当に全ユーザIDに署名しますか? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "ヒント: まず署名するユーザIDを選択します\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "不明の署名タイプ'%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "ユーザIDを少なくともひとつ選択してください。\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "('%s'コマンドを使用してください。)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "最後のユーザIDは削除できません!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "選択した全ユーザIDを本当に削除しますか? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "このユーザIDを本当に削除しますか? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "この主鍵を本当に移動しますか? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "鍵をきっかり1つ選択してください。\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "コマンドはファイル名の引数を期待します\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "'%s'が開けません: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "バックアップ鍵を'%s'から読み込みする際のエラー: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "鍵を少なくとも1本選択してください。\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "選択した鍵を本当に削除しますか? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "この鍵を本当に削除しますか? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "選択した全ユーザIDを本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "このユーザIDを本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "この鍵全体を本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "選択した副鍵を本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "この副鍵を本当に失効しますか? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "ユーザが指定した信用データベースを利用中、所有者信用は設定できません。\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "優先指定の一覧を設定:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "選択したユーザIDの優先指定を本当に更新しますか? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "優先指定を本当に更新しますか? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "変更を保存しますか? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "保存せずに終了しますか? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "秘密鍵のコピーの削除に失敗しました: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "鍵は無変更なので更新は不要です。\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "最後の有効なユーザIDは失効できません。\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "ユーザIDの失効に失敗しました: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "プライマリ・ユーザIDの設定に失敗しました: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\"はフィンガープリントではありません\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "無効なユーザID '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "マッチするユーザIDはありません。"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "署名するものがありません。\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "あなたによって署名されていません。\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "鍵の署名の失効に失敗しました: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s'は、有効な有効期限ではありません\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\"は正しいフィンガープリントではありません\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "副鍵\"%s\"が見つかりません\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "ダイジェスト: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "機能: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "鍵サーバ 修正しない"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "優先鍵サーバ: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "注釈: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x形式ユーザIDの優先指定が、ありません。\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3849
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "%sで%s鍵%sによって以下の鍵は、失効されました\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "この鍵は、%s鍵%sによって失効可能です"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(機密指定)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "作成: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "失効: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "期限切れ: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "有効期限: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "利用法: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "カード番号: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "信用: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "有効性: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "この鍵は使用禁止に設定されています"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4711,17 +4736,17 @@
 "プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
 "ということを念頭においてください。\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "失効"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "期限切れ"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4730,17 +4755,22 @@
 "*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
 " ユーザIDが主になると仮定する場合があります。\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "*警告*: あなたの暗号副鍵はもうすぐ期限切れとなります。\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "その有効期限も変更したいでしょう\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "*警告*: 有効な暗号副鍵がひとつも残っていません。\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4750,70 +4780,70 @@
 "は、\n"
 " この鍵を拒否するかもしれません。\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "それでも追加したいですか? (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
 
-#: g10/keyedit.c:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr "そういったユーザIDはすでにこの鍵に存在しています!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "この正しい署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "この無効な署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "この不明の署名を削除しますか? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "この自己署名を本当に削除しますか? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "%d個の署名を削除しました。\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "何も削除していません。\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "無効"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ユーザID \"%s\" は、コンパクトになりました: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "ユーザID \"%s\": %d の署名が除去されました\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ユーザID \"%s\": 既に最小化されています\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ユーザID \"%s\": 既にクリーンとなっています\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4823,275 +4853,289 @@
 "では、\n"
 " この鍵を拒否するかもしれません。\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "指名失効者のユーザIDを入力してください: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4713
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "指名失効者には、その鍵自体を任命できません\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4735
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "この鍵は失効者としてもう指名されています\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "*警告*: ある鍵を指名失効者に設定すると、元に戻せません!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr "追加の復号用の副鍵のフィンガー・プリントを入力してください:"
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, c-format
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "副鍵のフィンガー・プリントを指定しましたか?\n"
+
+#: g10/keyedit.c:4915
+#, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "鍵 \"%s\" は、もうこの鍵ブロックにあります。\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "本当に複数の副鍵の失効期限を変更しますか? (y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "副鍵の有効期限を変更します。\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "主鍵の有効期限を変更します。\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3鍵の有効期限は変更できません\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "副鍵の使用法を変更します。\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "主鍵の使用法を変更します。\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "署名する副鍵%sはすでに相互証明されています\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "副鍵 %s は署名をしないので、相互証明の必要はありません\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "ユーザIDをきっかりひとつ選択してください。\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "優先鍵サーバURLを入力してください: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "本当に置き換えたいですか? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "本当に削除したいですか? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "注釈を入力: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "進みますか? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d番のユーザIDはありません\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "ハッシュ%sのユーザIDはありません\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "鍵ID'%s'の副鍵はありません\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d番の副鍵はありません\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ユーザID:\"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%sで%s%s%sに署名されています\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (エクスポート不可)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "この署名は%sで期限切れです。\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "それでも本当に失効したいですか? (y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "この署名に対する失効証明書を作成しますか? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "これらのユーザIDに鍵%sで署名しました:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (失効不可)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "あなたの鍵%sで%sに失効されています\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "これらの署名を失効しようとしています:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "失効証明書を本当に作成しますか? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "秘密鍵がありません\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "ユーザIDでないものを失効しようとしました: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ユーザID\"%s\"は、もう失効されています\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "最後の有効なユーザIDは失効できません。\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "鍵 %s は、もう失効されています。\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "副鍵 %s は、もう失効されています。\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "オプション'%s'に無効な値です\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "優先指定'%s'の重複\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "暗号方式の優先指定が多すぎます\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "ダイジェストの優先指定が多すぎます\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "圧縮の優先指定が多すぎます\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "AEAD方式の優先指定が多すぎます\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "優先指定の文字列に無効な項目'%s'があります\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "直接署名を書き込みます\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "自己署名を書き込みます\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "鍵対応への署名を書き込みます\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "無効な鍵長。%uビットにします\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "鍵長を%uビットに丸めます\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5099,19 +5143,19 @@
 "*警告*: いくつかのOpenPGPプログラムはこのダイジェスト長のDSA鍵を扱うことがで"
 "きません\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5125,166 +5169,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "この%s鍵にありうる操作: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "現在の認められた操作: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) 署名機能を反転する\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) 暗号機能を反転する\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) 認証機能を反転する\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) 完了\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA と RSA%s\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA と Elgamal%s\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, c-format
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (署名のみ)%s\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, c-format
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (署名のみ)%s\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (暗号化のみ)%s\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (暗号化のみ)%s\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (機能をあなた自身で設定)%s\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (機能をあなた自身で設定)%s\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ECC (署名と暗号化)%s\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr " *デフォルト"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (署名のみ)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (機能をあなた自身で設定)%s\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (暗号化のみ)%s\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) 既存の鍵%s\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) カードに存在する鍵%s\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "keygripを入力: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "有効なkeygrip (40桁の16進数字)ではありません\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "このkeygripの鍵はありません\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "カードの読み込みエラー: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "カードのシリアル番号: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "利用可能な鍵:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "%uビットに切り上げます\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 鍵は %u から %u ビットの長さで可能です。\n"
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "副鍵の鍵長は? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "要求された鍵長は%uビット\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "ご希望の楕円曲線を選択してください:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5300,7 +5344,7 @@
 " <n>m = 鍵は n か月間で期限切れ\n"
 " <n>y = 鍵は n 年間で期限切れ\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5316,38 +5360,38 @@
 " <n>m = 署名は n か月間で期限切れ\n"
 " <n>y = 署名は n 年間で期限切れ\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "鍵の有効期間は? (0)"
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "署名の有効期間は? (%s)"
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "無効な値\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "鍵は無期限です\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "署名は無期限です\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "鍵は%sで期限切れとなります\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "署名は%sで期限切れとなります\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5355,11 +5399,11 @@
 "このシステムでは、2038年以降の日付を表示することはできませんが、\n"
 "2106年まで正しく処理されます。\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "これで正しいですか? (y/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5373,7 +5417,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5389,41 +5433,41 @@
 " \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "本名: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "名前に無効な文字があります\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "キャラクタ'%s'と'%s'は名前に使えません\n"
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "電子メール・アドレス: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "有効な電子メール・アドレスではありません\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "コメント: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "コメントに無効な文字があります\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "あなたは文字集合'%s'を使っています。\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5434,11 +5478,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
 
@@ -5453,31 +5497,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
 
-#: g10/keygen.c:3130
+#: g10/keygen.c:3114
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "名前(N)、電子メール(E)の変更、または終了(Q)? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "名前(N)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
 
-#: g10/keygen.c:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "まずエラーを修正してください\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5488,18 +5532,18 @@
 "す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
 "成器に十分なエントロピーを供給する機会を与えることができます。\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "警告: v4 が指定されましたが v5 で上書きされます。\n"
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "鍵の生成に失敗しました: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5510,64 +5554,64 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "続けますか? (Y/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" の鍵はもうあります\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "それでも鍵を作成しますか? (y/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "いずれにしろ鍵を作成\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "鍵の生成が取り消されました。\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注意: カード鍵のバックアップが'%s'へ保存されます\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "'%s'へ公開鍵を書き込みます\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5575,34 +5619,34 @@
 "この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
 "\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鍵の秘密部分が利用できません。\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鍵の秘密部分はカード上に保存されています。\n"
 
-#: g10/keygen.c:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "本当に作成しますか? (y/N) "
 
@@ -5610,71 +5654,87 @@
 msgid "never "
 msgstr "無期限 "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "ダイジェスト: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "機能: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "鍵サーバ 修正しない"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "クリティカルな署名ポリシー: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "署名ポリシー: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "クリティカルな優先鍵サーバ: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "クリティカルな署名注釈: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "署名注釈: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "正しい署名%d個\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 "エラーのため%d個の署名を検査しません\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 "警告: %lu個の鍵がその大きさのためスキップされました\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "鍵リング"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr " 主鍵フィンガープリント:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " 主鍵フィンガープリント:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " 副鍵フィンガープリント:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " フィンガープリント ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " カードシリアル番号 ="
 
@@ -5748,143 +5808,143 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\"鍵IDではありません: スキップします\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "%d本の鍵を%sから更新\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "*警告*: 鍵%sを%s経由で更新できません: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "鍵\"%s\"が鍵サーバに見つかりません\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "鍵が鍵サーバに見つかりません\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "鍵%sを%sに要求\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "鍵サーバがわかりません\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\"をスキップしました: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "鍵%sを%sへ送信\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "鍵を'%s'から要求\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "*警告*: URI %s からデータを取れません: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "変な長さの暗号化済みセッション鍵 (%d)\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr "%s.%s 暗号化済みセッション鍵\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s暗号化済みデータ\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "不明のアルゴリズム%d.%sによる暗号化\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "不明のダイジェスト・アルゴリズムで生成されたパスフレーズ %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "公開鍵は%sです\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "%s鍵, ID %s, 日付%sに暗号化されました\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s鍵, ID %sで暗号化されました\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "*警告*: 複数のプレインテクストが見られます\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu 個のパスフレーズで暗号化\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 個のパスフレーズで暗号化\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公開鍵の復号に失敗しました: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公開鍵による暗号化済みデータ: 正しいDEKです\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s暗号化済みデータを仮定\n"
 
-#: g10/mainproc.c:660
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA暗号方式は利用不能なので、楽天的ですが%sで代用しようとしています\n"
 
-#: g10/mainproc.c:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "*警告*: メッセージの完全性は保護されていません\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -5894,179 +5954,185 @@
 "このメッセージはおそらく正当でしょう。当時、整合性保護は広く使われ\n"
 "てはいなかったためです。\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "それでも復号するにはオプション '%s' を使います。\n"
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "復号は強制的に失敗とされました!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "復号に成功\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "*警告*: 暗号化されたメッセージは改竄されています!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "復号に失敗しました: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "充足できないコンプライアンス・ルールのため、操作は強制的に失敗します\n"
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意: 送信者は\"極秘とする\"ように求めています\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "元のファイル名='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用してください\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "署名が見つかりません\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\"からの*不正な*署名"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\"からの期限切れの署名"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"からの正しい署名"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "署名の検証を省略\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "このあいまいな署名データは取り扱えません\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%sに施された署名\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " %s鍵%sを使用\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%sに%s鍵ID %sで施された署名\n"
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " 発行者\"%s\"\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "以下に鍵があります: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注意: この情報を利用するには '%s' を使ってください\n"
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "不確定"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " 別名\"%s\""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "*警告*: この鍵は%sモードでの署名に適しません!\n"
 
-#: g10/mainproc.c:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "期限切れの署名 %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "この署名は%sで期限切れとなります\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "バイナリ"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "テキストモード"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "不明の"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr "、鍵アルゴリズム "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "署名を検査できません: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "分遣署名でありません\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
 msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "クラス0x%02xのスタンドアロン署名\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "古い形式 (PGP 2.x) の署名\n"
@@ -6170,27 +6236,27 @@
 msgid "uncompressed|none"
 msgstr "無圧縮|なし"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "このメッセージは、%sでは使用できません\n"
 
-#: g10/misc.c:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "あいまいなオプション'%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "不明のオプション'%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "不明の弱いダイジェスト'%s'\n"
@@ -6243,7 +6309,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "型%dの下位パケットにクリティカル・ビットを発見\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 msgid "Please enter the passphrase for decryption."
 msgstr "復号のためのパスフレーズを入力してください。"
 
@@ -6305,7 +6371,7 @@
 "作成日付 %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6319,70 +6385,70 @@
 "いておきましょう。もし大きな写真を使うと、あなたの鍵も同様に大きくなり\n"
 "ます! 240x288くらいにおさまる大きさの画像は、使いよいでしょう。\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "フォトID用のJPEGファイル名を入力してください: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "JPEGファイル'%s'が開けません: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "このJPEGは、本当に大きい (%dバイト) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "本当に使いたいですか? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s'は、JPEGファイルではありません\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "この写真は正しいですか (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "遠隔プログラムの実行は、サポートしていません\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "このプラットホームだと、外部プログラムの呼出しには、一時ファイルが必要です\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "シェル'%s'を実行できません: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "外部プログラムが、不自然に終了\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "外部プログラムの呼出しでシステム・エラー: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "*警告*: 一時ファイルを削除できません (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "*警告*: 一時ディレクトリ'%s'を削除できません: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6390,7 +6456,7 @@
 "オプション・ファイルの許可モードが安全ではないので、外部プログラムの呼出しは"
 "禁止となります。\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "フォトIDが表示不能!\n"
@@ -6470,32 +6536,32 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "究極的に信用した鍵への証明書:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: この鍵が本当に本人のものである、という兆候が、ありません\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: この鍵が本当に本人のものである、という兆候が、少ししかありません\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "この鍵はたぶん本人のものです\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "この鍵は自分のものです\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: この鍵はダメです! 信用できないとマークされています!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6505,7 +6571,7 @@
 "なにをしているのか分かっている場合には、次の質問には yes と\n"
 "答えてください。\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6515,154 +6581,154 @@
 "ません。今から行うことを＊本当に＊理解していない場合には、\n"
 "次の質問にはnoと答えてください。\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "それでもこの鍵を使いますか? (y/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "*警告*: 信用できない鍵を使っています!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "*警告*: この鍵は失効されたようです (失効鍵は不在)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "ユーザID\"%s\"\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "オプション%sが与えられましたが、発行者\"%s\"と合いません\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "発行者\"%s\"はどのユーザIDとも合いません\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "オプション%sが与えられましたが、対応するユーザIDが見つかりません\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "*警告*: この鍵は指名失効者によって失効されています!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "*警告*: この鍵は所有者によって失効されています!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " 署名が偽物なこともある、ということです。\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "*警告*: この副鍵は所有者によって失効されています!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "注意: この鍵は使用禁止に設定されています。\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "注意: この鍵は期限切れです!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "*警告*: この鍵のユーザIDは信用できる署名で証明されていません!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "*警告*: この鍵は信用できる署名で証明されていません!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " この署名が所有者のものかどうかの検証手段がありません。\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "*警告*: この鍵は信用できません!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " この署名はおそらく 偽物 です。\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
 "signatures!\n"
 msgstr "*警告*: この鍵のユーザIDは十分に信用できる署名で証明されていません!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "*警告*: この鍵は十分に信用できる署名で証明されていません!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " この署名が所有者のものかどうか確信できません。\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: スキップ: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: スキップ: 公開鍵は使用禁止です\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: スキップ: 公開鍵はもうあります\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "'%s'に暗号化できません\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr ""
 "オプション'%s'が与えられましたが、有効なデフォルト鍵が与えられていません\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "オプション'%s'が与えられましたが、オプション'%s'は与えられていません\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "ユーザIDを指定していません (\"-r\"を使いましょう) 。\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "今の受取人:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6670,40 +6736,40 @@
 "\n"
 "ユーザIDを入力。空行で終了: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "そのユーザIDはありません。\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "スキップ: 公開鍵はデフォルトの受取人としてもう設定済みです\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "公開鍵は使用禁止です。\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "スキップ: 公開鍵はもう設定済みです\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "デフォルトの受取人\"%s\"が不明です\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "有効な宛先がありません\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "注意: 鍵%sには %s の機能がありません\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "注意: 鍵%sには%sに対する優先指定がありません\n"
@@ -6742,7 +6808,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "署名されたデータ fd=%d が開けません: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "鍵%sは%sモードでの復号化のために適しません\n"
@@ -6968,49 +7034,44 @@
 msgstr ""
 "%s鍵%sは%zuビットあるいはより大きいハッシュを必要とします(今のハッシュは%s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "鍵%sを署名のために%sモードで使うことはできません\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr "オプション %sのため、検証を続けます\n"
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "*警告*: 署名のダイジェストが、メッセージと衝突します\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "*警告*: 署名副鍵%sは、相互証明されてません\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "詳細は%sをご覧ください\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "*警告*: 無効な相互証明が、署名副鍵%sにあります\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
 msgstr0 "公開鍵%sは、署名よりも%lu秒、新しいものです\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 "公開鍵%sは、署名よりも%lu日、新しいものです\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7018,72 +7079,72 @@
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr0 "鍵%sは%lu秒、未来にできました (時間歪曲か時計の障害でしょう)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, 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"
 msgstr0 "鍵%sは%lu日、未来にできました (時間歪曲か時計の障害でしょう)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "注意: 署名鍵%sは%sに期限切れとなります\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "注意: 鍵 %s は失効済みです\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "不明のクリティカル・ビットのため、鍵%sによる署名を不正とみなします\n"
 
-#: g10/sig-check.c:1241
+#: g10/sig-check.c:1235
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "鍵%s: 副鍵失効署名に対する副鍵がありません\n"
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "鍵%s: 副鍵対応への署名に対する副鍵がありません\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr "*警告*: 表記を%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr "*警告*: ポリシーURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 msgstr "*警告*: 優先鍵サーバURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s署名。署名者:\"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7091,12 +7152,12 @@
 "*警告*: ダイジェスト・アルゴリズム %s (%d) の強制が、受取人の優先指定と対立し"
 "ます\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "署名:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, c-format
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s暗号化を使用します\n"
@@ -7172,133 +7233,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "信用データベース: 同期に失敗しました: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "'%s'のロックを作成できません\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "'%s'がロックできません\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信用データベース レコード%lu: シークに失敗しました: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信用データベース レコード%lu: 書き込みに失敗しました (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "信用データベースのトランザクションが大きすぎます\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ディレクトリがありません!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "'%s'にアクセスできません: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: バージョン・レコードの作成に失敗しました: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 無効な信用データベースを作成\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 信用データベースができました\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "注意: 信用データベースが、書き込み不能です\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無効な信用データベース\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: ハッシュ表の作成に失敗しました: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: バージョン・レコードの更新エラー: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: バージョン・レコードの読み込みエラー: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: バージョン・レコードの書き込みエラー: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信用データベース: シークに失敗しました: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信用データベース: 読み込みに失敗しました (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 信用データベース・ファイルではありません\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: レコード番号%lu番のバージョン・レコード\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無効なファイル・バージョン%d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 空きレコードの読み込みエラー: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ディレクトリ・レコードの書き込みエラー: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: レコードの初期化に失敗しました: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: レコードの追加に失敗しました: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "エラー: 信用データベースが壊れています。\n"
@@ -7706,7 +7767,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "信用データベースの検査は、不要です\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "次回の信用データベース検査は、%sです\n"
@@ -7736,35 +7797,35 @@
 msgid "checking the trustdb\n"
 msgstr "信用データベースの検査\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%d個の鍵を処理"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 " (うち%d本の有効性数をクリア)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "究極的に信用する鍵が見つかりません\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, 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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -7835,7 +7896,7 @@
 msgid "ultimate"
 msgstr " 究極 "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -7846,12 +7907,12 @@
 "(.sigや.asc)がコマンド行の最初でなければ\n"
 "ならないことを念頭においてください。\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "入力の%u行目が長すぎるか、LFがないようです\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "fd %dが開けません: %s\n"
@@ -7866,19 +7927,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "ヒント: オプション %s を使わない\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "デバッグ・フラグを設定"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "フル・デバッグを有効にする"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "使い方: kbxutil オプション ファイル (ヘルプは -h)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -7889,16 +7950,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%s番号&#x1f;: %s%%0A保持者&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "残された試行回数: %d"
@@ -7927,10 +7988,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||あなたのPIVカードのアンブロッキングキーを入力してください"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PINコールバックがエラーを返しました: %s\n"
@@ -7950,151 +8011,151 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PINに無効な文字があります。数字だけが使えます\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "鍵はもうあります\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "既存の鍵は置き換えられます\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "新しい鍵を生成\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "新しい鍵を書き込み\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "鍵の保管に失敗しました: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "応答にRSAのモジュラスが含まれていません\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "応答にRSA公開指数が含まれていません\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "応答に楕円曲線の公開鍵が含まれていません\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "鍵生成の間、お待ちください ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "鍵の生成に失敗しました\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "鍵の生成が完了しました (%d秒)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "応答に公開鍵データが含まれていません\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||新しいPINを認定署名を生成する鍵のために入力してください。"
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|管理者PINを入力してください"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|標準の鍵のPIN Unblocking Code (PUK)を入力してください。"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||PINを標準の鍵のために入力してください。"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSAのモジュラスがないか、%dビットのものではありません\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA公開指数がないか %d ビットより大きすぎます\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "注意: PINがまだ有効となっていません"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPINが変更されていません\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|新しいPINを標準の鍵のために入力してください。"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|標準の鍵の新しいPIN Unblocking Code (PUK)を入力してください。"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|新しいPINを認定署名を生成する鍵のために入力してください。"
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 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:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 "|P|認定署名の鍵のために新しいPINブロック解除コード(PUK)を入力してください。"
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "新しいPINの取得エラー: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "指紋の保管に失敗しました: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "生成日の保管に失敗しました: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "カードからCHVステイタスの取得でエラー\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "公開鍵の読み込みに失敗しました: %s\n"
@@ -8102,64 +8163,64 @@
 #. 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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%s番号&#x1f;: %s%%0A保持者&#x1f;: %s%%0Aカウンタ&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "デフォルトPINを%sとして使います\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||カードをアンロックしてください"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%dの認証に失敗しました: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "カードが永久にロックされてます!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, 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"
 msgstr0 "カードの永久ロック前に%d回の管理者PINの試行が残っています\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "管理コマンドへのアクセスが設定されていません\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||PINを入力してください"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||カードのリセット・コードを入力してください"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "リセット・コードが短すぎます。最短の長さは%dです。\n"
@@ -8167,78 +8228,78 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|新しいリセット・コード"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新しい管理者PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|新しいPIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||管理者PINと新しい管理者PINを入力してください"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||PINと新しいPINを入力してください"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "アプリケーション・データの読み込みエラー\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "フィンガープリントのデータ・オブジェクトの読み込みエラー\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "作成時刻スタンプがありません\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA素数 %s がありません、または%dビットのものではありません\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "サポートされていない曲線\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGPカードに無効な構造 (データ・オブジェクト 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "カードのフィンガープリントが要求されたものと一致しません\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "カードはダイジェスト・アルゴリズム %s をサポートしていません\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "これまでに作成された署名: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管理者PINの確認はこのコマンドでは今のところ禁止されています\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%sにアクセスできません - 無効なOpenPGPカード?\n"
@@ -8258,7 +8319,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
 
@@ -8302,11 +8363,11 @@
 msgid "deny the use of admin card commands"
 msgstr "管理カード・コマンドの使用を拒否"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "使い方: @SCDAEMON@ オプション (ヘルプは -h)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8314,319 +8375,319 @@
 "形式: scdaemon オプション コマンド 引数\n"
 "@GNUPG@のSmartcardデーモン\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
 "い\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %dのハンドラが開始されました\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %dのハンドラが終了しました\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "鍵使用情報の取得エラー: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
-msgstr ""
+msgstr "Torが使われているかもしれません - ネットワークアクセスは制限されます"
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "証明書から以下の検証モデルが要求されました: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "クリティカルな証明書の拡張%sはサポートされていません"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "発行者の証明書がCAとしてマークされていません"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "コンフィグされたポリシーなしにクリティカルにマークされたポリシー"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "'%s'が開けません: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "注意: クリティカルでない証明書ポリシーは認められません"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "証明書ポリシーは認められません"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "フィンガープリントの取得に失敗しました\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "発行者の外部ロケーションを調べています\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "マッチする発行者の数: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccessを取得できません: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Dirmngrキャッシュから発行者を調べています\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "マッチする証明書の数: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngrのキャッシュだけの鍵探索に失敗しました: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "keyDBハンドルの確保に失敗しました\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "証明書は失効済みです"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "証明書のステイタスは不明です"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "\"dirmngr\" が正しくインストールされていることを確認してください\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRLの検査に失敗しました: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "無効の妥当性の証明書: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "証明書はまだ有効ではありません"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "ルート証明書がまだ有効ではありません"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "中間証明書はまだ有効ではありません"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "証明書が有効期限を過ぎています"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "ルート証明書が有効期限を過ぎています"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "中間証明書が有効期限を過ぎています"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "必要な証明書の属性がありません: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "妥当性が無効な証明書"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "証明書のライフタイムの間に署名が作られていません"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "発行者のライフタイムの間に証明書が作られていません"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "発行者のライフタイムの間に中間証明書が作られていません"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( 署名、作成"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (証明書、作成"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " ( 証明書、有効"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( 発行者、有効"
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "フィンガープリント=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "ルート証明書は信用すると今、マークされました\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 "インタラクティブに信用するとマークすることがgpg-agentで有効となっていません\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "インタラクティブに信用するとマークすることはこのセッションでは無効となってい"
 "ます\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "*警告*: 署名の作成時間が不明です - 現在時刻を仮定します"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "証明書の発行者がありません"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "自己署名証明書に*不正な*署名があります"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "ルート証明書が信用できるとマークされていません"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "信用リストの検査に失敗しました: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "証明書のチェインが長すぎます\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "発行者証明書が見つかりません"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "証明書に*不正な*署名があります"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "別の一致する可能性があるCA証明書が見つかりました - 再度試します"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "証明書のチェインがCAにより認められたもの(%d)より長くなっています"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "証明書は正しいです\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中間証明書は正しいです\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "ルート証明書は正しいです\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "チェイン・モデルに切り替えました"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用した検証モデル: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "メモリがありません\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(これはMD2アルゴリズムです)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "none"
 
@@ -8646,7 +8707,7 @@
 msgid "Error - invalid DN"
 msgstr "エラー: 無効な DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8661,42 +8722,42 @@
 "S/N %s, ID 0x%08lX,\n"
 "作成 %s, 有効期限 %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "鍵の使い方が指定されていません - すべての使い道を仮定します\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "証明書は証明のために使われるべきではありませんでした\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "証明書はOCSP応答の署名のために使われるべきではありませんでした\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "証明書は暗号化のために使われるべきではありませんでした\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "証明書は署名のために使われるべきではありませんでした\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "証明書は暗号化のために使えません\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "証明書は署名のために使えません\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "別の証明書を探す\n"
@@ -8914,17 +8975,17 @@
 msgid "resource problem: out of core\n"
 msgstr "リソースの問題: メモリがありません\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(RC2アルゴリズムです)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(暗号化されたメッセージではないようです)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "%s鍵 %sに対して暗号化されました\n"
@@ -8934,7 +8995,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "証明書'%s'が見つかりません: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "keyboxのロックのエラー: %s\n"
@@ -8959,123 +9020,123 @@
 msgid "no valid recipients given\n"
 msgstr "有効な受け取り手が指定されていません\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "外部鍵を一覧する"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "証明書のチェインを表示する"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "証明書をインポートする"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "証明書をエクスポートする"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "スマートカードを登録する"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "dirmngrにコマンドを渡す"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-toolを起動する"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "端末をまったく使わない"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|インクルードする証明書の数"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|ポリシー情報をFILEから取得する"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "PEMフォーマットの入力を仮定する"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "base-64フォーマットの入力を仮定する"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "バイナリ・フォーマットの入力を仮定する"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "base-64形式の出力を作成"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|USER-IDをデフォルトの秘密鍵として使う"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|鍵リングを鍵リングのリストに追加"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "紛失している発行者証明書を取得する"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|PKCS#12のパスフレーズにNAMEのエンコーディングを使う"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "決してCRLを調べない"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "ルート証明書のCRLをチェックしない"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "OCSPを用いて有効性を確認する"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "証明書ポリシーをチェックしない"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|暗号アルゴリズムにNAMEを使用"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|ダイジェスト・アルゴリズムにNAMEを使用"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "バッチ・モード: なにもユーザに問い合わせない"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "ほとんどの設問にyesを仮定する"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "ほとんどの設問にnoを仮定する"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|監査ログをFILEに書き出す"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "使い方: @GPGSM@ オプション ファイル (ヘルプは -h)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9085,27 +9146,27 @@
 "S/MIMEプロトコルを用いて、署名、検査、暗号化や復号を行います\n"
 "デフォルトの操作は、入力データに依存します\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注意:'%s'に対して暗号化できません: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "不明の検証モデル '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "共通証明書のインポート・エラー: %s\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "'%s'を用いて署名できません: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無効なコマンド (暗黙のコマンドはありません)\n"
@@ -9125,7 +9186,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本証明書チェックが失敗しました - インポートされませんでした\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "保存されたフラグの取得エラー: %s\n"
@@ -9135,47 +9196,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "証明書のインポート・エラー: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "入力読み込みエラー: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "このセッションでkeyboxdは実行されていません\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "鍵DBを開く際のエラー: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "既存の証明書の検索の問題: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "書き込み可能keyDBの判定エラー: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "証明書保存エラー: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "証明書の再検索の問題: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "フラグの保存エラー: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "エラー - "
 
@@ -9211,7 +9272,7 @@
 "\n"
 "%s%s本当にこれを望みますか?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9231,61 +9292,61 @@
 "\"%s\"\n"
 "注意してください: この証明書は署名を作るために作成されていません!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "ハッシュ・アルゴリズム %d (%s)(署名人 %d へ)はサポートされていません。%s を使"
 "います\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "署名者 %dのために使われたハッシュアルゴリズム: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "適正な認定証明書の検査に失敗しました: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s 署名 (%s鍵ID %sを使用)\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "施された署名 "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "日時指定なし"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "アルゴリズム:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "無効な署名: メッセージ・ダイジェストの属性が計算されたものと一致しません\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "正しい署名"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " 別名"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "これは認定署名です\n"
@@ -9310,316 +9371,311 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "証明書キャッシュのロックが解除できません: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "%uの証明書をキャッシュからはずします\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "証明書'%s'が解析できません: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "証明書'%s'はすでにキャッシュされています\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "信用される証明書'%s'をロードしました\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "証明書'%s'をロードしました\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " SHA1フィンガープリント = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " 発行者 ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr "サブジェクト ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "証明書'%s'の読み込みエラー: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "永続的にロードされる証明書: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "実行時キャッシュ証明書の数: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " 信用された証明書の数: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr " すでにキャッシュされた証明書\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "キャッシュされた証明書\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "証明書のキャッシュのエラー: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "無効なSHA1フィンガープリント文字列'%s'\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "S/Nでの証明書取得エラー : %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "サブジェクトでの証明書取得エラー: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "証明書に発行者がみつかりません\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "authorityKeyIdentifierの取得エラー: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "ディレクトリ'%s'の作成\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "ディレクトリ'%s'の作成エラー: %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "データベース・ディレクトリ'%s'を無視します\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "ディレクトリ'%s'の読み込みエラー: %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "キャッシュ・ファイル' %s'の削除\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "ファイル'%s'を削除しません\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "キャッシュ・ファイルでクローズのエラー: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "キャッシュ・ディレクトリ・ファイル'%s'が開けません: %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "新しいキャッシュ・ディレクトリ・ファイル'%s'の作成エラー: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "新しいキャッシュ・ディレクトリ・ファイル'%s'の書き込みエラー: %s\n"
 
-#: dirmngr/crlcache.c:434
+#: dirmngr/crlcache.c:441
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "新しいキャッシュ・ディレクトリ・ファイル'%s'でクローズのエラー: %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "新しいキャッシュ・ディレクトリ・ファイル'%s'ができました\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "キャッシュ・ディレクトリ・ファイル'%s'が再オープンできません: %s\n"
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "最初のレコード'%s'はそのバージョンではありません。\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "古いバージョンのキャッシュ・ディレクトリ - きれいにします\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "古いバージョンのキャッシュ・ディレクトリ - あきらめます\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "crlレコードの'%s'に行 %u で余分なフィールドが検出されました\n"
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "'%s' (行 %u)で無効な行\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "'%s' (行 %u)で重複したエントリ\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "サポートしていないレコード型 '%s' を行 %u でスキップしました\n"
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "'%s'の無効な発行者ハッシュ(行 %u)\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "'%s'で発行者DNがありません(行 %u)\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "'%s'の無効なタイムスタンプ(行 %u)\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "*警告*: '%s'で無効なキャッシュ・ファイル・ハッシュ(行 %u)\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "キャッシュ・ディレクトリ・ファイルの検出エラー\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "理由を確認し、手動でそのファイルを削除してください\n"
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "一時キャッシュ・ディレクトリ・ファイル'%s'が作成できません: %s\n"
 
-#: dirmngr/crlcache.c:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "'%s'でクローズのエラー: %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "'%s'から'%s'へ名前変更のエラー: %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "'%s'をハッシュできません: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "MD5ハッシュ・コンテクストの設定エラー: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "'%s'でハッシュのエラー: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "'%s'に対する無効な形式のチェックサム\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 "キャッシュ・ファイルを多くオープンしすぎです。これ以上オープンできません\n"
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "キャッシュ・ファイル'%s'を開く\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "キャッシュ・ファイル'%s'を開く際、エラー: %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "キャッシュ・ファイル '%s' の初期化エラー、読み込み: %s\n"
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "unlock_db_file のクローズしたファイルへの呼び出し\n"
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "unlock_db_fileのロックしてないファイルへの呼び出し\n"
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "新しいキャッシュ・オブジェクトを作成するのに失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "発行者ID%sに対してCRLはありません\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "キャッシュされたCRLの発行者ID %s が古すぎます。更新が必要です\n"
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9627,197 +9683,197 @@
 msgstr ""
 "force-crl-refreshが有効で%d分が発行者ID%sに経過しました。更新が必要です\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "force-crl-refreshが発行者ID%sに対し有効です。更新が必要です\n"
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "発行者ID%sに対する利用可能なCRLが使用できません\n"
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "発行者ID%sに対するキャッシュされたCRLが変更されています。更新が必要です\n"
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "**警告**: S/Nに対する無効なキャッシュ・レコード長"
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "S/N %sに対するキャッシュ・レコードを読み込む際の問題: %s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr "S/N %s は無効です。理由=%02X 日付=%.15s\n"
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "キャッシュ・ファイルからデータの取得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "libksbaから無効なS-式を取得しました\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "S式の変換に失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "不明なハッシュ・アルゴリズム'%s'\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "アルゴリズム%dのgcry_md_openが失敗: %s\n"
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "S式の作成に失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse に失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "CRLの更新時刻の取得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "このCRLの更新時刻: これ=%s 次=%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdateが与えられていません。一日の有効期間を仮定します\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "CRL項目の取得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "一時キャッシュ・ファイルに項目の挿入エラー: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRLに発行者がありません: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "CRL発行証明書をauthorityKeyIdentifierで見つけます\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL署名の検証に失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "CRL発行者証明書の検証検査エラ−: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new が失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader が失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "古い一時キャッシュ・ファイル'%s'を削除しました\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "古い一時キャッシュ・ファイル'%s'が削除の問題: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'の作成エラー: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert が失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'の終了エラー: %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'のクローズ・エラー: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "**警告**: 新しいCRLはまだ古すぎます。%sに期限がきています - それでも読み込み"
 "ます\n"
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新しいCRLはまだ古すぎます。%sに期限がきています\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "不明のクリティカルCRLの拡張 %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "CRL拡張の読み込みエラー: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "キャッシュ・ファイル'%s'の作成\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "'%s'から'%s'へ名前変更の問題: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9826,65 +9882,65 @@
 "DIRファイルの更新の失敗 - キャッシュ・エントリは次のプログラムの開始で失われ"
 "ます\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "CRLダンプの開始 (%s から取得)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr "*エラー*: CRLは使用されません。更新後でも、古すぎるからです!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr "*エラー*: CRLは不明なクリティカル拡張のため使用されません!\n"
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr "*エラー*: CRLは使用されません\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr "*エラー*: このキャッシュされたCRLは変更されているかもしれません!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "*警告*: 無効なキャッシュ・レコード長\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "キャッシュ・レコードの読み込みの問題: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "キャッシュ鍵の再読み込みの問題: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "dbからキャッシュ・エントリの読み込みエラー: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "CRLダンプの終了\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "DPからcrl_fetchが失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "DPからcrl_cache_insertが失敗しました: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "発行者からcrl_cache_insertが失敗しました: %s\n"
@@ -9895,28 +9951,26 @@
 msgstr "readerからファイル・マッピングのテーブルがいっぱいです - 待ちます\n"
 
 #: dirmngr/crlfetch.c:155
-#, fuzzy
-#| msgid "CRL access not possible due to Tor mode\n"
 msgid "CRL access not possible due to Tor mode"
-msgstr "CRLアクセスはTorモードのため不可能です\n"
+msgstr "CRLアクセスはTorモードのため不可能です"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "CRLアクセスは停止された%sのため不可能です\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "'%s'を取得する際のエラー: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "リーダ・オブジェクトの初期化エラー: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "禁止されているため、証明書の探索ができません: %s\n"
@@ -10062,139 +10116,135 @@
 msgid "looking up '%s'\n"
 msgstr "'%s'を検索します\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "CRLキャッシュの内容をリストします"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|FILEからCRLをキャッシュにロードする"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|URLからCRLを取得します"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "dirmngrをシャットダウンする"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "キャッシュをフラッシュします"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "オンラインのソフトウェア・バージョン・チェックを許す"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr "ネットワーク関連オプション"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "ネットワーク・トラフィックをすべてTor経由にする"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "HTTPサーバのコンフィグレーション"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "HTTPの使用を禁止する"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "HTTP CRL配布ポイントを無視する"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "システムのHTTPプロキシ設定を用います"
 
-#: dirmngr/dirmngr.c:251
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
-msgstr "HTTPサーバのコンフィグレーション"
+msgstr "OpenPGPサーバのコンフィグレーション"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|鍵サーバとしてURLを使用"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
 
-#: dirmngr/dirmngr.c:258
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
-msgstr "HTTPサーバのコンフィグレーション"
+msgstr "X.509サーバのコンフィグレーション"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "LDAPの使用を禁止する"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "LDAP CRL配布ポイントを無視する"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "--ldap-proxy にフォールバック・ホストを使わない"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|このキーサーバを鍵の検索に使う"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|LDAPのタイムアウトをN秒とする"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "OCSPのコンフィグレーション"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "OCSP要求の送信を認める"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "OCSPサービスURLに入っている証明書を無視する"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|OCSP応答としてURLを使用"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|FPRで署名されたOCSPレスポンス"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "期日の過ぎたCRLのロードを強制する"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10203,11 +10253,11 @@
 "@\n"
 "(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "使い方: @DIRMNGR@ オプション (ヘルプは -h)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10215,103 +10265,103 @@
 "形式: @DIRMNGR@ オプション コマンド 引数\n"
 "@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有効なdebugレベルは: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "使い方: %s オプション "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "コロンはソケット名に許されません\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "'%s'からCRLの取得の失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "'%s'からCRLの処理に失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行が長すぎます - スキップされました\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 読み込みエラー: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 行末のゴミを無視\n"
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERMを受け取り - シャットダウン...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "強制的にシャットダウンする\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "シグナル%dを受け取り - アクションは定義されない\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "'%s'へアクセスのエラー: httpステイタス %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL'%s' は '%s' (%u) へリダイレクトされました\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "リダイレクトが多すぎます\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "リダイレクトが'%s'に変更されました\n"
@@ -10366,32 +10416,32 @@
 msgid "malloc failed: %s\n"
 msgstr "mallocが失敗しました: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s'は、LDAP URLではありません\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' は無効なLDAP URLです\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search がサーバのサイズ限界を越えました\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: ユーザなしに与えられたパスワード\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr "%s:%u: 未知のフラグ '%s' を無視します\n"
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: この行はスキップ\n"
@@ -10427,10 +10477,8 @@
 msgstr "サーバからの応答がが長すぎます (上限%dバイト)。\n"
 
 #: dirmngr/ocsp.c:148
-#, fuzzy
-#| msgid "OCSP request not possible due to Tor mode\n"
 msgid "OCSP request not possible due to Tor mode"
-msgstr "TorモードのためOCSPリクエストが不可能です\n"
+msgstr "TorモードのためOCSPリクエストが不可能です"
 
 #: dirmngr/ocsp.c:157
 #, c-format
@@ -10482,161 +10530,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "デフォルトOCSP署名者の証明で署名されていません"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "リスト項目の確保に失敗しました: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "応答IDの取得エラー: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "OCSP応答を検証する適切な証明書がありませんでした\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "発行者証明書が見つかりません: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "呼出側が対象の証明書を返しませんでした\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "呼出側が発行される証明書を返しませんでした\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "OCSPコンテクストの確保に失敗しました: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "デフォルトOCSPレスポンダが定義されていません\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "デフォルトのOCSP署名者が定義されていません\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "デフォルトOCSP応答'%s'を使います\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "OCSP応答'%s'を使います\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "対象の証明書のOCSPステイタスの取得エラー: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "証明書ステイタスは: %s (これ=%s 次=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "証明書は失効済みです: %s (理由: %s)\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OSCPレスポンダは未来のステイタスを返しました\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OSCPレスポンダは現在でないステイタスを返しました\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s)が失敗しました: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "serialnoがcert IDにありません"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquireに失敗しました: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url が失敗しました: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "データ送信エラー: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch が失敗しました: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert が失敗しました: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d を越えました\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "制御構造を確保できません: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "assuanコンテクストの確保に失敗しました: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "サーバの初期化に失敗しました: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Assuanで登録コマンドに失敗しました: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept の問題: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuanの処理が失敗しました: %s\n"
@@ -10646,83 +10694,83 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "CAとしてマークされていないルートCAを受領します"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "CRL検査のネストが深すぎです\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "CRL を確認しません"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "CRLの検査をしています"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "ルート証明書の信用検査に失敗しました: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "証明書チェインは正しいです\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "証明書はCRL署名のために使われるべきではありませんでした\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "おとなしく"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "16進でエンコードしてデータ出力を表示する"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "受信したデータ行をデコードする"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "dirmngrへ接続"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr "keyboxdへ接続"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|Assuanのソケット名NAMEに接続する"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|ADDRのAssuanサーバに接続する"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "コマンド・ラインで与えられたAssuanサーバを実行する"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "拡張接続モードを使わない"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|起動時にFILEからコマンドを実行する"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "起動時に /subst を実行する"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "使い方: @GPG@-connect-agent オプション (ヘルプは -h)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -10730,48 +10778,48 @@
 "形式: @GPG@-connect-agent オプション\n"
 "実行中のagentに接続し、コマンドを送る\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "オプション\"%s\"はプログラムとオプショナルの引数を要します\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "オプション\"%s\"は\"%s\"のため無視されました\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "行の受信に失敗しました: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "行が長すぎます - スキップされました\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "組込みのNulキャラクタのため行は短くされました\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "不明のコマンド'%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "行の送信に失敗しました: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "このセッションでkeyboxデーモンは実行されていません\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "標準オプションを送信エラー: %s\n"
@@ -10831,12 +10879,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "グループ仕様は無視されていることに注意してください\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "'%s'でクローズのエラー\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "'%s'でパーズのエラー\n"
@@ -10941,34 +10989,34 @@
 "形式: gpg-check-pattern オプション パターンファイル\n"
 "パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "注意: 鍵 %s はもうカードに保管してあります!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "注意: 鍵はもうカードに保管してあります!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "既存の鍵 %s を置き換えますか? (y/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s カードno. %sを検出\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 "ユーザインタラクションフラグは\"%s\"に設定されています - 変更できません\n"
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -10977,47 +11025,62 @@
 "警告: ユーザインタラクションフラグを\"%s\"に戻すには\n"
 " ファクトリリセットしかありません!\n"
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "\"uif --yes %d %s\"を使ってください\n"
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "カードに対して認証します"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "カードデーモンにリセットを送信する"
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "PIN認証のKDFを設定する"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "プライベート使用のデータオブジェクトを変更する"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "データオブジェクトから証明書を読み出します"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "証明書をデータオブジェクトに保管します"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "プライベート鍵をデータオブジェクトに保管する"
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey管理コマンド"
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "コマンド履歴を管理する"
 
+#~ msgid "continuing verification anyway due to option %s\n"
+#~ msgstr "オプション %sのため、検証を続けます\n"
+
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "選択されたAEADアルゴリズムは無効です\n"
+
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "無効な個人用AEAD方式の優先指定\n"
+
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "AEADアルゴリズム'%s'を%sモードで使うことはできません\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "一時ファイルの書き込みエラー: %s\n"
 
@@ -11809,9 +11872,6 @@
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "秘密鍵と公開鍵の一覧の反転"
 
-#~ msgid "Passphrase"
-#~ msgstr "パスフレーズ"
-
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "キーサーバ・ヘルパーにデータを与える際、一時ファイルを使う"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/nb.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/nb.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/nb.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/nb.po Changed

@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
@@ -34,49 +34,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Avbryt"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Ja"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Nei"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Lagre i passordbehandler"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Gjør passordfrase synlig"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Skjul passordfrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -87,7 +87,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -98,14 +98,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -113,7 +113,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -123,20 +123,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
 "hvordan kvaliteten vurderes."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 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:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -144,76 +144,82 @@
 "Skriv inn passordfrasen din, slik at hemmelig nøkkel kan låses opp for "
 "gjeldende økt"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Passordfrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "feil. Prøv igjen"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase Entry"
+msgid "Passphrases match."
+msgstr "Skriving av passordfrase"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (forsøk %d av %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Gjenta:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "For lang PIN"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "For lang passordfrase"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "Koden er for kort"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Ugyldig PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Ugyldig passordfrase"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "feil under henting av kort-serienummer: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Skriv inn denne passordfrasen på nytt"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -224,51 +230,51 @@
 msgstr ""
 "Skriv inn passordfrase for å låse nytt importert objekt i GnuPG-systemet."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "klarte ikke å lage «%s»: %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "klarte ikke å åpne «%s»: %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "fant ingen passende kortnøkkel: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "feil under henting av kortliste: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -277,20 +283,20 @@
 "En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A %s%%0A (%s)%%0AVil "
 "du tillate dette?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Tillat"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Avvis"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Skriv inn passordfrase for ssh-nøkkel%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -299,86 +305,82 @@
 "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:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke å lage strøm av sokkel: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Sett inn kort med serienummer"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Tilbakestillingskode"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0ABruk leserens kodeplate til å skrive."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Gjenta tilbakestillingskode"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Gjenta PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Gjenta PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Tilbakestillingskode ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK-kode ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Skriv inn PIN-kode%s%s%s for å låse opp kort"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "feil under skriving til %s: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "Du har ikke skrevet inn en passordfrase.%0ATom passordfrase er ikke tillatt."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -387,18 +389,18 @@
 "Du har ikke skrevet inn en passordfrase. Dette er generelt ikke lurt."
 "%0ABekreft at du ikke vil beskytte nøkkelen."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Ja, beskyttelse er unødvendig"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "Passordfraser skal bestå av minst %u tegn."
 msgstr1 "Passordfraser skal bestå av minst %u tegn."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -406,236 +408,242 @@
 msgstr0 "Passordfraser bør inneholde minst %u siffer eller%%0Aspesialtegn."
 msgstr1 "Passordfraser bør inneholde minst %u sifre eller%%0Aspesialtegn."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "Ikke bruk kjente ord, uttrykk eller kjente mønster%%0Ai passordfraser."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Advarsel: du har skrevet inn en svak passordfrase."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Bruk denne likevel"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Skriv inn passordfrase for å%0Abeskytte ny nøkkel"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Nyttige feilsøkingsvalg"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "kjør som bakgrunnsprosess («daemon»)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "kjør i tjenermodus (forgrunn)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "ikke løsne fra konsoll"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "csh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|les valg fra valgt FIL"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Styring av diagnostikk-utdata"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detaljert utskrift"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "være noenlunde stille"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Oppsettsvalg"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "ikke bruk SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|bruk PGN som SCdaemon-program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|bruk PGN som SCdaemon-program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|godta enkelte kommandoer via «NAME»"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørsler om å bytte TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørsler om å bytte X-skjerm"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "slå på ssh-støtte"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "slå på støtte for putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "slå på støtte for putty"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Sikkerhetsvalg"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 "|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "ikke bruk PIN-hurtiglager under signering"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ikke la klienter tillitsmarkere nøkler"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "tillat valg av passordfrase på forhånd"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Valg som håndhever passordfrase-regler"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "ikke tillat avvik fra passordregler"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|endre minimal passordfrase-lengde til N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|krev at passordfraser inneholder minst N antall spesialtegn og tall"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|regn passord som ugyldig etter N antall dager"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "ikke tillat gjenbruk av gamle passordfraser"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Sikkerhetsvalg"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "ikke la kaller overstyre PIN-inntasting"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "ikke bruk tastatur og mus"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "la brukeren skrive inn passordfrase via Emacs"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter programfeil til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Bruk: @GPG_AGENT@ valg («-h» for hjelp)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -643,141 +651,141 @@
 "Syntaks: @GPG_AGENT@ valg kommando arg\n"
 "Håndtering av hemmelige nøkler for @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg kontrollsum-algoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leser valg fra «%s»\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Merk: «%s» regnes ikke som et valg\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: valget «%s» er utgått\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "klarte ikke å lage sokkel: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "sokkelnavnet «%s» er for langt\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "feil under henting av sokkel-anledning\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "feil under knytning av sokkel til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "lytter på sokkel «%s»\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "klarte ikke å lage mappa «%s»: %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "mappa «%s» er opprettet\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() mislyktes for «%s»: %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "«%s» kan ikke brukes som hjemmemappe\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "startet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "avsluttet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect mislyktes: %s - venter 1s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -785,11 +793,11 @@
 "@Valg:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -797,8 +805,8 @@
 "Syntaks: gpg-preset-passphrase valg KEYGRIP\n"
 "Vedlikehold av hurtiglager for passord\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -806,8 +814,8 @@
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -817,11 +825,11 @@
 "Valg:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Bruk: gpg-protect-tool valg («-h» for hjelp)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -829,22 +837,22 @@
 "Syntaks: gpg-protect-tool valg arg\n"
 "Håndteringsverktøy for hemmelige nøkler\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 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:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -852,52 +860,54 @@
 "Skriv inn passordfrase eller PIN-kode som\n"
 "kreves for å fullføre gjeldende handling."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "avbrutt\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "feil under åpning av «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fil «%s», linje %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "uttrykk «%s» ignorert i «%s», linje %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system-tillitsliste «%s» er ikke tilgjengelig\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "ugyldig fingeravtrykk i «%s», linje %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ugyldig nøkkelvalg i «%s», linje %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "feil under lesing av «%s», linje %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "feil under lesing av liste over tillitsmerkede rotsertifikater\n"
@@ -910,7 +920,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -919,11 +929,11 @@
 "Stoler du fullstendig på at%%0A «%s»%%0Asertifiserer brukersertifikater "
 "korrekt?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Nei"
@@ -936,7 +946,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -946,21 +956,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Riktig"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Feil"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -969,15 +979,29 @@
 "Denne passordfrasen har ikke blitt endret%%0Asiden %.4s-%.2s-%.2s. Endre den "
 "umiddelbart."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Endre passordfrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Jeg endrer senere"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Sett inn kort med serienummer"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A %s%%0A (%s)%%0AVil "
+"du tillate dette?"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -985,11 +1009,11 @@
 msgstr ""
 "Er du sikker på at du vil slette nøkkel med nøkkelgrep%%0A %s%%0A %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Slett nøkkel"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1003,8 +1027,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s nøkkel bruker utrygg kontrollsum (%u bit)\n"
@@ -1014,7 +1038,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av opprettet signatur mislyktes: %s\n"
@@ -1024,7 +1048,7 @@
 msgid "secret key parts are not available\n"
 msgstr "hemmelige nøkkeldeler er ikke tilgjenglig\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "offentlig nøkkelalgoritme %d (%s) støttes ikke\n"
@@ -1039,53 +1063,53 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "kontrollsum-algoritme for beskyttelse %d (%s) støttes ikke\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil under opprettelse av datarør: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "feil under opprettelse av strøm for datarør: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "feil under kopiering av prosess: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "prosess %d avsluttet ikke i tide: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr ""
 "feil under kjøring av «%s». Programmet er sannsynligvis ikke installert\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "feil under kjøring av «%s». Avslutningskode %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "feil under kjøring av «%s». Avsluttet\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "venting på avslutning av prosesser mislyktes: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil under henting av prosess-avslutningskode %d: %s\n"
@@ -1105,28 +1129,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "klarte ikke å slå av kjernedump: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Advarsel: utrygt eierskap til %s «%s»\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: utrygge tillatelser til %s «%s»\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter på at fila «%s» skal bli tilgjengelig …\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ja"
 
@@ -1180,8 +1204,8 @@
 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:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "feil under tildeling av minne: %s\n"
@@ -1196,78 +1220,78 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "ADVARSEL: valget «%s%s» er utgått, og har ingen effekt\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "unknown debug flag '%s' ignored\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "venter på at dirmngr skal dukke opp … (%ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "venter på at agent skal dukke opp … (%ds)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "venter på at agent skal dukke opp … (%ds)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "koblet til dirmngr\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the keyboxd established\n"
 msgstr "koblet til dirmngr\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the agent established\n"
 msgstr "koblet til dirmngr\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running Dirmngr - starting '%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "ingen kjørende Dirmngr. Starter «%s»\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "connection to agent is in restricted mode\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "kobler til agent i begrenset modus\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "feil under henting av versjon fra «%s»: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "tjener «%s» er eldre enn oss (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "ADVARSEL: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr "Merk: Utdaterte tjenere kan mangle viktige sikkerhetsfunksjoner.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Merk: Bruk kommandoen «%s» for å starte dem på nytt.\n"
@@ -1340,7 +1364,7 @@
 msgstr "algoritme: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "ustøttet algoritme: %s"
@@ -1415,39 +1439,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Rotsertifikat regnes som troverdig"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "fant ingen sertifikat-CRL"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "tilgjengelig CRL er for gammel"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL-/OCSP-sertifikatkontroll"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Inkluderte sertifikater"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Ingen elementer i revisjonslogg."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Ukjent handling"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent kan brukes"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr kan brukes"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Ingen hjelp tilgjengelig for «%s»"
@@ -1456,11 +1480,11 @@
 msgid "ignoring garbage line"
 msgstr "ignorerer ubrukelig linje"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "ingen"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
@@ -1495,136 +1519,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open mislyktes: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering fra «%s» til «%s» mislyktes: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "klarte ikke å lage midlertidig fil «%s»: %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "feil under skriving til «%s»: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "fjerner ødelagt låsfil (laget av %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(vranglås?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lås «%s» ikke opprettet: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "venter på lås %s …\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (krever %s, har %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "feil under oppretting av «%s»: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "feil under lukking av «%s»: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "ugyldig armorheader: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "armorheader: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "ugyldig clearsigheader\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "ukjent skjold-hode: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "nøstede klartekst-signaturer\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "uforventet armering: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "ugyldig bindestrekbeskyttet linje: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "feilformatert CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-feil; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (på sluttlinje)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "feil på etterfølgende linje\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "fant ingen gyldig OpenPGP-data.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldig armor: linje lengre enn %d tegn\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1632,12 +1668,12 @@
 "anført utskrivbart tegn i armor. Noen har antakeligvis brukt en feiloppsatt "
 "e-posttjener\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " ikke menneskevennlig (%zu byte: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1646,32 +1682,32 @@
 "notatnavn kan bare inneholde utskrivbare tegn og mellomrom, og må slutte med "
 "«=»\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bruker-notatnavn må inneholde tegnet «@»\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "notatnavn kan ikke inneholde flere enn ett «@»-tegn\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "notatverdier kan ikke inneholde kontrolltegn\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "notatnavn kan ikke inneholde tegnet «=»\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "notatnavn skal bare inneholde utskrivbare tegn og evt. mellomrom\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ADVARSEL: fant ugyldig notatdata\n"
@@ -1685,8 +1721,8 @@
 msgid "Enter passphrase: "
 msgstr "Skriv inn passordfrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s kan ikke brukes i %s-modus\n"
@@ -1697,13 +1733,13 @@
 msgid "error from TPM: %s\n"
 msgstr "feil under lesing fra %s: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agent: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "ingen dirmngr kjører i gjeldende økt\n"
@@ -1714,204 +1750,209 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 #| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 #| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Oppdaget OpenPGP-kortnummer %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "du kan ikke gjøres dette i buntmodus\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "ikke valgt"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er foreløpig tillatt.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: tegnet «<» kan ikke brukes.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "Adresse for henting av offentlig nøkkel: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "feil under lesing av «%s»: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "feil under skriving av «%s»: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Språkoppsett: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig svar.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: feilformatert fingeravtrykk.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "klarte ikke å utføre nøkkelhandling: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil under henting av nøkkelinfo: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende nøkkel? (j/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1927,109 +1968,109 @@
 " Se dokumentasjon for kortet du bruker og finn ut hvilke størrelser \n"
 " det tillater hvis nøkkelgenerering mislykkes.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvor stor skal nøkkelen være? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bit\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 #| msgid " (1) Signature key\n"
 msgid "Signature key\n"
 msgstr " (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 #| msgid " (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr " (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 #, fuzzy
 #| msgid " (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr " (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Velg hvilken type nøkkel du vil ha:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 #| msgid " (%d) ECC and ECC\n"
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC og ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende nøkler? (j/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2040,186 +2081,191 @@
 " PIN = «%s» Admin-PIN = «%s»\n"
 "Du bør endre disse med kommandoen «--change-pin»\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "Velg hvilken type nøkkel du vil lage:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "velg hvor nøkkelen skal lagres:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD mislyktes: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, 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:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error looking up: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "feil under oppslag av %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "gå ut av denne menyen"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "vis admin-kommandoer"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "vis denne hjelpeteksten"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "endre adresse for å hente nøkkel"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "hent nøkkel som ligger i kortets adresse"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "endre brukernavn"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "endre språkoppsett"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "endre kortholders kjønn"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "endre CA-fingeravtrykk"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "slå av på tvungen bruk av signatur-PIN"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "lag nye nøkler"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "meny for å endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "fjern PIN-blokkering med en tilbakestillingskode"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "ødelegg alle nøkler og data"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "endre eiertillit"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "endre eiertillit"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Ugyldig kommando (prøv «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "fant ikke nøkkelen «%s»: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2278,9 +2324,9 @@
 msgid "subkey"
 msgstr "undernøkkel"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
@@ -2305,80 +2351,75 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
+"mottakers oppsett\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil under opprettelse av passordfrase: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "klarte ikke å bruke symmetrisk ESK-pakke på grunn av S2K-modus\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "bruker krypteringsmetode %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "«%s» er allerede komprimert\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ADVARSEL: «%s» er en tom fil\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "leser fra «%s»\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
-"mottakers oppsett\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2387,18 +2428,13 @@
 "ADVARSEL: tvungen bruk av komprimeringsalgoritme %s (%d) bryter med "
 "mottakers oppsett\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: «%s»\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
@@ -2414,7 +2450,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2427,402 +2463,408 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved håndtering av kryptert pakke\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "eksportere signaturer som er markert som bare-lokale"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "eksporter bruker-id-er (generelt foto-id-er)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "eksporter opphevelsesnøkler markert som «sensitive»"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "fjern ubrukelige deler fra nøkkelen under eksportering"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "fjern så mye som mulig fra nøkkelen under eksportering"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "lag opphevelsessertifikat"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "bruk GnuPG-format til sikkerhetskopiering av nøkkel"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr ". Hoppet over"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "skriver til «%s»\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "nøkkel %s: nøkkelmateriell på kort - hoppet over\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nøkkel %s: PGP 2.x-aktig nøkkel - hoppet over\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: ingenting eksportert\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "feil under oppretting av «%s»: %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "Fant ikke bruker-ID"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "hentet «%s» via %s automatisk\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "feil under henting av «%s» via %s: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Ingen fingeravtrykk"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(kontroller argument for valget «%s»)\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "bruker «%s» som forvalgt hemmelig signeringsnøkkel\n"
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "alle verdier som sendes til «%s» blir ignorert\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "følgende verdier er gyldige for «%s»:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "lag signatur"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "lag klartekst-signatur"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "lag adskilt signatur"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "krypter data (symmetrisk)"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "dekrypter data (forvalgt)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "bekreft signatur"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "vis nøkler"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "vis nøkler og signaturer"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøkkelsignaturer"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "vis nøkler og fingeravtrykk"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "vis hemmelige nøkler"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "lag nytt nøkkelpar"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "lag nytt nøkkelpar raskt"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "legg til en ny bruker-ID raskt"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "opphev bruker-ID raskt"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "endre utløpsdato raskt"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "fullverdig generering av nøkkelpar"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "fjern nøkler fra offentlig nøkkelknippe"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøkler fra hemmelig nøkkelknippe"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "hurtigsigner nøkkel"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "hurtigsigner nøkkel lokalt"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "opphev bruker-ID raskt"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "signer nøkkel"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "signer nøkkel lokalt"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "signer eller rediger nøkkel"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "endre passordfrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "eksporter nøkler"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "eksporter nøkler til nøkkeltjener"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importer nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "søk etter nøkler på nøkkeltjener"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "oppdater alle nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importer/slå sammen nøkler"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "vis kortstatus"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "endre data på kort"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "endre PIN på kort"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "oppdater tillitsdatabase"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "skriv ut kontrollsum av melding"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "kjør i tjenermodus"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VERDI|endre TOFU-regler for nøkkel"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPES|sett opp e-post-alias"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppførsel"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "ikke utfør valgte endringer"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "spør før overskriving"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Sikkerhetsvalg"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Styring av diagnostikk-utdata"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "lag ASCII-beskyttet utdata"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv utdata til valgt FIL"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Valg som styrer grensesnitt og håndheving av regler"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MEKANISMER|bruk valgte MEKANISME til å finne nøkler med e-postadresse"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importer nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "vis og kontroller nøkkelsignaturer"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "slå av all tilgang til dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Oppsettsvalg"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "vis hemmelige nøkler"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2830,7 +2872,7 @@
 "@\n"
 "(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2850,11 +2892,11 @@
 " --list-keys navn vis nøkler\n"
 " --fingerprint navn vis fingeravtrykk\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Bruk: @GPG@ valg filer (-h for hjelp)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2864,7 +2906,7 @@
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2872,562 +2914,556 @@
 "\n"
 "Støttede algoritmer:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Off. nøkkel: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Kryptering: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "bruk: %s valg %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "oppsettselementet «%s» er ukjent\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "vis foto-id-er i nøkkelvisning"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "vis regeladresser i signaturvisning"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "vis alle notater i signaturvisning"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotater under signaturvisning"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brukervalgte notater under signaturvisning"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 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:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "vis utløpsdatoer i nøkkelvisning"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "vis nøkkelknippe-navn i nøkkelvisning"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "vis utløpsdatoer i nøkkelvisning"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "vis innstillinger (avansert)"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "«%s» er et ukjent TOFU-regelverk\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(bruk «help» for å vise valg)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» er en ugyldig signatur-utløpstid\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» er en ugyldig e-postadresse\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, 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:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "filtervalget %s er ugyldig\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "vis bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "vis adresser til retningslinjer under signaturbekreftelse"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "vis alle merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotater under signaturbekreftelse"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "vis selvvalgte merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "klarte ikke å endre «exec»-sti til %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "ugyldig argument for valget «%.50s»\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "du kan ikke bruke %s med %s.\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s gir ikke mening med %s.\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kjører med falsk systemtid: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "valg kontrollsum-algoritme er ugyldig\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, 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:3984
+#: g10/gpg.c:4002
 #, 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:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldig standardoppsett\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enda med %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøkkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "søk på nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, 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:5342
+#: g10/gpg.c:5394
 #, 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:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv inn melding …\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "valgt adresse for signaturregler er ugyldig\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
@@ -3440,7 +3476,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare være en advarsel"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -3469,157 +3505,157 @@
 msgid "No help available for '%s'"
 msgstr "Ingen hjelp tilgjengelig for «%s»"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "importer signaturer som er merket som kun lokale"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparer skader fra pks-nøkkeltjener under importering"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "ikke tøm «ownertrust»-verdier under importering"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "ikke oppdater tillitsdatabase etter importering"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "enable putty support"
 msgid "enable bulk import mode"
 msgstr "slå på støtte for putty"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "vis nøkkel under importering"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key during import"
 msgid "show key but do not actually import"
 msgstr "vis nøkkel under importering"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "bare godta oppdateringer av nøkler som finnes allerede"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "fjern ubrukelige deler av nøkkel etter importering"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "fjern så mye som mulig fra nøkkel etter importering"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "kjør importeringsfiltre og eksporter nøkkel umiddelbart"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "forvent GnuPG-format på sikkerhetskopierte nøkler"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "reparer nøkler under importering"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hopper over blokk av typen %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nøkler behandlet hittil\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antall behandlet: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " hopper over PGP 2-nøkler: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " nye nøkler som ble hoppet over: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " uten bruker-id-er: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importert: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " uendret: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nye bruker-id-er: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nye undernøkler: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nye signaturer: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " nye nøkkelopphevinger: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " leste hemmelige nøkler: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " importerte hemmelige nøkler: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " uforandrede hemmelige nøkler: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " ikke importert: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " oppryddete signaturer: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " tømte bruker-id-er: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3628,179 +3664,184 @@
 "ADVARSEL: nøkkelen %s inneholder innstillinger for\n"
 "utilgjengelige algoritmer på følgende bruker-id-er:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " «%s»: innstilling for krypteringsalgoritme %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " «%s»: innstilling for krypteringsalgoritme %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " «%s»: oppsett for kontrollsum-algoritme %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " «%s»: oppsett av komprimeringsalgoritme %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "du anbefales på det sterkeste å endre oppsett og\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "dele ut denne nøkkelen på nytt for å unngå potensielle problemer med "
 "algoritme-samsvar\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "oppdater oppsettet med følgende kommando: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nøkkel %s: ingen bruker-ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "nøkkel %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "avvist av importeringskontrollør"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nøkkel %s: PKS-undernøkkel reparert\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nøkkel %s: akseptert ikke-selvsignert bruker-ID «%s»\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nøkkel %s: ingen gyldig bruker-id-er\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes manglende selvsignatur\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nøkkel %s: fant ikke offentlig nøkkel: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nøkkel %s: ny nøkkel. Hoppet over\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fant ikke skrivbart nøkkelknippe: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "feil under skriving av nøkkelknippe «%s»: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nøkkel %s: offentlig nøkkel «%s» importert\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nøkkel %s: «%s» 1 ny bruker-ID\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nøkkel %s: «%s» 1 ny signatur\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nøkkel %s: «%s» 1 ny undernøkkel\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nøkkel %s: «%s» %d nye undernøkler\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nøkkel %s: «%s» ikke endret\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nøkkel %s: hemmelig nøkkel importert\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "nøkkel %s: hemmelig nøkkel finnes allerede\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "nøkkel %s: feil under sending til agent: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3809,203 +3850,203 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, 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:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "hemmelig nøkkel %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importering av hemmelig nøkkel er ikke tillatt\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Ingen grunn oppgitt"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Nøkkelen er overgått"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Nøkkelen har blitt kompromittert"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Nøkkelen er ikke lengre i bruk"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Bruker-ID er ikke lenger gyldig"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "grunnen for opphevelse: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "kommentar til opphevelse: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nøkkel %s: «%s» opphevingssertifikat importert\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nøkkel %s: ingen bruker-ID for signatur\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nøkkel %s: ustøttet offentlig nøkkelalgoritme\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nøkkel %s: ugyldig direkte nøkkelsignatur\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nøkkel %s: fjernet flere undernøkkelbindinger\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nøkkel %s: fjernet flere undernøkkelopphevinger\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nøkkel %s: hoppet over bruker-ID «%s»\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nøkkel %s: hoppet over undernøkkel\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nøkkel %s: «%s» opphevingssertifikat lagt til\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
@@ -4015,14 +4056,14 @@
 msgid "error allocating memory: %s\n"
 msgstr "feil under minnetildeling: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@ -4030,44 +4071,44 @@
 "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
 "meldingssum (%d): %s.\n"
 
-#: g10/key-check.c:571
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr " (omsorterte signaturer følger)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "nøkkel %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "%d duplikatsignatur fjernet\n"
 msgstr1 "%d duplikatsignaturer fjernet\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 "%d signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
 msgstr1 "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d ubrukelig signatur\n"
 msgstr1 "%d ubrukelige signaturer\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "%d signatur omsortert\n"
 msgstr1 "%d signaturer omsortert\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -4076,45 +4117,45 @@
 "Advarsel: fant feil og kontrollerte bare selvsignaturer. Kjør «%s» for å "
 "kontrollere alle signaturer.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "feil under opprettelse av nøkkelskrin «%s»: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "feil under opprettelse av nøkkelknippe «%s»: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "nøkkelskrin «%s» er opprettet\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "nøkkelknippe «%s» er opprettet\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "nøkkelblokkressurs «%s»: %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "klarte ikke å bygge hurtiglager for nøkkelknippe på nytt: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "oppheving"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "selvsignatur"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4125,17 +4166,17 @@
 "andre brukeres nøkler (ved å se på pass, sjekke fingeravtrykk fra\n"
 "forskjellige kilder, osv.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Jeg stoler marginalt\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Jeg stoler fullt\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4145,52 +4186,52 @@
 "En dybde på over 1 tillater at nøkkelen du signerer\n"
 "lager tillitssignaturer på dine vegne.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Skriv inn et domene som denne signaturen skal begrenses til, eller trykk "
 "enter hvis ingen.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Hopper over bruker-ID «%s», som ikke er en tekst-iD.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Bruker-ID «%s» er opphevet."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker på at du vil signerere den? (j/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Klarte ikke å signere.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Bruker-ID «%s» er utgått."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Bruker-ID «%s» er ikke selvsignert."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Bruker-ID «%s» er signerbar. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Signere den? (j/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4199,11 +4240,11 @@
 "Selvsignaturen på «%s»\n"
 "er en PGP 2.x-aktig signatur.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4212,11 +4253,11 @@
 "Gjeldende signatur på «%s»\n"
 "er utgått.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vil du utstede en ny signatur for å erstatte den som er utgått? (j/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4225,43 +4266,43 @@
 "Din nåværede signatur på «%s»\n"
 "er en lokal signatur.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» var allerede lokalt signert med nøkkelen %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» var allerede signert med nøkkelen %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vil du signere den på nytt likevel? (j/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ingenting å signere med nøkkelen %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Denne nøkkelen er utgått."
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne nøkkelen utgår %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vil du at signaturen skal utgå på samme tidspunkt? (J/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4271,31 +4312,31 @@
 "tilhører den overnevnte personen? Skriv «0» hvis du ikke vet\n"
 "svaret.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Jeg vil ikke svare.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Jeg har ikke sjekket i det hele tatt.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Jeg har gjort en vanlig sjekk.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Jeg har sjekket veldig nøye.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Hva velger du? (skriv «?» for mer informasjon): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4304,234 +4345,245 @@
 "Er du sikker på at du vil signerere denne nøkkelen med\n"
 "nøkkelen «%s» (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Dette skal være en selvsignatur.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ADVARSEL: signaturen blir ikke markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ADVARSEL: signaturen blir ikke markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen blir markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen blir markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Jeg har ikke sjekket denne nøkkelen i det hele tatt.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Jeg har sjekket denne nøkkelen på vanlig måte.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Jeg har sjekket denne nøkkelen veldig nøye.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Er du sikker på at du vil signere? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Nøkkelen har bare stubbe- eller kortnøkkel-elementer. Ingen passordfrase å "
 "endre.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "nøkkel %s: feil under endring av passordfrase: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "vise nøkkelens fingeravtrykk"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "vis nøkkelgrep"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "vis nøkler og bruker-id-er"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "velger bruker-ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "velger bruker-ID N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "sjekke signaturer"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "signer valgte bruker-id-er * se nedenfor for relevante kommandoer"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "signerer valgte bruker-id-er lokalt"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer valgte bruker-id-er med tillitssignatur"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer valgte bruker-id-er med en signatur som ikke kan trekkes tilbake"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "legg til bruker-ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "legg til foto-ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "slett valgte bruker-id-er"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "legg til undernøkkel"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "legg til nøkkel på et smartkort"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "flytt nøkkel til et smartkort"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "flytt en sikkerhetskopi-nøkkel til et smartkort"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "slett valgte undernøkler"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "legg til opphevingsnøkkel"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Datadekryptering fullført"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "slett signaturer fra valgte bruker-id-er"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "endre utløpsdato for nøkkelen eller valgte undernøkler"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "marker valgt bruker-ID som primær"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "vis innstillinger (avansert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "vis innstillinger (detaljert)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "velg oppsettsliste for valgte bruker-id-er"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "endre adresse til foretrukket nøkkeltjener for valgte bruker-id-er"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "endre notat for valgte bruker-id-er"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "endre passordfrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "endre eiertillit"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "opphev signaturer på valgte bruker-id-er"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "opphev valgte bruker-id-er"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "opphev nøkkel eller valgte undernøkler"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "ta nøkkel i bruk"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "ta nøkkel ut av bruk"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "vis valgte foto-id-er"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "pakkk sammen ubrukelige bruker-id-er og fjern ubrukelige signaturer fra "
 "nøkkel"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "pakkk sammen ubrukelige bruker-id-er og fjern alle signaturer fra nøkkel"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Hemmelig nøkkel er tilgjengelig.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Hemmelig nøkkel er tilgjengelig.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Du trenger tilhørende hemmelig nøkkel for å gjøre dette.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4545,286 +4597,277 @@
 " (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
 "osv.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Nøkkelen er opphevet."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Er du sikker på at du vil signerere alle bruker-id-er? (j/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Er du sikker på at du vil signerere alle bruker-id-er? (j/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Velg bruker-id-en(e) du vil signere\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "«%s» er en ukjent signaturtype\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Du må velge minst én bruker-ID.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Bruk kommandoen «%s».)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan ikke slette siste bruker-ID.\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Er du sikker på at du vil fjerne alle valgte bruker-id-er? (j/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Er du sikker på at du vil fjerne valgt bruker-ID? (j/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 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:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Du må velge minst én nøkkel.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Kommandoen forventer et filnavn-argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Klarte ikke å åpne «%s»: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Feil under lesing av sikkerhetskopi-nøkkel fra «%s»: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Du må velge minst én nøkkel.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Er du sikker på at du vil slette valgt nøkkel? (j/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Er du sikker på at du vil slette denne nøkkelen? (j/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Er du sikker på at du vil oppheve alle valgte bruker-id-er? (j/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Er du sikker på at du vil oppheve denne bruker-id-en? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Er du sikker på at du vil oppheve hele nøkkelen? (j/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Er du sikker på at du vil oppheve valgte undernøkler? (j/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Er du sikker på at du vil oppheve denne undernøkkelen? (j/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Du kan ikke justere eiertillit når du bruker selvvalgt tillitsdatabase\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Bytt oppsettsliste til:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Er du sikker på at du vil oppdatere oppsett for valgte bruker-id-er? (j/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Er du sikker på at du vil oppdatere oppsett? (j/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Vil du lagre endringer? (j/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Vil du avslutte uten å lagre? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "sletting av hemmelig nøkkel %s mislyktes: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "opphevelse av bruker-id mislyktes: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "endring av primær bruker-ID mislyktes: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» er ikke et fingeravtrykk\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» er ikke primært fingeravtrykk\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Bruker-ID «%s» er ugyldig: %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "Ingen treff på bruker-id-er."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Ingenting å signere.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke signert av deg.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» er en ugyldig utløpstid\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "fant ikke undernøkkel «%s»\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Kontrollsum: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Funksjoner: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Nøkkeltjener no-modify"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "utgår: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "bruk: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Denne nøkkelen er ikke i bruk"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4832,17 +4875,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "utgått"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4851,17 +4894,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4871,74 +4920,74 @@
 "føre til at\n"
 " enkelte PGP-versjoner avviser nøkkelen.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "Slettet %d signatur.\n"
 msgstr1 "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruker-ID «%s» pakket sammen: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "Bruker-ID «%s»: %d signatur fjernet\n"
 msgstr1 "Bruker-ID «%s»: %d signaturer fjernet\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruker-ID «%s»: allerede minimert\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruker-ID «%s»: allerede renset\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4948,283 +4997,299 @@
 " kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
 "nøkkelen.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Skriv inn oppheverens bruker-ID: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(med mindre du oppgir nøkkel ved hjelp av fingeravtrykk)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Undernøkkel %s er allerede opphevet.\n"
+
+#: g10/keyedit.c:5007
 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:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Endrer utløpstid for undernøkkel.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Endrer utløpstid for primærnøkkel.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, 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:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Velg én bruker-ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 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:5384
+#: g10/keyedit.c:5672
 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:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Skriv inn notat: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruker-ID med indeks %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruker-ID med kontrollsum %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernøkkel med ID «%s».\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøkkel med indeks %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruker-ID: «%s»\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (kan ikke oppheves)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "opphevet med nøkkelen %s %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøkkel\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, 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:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruker-ID «%s» er allerede opphevet\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøkkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøkkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "ugyldig verdi for valg «%s»\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "innstilling «%s» er duplisert\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "for mange krypteringsinnstillinger\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "for mange kontrollsum-innstillinger\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "for mange komprimeringsinnstillinger\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "for mange krypteringsinnstillinger\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "«%s» er et ugyldig oppsettsvalg\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver nøkkelbindende signatur\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nøkkelstørrelse rundet opp til %u bit\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5232,19 +5297,19 @@
 "ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
 "denne kontrollsum-størrelsen\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -5262,180 +5327,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Mulige handlinger med en %s-nøkkel: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Tillatte handlinger: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Slå av/på signeringsfunksjon\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Slå av/på krypteringsfunksjon\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Slå av/på autentiseringsfunksjon\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Ferdig\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA og RSA (standard)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA og Elgamal\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (bare kryptering)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) sign, encrypt\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) signer, krypter\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (kun signering)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) ECC (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (velg funksjoner selv)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) ECC (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (kun kryptering)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Nøkkel\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Nøkkel fra kort\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Skriv inn nøkkelgrep: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "feil under lesing av kort: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Kortets serienummer: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tilgjengelige nøkler:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rundet av til %u bit\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Forespurt nøkkelstørrelse er %u bit\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Velg elliptisk kurve:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5451,7 +5516,7 @@
 " <n>m = nøkkelen utgår om n months\n"
 " <n>y = nøkkelen utgår om n years\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5467,38 +5532,38 @@
 " <n>m = signaturen utgår om n months\n"
 " <n>y = signaturen utgår om n years\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Nøkkelen er gyldig for? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Nøkkel utgår ikke i det hele tatt\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utgår ikke i det hele tatt\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøkkel utgår %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utgår %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5506,11 +5571,11 @@
 "Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
 "Likevel håndteres det korrekt fram til 2106.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5524,7 +5589,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5540,41 +5605,41 @@
 " «Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>»\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, 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:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-postadresse: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Ugyldig e-postadresse\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Du bruker tegnsettet «%s».\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5585,11 +5650,11 @@
 " «%s»\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 
@@ -5604,31 +5669,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Rett opp feilen først\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5640,18 +5705,18 @@
 "diskene jobbe) mens dette pågår. Da får\n"
 "tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøkkelgenerering mislyktes: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5662,65 +5727,65 @@
 " «%s»\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Vil du fortsette? (J/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Det finnes allerede en nøkkel for «%s»\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Vil du lage nøkkel likevel? (j/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "lager likevel\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, 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:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Nøkkelgenerering ble avbrutt.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "skriver offentlig nøkkel til «%s»\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5729,7 +5794,7 @@
 "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
 "undernøkkel til dette formålet.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5737,7 +5802,7 @@
 "nøkkel har blitt opprettet %lu sekund i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5745,23 +5810,23 @@
 "nøkkel har blitt opprettet %lu sekunder i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Er du sikker på at du vil fortsette? (j/N) "
 
@@ -5769,74 +5834,90 @@
 msgid "never "
 msgstr "aldri "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Kontrollsum: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Funksjoner: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Nøkkeltjener no-modify"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Regler for kritisk signatur: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Regler for signatur: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Kritisk foretrukket nøkkeltjener: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kritisk signaturnotat: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Signaturnotat: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d gyldig signatur\n"
 msgstr1 "%d gyldige signaturer\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 "%d signatur ble ikke kontrollert på grunn av feil\n"
 msgstr1 "%d signaturer ble ikke kontrollert på grunn av feil\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 "Advarsel: hoppet over %lu nøkkel pga. for høy størrelse\n"
 msgstr1 "Advarsel: hoppet over %lu nøkler pga. for høy størrelse\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Nøkkelknippe"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Fingeravtrykk for primærnøkkel:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Fingeravtrykk for primærnøkkel:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Fingeravstrykk for undernøkkel:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Nøkkelfingeravtrykk ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Serienummer for kort ="
 
@@ -5913,92 +5994,92 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» er ikke en nøkkel-ID, og blir hoppet over\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "oppdaterer %d nøkkel fra %s\n"
 msgstr1 "oppdaterer %d nøkler fra %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "fant ikke nøkkelen «%s» på nøkkeltjener\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "fant ikke nøkkelen på nøkkeltjener\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om nøkkelen %s fra %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "ingen kjent nøkkeltjener\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppet over «%s»: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sender nøkkelen %s til %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "ber om nøkkel fra «%s»\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s kryptert øktnøkkel\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passordfrase generert med ukjent summeringsalgoritme %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøkkel er %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
@@ -6006,236 +6087,242 @@
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " «%s»\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-nøkkel, ID %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: fant flere elementer i ren tekst\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kryptert med %lu passordfraser\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "kryptert med 1 passordfrase\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig nøkkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig nøkkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: meldinga var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekryptering ok\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: kryptert melding er blitt manipulert.\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Merk: senderen spesifiserte «kun for dine øyne»\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=«%.*s»\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "fant ikke signatur\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG signatur fra «%s»"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgått signatur fra «%s»"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra «%s»"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturbekreftelse ble hindret\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "disse flertydige signaturdataene kan ikke behandles\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " bruker %s nøkkel %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " utsteder «%s»\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Nøkkel tilgjengelig ved: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "usikker"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " aka «%s»"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utgått %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utgår %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", nøkkelalgoritme"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, 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:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Klarte ikke å kontrollere signatur: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en separat signatur\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "separat signatur av klasse 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
@@ -6336,28 +6423,28 @@
 msgid "uncompressed|none"
 msgstr "ukomprimert|ingen"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "«%s» er et flertydig valg\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "«%s» er et ukjent valg\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "«%s» er en ukjent svak summeringsmetode\n"
@@ -6411,7 +6498,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpakke %d er merket som kritisk\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6477,7 +6564,7 @@
 "opprettet %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6491,70 +6578,70 @@
 "nøkkelstørrelsen derfor påvirkes av hvor stort bildet er.\n"
 "En oppløsning på rundt 240x288 piksler er et godt utgangspunkt.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv inn JPEG-filnavn for foto-ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "klarte ikke å åpne JPEG-fil «%s»: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Denne JPEG-fila er veldig stor (%d byte).\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker på at du vil bruke den? (j/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "«%s» er ikke en JPEG-fil\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette bildet riktig (j/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "fjernutføring av programmer er ikke støttet\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "denne plattformen krever midlertidige filer ved kall på eksterne programmer\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "klarte ikke å kjøre skallet «%s»: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "unaturlig avslutning av eksternt program\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfeil under kall på eksternt program: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "ADVARSEL: klarte ikke å fjerne midlertidig fil (%s) «%s»: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "ADVARSEL: klarte ikke å fjerne midlertidig mappe «%s»: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6562,7 +6649,7 @@
 "eksterne programkall er slått av på grunn av utrygge tillatelser til "
 "oppsettsfil\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "klarte ikke å vise foto-ID.\n"
@@ -6644,36 +6731,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikater som fører til en fullstendig betrodd nøkkel:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finnes ingen indikasjon på at denne nøkkelen faktisk tilhører "
 "navngitt bruker\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det er begrenset indikasjon på at denne nøkkelen faktisk tilhører "
 "navngitt bruker\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne nøkkelen tilhører sannsynligvis navngitt bruker\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "denne nøkkelen tilhører oss\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: Denne nøkkelen er markert som upålitelig, og bør ikke brukes.\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6683,7 +6770,7 @@
 "Ikke svar ja på neste spørsmål med mindre du *virkelig* vet\n"
 "hva det innebærer.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6693,106 +6780,106 @@
 "bruker-id-en. Hvis du *virkelig* vet hva du gjør, kan du svare ja\n"
 "på neste spørsmål.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Vil du bruke denne nøkkelen likevel? (j/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: du bruker en upålitelig nøkkel.\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, fuzzy, c-format
 #| msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "bruker-ID: «%s»\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "valgt «%s», men mangler valget «%s»\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but no matching User ID found\n"
 msgstr "valgt «%s», men mangler valget «%s»\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ADVARSEL: denne nøkkelen er opphevet.\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: denne nøkkelen er opphevet av eieren.\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Dette kan bety at signaturen er falsk.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: denne undernøkkelen er opphevet av eieren.\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Merk: Denne nøkkelen er ikke i bruk.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Merk: denne nøkkelen er utgått.\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "ADVARSEL: denne nøkkelen er ikke sertifisert med en tillitsverdig signatur.\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ADVARSEL: denne nøkkelen er ikke sertifisert med en tillitsverdig signatur.\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " Det er ingen indikasjon på at signaturen tilhører eieren.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: vi stoler IKKE på denne nøkkelen.\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Signaturen er sannsynligvis et FALSKNERI.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6803,7 +6890,7 @@
 "ADVARSEL: denne nøkkelen er ikke sertifisert med tilstrekkelig "
 "tillitsverdige signaturer.\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6811,50 +6898,50 @@
 "ADVARSEL: denne nøkkelen er ikke sertifisert med tilstrekkelig "
 "tillitsverdige signaturer.\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Det er ikke sikkert at signaturen tilhører brukeren.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppet over. Offentlig nøkkel er ikke i bruk\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppet over: offentlig nøkkel er allerede tilstede\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "klarte ikke å kryptere til «%s»\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "valgt «%s», men mangler gyldig forvalgt nøkkel\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "valgt «%s», men mangler valget «%s»\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du skrev ikke inn en bruker-ID. (bruk evt. «-r»)\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Gjeldende mottakere:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6862,40 +6949,40 @@
 "\n"
 "Skriv inn bruker-ID og avslutt med tom linje: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Bruker-id-en finnes ikke.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "hoppet over: offentlig nøkkel allerede valgt som standardmottaker\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Offentlig nøkkel er ikke i bruk.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "hoppet over: offentlig nøkkel er allerede valgt\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "«%s» er en ukjent standardmottaker\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "ingen gyldige mottakere\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
@@ -6933,7 +7020,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "klarte ikke å åpne signert data fd=%d: «%s»\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "nøkkel %s egner seg ikke for dekryptering i %s-modus\n"
@@ -7165,53 +7252,48 @@
 msgstr ""
 "%s-nøkkel %s krever kontrollsum på %zu eller flere bit (gjeldende sum: %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ADVARSEL: konflikt med signatur-kontrollsum i melding\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "ADVARSEL: undernøkkel %s for signering er ikke kryssertifisert\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s for mer informasjon\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ADVARSEL: undernøkkel %s for signering er kryssertifisert på ugyldig "
 "grunnlag\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
 msgstr0 "offentlig nøkkel %s er %lu sekund nyere enn signaturen\n"
 msgstr1 "offentlig nøkkel %s er %lu sekunder nyere enn signaturen\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 "offentlig nøkkel %s er %lu dag nyere enn signaturen\n"
 msgstr1 "offentlig nøkkel %s er %lu dager nyere enn signaturen\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7224,7 +7306,7 @@
 "nøkkel %s ble opprettet %lu sekunder i framtiden (tidsforskyvnings- eller "
 "klokkeproblem)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7236,55 +7318,55 @@
 "nøkkel %s ble opprettet %lu dager i framtiden (tidsforskyvnings- eller "
 "klokkeproblem)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Merk: signaturnøkkel %s utgått %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Merk: signaturnøkkel %s er opphevet\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nøkkel %s: ingen undernøkkel for undernøkkelbindingssignatur\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr "ADVARSEL: klarte ikke å %%-utvide notasjon (for lang).\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr "ADVARSEL: klarte ikke å %%-utvide regelverkadresse (for lang).\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7293,23 +7375,23 @@
 "ADVARSEL: klarte ikke å %%-utvide foretrukket nøkkeltjener-adresse (for "
 "lang).\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: «%s»\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7385,133 +7467,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synk mislyktes: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "klarte ikke å lage lås for «%s»\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "klarte ikke å låse «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb-oppf. %lu: skriving mislyktes (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-transaksjon er for stor\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: mappa finnes ikke.\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "fikk ikke tilgang til «%s»: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: klarte ikke å lage versjonsoppføring: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: laget ugyldig trustdb\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb opprettet\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Merk: trustdb er ikke skrivbar\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ugyldig trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: klarte ikke å lage kontrollsum-tabell: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: feil under oppdatering av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: feil under lesing av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: feil under skriving av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek mislyktes: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lesing mislyktes (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ikke en trustdb-fil\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versjonsoppføring nr. %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: %d er en ugyldig filversjon\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: feil under lesing av «free»-oppføring: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: feil under skriving av «dir»-oppføring: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: klarte ikke å nullstille oppføring: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: klarte ikke å legge til oppføring: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: trustdb er skadet.\n"
@@ -7950,7 +8032,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "kontroll av trustdb er ikke nødvendig\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "neste kontroll av trustdb planlagt %s\n"
@@ -7980,38 +8062,38 @@
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%d nøkkel behandlet"
 msgstr1 "%d nøkler behandlet"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 "(%d gyldighetsantall klarert)\n"
 msgstr1 "(%d gyldighetsantall klarert)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, 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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8081,7 +8163,7 @@
 msgid "ultimate"
 msgstr " fullst."
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8092,12 +8174,12 @@
 "Husk at signaturfil (.sig eller .asc)\n"
 "skal være første filargument på kommandolinja.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "inndatalinje %u er for lang eller mangler LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "klarte ikke å åpne fd %d: %s\n"
@@ -8114,19 +8196,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "«%s» er et flertydig valg\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "endre feilsøkingsvalg"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "slå på full feilsøking"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Bruk: kbxutil valg filer (-h for hjelp)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8137,16 +8219,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Gjenstående forsøk: %d"
@@ -8187,10 +8269,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|Skriv inn PIN-opplåsingskode (PUK) for standardnøkler."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
@@ -8212,153 +8294,153 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "nøkkelen finnes allerede\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "gjeldende nøkkel blir erstattet\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "lager ny nøkkel\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nøkkel\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke å lagre nøkkel: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svar inneholder ikke RSA-modulus\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "svar inneholder ikke offentlig EC-nøkkel\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "vent mens nøkkel blir generert …\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "nøkkelgenerering mislyktes\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "nøkkelgenerering fullført (%d sekund)\n"
 msgstr1 "nøkkelgenerering fullført (%d sekunder)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svar inneholder ikke offentlig nøkkeldata\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Skriv inn PIN for å la nøkkelen lage kvalifiserte signaturer."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Skriv inn admin-PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Skriv inn PIN-kode for standardnøkler."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN er ikke blitt endret enda\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN er ikke blitt endret enda\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 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:2048
+#: scd/app-nks.c:2118
 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:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil under henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "feil under henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
@@ -8366,44 +8448,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%sNummer\\x1f: %s%%0AHolder\\x1f: %s%%0ATeller\\x1f: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruker forvalgt PIN som %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Lås opp kort"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet er låst for godt.\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8411,20 +8493,20 @@
 msgstr0 "%d Admin-PIN-forsøk gjenstår før kortet blir låst permanent\n"
 msgstr1 "%d Admin-PIN-forsøk gjenstår før kortet blir låst permanent\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Skriv inn PIN-kode"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Skriv inn tilbakestillingskode for kortet"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
@@ -8432,78 +8514,78 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny tilbakestillingskode"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Skriv inn admin-PIN og ny admin-PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Skriv inn PIN-kode og ny PIN-kode"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "feil under lesing av programdata\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "feil under lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "ustøttet kurve\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet så langt: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, 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:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@ -8523,7 +8605,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "kjør i multi-tjenermodus (forgrunn)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
 
@@ -8567,11 +8649,11 @@
 msgid "deny the use of admin card commands"
 msgstr "avvis bruk av admin-kortkommandoer"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Bruk: @SCDAEMON@ valg (-h for hjelp)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8579,315 +8661,315 @@
 "Syntaks: scdaemon valg kommando arg\n"
 "Smartcard-bakgrunnsprogram for @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "startet håndteringsprogram for fd %d\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "avsluttet håndteringsprogram for fd %d\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "feil under henting av informasjon om nøkkelbruk: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "kontrollmodell forespurt av sertifikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "kjede"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "skall"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritisk sertifikatutvidelse %s støttes ikke"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "utsteders sertifikat er ikke merket som CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "regelsett merket som kritisk uten oppsatte regler"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "klarte ikke å åpne «%s»: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "sertifikatregelverk tillates ikke"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "klarte ikke å hente fingeravtrykk\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår opp utsteder på ekstern plassering\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antall ustedere funnet: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår opp utsteder fra Dirmngr-hurtiglager\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antall treff på sertifikater: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "nøkkeloppslag i dirmngr-hurtiglager mislyktes: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "klarte ikke å tildele nøkkeldatabase-verdi\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "sertifikatet er opphevet"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "sertifikatet har ukjent status"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "kontroller at «dirmngr» er installert skikkelig\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll av CRL mislyktes: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "sertifikat med ugyldig gyldighetsverdi: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "sertifikatet er ikke gyldig enda"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "rotsertifikat er ikke gyldig enda"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "mellomsertifikat er ikke gyldig enda"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "sertifikatet er utgått"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "rotsertifikat er utgått"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "mellomsertifikat er utgått"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "påkrevde sertifikategenskaper mangler: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "sertifikat med ugyldig gyldighetsverdi"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "signatur ikke laget innenfor sertifikatets levetid"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "sertifikat ikke laget innenfor utsteders levetid"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "mellomsertifikat ikke laget innenfor utsteders levetid"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( signatur opprettet "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (sertifikat opprettet "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (sertifikat gyldig fra "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( utsteder gyldig fra "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtrykk=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotsertifikat er nå merket som troverdig\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "ADVARSEL: opprettelsestid for signatur er ukjent. Antar gjeldende tidspunkt"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "fant ingen utsteder i sertifikat"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "selvsignert sertifikat har ugyldig signatur"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rotsertifikat er ikke merket som troverdig"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll av tillitsliste mislyktes: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifikatkjede er for langt\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "fant ikke utstedersertifikat"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "sertifikatet har ugyldig signatur"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "fant et annet CA-sertifikat som kan fungere. Prøver igjen"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifikatkjede er lengre enn CA tillater (%d)"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "sertifikatet er gyldig\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mellomsertifikat er ok\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rotsertifikat er gyldig\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "bytter til kjedemodell"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "gyldighetsmodell: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "kjernen er full\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er algortime MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ingen"
 
@@ -8907,7 +8989,7 @@
 msgid "Error - invalid DN"
 msgstr "feil - ugyldig DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8922,42 +9004,42 @@
 "S/N %s, ID 0x%08lX,\n"
 "opprettet %s, utgår %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, 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:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifikatet egner seg ikke til kryptering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifikatet egner seg ikke til signering\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9179,17 +9261,17 @@
 msgid "resource problem: out of core\n"
 msgstr "ressursproblem: oppbrukt kjerne\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(dette er algoritme RC2)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(dette ser ikke ut som en kryptert melding)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9200,7 +9282,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "fant ikke sertifikatet «%s»: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "feil under låsing av nøkkelskrin: %s\n"
@@ -9225,123 +9307,123 @@
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige mottakere valgt\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "vis eksterne nøkler"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "vis sertifikatkjede "
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "importer sertifikater"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "eksporter sertifikater"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "registrer smartkort"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "send en kommando til dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "kall gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "ikke bruk terminal i det hele tatt"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|antall sertifikater som skal være med"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hent regler fra valgt FIL"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "forvent inndata i «PEM»-format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "forvent inndata i «base-64»-format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "forvent inndata i binærformat"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "lag base64-kodet utdata"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 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:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "hent manglende utstedersertifikat"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "aldri spør CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "ikke se etter rotsertifikater i CRL"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "kontroller gyldighet med OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "ikke kontroller sertifikatregler"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "buntmodus: aldri spør"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "svar automatisk ja på de fleste spørsmål"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "svar automatisk nei på de fleste spørsmål"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Bruk: @GPGSM@ valg filer (-h for hjelp)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9351,27 +9433,27 @@
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "«%s» er en ukjent kontrollmodell\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importerer sertifikat «%s»\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "klarte ikke å signere med «%s»: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
@@ -9391,7 +9473,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkel sertifikatkontroll mislyktes. Ikke importert\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "feil under henting av lagrede valg: %s\n"
@@ -9401,48 +9483,48 @@
 msgid "error importing certificate: %s\n"
 msgstr "feil under importering av sertifikat: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "feil under lesing av inndata: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "ingen dirmngr kjører i gjeldende økt\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "feil under åpning av nøkkeldatabase: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "klarte ikke å søke etter sertifikat: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "feil under søk etter skrivbar nøkkeldatabase: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "feil under lagring av sertifikat: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, 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:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "feil under lagring av valg: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Feil - "
 
@@ -9478,7 +9560,7 @@
 "\n"
 "%s%sEr du sikker på at du vil gjøre dette?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9498,45 +9580,45 @@
 "«%s»\n"
 "Merk: dette sertifikatet lager ikke «kvalifiserte» signaturer."
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "kontrollsum-algoritme %d (%s) for undertegnet %d støttes ikke. Bruker %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "kontrollsum-algoritme brukt av undertegnet %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "søk etter godkjent sertifikat mislyktes: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Signatur laget %s ved hjelp av %s-nøkkel ID %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Signatur fullført"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "dato ikke oppgitt"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 #| msgid "algorithm: %s"
 msgid "algorithm:"
 msgstr "algoritme: %s"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9544,17 +9626,17 @@
 "ugyldig signatur. Kontrollsum-attributt for melding samsvarer ikke med "
 "attributt for utregnet sum\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Gyldig signatur fra"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " også kjent som"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dette er en godkjent signatur\n"
@@ -9579,315 +9661,310 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "klarte ikke å låse opp sertifikat-hurtiglager: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "fjerner %u sertifikater fra hurtiglager\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "klarte ikke å tolke sertifikat «%s»: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "sertifikat «%s» ligger allerede i hurtiglager\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "lastet inn tillitsmerket sertifikat «%s»\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "lastet inn sertifikat «%s»\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " SHA1-fingeravtrykk = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " utsteder ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " emne ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "feil under innlasting av sertifikat «%s»: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanent innlastede sertifikater: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " hurtiglagrede sertifikater: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " pålitelige sertifikater: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "sertifikat allerede hurtiglagret\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "sertifikat hurtiglagret\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "feil under hurtiglagring av sertifikat: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "«%s» er et ugyldig SHA1-fingeravtrykk\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, 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:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "feil under henting av sertifikat etter emne: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "fant ingen utsteder av sertifikat\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "feil under henting av «authorityKeyIdentifier»: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "lager mappe «%s»\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "feil under oppretting av mappa «%s»: %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorerer databasemappe «%s»\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "feil under lesing av mappa «%s»: %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "fjerner hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "lar være å fjerne «%s»\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "feil under lukking av hurtiglager-fil: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "klarte ikke å åpne hurtiglagermappe-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "ny hurtiglagermappe-fil «%s» opprettet\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, 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:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "hurtiglager-mappe er av gammel versjon. Rydder opp\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "hurtiglager-mappe er av gammel versjon. Gir opp\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, 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:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "fant ugyldig linje i «%s» på linje %u\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "fant duplikat i «%s» på linje %u\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, 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:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "ugyldig utsteder-kontrollsum i «%s», linje %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "ingen utsteder-DN i «%s», linje %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "ugyldig tidsstempel i «%s» på linje %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "fant feil i oppsettsfil for hurtiglager-mappe\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "kontroller årsaken og slett fila manuelt\n"
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "feil under lukking av «%s»: %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "klarte ikke å summere «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "feil under oppsett av MD5-summeringskontekst: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "feil under summering av «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "feilformatert kontrollsum av «%s»\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "for mange åpne hurtiglager-filer\n"
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "åpner hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "feil under åpning av hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, 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:1174
+#: dirmngr/crlcache.c:1181
 #, 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:1176
+#: dirmngr/crlcache.c:1183
 #, 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:1230
+#: dirmngr/crlcache.c:1237
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "klarte ikke å lage nytt huritglager-objekt: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "ingen CRL tilgjengelig for utsteder-ID %s\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, 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:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9896,197 +9973,197 @@
 "«force-crl-refresh» er slått på og %d minutter er gått for utsteder-ID %s. "
 "Oppdater hurtiglager.\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, 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:1325
+#: dirmngr/crlcache.c:1332
 #, 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:1336
+#: dirmngr/crlcache.c:1343
 #, 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:1348
+#: dirmngr/crlcache.c:1355
 #, 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:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, 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:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "fikk ugyldig S-uttrykk fra libksba\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "konvertering av S-uttrykk mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "oppretting av S-uttrykk mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "feil under henting av CRL-oppdateringstid: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, 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:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "feil under henting av CRL-element: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "fant ingen CRL-utsteder i CRL: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "finner CRL-utstedersertifikat med «authorityKeyIdentifier»\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL-signaturbekreftelse mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "fjernet ødelagt midlertidig hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, 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:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "%s er en ukjent kritisk CRL-utvidelse\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "feil under lesing av CRL-utvidelser: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "lager hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "klarte ikke å endre navn på «%s» til «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10095,12 +10172,12 @@
 "oppdatering av DIR-fil mislyktes. Hurtiglager-oppføring går tapt neste gang "
 "programmet starter\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Start CRL-utskrift (hentet via %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10108,54 +10185,54 @@
 " FEIL: CRL blir ikke brukt fordi den fremdeles var for gammel etter "
 "oppdatering.\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " FEIL: CRL blir ikke brukt\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 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:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " ADVARSEL: ugyldig lengde på oppføring i hurtiglager\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "klarte ikke å lese hurtiglager-oppføring: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "klarte ikke å lese hurtiglager-nøkkel: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, 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:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Avslutt CRL-utskrift\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via utsteder mislyktes: %s\n"
@@ -10171,23 +10248,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "Ingen CRL-tilgang i Tor-modus\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "Ingen CRL-tilgang fordi %s er slått av\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "feil under henting av «%s»: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "feil under innlasting av leserobjekt: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "sertifikatsøk ikke tilgjengelig fordi %s er slått av\n"
@@ -10332,140 +10409,140 @@
 msgid "looking up '%s'\n"
 msgstr "slår opp «%s»\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "vis innhold i CRL-hurtiglager"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|ADR|hent CRL fra valgt nettADResse"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "slå av dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "tøm hurtiglager"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "tillat kontroll av programvare-versjon over nett"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 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:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "kjør all nettverkstrafikk gjennom Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Oppsett for HTTP-tjenere"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "hindre bruk av HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorer HTTP CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "bruk systemets innstilling for HTTP-mellomtjener"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Oppsett for HTTP-tjenere"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 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:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Oppsett for HTTP-tjenere"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "hindre bruk av LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorer LDAP CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Oppsett for OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "tillat sending av OCSP-forespørsler"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP-svartjeneste signert av FPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "tving innlasting av utdatert CRL"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10474,11 +10551,11 @@
 "@\n"
 "Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Bruk: @DIRMNGR@ valg (-h for hjelp)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10486,103 +10563,103 @@
 "Syntaks: @DIRMNGR@ valg kommando arg\n"
 "Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "bruk: %s valg "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "kolon tillates ikke i sokkelnavn\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "henting av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: for lang linje. Hoppet over\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: lesefeil: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM mottatt. Slår av …\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "slår av under tvang\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT mottatt. Slår av umiddelbart\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d mottatt. Ingen handling definert\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "Videresendt fra adresse «%s» til «%s» (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "for mange videresendinger\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10638,32 +10715,32 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc mislyktes: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "«%s» er ikke en LDAP-adresse\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "«%s» er en ugyldig LDAP-adresse\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search overskred tjenerens størrelsesgrense\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: passord skrevet inn uten brukernavn\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hopper over denne linja\n"
@@ -10754,161 +10831,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "ikke signert av sertifikat som tilhører en forvalgt OCSP-fullmektig"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "tildeling av listeelement mislyktes: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "feil under henting av svartjeneste-ID: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "fant ingen sertifikat som egner seg til å bekrefte OCSP-svar\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "fant ikke utstedersertifikat: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "klient sendte ikke målsertifikat\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "klient sendte ikke utstedersertifikat\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "klarte ikke å tildele OCSP-kontekst: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "ingen forvalgt OCSP-svartjeneste\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "ingen OCSP-undertegner er definert som standard\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "bruker forvalgt OCSP-svartjeneste «%s»\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "bruker OCSP-svartjeneste «%s»\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "feil under henting av OCSP-status for målsertifikat: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "sertifikatstatus er: %s (dette=%s neste=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "bra"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "sertifikat opphevet %s med følgende begrunnelse: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP-svartjeneste sendte status datert i framtiden\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP-svartjeneste sendte status som ikke er datert i nåtid\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP-svartjeneste sendte for gammel status\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "serienummer mangler i sertifikat-ID"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "«assuan_inquire» mislyktes: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "«fetch_cert_by_url» mislyktes: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "feil under sending av data: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "«start_cert_fetch» mislyktes: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "«fetch_next_cert» mislyktes: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d overskredet\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "klarte ikke å starte opp tjener: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan-godkjenningsproblem: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan-behandling mislyktes: %s\n"
@@ -10918,85 +10995,85 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "godtar rot-CA som ikke er merket som CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "for mange nivåer av CRL-kontroll\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "lar være å kontrollere CRL for"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "kontrollerer CRL for"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "troverdighetssjekk av rotsertifikat mislyktes: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "sertifikatkjede er funnet i orden\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "stille"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "kod utdata i heksadesimaler"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "dekod mottatte datalinjer"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "koble til dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "koble til dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAVN|koble til valgt Assuan-sokkelNAVN"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADR|koble til Assuan-tjener på valgt nettADResse"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "kjør valgt Assuan-tjener"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "ikke bruk utvidet tilkoblingsmodus"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIL|kjør kommandoer fra valgt FIL ved oppstart"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "kjør /subst ved oppstart"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Bruk: @GPG@-connect-agent vlag (-h for hjelp)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11004,49 +11081,49 @@
 "Syntaks: @GPG@-connect-agent valg\n"
 "Koble til kjørende agent og send kommandoer\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "ignorerer valget «%s» pga. «%s»\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "linjemottak mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "hoppet over for lang linje\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linje forkortet pga. innebygget Nul-tegn\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "«%s» er en ukjent kommando\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending av linje mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "ingen dirmngr kjører i gjeldende økt\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil under sending av standardvalg: %s\n"
@@ -11110,12 +11187,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "feil under lukking av «%s»\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "feil under tolkning av «%s»\n"
@@ -11220,92 +11297,110 @@
 "Syntaks: gpg-check-pattern valg mønsterfil\n"
 "Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "MERK: det ligger allerede nøkler på kortet.\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "MERK: det ligger allerede nøkler på kortet.\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Erstatte eksisterende nøkler? (j/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Oppdaget OpenPGP-kortnummer %s\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "legg til sertifikat i hurtiglager"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "legg til sertifikat i hurtiglager"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "legg til sertifikat i hurtiglager"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "valg kontrollsum-algoritme er ugyldig\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
+
+#, fuzzy
+#~| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "tvungen bruk av krypt.metode %s (%d) bryter med mottakers oppsett\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "feil under skriving til midlertidig fil: %s\n"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/pl.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/pl.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/pl.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/pl.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-2.2.24\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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"
@@ -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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nie udało się uzyskać blokady pinentry: %s\n"
@@ -30,49 +30,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Anuluj"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Tak"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Nie"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Zapisz w zarządcy haseł"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Pokazanie hasła"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Ukrycie hasła"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -83,7 +83,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -94,14 +94,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -109,7 +109,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Jakość:"
 
@@ -119,95 +119,101 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Jakość wpisanego wyżej tekstu.\n"
 "Kryteria jakości można uzyskać od administratora."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 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:1480
+#: agent/call-pinentry.c:1477
 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Hasło:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "nie pasują - proszę spróbować jeszcze raz"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase Entry"
+msgid "Passphrases match."
+msgstr "Wpisywanie hasła"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (próba %d z %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Powtórzenie:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN zbyt długi"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Hasło zbyt długie"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Niewłaściwy znak w PIN-ie"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN zbyt krótki"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Niepoprawny PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Niepoprawne hasło"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "błąd pobierania numeru seryjnego karty: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Proszę ponownie wprowadzić to hasło"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -218,51 +224,51 @@
 msgstr ""
 "Proszę wprowadzić hasło do zabezpieczenia ważnego obiektu w systemie GnuPG."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "nie można utworzyć ,,%s'': %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nie można otworzyć ,,%s'': %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nie znaleziono pasującego klucza karty: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "błąd pobierania listy kart: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -270,20 +276,20 @@
 msgstr ""
 "Proces ssh zarządał użycia klucza%%0a %s%%0A (%s)%%0ACzy zezwolić na to?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Zgoda"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Odmowa"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Proszę wprowadzić hasło dla klucza ssh%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -292,83 +298,79 @@
 "Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A %s"
 "%%0A %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Proszę włożyć kartę z numerem seryjnym"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "PIN administracyjny"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Kod resetujący"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Wciśnij przycisk ACK na karcie/tokenie."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Do wpisywania należy użyć klawiatury czytnika."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Powtórz ten kod resetujący"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Powtórz ten PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Powtórz ten PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Kod resetujący nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Proszę wprowadzić PIN%s%s%s aby odblokować kartę"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "błąd zapisu do %s: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Wprowadź nowe hasło"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Nie wprowadzono hasła!%0APuste hasło nie jest dozwolone."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -377,11 +379,11 @@
 "Nie wprowadzono hasła - to jest ogólnie zły pomysł!%0AProszę potwierdzić, że "
 "naprawdę ma nie być żadnej ochrony tego klucza."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Tak, ochrona nie jest potrzebna"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -389,7 +391,7 @@
 msgstr1 "Hasło musi mieć co najmniej %u znaki długości."
 msgstr2 "Hasło musi mieć co najmniej %u znaków długości."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -400,234 +402,240 @@
 msgstr2 ""
 "Hasło powinno zawierać przynajmniej %u cyfr lub%%0Aznaków specjalnych."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "Hasło nie może być znanym słowem ani pasować%%0Ado określonego wzorca."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Ostrzeżenie: Wprowadzono hasło, które nie jest bezpieczne."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Przyjmij je mimo to"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Proszę wprowadzić nowe hasło"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Opcje przydatne do diagnostyki"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "bez odłączania od konsoli"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "wyjście poleceń w stylu sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "wyjście poleceń w stylu csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Opcje sterujące wyjściem diagnostycznym"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "więcej komunikatów"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatów"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|PLIK|zapis logów trybu serwera do PLIKU"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Opcje sterujące konfiguracją"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "nieużywanie SCdaemona"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|użycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|użycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAZWA|przyjęcie poleceń poprzez NAZWĘ"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie żądań zmiany TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie żądań zmiany ekranu X"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "włączenie obsługi ssh"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|użycie ALGO do wyświetlania odcisków ssh"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "włączenie obsługi putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "włączenie obsługi putty"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|przedawnienie kluczy SSH po N sekundach"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|ustawienie maksymalnego czasu życia kluczy SSH na N sekund"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "nieużywanie pamięci PIN-ów przy podpisywaniu"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 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:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "niezezwalanie klientom na oznaczanie kluczy jako ,,zaufanych''"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane hasło"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Opcje wymuszające politykę haseł"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "niezezwalanie na pominięcie polityki haseł"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|ustawienie minimalnej długości nowych haseł na N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|wymaganie przynajmniej N znaków niealfanumerycznych w nowym haśle"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|PLIK|sprawdzanie nowych haseł pod kątem wzorców z PLIKU"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|przedawnianie haseł po N dniach"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "niezezwalanie na ponowne użycie starych haseł"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "niezezwalanie wywołującym na nadpisywanie pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|ustawienie limitu czasu Pinentry na N sekund"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "zezwolenie na pytanie o hasło poprzez Emacsa"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Składnia: @GPG_AGENT@ opcje (-h wyświetla pomoc)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -635,141 +643,141 @@
 "Składnia: @GPG_AGENT@ opcje polecenie argumenty\n"
 "Zarządzanie kluczem tajnym dla @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "podano błędny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Uwaga: ,,%s'' nie jest uznane za opcję\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie można utworzyć gniazda: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "nazwa gniazda ,,%s'' zbyt długa\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "błąd podczas pobierania nonce z gniazda\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, 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:2755
+#: agent/gpg-agent.c:2876
 #, 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:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, 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:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -777,12 +785,12 @@
 "@Opcje:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -790,8 +798,8 @@
 "Składnia: gpg-preset-passphrase opcje UCHWYT_KLUCZA\n"
 "Utrzymuwanie pamięci haseł\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -799,8 +807,8 @@
 "@Polecenia:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -810,11 +818,11 @@
 "Opcje:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -822,22 +830,22 @@
 "Składnia: gpg-protect-tool opcje argumenty\n"
 "Narzędzie do utrzymywania kluczy tajnych\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 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:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -845,52 +853,54 @@
 "Proszę wprowadzić hasło lub PIN\n"
 "Potrzebny do zakończenia tej operacji."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "anulowano\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "błąd podczas otwierania ,,%s'': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "plik ,,%s'', linia %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "instrukcja \"%s\" zignorowana w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "systemowa lista zaufania ,,%s'' niedostępna\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "błędny odcisk w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "nieprawidłowa flaga klucza w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "błąd odczytu ,,%s'', w linii %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
@@ -903,7 +913,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -912,11 +922,11 @@
 "Czy absolutnie ufasz, że%%0A ,,%s''%%0Apoprawnie poświadcza certyfikaty "
 "użytkowników?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Tak"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Nie"
@@ -929,7 +939,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -941,20 +951,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Akceptuj"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Odrzuć"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -962,15 +972,28 @@
 msgstr ""
 "To hasło nie zostało zmienione%%0Aod %.4s-%.2s-%.2s. Proszę zmienić je teraz."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Zmiana hasła"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Zmienię je później"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Proszę włożyć kartę z numerem seryjnym"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"Proces ssh zarządał użycia klucza%%0a %s%%0A (%s)%%0ACzy zezwolić na to?"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -978,11 +1001,11 @@
 msgstr ""
 "Czy na pewno usunąć klucz identyfikowany przez uchwyt%%0A %s%%0A %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Usuń klucz"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -995,8 +1018,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "Klucz %s używa niebezpiecznego (%u-bitowego) skrótu\n"
@@ -1006,7 +1029,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
@@ -1016,7 +1039,7 @@
 msgid "secret key parts are not available\n"
 msgstr "tajne części klucza są niedostępne\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "algorytm klucza publicznego %d (%s) nie jest obsługiwany\n"
@@ -1031,52 +1054,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algorytm hasza ochrony %d (%s) nie jest obsługiwany\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "błąd tworzenia potoku: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "błąd tworzenia strumienia dla potoku: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "błąd podczas tworzenia procesu: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "błąd uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "błąd uruchamiania ,,%s'': zakończono\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "oczekiwanie na zakończenie procesów nie powiodło się: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "błąd odczytu kodu zakończenia procesu %d: %s\n"
@@ -1096,28 +1119,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "nie można wyłączyć zrzutów pamięci: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, 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:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "oczekiwanie aż plik ,,%s'' stanie się dostępny...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "tak"
 
@@ -1171,8 +1194,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "brak miejsca podczas przydzielania %lu bajtów"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
@@ -1187,81 +1210,81 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "OSTRZEŻENIE: ,,%s%s'' jest przestarzałą opcją - nie ma efektu\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "nieznana flaga diagnostyczna ,,%s'' zignorowana\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 #| msgid "waiting for the %s to come up ... (%ds)\n"
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "oczekiwanie na uruchomienie procesu %s... (%ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting for the %s to come up ... (%ds)\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "oczekiwanie na uruchomienie procesu %s... (%ds)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting for the %s to come up ... (%ds)\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "oczekiwanie na uruchomienie procesu %s... (%ds)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 #| msgid "connection to %s established\n"
 msgid "connection to the dirmngr established\n"
 msgstr "ustanowiono połączenie z procesem %s\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "connection to %s established\n"
 msgid "connection to the keyboxd established\n"
 msgstr "ustanowiono połączenie z procesem %s\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "connection to %s established\n"
 msgid "connection to the agent established\n"
 msgstr "ustanowiono połączenie z procesem %s\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running Dirmngr - starting '%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "Dirmngr nie działa - uruchamianie ,,%s''\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "connection to agent is in restricted mode\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "połączenie z agentem jest w trybie ograniczonym\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "błąd pobierania wersji z ,,%s'': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "serwer ,,%s'' jest starszy niż nasz (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "OSTRZEŻENIE: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 "Uwaga: przestarzałe serwery mogą nie mieć ważnych poprawek bezpieczeństwa.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Uwaga: do restartu ich należy użyć polecenia ,,%s''.\n"
@@ -1334,7 +1357,7 @@
 msgstr "algorytm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "nieobsługiwany algorytm: %s"
@@ -1409,39 +1432,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Certyfikat główny jest zaufany"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "nie znaleziono CRL dla certyfikatu"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "dostępny CRL jest zbyt stary"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "weryfikacja CRL/OCSP certyfikatów"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Dołączone certyfikaty"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Brak wpisów w logu."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Nieznana operacja"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent sprawny"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr sprawny"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Brak pomocy dla ,,%s''."
@@ -1450,11 +1473,11 @@
 msgid "ignoring garbage line"
 msgstr "zignorowano błędną linię"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "brak"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niewłaściwy znak formatu radix64 %02x został pominięty\n"
@@ -1489,136 +1512,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open nie powiodło się: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konwersja z ,,%s'' do ,,%s'' nie powiodła się: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "błąd zapisu do ,,%s'': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "usuwanie nieaktualnego pliku blokady (utworzonego przez %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(zakleszczenie?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "blokada ,,%s'' nie założona: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "oczekiwanie na blokadę %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (wymagana %s, zainstalowana %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "błąd tworzenia ,,%s'': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "błąd zamykania ,,%s'': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "niepoprawny nagłówek opakowania: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "nagłówek opakowania: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "niewłaściwy nagłówek dokumentu z podpisem na końcu\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "nieznany nagłówek opakowania: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "zagnieżdżone podpisy na końcu dokumentu\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "nieoczekiwane opakowanie: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niewłaściwy znak formatu radix64 ,,%02X'' został pominięty\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "przedwczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "błąd formatu CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Błąd sumy CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii kończącej)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "błąd w linii kończącej\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "błąd opakowania: linia dłuższa niż %d znaków\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1626,12 +1661,12 @@
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przekłamanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " nieczytelne dla człowieka (%zu bajtów: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1640,32 +1675,32 @@
 "nazwa adnotacji musi zawierać tylko znaki drukowalne lub spacje i kończyć "
 "się znakiem ,,=''\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nazwa adnotacji użytkownika musi zawierać znak ,,@''\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "nazwa adnotacjinie może zawierać więcej niż jednego znaku ,,@''\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "wartość adnotacji nie może zawierać żadnych znaków sterujących\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "nazwa adnotacji nie może zawierać znaku ,,=''\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "nazwa adnotacji musi zawierać tylko znaki drukowalne lub spacje\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZEŻENIE: napotkano błędne dane adnotacji\n"
@@ -1679,8 +1714,8 @@
 msgid "Enter passphrase: "
 msgstr "Hasło: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s nie jest zgodny z trybem %s\n"
@@ -1691,13 +1726,13 @@
 msgid "error from TPM: %s\n"
 msgstr "błąd odczytu z %s: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem z agentem: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "brak działającego dirmngr w tej sesji\n"
@@ -1708,197 +1743,202 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "opcja serwera kluczy ,,%s'' nie może być używana w trybie %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKD używa zapamiętanego wyniku"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "Tor nie działa"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Tor nie jest właściwie skonfigurowany"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNS nie jest właściwie skonfigurowany"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "niedopuszczalne przekierowanie HTTP z serwera"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "niedopuszczalne przekierowanie HTTP z serwera zostało wyczyszczone"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "serwer używa błędnego certyfikatu"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "Uwaga: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nie działa w trybie wsadowym\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "nie ustawiono"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Pan"
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Pani"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "nie wymuszono"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "wymuszono"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Błąd: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Błąd: znak ,,<'' nie może być użyty.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Błąd: podwójne spacje nie są dopuszczalne.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Nazwisko posiadacza karty: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Imię posiadacza karty: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL do odczytania klucza publicznego: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "błąd odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "błąd zapisu ,,%s'': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Dane logowania (nazwa konta): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Preferowane języki: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Błąd: niewłaściwa długość tekstu preferencji.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Błąd: niewłaściwe znaki w tekście preferencji.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Tutuł (M = Pan, F = Pani lub spacja): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Błąd: niewłaściwa odpowiedź.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Odcisk CA:"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Błąd: niewłaściwie sformatowany odcisk.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operacja na kluczu niewykonalna: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "to nie jest karta OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Zastąpić istniejący klucz? (t/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1914,99 +1954,99 @@
 " Jeśli tworzenie klucza nie powiedzie się, proszę sprawdzić\n"
 " dokumentację karty, aby poznać dozwolone rozmiary.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej długości klucz wygenerować? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Zmiana atrybutu klucza karty dla: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Klucz do podpisów\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszę wybrać rodzaj klucza:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Niewłaściwy wybór.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "błąd podczas pobierania informacji o karcie: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Zastąpić istniejące klucze? (t/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2017,181 +2057,186 @@
 " PIN = ,,%s'' PIN administracyjny = ,,%s''\n"
 "Należy je zmienić przy użyciu polecenia --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "Proszę wybrać rodzaj klucza do wygenerowania:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Klucz do podpisów\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Proszę wybrać gdzie zapisać klucz:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD nie powiodło się: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Naprawdę przywrócić stan fabryczny? (proszę wpisać ,,yes'') "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "błąd przy ustawianiu KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "błąd przy ustawianiu KDF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "wyjście z tego menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "pokazanie poleceń administratora"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "wypisanie wszystkich dostępnych danych"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "zmiana nazwy posiadacza karty"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "zmiana URL-a do odczytu klucza"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "pobranie klucza określonego w URL-u karty"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "zmiana nazwy logowania"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "zmiana preferowanych języków"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "zmiana tytułu posiadacza karty"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku CA"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "wygenerowanie nowych kluczy"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "menu do zmiany lub odblokowania PIN-u"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokowanie PIN-u przy użyciu kodu resetującego"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "zniszczenie wszystkich kluczy i danych"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "ustawienie KDF do uwierzytelniania PIN-em"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "zmiana atrybutu klucza"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "zmiana zaufania właściciela"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Polecenie tylko dla administratora\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia dla administratora są dozwolone\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia dla administratora nie są dozwolone\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Niepoprawne polecenie (spróbuj ,,help'')\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2251,9 +2296,9 @@
 msgid "subkey"
 msgstr "podklucza"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powiódł się: %s\n"
@@ -2278,81 +2323,76 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
+"adresata\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "błąd podczas tworzenia hasła: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr ""
 "ustawiony tryb S2K nie pozwala użyć pakietu ESK dla szyfru symetrycznego\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr ",,%s'' już jest skompresowany\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "OSTRZEŻENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "odczyt z ,,%s''\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
-"adresata\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2361,18 +2401,13 @@
 "OSTRZEŻENIE: wymuszone użycie kompresji %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2388,7 +2423,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2400,402 +2435,408 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obróbki pakietu szyfrowego\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "eksport podpisów oznaczonych jako tylko lokalne"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "eksport atrybutów ID użytkownika (ogólnie ID zdjęć)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "eksport kluczy unieważniających oznaczonych jako ,,poufne''"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "usunięcie bezużytecznych części z klucza przy eksporcie"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "usunięcie jak największej części klucza przy eksporcie"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "tworzenie certyfikatu unieważnienia klucza"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "użycie formatu kopii zapasowej klucza GnuPG"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "eksport kluczy tajnych nie jest dozwolony\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - pominięty"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "zapis do ,,%s''\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "klucz %s: zawartość klucza na karcie - pominięto\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "eksport kluczy tajnych nie jest dozwolony\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %s: klucz PGP 2.x - pominięty\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "błąd tworzenia ,,%s'': %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "brak identyfikatora użytkownika"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatycznie pobrano ,,%s'' poprzez %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "błąd pobierania ,,%s'' poprzez %s: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Brak odcisku"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, 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:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(sprawdzić argument opcji ,,%s'')\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "wszystkie wartości przekazane do ,,%s'' zostały zignorowane\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "poprawne argimenty dla opcji ,,%s'':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "złożenie podpisu"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "złożenie podpisu pod dokumentem"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "złożenie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domyślne)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "wypisanie i sprawdzenie podpisów kluczy"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "wygenerowanie nowej pary kluczy"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "szybkie wygenerowanie nowej pary kluczy"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "szybkie dodanie nowego identyfikatora użytkownika"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "szybkie unieważnienie identyfikatora użytkownika"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "szybkie ustawienie nowej daty wygaśnięcia"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "wygenerowanie pary kluczy z pełną funkcjonalnością"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu unieważnienia klucza"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "usunięcie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "szybkie złożenie podpisu na kluczu"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "szybkie złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
 msgstr "szybkie unieważnienie podpisu klucza"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "złożenie podpisu na kluczu"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "zmiana hasła"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "odświeżenie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "import/dołączenie kluczy"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "wyświetlenie stanu karty"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "zmiana danych na karcie"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "zmiana PIN-u karty"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "wypisanie skrótów wiadomości"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WARTOŚĆ|ustawienie polityki TOFU dla klucza"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|określ adres email"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "ścisłe zachowanie OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plików"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Opcje sterujące wyjściem diagnostycznym"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|PLIK|zapis wyjścia do PLIKU"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Opcje sterujące interaktywnością i wymuszaniem"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANIZMY|wykorzystaj MECHANIZMY do wyszukiwania kluczy na podstawie "
 "adresów e-mail"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "import brakującego klucza z podpisu"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "włączanie klucza publicznego do podpisów"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "zablokuj dostęp do dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Opcje sterujące konfiguracją"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 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:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2803,7 +2844,7 @@
 "@\n"
 "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2825,11 +2866,11 @@
 " --list-keys nazwy pokazanie kluczy\n"
 " --fingerprint nazwy pokazanie odcisków kluczy\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Składnia: @GPG@ opcje pliki (-h wyświetla pomoc)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2839,7 +2880,7 @@
 "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2847,78 +2888,78 @@
 "\n"
 "Obsługiwane algorytmy:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Skrótów: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "składnia: %s opcje %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, 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:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, 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:1719
+#: g10/gpg.c:1728
 #, 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:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2926,21 +2967,21 @@
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2948,480 +2989,474 @@
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "pokazywanie informacji o zastosowaniu klucza przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 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:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "ustawienia (zaawansowane)"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nieznana polityka TOFU ,,%s''\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(,,help'' wyświetli listę wyborów)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dostępne w trybie %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Uwaga: %s nie jest do normalnego użytku!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ",,%s'' nie jest niepoprawnym adresem e-mail\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "błędny tryb pinentry ,,%s''\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "błędne źródło żądania ,,%s''\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumiały URL serwera kluczy\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "niepoprawne opcje filtrowania: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 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:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, 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:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "błędny argument dla opcji ,,%.50s''\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, 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:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno używać %s z %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w połączeniu z %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, 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:3984
+#: g10/gpg.c:4002
 #, 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:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "niewłaściwe domyślne ustawienia\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "niewłaściwe ustawienia szyfrów\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "niewłaściwe ustawienia szyfrów\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "niewłaściwe ustawienia skrótów\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie działa z %s!\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiodło się: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksport do klucza ssh powiódł się: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "błąd analizy specyfikacji klucza ,,%s'': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, 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:5342
+#: g10/gpg.c:5394
 #, 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:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoją wiadomość ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@ -3434,7 +3469,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktować konfliktu datowników jako błędu"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -3463,157 +3498,157 @@
 msgid "No help available for '%s'"
 msgstr "Brak pomocy o ,,%s''"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "import podpisów oznaczonych jako tylko lokalne"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "naprawienie uszkodzeń z serwera pks przy imporcie"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "nieczyszczenie wartości zaufania podczas importu"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "nieuaktualnianie bazy zaufania po imporcie"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "enable putty support"
 msgid "enable bulk import mode"
 msgstr "włączenie obsługi putty"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "okazanie klucza podczas importu"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key during import"
 msgid "show key but do not actually import"
 msgstr "okazanie klucza podczas importu"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "przyjmowanie tylko uaktualnień istniejących kluczy"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "usuwanie bezużytecznych części kluczy po imporcie"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "usuwanie jak największej części kluczy po imporcie"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "ignorowanie podpisów kluczy nie będących podpisami własnymi"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "natychmiastowe uruchomienie filtrów importu i eksport klucza"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "przyjęcie wejścia w formacie kopii zapasowej klucza GnuPG"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "naprawienie kluczy przy imporcie"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pominięty\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Ogółem przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " pominiętych kluczy PGP-2: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " pominiętych nowych kluczy: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " bez identyfikatora: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " dołączono do zbioru: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " bez zmian: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nowych identyfikatorów: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nowych podkluczy: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nowych podpisów: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " nowych unieważnień kluczy: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " nie włączono do zbioru: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " podpisów wyczyszczonych: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr "ID użytkownika wyczyszczonych: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3622,177 +3657,182 @@
 "OSTRZEŻENIE: klucz %s zawiera preferencje dla niedostępnych\n"
 "algorytmów dla tych ID użytkownika:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " ,,%s'': preferowany szyfr %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " ,,%s'': preferowany szyfr %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " ,,%s'': preferowany algorytm skrótu %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " ,,%s'': preferowany algorytm kompresji %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "zdecydowanie sugerowane jest uaktualnienie ustawień i ponowne\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "rozesłanie tego klucza w celu uniknięcia niezgodności algorytmów\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "można uaktualnić swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %s: brak identyfikatora użytkownika\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "klucz %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "odrzucony przez filtr importu"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %s: podklucz uszkodzony przez serwer został naprawiony\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %s: przyjęto identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %s: brak poprawnych identyfikatorów użytkownika\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %s: brak klucza publicznego: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %s: nowy klucz - pominięty\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "błąd zapisu zbioru kluczy ,,%s'': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %s: nie zgadza się z lokalną kopią\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %s: ,,%s'' 1 nowy identyfikator użytkownika\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %s: ,,%s'' %d nowych identyfikatorów użytkownika\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %s: ,,%s'' %d nowych podpisów\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %s: ,,%s'' %d podpisów wyczyszczonych\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %s: ,,%s'' %d identyfikator użytkownika wyczyszczony\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %s: ,,%s'' %d identyfikatorów użytkownika wyczyszczonych\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %s: ,,%s'' bez zmian\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "klucz %s: klucz prywatny już istnieje\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "klucz %s: błąd wysyłania do agenta: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3801,207 +3841,207 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, 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:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "klucz prywatny %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "klucz został zastąpiony"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "klucz został skompromitowany"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "klucz nie jest już używany"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "identyfikator użytkownika przestał być poprawny"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "powód unieważnienia: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "komentarz do unieważnienia: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %s: niepoprawny certyfikat unieważnienia: %s - odrzucony\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %s: ,,%s'' certyfikat unieważnienia został już wczytany\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %s: brak identyfikatora użytkownika do podpisu\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "klucz %s: nieprawidłowy bezpośredni podpis\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %s: brak podklucza do dowiązania\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %s: niepoprawne dowiązanie podklucza\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %s: usunięto wielokrotne dowiązanie podklucza\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %s: niepoprawne unieważnienie podklucza\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %s: usunięto wielokrotne unieważnienie podklucza\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %s: pominięto identyfikator użytkownika ,,%s''\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %s: podklucz pominięty\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "key %s: dołączono powtórzony identyfikator użytkownika\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %s: ,,%s'' dodany certyfikat unieważnienia\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %s: dodano bezpośredni podpis\n"
@@ -4011,30 +4051,30 @@
 msgid "error allocating memory: %s\n"
 msgstr "błąd przydzielania pamięci: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr " (poniżej uporządkowane podpisy)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "klucz %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
@@ -4042,7 +4082,7 @@
 msgstr1 "%d powtórzone podpisy usunięte\n"
 msgstr2 "%d powtórzonych podpisów usuniętych\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
@@ -4050,7 +4090,7 @@
 msgstr1 "%d podpisy nie zostały sprawdzone z powodu braku klucza\n"
 msgstr2 "%d podpisów nie zostało sprawdzonych z powodu braku klucza\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
@@ -4058,7 +4098,7 @@
 msgstr1 "%d niepoprawne podpisy\n"
 msgstr2 "%d niepoprawnych podpisów\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
@@ -4066,7 +4106,7 @@
 msgstr1 "%d podpisy uporządkowane\n"
 msgstr2 "%d podpisów uporządkowanych\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -4075,45 +4115,45 @@
 "Uwaga: znaleziono błędy, a sprawdzono tylko podpisy własne; uruchomienie "
 "'%s' sprawdzi wszystkie podpisy.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "błąd tworzenia keyboksa ,,%s'': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "błąd tworzenia zbioru kluczy ,,%s'': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ,,%s'' utworzony\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "zbiór kluczy ,,%s'' został utworzony\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "zasób bloku klucza ,,%s'': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiodła się odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "unieważnienie"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "podpis klucza nim samym"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4124,17 +4164,17 @@
 "tożsamości innych użytkowników (czy sprawdzi on odciski kluczy pobrane\n"
 "z różnych źródeł, dokumenty potwierdzające tożsamość, itd.).\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = mam pełne zaufanie\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4144,52 +4184,52 @@
 "Poziom wyższy niż 1 umożliwia używanie podpisywanego właśnie klucza\n"
 "do wykonywania zaufanych podpisów w twoim imieniu.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Proszę wpisać domenę ograniczającą ten podpis lub Enter dla żadnej.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 "Pominięto identyfikator użytkownika ,,%s'' nie będący identyfikatorem "
 "tekstowym.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator użytkownika ,,%s'' został unieważniony."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisać? (t/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Nie da się złożyć podpisu.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator użytkownika ,,%s'' przekroczył swój termin ważności."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Identyfikator użytkownika ,,%s'' jest podpisywalny. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Podpisać go? (t/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4198,11 +4238,11 @@
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem złożonym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamienić go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4211,11 +4251,11 @@
 "Twój podpis na ,,%s''\n"
 "przekroczył datę ważności.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zastąpić przeterminowany podpis nowym? (t/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4224,45 +4264,45 @@
 "Twój podpis na ,,%s''\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamienić go na pełny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ",,%s'' jest już lokalnie podpisany kluczem %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ",,%s'' jest już podpisany kluczem %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisać jeszcze raz? (t/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Data ważności tego klucza upłynęła!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ważność tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz żeby ważność Twojego podpisu wygasała w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4271,31 +4311,31 @@
 "Jak dokładnie została przez Ciebie sprawdzona tożsamość tej osoby?\n"
 "Jeśli nie wiesz co odpowiedzieć, podaj ,,0''.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) W ogóle nie.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Pobieżnie.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Bardzo dokładnie.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Wybór (,,?'' podaje więcej informacji): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4304,243 +4344,256 @@
 "Czy jesteś naprawdę pewien, że chcesz podpisać ten klucz\n"
 "swoim kluczem ,,%s'' (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "To będzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "OSTRZEŻENIE: podpis nie zostanie oznaczony jako prywatny "
 "(nieeksportowalny).\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "OSTRZEŻENIE: podpis nie zostanie oznaczony jako nie podlegający "
 "unieważnieniu.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis zostanie oznaczony jako nie podlegający unieważnieniu.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Tożsamość użytkownika nie została w ogóle sprawdzona.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Tożsamość użytkownika została sprawdzona pobieżnie.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Tożsamość użytkownika została dokładnie sprawdzona.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisać? (t/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "złożenie podpisu nie powiodło się: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Klucz ma tylko zaślepkę albo elementy na karcie - nie ma hasła do zmiany.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "klucz %s: błąd podczas zmiany hasła: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "zapis zmian i wyjście"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "okazanie uchwytu klucza"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikatorów użytkownika"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "wybór identyfikatora użytkownika N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "wybór podklucza N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "sprawdzenie podpisów"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 "złożenie podpisu na wybranych identyfikatorach użytkownika * poniżej "
 "powiązane polecenia"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr ""
 "złożenie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
 "użytkownika"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "podpisanie wybranych identyfikatorów użytkownika sygnaturą zaufania"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "podpisanie wybranych identyfikatorów użytkownika sygnaturą nie podlegającą "
 "unieważnieniu"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora użytkownika do klucza"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "dodanie zdjęcia użytkownika do klucza"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "usunięcie wybranych identyfikatorów użytkownika z klucza"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "dodanie klucza do karty procesorowej"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "przeniesienie klucza na kartę procesorową"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "przeniesienie klucza zapasowego na kartę procesorową"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "usunięcie wybranych podkluczy"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "dodanie klucza unieważniającego"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Odszyfrowywanie danych zakończone"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "usunięcie podpisów z wybranych identyfikatorów użytkownika"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zmiana daty wygaśnięcia dla klucza lub wybranych podkluczy"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie wybranego identyfikatora użytkownika jako głównego"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawień"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "ustawienie listy preferencji dla wybranych identyfikatorów użytkownika"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "ustawienie URL-a preferowanego serwera kluczy dla wybranych identyfikatorów "
 "użytkownika"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "ustawienie adnotacji dla wybranych identyfikatorów użytkownika"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "zmiana hasła klucza"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "zmiana zaufania właściciela"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "unieważnienie podpisów na wybranych identyfikatorach użytkownika"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "unieważnienie wybranych identyfikatorów użytkownika"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "unieważnienie klucza lub wybranych podkluczy"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "włączenie klucza do użycia"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "wyłączenie klucza z użycia"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "okazanie wybranych identyfikatorów - zdjęć"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "zagęszczanie bezużytecznych ID użytkowników i usuwanie bezużytecznych "
 "podpisów z kluczy"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "zagęszczanie bezużytecznych ID użytkowników i usuwanie wszystkich podpisów z "
 "kluczy"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Dostępny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Dostępne są podklucze tajne.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+#, fuzzy
+#| msgid "Note: Only the secret part of the shown subkey will be deleted.\n"
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr "Uwaga: usunięta zostanie tylko tajna część pokazanego podklucza.\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4553,289 +4606,280 @@
 "(ltsign,\n"
 " tnrsign itd.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Klucz unieważniony."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr ""
 "Czy na pewno podpisać wszystkie tekstowe identyfikatory użytkownika? (t/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Czy na pewno podpisać wszystkie identyfikatory użytkownika? (t/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowiedź: wybierz identyfikatory użytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Nieznany rodzaj podpisu ,,%s''\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybrać co najmniej jeden identyfikator użytkownika.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Należy użyć polecenia ,,%s''.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie możesz usunąć ostatniego identyfikatora użytkownika!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno usunąć wszystkie wybrane identyfikatory użytkownika? (t/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usunąć ten identyfikator użytkownika? (t/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno przenieść główny klucz (t/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybrać dokładnie jeden klucz.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Polecenie oczekuje argumentu będącego nazwą pliku\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Nie można otworzyć ,,%s'': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Błąd podczas odczytu klucza zapasowego z ,,%s'': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybrać co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usunąć ten klucz? (t/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno unieważnić wszystkie wybrane identyfikatory użytkownika? (t/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno unieważnić ten identyfikator użytkownika? (t/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz unieważnić cały klucz? (t/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz unieważnić wybrane podklucze? (t/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz unieważnić ten podklucz? (t/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Zaufanie użytkownika nie może być ustawione podczas używania bazy zaufania\n"
 "dostarczonej przez użytkownika\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Ustawienie listy ustawień na:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno uaktualnić ustawienia dla wybranych identyfikatorów? (t/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno uaktualnić ustawienia? (t/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Zapisać zmiany? (t/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Wyjść bez zapisania zmian? (t/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "usunięcie %s tajnego nie powiodło się: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie został zmieniony więc zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "nie można unieważnić ostatniego identyfikatora użytkownika.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "unieważnienie identyfikatora użytkownika nie powiodło się: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "ustawienie głównego identyfikatora użytkownika nie powiodło się: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr ",,%s'' nie jest odciskiem\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ",,%s'' nie jest głównym odciskiem\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Błędny identyfikator użytkownika ,,%s'': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "Brak pasującego identyfikatora użytkownika."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Nie ma nic do podpisania.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nie podpisane przez ciebie.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "unieważnienie podpisu klucza nie powiodło się: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ",,%s'' nie jest właściwym odciskiem\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklucz ,,%s'' nie został odnaleziony\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Skrót: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Ustawienia: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "no-modify dla serwera kluczy"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "unieważniono: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "wygasł: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "użycie: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "poprawność: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Ten klucz został wyłączony z użytku"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4843,17 +4887,17 @@
 "Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
 "dopóki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "unieważniony"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "wygasł"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4863,17 +4907,23 @@
 " 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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "OSTRZEŻENIE: podklucz do szyfrowania wkrótce wygaśnie.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "OSTRZEŻENIE: podklucz do szyfrowania wkrótce wygaśnie.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4882,37 +4932,37 @@
 "OSTRZEŻENIE: To jest klucz PGP wersji 2. Dodanie zdjęcia spowoduje, że\n"
 " niektóre wersje przestaną go rozumieć.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je dodać? (t/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usunąć ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usunąć ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usunąć ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usunąć ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4920,20 +4970,20 @@
 msgstr1 "%d podpisy usunięte.\n"
 msgstr2 "%d podpisów usuniętych.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zostało usunięte.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator użytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4941,17 +4991,17 @@
 msgstr1 "Identyfikator użytkownika ,,%s'': %d podpisy usunięte\n"
 msgstr2 "Identyfikator użytkownika ,,%s'': %d podpisów usuniętych\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator użytkownika ,,%s'': już zmniejszony.\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator użytkownika ,,%s'': już czysty.\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4961,284 +5011,300 @@
 " unieważniającego spowoduje, że niektóre wersje PGP przestaną\n"
 " go rozumieć.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza unieważniającego: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(chyba, że klucz zostaje wybrany przez podanie odcisku)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Podklucz %s jest już unieważniony.\n"
+
+#: g10/keyedit.c:5007
 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:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty ważności podklucza.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty ważności głównego klucza.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Zmiana zastosowań podklucza.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Zmiana zastosowań klucza głównego.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Proszę wybrać dokładnie jeden identyfikator użytkownika.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usunąć? (t/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Brak podklucza o identyfikatorze ,,%s''.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator użytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ważność tego klucza wygasła %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go unieważnić? (t/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (podpis nieunieważnialny) "
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, 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:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, 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:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "błędna wartość dla opcji ,,%s''\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "ustawienie ,,%s'' powtarza się\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele ustawień szyfru\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele ustawień funkcji skrótu\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele ustawień kompresji\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "zbyt wiele ustawień szyfru\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "niewłaściwy element ,,%s'' w tekście ustawień\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpośredniego\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wiążącego klucz\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, 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:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5246,19 +5312,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:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Podpisywanie"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certyfikowanie"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Szyfrowanie"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Uwierzytelnianie"
 
@@ -5272,180 +5338,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "PpSsUuZz"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Możliwe akcje dla klucza %s: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Aktualnie dopuszczalne akcje: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Przełączenie możliwości podpisywania\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Przełączenie możliwości szyfrowania\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Przełączenie możliwości uwierzytelniania\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Zakończenie\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA i RSA (domyślne)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA i Elgamala\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) sign, encrypt\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) podpisywanie, szyfrowanie\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (tylko do podpisywania)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) ECC (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) ECC (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Istniejący klucz\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Istniejący klucz z karty\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Uchwyt klucza: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Nieprawidłowy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Brak klucza o tym uchwycie\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "błąd odczytu karty: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numer seryjny karty: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Dostępne klucze:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Jakiej długości podklucz wygenerować? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Żądana długość klucza to %u bitów.\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Proszę wybrać rodzaj krzywej eliptycznej:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5461,7 +5527,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:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5477,38 +5543,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:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Okres ważności klucza? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres ważności podpisu? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "niepoprawna wartość\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie wygaśnie w ogóle\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Podpis nie wygaśnie w ogóle\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz traci ważność %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ważność podpisu wygasa %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5516,11 +5582,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:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko się zgadza (t/N)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5534,7 +5600,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5550,41 +5616,41 @@
 " \"Tadeusz Żeleński (Boy) <tzb@ziemianska.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Imię i nazwisko: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Niewłaściwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, 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:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Niewłaściwy znak w komentarzu\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Używany zestaw znaków: ,,%s''.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5595,13 +5661,13 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 "komentarza.\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 
@@ -5616,35 +5682,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Zmienić (I)mię/nazwisko, adres (E)mail, czy (W)yjść? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawić ten błąd\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5660,18 +5726,18 @@
 "ilości\n"
 "entropii.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiodła się: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5682,66 +5748,66 @@
 " ,,%s''\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Kontynuować? (T/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "klucz dla ,,%s'' już istnieje\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Utworzyć klucz mimo to? (t/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "tworzenie mimo to\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, 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:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza została anulowana.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, 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:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "zapis klucza publicznego w ,,%s''\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5749,7 +5815,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5757,7 +5823,7 @@
 "klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5765,23 +5831,23 @@
 "klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzyć? (t/N) "
 
@@ -5789,27 +5855,43 @@
 msgid "never "
 msgstr "nigdy "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Skrót: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Ustawienia: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "no-modify dla serwera kluczy"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Krytyczny regulamin podpisu: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Krytyczny preferowany serwer kluczy: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Krytyczne adnotacje podpisu: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
@@ -5817,7 +5899,7 @@
 msgstr1 "%d poprawne podpisy\n"
 msgstr2 "%d poprawnych podpisów\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
@@ -5825,7 +5907,7 @@
 msgstr1 "%d podpisy nie został sprawdzone z powodu błędu\n"
 msgstr2 "%d podpisów nie zostało sprawdzonych z powodu błędu\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
@@ -5833,33 +5915,33 @@
 msgstr1 "Ostrzeżenie: %lu klucze pominięto z powodu dużego rozmiaru\n"
 msgstr2 "Ostrzeżenie: %lu kluczy pominięto z powodu dużego rozmiaru\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Zbiór kluczy"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza głównego:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza głównego:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Odcisk podklucza:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Odcisk klucza ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Nr seryjny karty ="
 
@@ -5939,7 +6021,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ",,%s'' nie jest identyfikatorem klucza - pominięto\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5947,142 +6029,142 @@
 msgstr1 "odświeżanie %d kluczy z %s\n"
 msgstr2 "odświeżanie %d kluczy z %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie został odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "klucz nie został odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %s z %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "brak znanego serwera kluczy\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pominięty ,,%s'': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "wysyłanie klucza %s na %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "zapytanie o klucz z ,,%s''\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomocą %s\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "hasło wygenerowane nieznanym algorytmem skrótu %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny to %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr ""
 "zaszyfrowano %u-bitowym kluczem %s o identyfikatorze %s, stworzonym %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " ,,%s''\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "OSTRZEŻENIE: widziano wiele czystych tekstów\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomocą %lu haseł\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym hasłem\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "błąd odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZEŻENIE: wiadomość nie była zabezpieczona przed manipulacją\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -6092,182 +6174,188 @@
 "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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Użycie mimo to opcji ,,%s'' do odszyfrowania.\n"
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "wymuszono błąd odszyfrowywania!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZEŻENIE: zaszyfrowana wiadomość była manipulowana!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "błąd odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "nie znaleziono podpisu\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpisano w %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " przy użyciu klucza %s %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " wystawca ,,%s''\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Klucz dostępny w: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Uwaga: aby wykorzystać tę informację, należy użyć ,,%s''\n"
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "niepewne"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " alias ,,%s''"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Ważność podpisu wygasła %s.\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Ważność podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, algorytm skrótu %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", algorytm klucza "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, 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:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie można sprawdzić podpisu: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
@@ -6375,28 +6463,28 @@
 msgid "uncompressed|none"
 msgstr "nieskompresowany|brak"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "nieznany słaby skrót ,,%s''\n"
@@ -6451,7 +6539,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6517,7 +6605,7 @@
 "utworzony %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6531,78 +6619,78 @@
 "publicznym. Jeśli będzie duży, powiększy to także rozmiar Twojego klucza!\n"
 "Dobry rozmiar to około 240 na 288 pikseli.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Nazwa pliku ze zdjęciem w formacie JPEG: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "nie można otworzyć pliku JPEG ,,%s'': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Ten JPEG jest naprawdę duży (%d bajtów)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Czy na pewno chcesz go użyć? (t/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr ",,%s'' nie jest plikiem JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Czy zdjęcie jest w porządku? (t/N/w) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "odwołania do zewnętrznych programów są wyłączone\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platforma wymaga użycia plików tymczasowych do wołania zewnętrznych "
 "programów\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "nie można uruchomić powłoki ,,%s'': %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "nienaturalne zakończenie pracy zewnętrznego programu\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "błąd systemu podczas wołania programu zewnętrznego: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "OSTRZEŻENIE: nie można skasować pliku tymczasowego (%s) ,,%s'': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "OSTRZEŻENIE: nie można skasować tymczasowego katalogu ,,%s'': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "nieszczelne uprawnienia ustawień - wołanie zewnętrznych programów wyłączone\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nie można wyświetlić zdjęcia!\n"
@@ -6683,32 +6771,32 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadzące do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: Nie ma żadnej pewności, czy ten klucz należy do tej osoby\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: Nie ma całkowitej pewności, czy ten klucz należy do tej osoby\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Ten klucz prawdopodobnie należy do tej osoby\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Ten klucz należy do nas\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: Ten klucz jest niedobry! Został oznaczony jako niezaufany!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6718,7 +6806,7 @@
 "Jeżeli *naprawdę* wiesz, co robisz, możesz odpowiedzieć ,,tak'' na\n"
 "następne pytanie.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6728,105 +6816,105 @@
 "Jeśli nie masz co do tego żadnych wątpliwości i *naprawdę* wiesz co robisz,\n"
 "możesz odpowiedzieć ,,tak'' na następne pytanie.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Użyć tego klucza pomimo to? (t/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZEŻENIE: używany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "OSTRZEŻENIE: ten klucz mógł zostać unieważniony\n"
 " (brak klucza unieważniającego aby to sprawdzić)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "identyfikator użytkownika: ,,%s''\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "podano opcję ,,%s'', ale nie podano opcji ,,%s''\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "klucz %s: nie zgadza się z lokalną kopią\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but no matching User ID found\n"
 msgstr "podano opcję ,,%s'', ale nie podano opcji ,,%s''\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "OSTRZEŻENIE: Ten klucz został unieważniony kluczem unieważniającym!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZEŻENIE: Ten klucz został unieważniony przez właściciela!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " To może oznaczać, że podpis jest fałszerstwem.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZEŻENIE: Ten podklucz został unieważniony przez właściciela!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Uwaga: Ten klucz został wyłączony z użytku.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data ważności tego klucza upłynęła!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "OSTRZEŻENIE: Ten klucz nie jest poświadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZEŻENIE: Ten klucz nie jest poświadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Nie ma pewności co do tożsamości osoby która złożyła podpis.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZEŻENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Ten podpis prawdopodobnie jest FAŁSZYWY.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6836,59 +6924,59 @@
 msgstr ""
 "OSTRZEŻENIE: Tego klucza nie poświadczają wystarczająco zaufane podpisy!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZEŻENIE: Tego klucza nie poświadczają wystarczająco zaufane podpisy!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 " Nie ma pewności co do tożsamości osoby która złożyła ten "
 "podpis.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pominięty: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pominięty: klucz publiczny wyłączony z użytku\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pominięty: został już wybrany w innej opcji\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "nie można zaszyfrować do ,,%s''\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "podano opcję ,,%s'', ale nie podano poprawnych kluczy domyślnych\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "podano opcję ,,%s'', ale nie podano opcji ,,%s''\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nie został podany identyfikator użytkownika (np. za pomocą ,,-r'')\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Aktualni odbiorcy:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6896,40 +6984,40 @@
 "\n"
 "Identyfikator użytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora użytkownika.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pominięty: klucz publiczny już jest domyślnym adresatem\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wyłączony z użycia.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "pominięty: został już wybrany w innej opcji\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nieznany domyślny adresat ,,%s''\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresatów\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Uwaga: klucz %s nie ma cechy %s\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@ -6968,7 +7056,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nie można otworzyć podpisanych danych z fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "klucz %s nie nadaje się do odszyfrowywania w trybie %s\n"
@@ -7202,38 +7290,33 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "klucz %s %s wymaga skrótu %zu-bitowego lub większego (skrót to %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 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:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "OSTRZEŻENIE: podklucz podpisujący %s nie jest skrośnie podpisany\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "objaśnienie można przeczytać tutaj: %s\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "OSTRZEŻENIE: podklucz podpisujący %s jest niepoprawnie skrośnie podpisany\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
@@ -7241,7 +7324,7 @@
 msgstr1 "klucz publiczny %s jest o %lu sekundy młodszy od podpisu\n"
 msgstr2 "klucz publiczny %s jest o %lu sekund młodszy od podpisu\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
@@ -7249,7 +7332,7 @@
 msgstr1 "klucz publiczny %s jest o %lu dni młodszy od podpisu\n"
 msgstr2 "klucz publiczny %s jest o %lu dni młodszy od podpisu\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7265,7 +7348,7 @@
 "klucz %s został stworzony %lu sekund w przyszłości (zaburzenia\n"
 "czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7280,51 +7363,51 @@
 "klucz %s został stworzony %lu dni w przyszłości (zaburzenia\n"
 "czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Uwaga: klucz podpisujący %s przekroczył datę ważności %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Uwaga: klucz podpisujący %s został unieważniony\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %s: brak podklucza dowiązywanego podpisem\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "OSTRZEŻENIE: nie można rozwinąć %% w URL adnotacji (jest zbyt długi).\n"
 " Użyty zostanie nie rozwinięty.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7332,7 +7415,7 @@
 "OSTRZEŻENIE: nie można rozwinąć znaczników %% w URL regulaminu\n"
 " (jest zbyt długi). Użyty zostanie nie rozwinięty.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7341,12 +7424,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:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "podpis %s/%s złożony przez: ,,%s''\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7354,12 +7437,12 @@
 "OSTRZEŻENIE: wymuszone użycie skrótu %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7438,133 +7521,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "nie można utworzyć blokady dla ,,%s''\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "nie można zablokować ,,%s''\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, 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"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "zbyt duże zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "nie można dostać się do ,,%s'': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiodło się: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Uwaga: nie można zapisywać bazy zaufania\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, 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:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: błąd przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: błąd odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: błąd zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiodła: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiodła: %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niewłaściwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: błąd odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiodło się: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiodło się: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Błąd: uszkodzona baza zaufania.\n"
@@ -8035,7 +8118,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "następne sprawdzanie bazy odbędzie się %s\n"
@@ -8065,7 +8148,7 @@
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8073,7 +8156,7 @@
 msgstr1 "przetworzono %d klucze"
 msgstr2 "przetworzono %d kluczy"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8081,17 +8164,17 @@
 msgstr1 " (skasowano %d liczniki zaufania)\n"
 msgstr2 " (skasowano %d liczników zaufania)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8099,7 +8182,7 @@
 "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
 "%du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8170,7 +8253,7 @@
 msgid "ultimate"
 msgstr " absolutne "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8181,12 +8264,12 @@
 "Należy pamiętać o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
 "argumentu linii poleceń.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wejścia %u zbyt długa lub brak znaku LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nie można otworzyć fd %d: %s\n"
@@ -8203,19 +8286,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "ustawienie flag diagnostycznych"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "włączenie pełnej diagnostyki"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Składnia: kbxutil opcje pliki (-h wyświetla pomoc)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8226,16 +8309,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%sNumer&#x1f;: %s%%0AWłaściciel&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Pozostało prób: %d"
@@ -8276,10 +8359,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla zwykłych kluczy."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwróciło błąd: %s\n"
@@ -8301,57 +8384,57 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "klucz już istnieje\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "istniejący klucz zostanie zastąpiony\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "zapisywanie nowego klucza\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nie powiódł się zapis klucza: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowiedź nie zawiera współczynnika RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "odpowiedź nie zawiera klucza publicznego EC\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "proszę czekać na wygenerowanie klucza...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiodło się\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8359,67 +8442,67 @@
 msgstr1 "generowanie klucza zakończone (%d sekundy)\n"
 msgstr2 "generowanie klucza zakończone (%d sekund)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Proszę wprowadzić PIN PIN dla klucza do tworzenia podpisów kwalifikowanych."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Proszę wprowadzić PIN administracyjny"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Proszę wprowadzić PIN dla zwykłych kluczy."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN nie został jeszcze zmieniony\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN nie został jeszcze zmieniony\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8427,7 +8510,7 @@
 "|NP|Proszę wprowadzić nowy kod odblokowujący PIN (PUK) dla klucza do "
 "tworzenia podpisów kwalifikowanych."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8435,27 +8518,27 @@
 "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla klucza do tworzenia "
 "podpisów kwalifikowanych."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nie powiódł się zapis odcisku: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "błąd podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
@@ -8463,44 +8546,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%sNumer&#x1f;: %s%%0AWłaściciel&#x1f;: %s%%0ALicznik&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "użycie domyślnego PIN-u jako %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Proszę odblokować kartę"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta została trwale zablokowana!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8512,20 +8595,20 @@
 msgstr2 ""
 "Zostało %d prób PIN-u administracyjnego do trwałego zablokowania karty\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, 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:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Proszę wpisać PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Proszę wprowadzić kod resetujący dla karty"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, 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"
@@ -8533,72 +8616,72 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nowy kod resetujący"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administracyjny"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Proszę wprowadzić PIN administracyjny i nowy PIN administracyjny"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Proszę wprowadzić PIN i nowy PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "błąd podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "błąd podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "nieobsługiwana krzywa\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, 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:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpisów: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8606,7 +8689,7 @@
 "weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
 "zabroniona\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
@@ -8626,7 +8709,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
@@ -8670,11 +8753,11 @@
 msgid "deny the use of admin card commands"
 msgstr "zabronienie używania poleceń karty administratora"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Składnia: @SCDAEMON@ opcje (-h wyświetla pomoc)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8682,316 +8765,316 @@
 "Składnia: scdaemon opcje polecenie argumenty\n"
 "Demon kart procesorowych dla @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsługa fd %d uruchomiona\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsługa fd %d zakończona\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "błąd pobierania informacji o zastosowaniu klucza: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "model poprawności żądany przez certyfikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "łańcuchowy"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "powłokowy"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "certyfikat wystawcy nie jest oznaczony jako CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "polityka oznaczona jako krytyczna bez skonfigurowanych polityk"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "nie udało się otworzyć ,,%s'': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Uwaga: niekrytyczna polityka certyfikatu niedozwolona"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "polityka certyfikatu niedozwolona"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "nie udało się pobrać odcisku\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "poszukiwanie wystawcy na zewnątrz\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "liczba pasujących wystawców: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "nie można uzyskać authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "poszukiwanie wystawcy w pamięci podręcznej Dirmngr\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "liczba pasujących certyfikatów: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, 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:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "nie udało się przydzielić uchwytu keyDB\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "certyfikat został unieważniony"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "status certyfikatu jest nieznany"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sprawdzenie CRL nie powiodło się: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certyfikat z błędną ważnością: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certyfikat jeszcze nie jest ważny"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "certyfikat główny jeszcze nie jest ważny"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "certyfikat pośredni jeszcze nie jest ważny"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "certyfikat wygasł"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "certyfikat główny wygasł"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "certyfikat pośredni wygasł"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "brak wymaganych atrybutów certyfikatu: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "certyfikat o nieważnej ważności"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "podpis nie utworzony w czasie życia certyfikatu"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "certyfikat nie utworzony w czasie życia wystawcy"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "pośredni certyfikat nie utworzony w czasie życia wystawcy"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( podpis utworzony "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (certyfikat utworzony "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (certyfikat ważny od "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( wystawca ważny od "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "odcisk=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "nie znaleziono wystawcy w certyfikacie"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "własnoręcznie podpisany certyfikat ma ZŁY podpis"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "główny certyfikat nie jest oznaczony jako zaufany"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "łańcuch certyfikatów zbyt długi\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "nie znaleziono certyfikatu wystawcy"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certyfikat ma ZŁY podpis"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 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:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, 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:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "certyfikat jest dobry\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certyfikat pośredni jest dobry\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certyfikat główny jest dobry\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "przełączanie do modelu łańcuchowego"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "użyty model poprawności: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "brak pamięci\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(to jest algorytm MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "brak"
 
@@ -9011,7 +9094,7 @@
 msgid "Error - invalid DN"
 msgstr "Błąd - niewłaściwe DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9025,42 +9108,42 @@
 "S/N %s, ID 0x%08lX,\n"
 "stworzony %s, wygasa %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "nie podano zastosowania klucza - przyjęto wszystkie zastosowania\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certyfikat nie nadaje się do szyfrowania\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certyfikat nie nadaje się do podpisywania\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9280,17 +9363,17 @@
 msgid "resource problem: out of core\n"
 msgstr "problem z zasobami: brak pamięci\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(to jest algorytm RC2)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(to nie wygląda na zaszyfrowaną wiadomość)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9301,7 +9384,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "błąd blokowania keyboksa: %s\n"
@@ -9326,123 +9409,123 @@
 msgid "no valid recipients given\n"
 msgstr "nie podano poprawnych adresatów\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "wypisanie kluczy zewnętrznych"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "wypisanie łańcucha certyfikatów"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "import certyfikatów"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "eksport certyfikatów"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "zarejestrowanie karty procesorowej"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "przekazanie polecenia do dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "wywołanie gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "nieużywanie w ogóle terminala"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|liczba certyfikatów do dołączenia"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "przyjęcie wejścia w formacie PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "przyjęcie wejścia w formacie base-64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "przyjęcie wejścia w formacie binarnym"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "tworzenie wyjścia zakodowanego base-64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 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:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "pobranie brakujących certyfikatów wystawców"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "pominięcie CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "niesprawdzanie CRL dla głównych certyfikatów"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "sprawdzenie poprawności przy użyciu OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "niesprawdzanie polityk certyfikatów"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: bez żadnych pytań"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "przyjęcie odpowiedzi ,,tak'' na większość pytań"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "przyjęcie odpowiedzi ,,nie'' na większość pytań"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Składnia: @GPGSM@ opcje pliki (-h wyświetla pomoc)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9453,27 +9536,27 @@
 "S/MIME\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nieznany model poprawności ,,%s''\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "import wspólnych certyfikatów ,,%s''\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nie można podpisać z użyciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
@@ -9494,7 +9577,7 @@
 msgstr ""
 "podstawowe sprawdzenia certyikatu nie powiodły się - nie zaimportowany\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "błąd pobierania zapisanych flag: %s\n"
@@ -9504,48 +9587,48 @@
 msgid "error importing certificate: %s\n"
 msgstr "błąd importu certyfikatu: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "błąd odczytu wejścia: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "brak działającego dirmngr w tej sesji\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "błąd podczas otwierania bazy kluczy: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem odszukaniem istniejącego certyfikatu: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "błąd podczas szukania zapisywalnego keyDB: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "błąd zapisywania certyfikatu: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "błąd zapisywania flag: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Błąd - "
 
@@ -9581,7 +9664,7 @@
 "\n"
 "%s%sNa pewno chcesz to zrobić?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9601,61 +9684,61 @@
 ",,%s''\n"
 "Należy zauważyć, że ten certyfikat NIE utworzy kwalifikowanego podpisu!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "algorytm skrótu %d (%s) dla podpisującego %d nie jest obsługiwany; użycie "
 "%s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "algorytm skrótu użyty dla podpisującego %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Podpisano w %s kluczem %s o numerze %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Podpisano w "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "nie podano daty"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "algorytm:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, 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:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Poprawny podpis złożony przez"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " alias"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "To jest podpis kwalifikowany\n"
@@ -9682,323 +9765,318 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "nie można zwolnić blokady pamięci podręcznej certyfikatów: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "porzucanie %u certyfikatów z pamięci podręcznej\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "nie można przeanalizować certyfikatu ,,%s'': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "certyfikat ,,%s'' jest już w pamięci podręcznej\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "certyfikat zaufany ,,%s'' załadowany\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "certyfikat ,,%s'' załadowany\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " odcisk SHA1 = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " wystawca ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " przedmiot ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "błąd ładowania certyfikatu ,,%s'': %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr " trwale załadowanych certyfikatów: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "certyfikatów w pamięci podręcznej: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " certyfikatów zaufanych: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certyfikat już istnieje w pamięci podręcznej\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "certyfikat zapisany w pamięci podręcznej\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "błąd zapisu certyfikatu w pamięci podręcznej: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "niewłaściwy łańcuch odcisku SHA1 ,,%s''\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "błąd pobierania certyfikatu wg S/N: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "błąd pobierania certyfikatu wg przedmiotu: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "nie znaleziono wystawcy w certyfikacie\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "błąd pobierania authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "tworzenie katalogu ,,%s''\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "błąd tworzenia katalogu ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "zignorowano katalog bazy danych ,,%s''\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "błąd odczytu katalogu ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "usuwanie pliku pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "bez usuwania pliku ,,%s''\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "błąd zamykania pliku pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "pierwszy rekord ,,%s'' nie jest wersją\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "stara wersja katalogu pamięci podręcznej - czyszczenie\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, 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:614
+#: dirmngr/crlcache.c:621
 #, 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:622
+#: dirmngr/crlcache.c:629
 #, 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:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "wykryto powtórzony wpis w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, 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:672
+#: dirmngr/crlcache.c:679
 #, 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:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "brak DN wystawcy w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "nieprawidłowy znacznik czasu w ,,%s'', linia %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, 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:698
+#: dirmngr/crlcache.c:705
 #, 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:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "błąd zamykania ,,%s'': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "błąd zmiany nazwy ,,%s'' na ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nie można policzyć skrótu ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "błąd ustawiania kontekstu skrótu MD5: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "błąd liczenia skrótu ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "niewłaściwie sformatowana suma kontrolna ,,%s''\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, 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:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "otwieranie pliku pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, 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:1153
+#: dirmngr/crlcache.c:1160
 #, 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:1174
+#: dirmngr/crlcache.c:1181
 #, 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:1176
+#: dirmngr/crlcache.c:1183
 #, 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:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "brak dostępnego CRL dla id wystawcy %s\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, 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:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -10007,200 +10085,200 @@
 "force-crl-refresh aktywne i minęło %d minut dla id wystawcy %s; wymagana "
 "aktualizacja\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, 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:1325
+#: dirmngr/crlcache.c:1332
 #, 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:1336
+#: dirmngr/crlcache.c:1343
 #, 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:1348
+#: dirmngr/crlcache.c:1355
 #, 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:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, 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:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "odebrano błędne S-wyrażenie z libksba\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, 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:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "tworzenie S-wyrażenia nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "błąd pobierania czasów aktualizacji CRL: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, 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:1948
+#: dirmngr/crlcache.c:1959
 #, 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:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "błąd pobierania elementu CRL: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "nie znaleziono wystawcy CRL w CRL: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "wyszukiwanie certyfikatu wystawcy CRL po authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "weryfikacja podpisu CRL nie powiodła się: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, 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:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, 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:2336
+#: dirmngr/crlcache.c:2347
 #, 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:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "nieznane rozszerzenie krytyczne CRL %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "błąd odczytu rozszerzeń CRL: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "błąd tworzenia pliku pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem ze zmianą nazwy ,,%s'' na ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10209,12 +10287,12 @@
 "uaktualnianie pliku DIR nie powiodło się - wpis pamięci podręcznej zostanie "
 "utracony przy następnym starcie programu\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Rozpoczęcie zrzutu cRL (uzyskanego poprzez %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10222,55 +10300,55 @@
 " BŁĄD: CRL nie będzie użyte, ponieważ po uaktualnieniu jest nadal zbyt "
 "stare!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 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:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " BŁĄD: CRL nie będzie użyte\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 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:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem z odczytem rekordu pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem z odczytem klucza pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, 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:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Koniec zrzutu CRL\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch po DP nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert po wystawcy nie powiodło się: %s\n"
@@ -10286,23 +10364,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "dostęp do CRL niemożliwy z powodu trybu Tor\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "Dostęp do CRL niemożliwy z powodu wyłączonego %s\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "błąd odtwarzania ,,%s'': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "błąd inicjowania obiektu czytelnika: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "wyszukanie certyfikatu niemożliwe z powodu wyłączonego %s\n"
@@ -10449,141 +10527,141 @@
 msgid "looking up '%s'\n"
 msgstr "wyszukiwanie ,,%s''\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "lista zawartości pamięci podręcznej CRL"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|PLIK|załadowanie CRL z PLIKU do pamięci podręcznej"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|pobranie CRL z URL-a"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "wyłączenie dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "zapis pamięci podręcznej"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "zezwolenie na sprawdzenie wersji oprogramowania online"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 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:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "trasowanie całego ruchu sieciowego przez Tora"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguracja dla serwerów HTTP"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "powstrzymanie od użycia HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorowanie punktów dystrybucji CRL przez HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|przekierowanie wszystkich żądań HTTP na URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "użycie systemowego ustawienia proxy HTTP"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Konfiguracja dla serwerów HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|używaj serwera kluczy URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 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:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Konfiguracja dla serwerów HTTP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "powstrzymanie od użycia LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorowanie punktów dystrybucji CRL przez LDAP"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|użycie HOSTA do zapytań LDAP"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "bez użycia hostów zapasowych z --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|PLIK|odczyt listy serwerów LDAP z PLIKU"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 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:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|ustawienie limitu czasu LDAP na N sekund"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Konfiguracja dla OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "zezwolenie na wysyłanie żądań OCSP"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorowanie URL-i usług OCSP zawartych w certyfikatach"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|użycie respondera OCSP spod URL-a"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|odpowiedź OCSP podpisana przez FPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "wymuszenie ładowania nieaktualnych CRL"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10592,11 +10670,11 @@
 "@\n"
 "(pełną listę poleceń i opcji można znaleźć w podręczniku ,,info'')\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Składnia: @DIRMNGR@ opcje (-h wyświetla pomoc)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10604,104 +10682,104 @@
 "Składnia: @DIRMNGR@ opcje polecenie argumenty\n"
 "Dostęp do serwera kluczy, CRL i OCSP dla @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "poprawne poziomy diagnostyki to: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "składnia: %s opcje"
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "dwukropki nie są dozwolone w nazwie gniazda\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pobranie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "przetworzenie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: linia zbyt długa - pominięto\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: wykryto błędny odcisk\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: błąd odczytu: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, 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:1982
+#: dirmngr/dirmngr.c:2035
 #, 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:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "otrzymano SIGUSR2 - nie zdefiniowano akcji\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "otrzymano SIGTERM - zamykanie...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "otrzymano SIGTERM - nadal są aktywne połączenia: %d\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "wymuszono zamknięcie\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "otrzymano SIGINT - natychmiastowe zamknięcie\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "otrzymano sygnał %d - nie zdefiniowano akcji\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "błąd dostępu do ,,%s'': status http %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ,,%s'' przekierowany na ,,%s'' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "za dużo przekierowań\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "przekierowanie zmienione na ,,%s''\n"
@@ -10756,32 +10834,32 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc nie powiodło się: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr ",,%s'' nie jest URL-em LDAP\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ",,%s'' jest nieprawidłowym URL-em LDAP\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search natrafiło na limit rozmiaru w serwerze\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: podano hasło bez użytkownika\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: linia pominięta\n"
@@ -10872,162 +10950,162 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "nie podpisane domyślnym certyfikatem podpisującego OCSP"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "przydzielanie elementu listy nie powiodło się: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "błąd pobierania ID respondera: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "nie znaleziono odpowiedniego certyfikatu do zweryfikowania odpowiedzi OCSP\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "nie znaleziono certyfikatu wystawcy: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "wywołujący nie zwrócił certyfikatu docelowego\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "wywołujący nie zwrócił certyfikatu wystawcy\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "nie udało się przydzielić kontekstu OCSP: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "nie zdefiniowano domyślnego respondera OCSP\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "nie zdefiniowano domyślnego podpisującego OCSP\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "użycie domyślnego respondera OCSP ,,%s''\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "użycie respondera OCSP ,,%s''\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "błąd pobierania stanu OCSP dla certyfikatu docelowego: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "stan certyfikatu: %s (ten=%s następny=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "poprawny"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certyfikat został unieważniony: %s z powodu: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "responder OCSP zwrócił stan z przyszłości\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "responder OCSP zwrócił stan niebieżący\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "responder OCSP zwrócił stan zbyt stary\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "brak pola serialno w ID certyfikatu"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "błąd wysyłania danych: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "przekroczono max_replies %d\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nie można przydzielić struktury sterującej: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "nie udało się przydzielić kontekstu assuan: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "nie udało się zainicjować serwera: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problem z accept u Assuana: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Przetwarzanie u Assuana nie powiodło się: %s\n"
@@ -11037,85 +11115,85 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "zaakceptowano główne CA nie oznaczone jako CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "sprawdzanie CRL zagnieżdżone zbyt głęboko\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "bez sprawdzania CRL dla"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "sprawdzanie CRL dla"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "sprawdzanie zaufania certyfikatu głównego nie powiodło się: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "łańcuch certyfikatów jest dobry\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "cicho"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "wypisanie danych zakodowanych szesnastkowo"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "dekodowanie otrzymanych linii danych"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "połączenie z dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "połączenie z dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAZWA|połączenie z gniazdem Assuan o tej nazwie"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADRES|połączenie z serwerem Assuan pod ADRESEM"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "uruchomienie serwera Assuan podanego z linii poleceń"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "nieużywanie rozszerzonego trybu połączenia"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|PLIK|uruchomienie poleceń z PLIKU przy starcie"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "uruchomienie /subst przy starcie"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11123,49 +11201,49 @@
 "Składnia: @GPG@-connect-agent opcje\n"
 "Połączenie z działającym agentem i wysyłanie poleceń\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "opcja ,,%s'' zignorowana z powodu ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "odbieranie linii nie powiodło się: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "linia zbyt długa - pominięta\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "nieznane polecenie ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "wysyłanie linii nie powiodło się: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "brak działającego dirmngr w tej sesji\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "błąd wysyłania standardowych opcji: %s\n"
@@ -11227,12 +11305,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Uwaga, określenia grup są ignorowane\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "błąd zamykania ,,%s''\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "błąd analizy ,,%s''\n"
@@ -11338,90 +11416,108 @@
 "Składnia: gpg-check-pattern opcje plik-wzorców\n"
 "Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Uwaga: klucze są już zapisane na karcie!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Uwaga: klucze są już zapisane na karcie!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Zastąpić istniejące klucze? (t/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Wykryto kartę OpenPGP nr %s\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "dodanie certyfikatu do pamięci podręcznej"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "ustawienie KDF do uwierzytelniania PIN-em"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "dodanie certyfikatu do pamięci podręcznej"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "dodanie certyfikatu do pamięci podręcznej"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "niewłaściwe ustawienia szyfrów\n"
+
+#, fuzzy
+#~| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami adresata\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "błąd zapisu do pliku tymczasowego: %s\n"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/pt.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/pt.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/pt.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/pt.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, 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,52 +29,52 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "frase-secreta inválida"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,28 +85,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "frase secreta demasiado longa\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -116,273 +116,274 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "frase secreta incorrecta"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inválido no nome\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenhum porta-chaves secreto com permissões de escrita encontrado: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Insira a frase secreta\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -390,7 +391,7 @@
 msgstr0 "O nome deve ter pelo menos 5 caracteres\n"
 msgstr1 "O nome deve ter pelo menos 5 caracteres\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -398,102 +399,102 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Usar esta chave de qualquer modo? "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confiança"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
@@ -501,288 +502,294 @@
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "não suportado"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usar mode de frase secreta N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "utilizar o gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Uso: gpg opções ficheiros (-h para ajuda)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, 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:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, 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:2388
+#: agent/gpg-agent.c:2416
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -792,19 +799,19 @@
 "Opções:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -812,8 +819,8 @@
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -823,86 +830,88 @@
 "Opções:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, fuzzy
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Uso: gpg opções ficheiros (-h para ajuda)"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "partes da chave secreta não disponíveis\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -915,19 +924,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -940,7 +949,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -950,48 +959,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "activa uma chave"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1002,8 +1020,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1013,7 +1031,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
@@ -1023,7 +1041,7 @@
 msgid "secret key parts are not available\n"
 msgstr "partes da chave secreta não disponíveis\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1041,52 +1059,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algoritmo de protecção %d%s não é suportado\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@ -1107,28 +1125,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desactivar core dumps: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 #, fuzzy
 msgid "yes"
 msgstr "sim"
@@ -1184,8 +1202,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
@@ -1200,74 +1218,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1351,7 +1369,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1435,44 +1453,44 @@
 msgid "Root certificate trustworthy"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda disponível"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versão desconhecida"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Nenhuma ajuda disponível para `%s'"
@@ -1482,12 +1500,12 @@
 msgid "ignoring garbage line"
 msgstr "erro na última linha\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "versão desconhecida"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inválido %02x ignorado\n"
@@ -1522,136 +1540,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "chave pública %08lX não encontrada: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "erro ao criar `%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "cabeçalho de armadura inválido: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "cabeçalho de armadura: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "cabeçalho de assinatura em texto puro inválido\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "cabeçalho de armadura: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "linha com hífen inválida: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inválido %02x ignorado\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "erro na última linha\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inválida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1659,13 +1690,13 @@
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "não legível por humanos"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1674,27 +1705,27 @@
 "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e "
 "terminar com um '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1704,7 +1735,7 @@
 "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e "
 "terminar com um '='\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
@@ -1718,8 +1749,8 @@
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s não faz sentido com %s!\n"
@@ -1729,13 +1760,13 @@
 msgid "error from TPM: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
@@ -1746,209 +1777,214 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Opção? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "não processado"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave pública para `%s'\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferências actualizadas"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 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:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 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:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1956,102 +1992,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (apenas assinatura)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2059,197 +2095,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revocação: "
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2311,9 +2352,9 @@
 msgid "subkey"
 msgstr "Chave pública: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
@@ -2338,80 +2379,75 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK 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:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 msgid "using cipher %s.%s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2420,19 +2456,13 @@
 "ao forçar o algoritmo de compressão %s (%d) viola as preferências do "
 "destinatário\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2449,7 +2479,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2461,431 +2491,435 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A assinatura será marcada como não-revocável.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta não utilizável"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "gerar um certificado de revogação"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "erro ao criar `%s': %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "Utilizador não encontrado"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|ficheiro|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra simétrica"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "decifrar dados (acção por omissão)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves público"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo ficheiros|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrepôr"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, 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:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, 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:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2893,7 +2927,7 @@
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2923,13 +2957,13 @@
 " --list-keys nomes mostrar chaves\n"
 " --fingerprint nomes mostrar impressões digitais\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2944,7 +2978,7 @@
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2952,570 +2986,564 @@
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Chave pública: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Dispersão: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compressão: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "uso: gpg opções "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave está"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "configurar lista de preferências"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, 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:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, 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:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, 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:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, 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:3647
+#: g10/gpg.c:3668
 #, 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:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, 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:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferências por omissão inválidas\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferências pessoais de cifra inválidas\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "preferências pessoais de cifra inválidas\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferências pessoais de 'digest' inválidas\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferências pessoais de compressão inválidas\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "tamanho de chave inválido; a utilizar %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD 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:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, 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:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, 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:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, 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:5702
+#: g10/gpg.c:5762
 #, 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:5735
+#: g10/gpg.c:5795
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
@@ -3530,7 +3558,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informações de estado para o\n"
@@ -3561,339 +3589,344 @@
 msgid "No help available for '%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "não suportado"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "mostra impressão digital"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "mostra impressão digital"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chave secreta não utilizável"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "mostra impressão digital"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas até agora\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total processado: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " ignorei novas chaves: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " ignorei novas chaves: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importados: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " não modificados: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " novas subchaves: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " novas assinaturas: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " novas revogações de chaves: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " chaves secretas lidas: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " chaves secretas importadas: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas não modificadas: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " não importadas: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " novas assinaturas: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " chaves secretas lidas: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave pública não encontrada: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave pública \"%s\" importada\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" não modificada\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3902,204 +3935,204 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "A chave foi substituída"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "A chave já não é utilizada"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador já não é válido"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motivo da revocação: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentário da revocação: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revogação importado\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, 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:3670
+#: g10/import.c:3766
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, 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:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocação de subchave inválida\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, 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:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@ -4109,35 +4142,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Assinatura correcta de \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "Utilizador \"%s\" está revocado."
 msgstr1 "Utilizador \"%s\" está revocado."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4145,7 +4178,7 @@
 msgstr0 "1 assinatura não verificada por falta de chave\n"
 msgstr1 "1 assinatura não verificada por falta de chave\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4153,61 +4186,61 @@
 msgstr0 "%d assinaturas incorrectas\n"
 msgstr1 "%d assinaturas incorrectas\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Assinatura correcta de \""
 msgstr1 "Assinatura correcta de \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revogação"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "auto-assinatura"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4220,68 +4253,68 @@
 "(vendo passaportes, verificando impressões digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Não foi possível assinar.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n"
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n"
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4290,11 +4323,11 @@
 "A sua auto-assinatura em \"%s\"\n"
 "é uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promovê-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4303,12 +4336,12 @@
 "A sua assinatura actual em \"%s\"\n"
 "é uma assinatura local.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4317,44 +4350,44 @@
 "A sua assinatura actual em \"%s\"\n"
 "é uma assinatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promovê-la a uma assinatura exportável? (s/N)"
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" já foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" já foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4364,32 +4397,32 @@
 "pertence\n"
 "à pessoa correcta? Se não sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Não vou responder.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Não verifiquei.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr " i = mostrar mais informações\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4398,278 +4431,287 @@
 "Você tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto será uma auto-assinatura.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura não será marcada como não-exportável.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura não será marcada como não-revocável.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura será marcada como não-exportável.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura será marcada como não-revocável.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Não verifiquei esta chave.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notação de assinatura: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotográfico"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revocação"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as preferências para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como primário"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "lista preferências (perito)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "lista preferências (detalhadamente)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as preferências para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Realmente actualizar as preferências para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotográfico"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4677,310 +4719,300 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "A chave está revogada."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Você não pode remover o último ID de utilizador!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Você quer realmente remover esta chave? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Você quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Você quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Você quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de preferências"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as preferências para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as preferências?"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar alterações? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "remoção do bloco de chave falhou: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valor inválido\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "'Digest': "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Características: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Notação: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensível)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "expira: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "expira: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4988,37 +5020,42 @@
 "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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, 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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5027,36 +5064,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5064,38 +5101,38 @@
 msgstr0 "%d assinatura removida.\n"
 msgstr1 "%d assinatura removida.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inválida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "Utilizador \"%s\" está revocado."
 msgstr1 "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5104,310 +5141,325 @@
 "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:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 #, 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:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(a não ser que escolha a chave pela sua impressão digital)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "o utilizador com o id \"%s\" já está revocado\n"
+
+#: g10/keyedit.c:5007
 #, 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:4726
+#: g10/keyedit.c:5012
 #, 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:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, 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:5384
+#: g10/keyedit.c:5672
 #, 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:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notação de assinatura: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (não-exportável)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 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:6071
+#: g10/keyedit.c:6359
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (não-exportável)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revogação? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, 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:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inválido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5421,180 +5473,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) ElGamal (sign and encrypt)\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ElGamal (assinatura e cifragem)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (por omissão)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notação de assinatura: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "desactiva uma chave"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5610,7 +5662,7 @@
 " <n>m = chave expira em n meses\n"
 " <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5626,40 +5678,40 @@
 " <n>m = assinatura expira em n meses\n"
 " <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura é valida por? (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5667,12 +5719,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:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5683,7 +5735,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5701,42 +5753,42 @@
 " \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5747,13 +5799,13 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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 "
 "comentário\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5768,35 +5820,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5808,18 +5860,18 @@
 "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:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5827,69 +5879,69 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, 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:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5898,7 +5950,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5906,7 +5958,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5914,23 +5966,23 @@
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
@@ -5939,27 +5991,43 @@
 msgid "never "
 msgstr ""
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "'Digest': "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Características: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Politica de assinatura crítica: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Notação de assinatura crítica: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Notação de assinatura: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5967,7 +6035,7 @@
 msgstr0 "%d assinaturas incorrectas\n"
 msgstr1 "%d assinaturas incorrectas\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5975,41 +6043,41 @@
 msgstr0 "1 assinatura não verificada devido a um erro\n"
 msgstr1 "1 assinatura não verificada devido a um erro\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Impressão da chave primária:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr "Impressão da chave primária:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Impressão da subchave:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Impressão da chave ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6089,334 +6157,340 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "a pedir a chave %08lX de %s\n"
 msgstr1 "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid " \"%s\"\n"
 msgstr " ou \""
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, 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:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, fuzzy, c-format
 msgid " using %s key %s\n"
 msgstr " ou \""
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " ou \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "incerto"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " ou \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 #, fuzzy
 msgid "unknown"
 msgstr "versão desconhecida"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública desconhecido"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "não é uma assinatura separada\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
@@ -6522,27 +6596,27 @@
 msgid "uncompressed|none"
 msgstr "não processado"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "classe de assinatura desconhecida"
@@ -6599,7 +6673,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "muda a frase secreta"
@@ -6663,7 +6737,7 @@
 "%s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6672,77 +6746,77 @@
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "%s: não é um base de dados de confiança\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro ao ler registo de versão: %s\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "não foi possível alterar o exec-path para %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: erro ao ler registo de versão: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "não foi possível alterar o exec-path para %s\n"
@@ -6829,34 +6903,34 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: Não há indicação de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: Não há indicação de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence-nos\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6868,7 +6942,7 @@
 "sim à próxima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6880,101 +6954,101 @@
 "sim à próxima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: A utilizar uma chave que não é de confiança!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, fuzzy, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não "
 "presente.\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, fuzzy, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Isto pode significar que a assinatura é falsificada.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " Não há indicação de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: Nós NÃO confiamos nesta chave!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " A assinatura é provavelmente uma FALSIFICAÇÃO.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6985,7 +7059,7 @@
 "AVISO: Esta chave não está certificada com assinaturas suficientemente\n"
 " confiáveis!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6993,51 +7067,51 @@
 "AVISO: Esta chave não está certificada com assinaturas suficientemente\n"
 " confiáveis!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Não se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave pública está desactivada\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "impossível ligar a `%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Não especificou um identificador de utilizador. (pode usar \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7045,40 +7119,40 @@
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave pública já colocada como destinatário por omissão\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desativada.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -7117,7 +7191,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -7337,52 +7411,47 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informações\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
 msgstr1 "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
 msgstr0 "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
 msgstr1 "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7395,7 +7464,7 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7407,53 +7476,53 @@
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTA: a chave foi revogada"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para ligação de chaves\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "AVISO: impossível expandir-%% a url de política (demasiado grande). A "
 "utilizar não expandida.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7461,7 +7530,7 @@
 "AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
 "A utilizar não expandida.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7470,12 +7539,12 @@
 "AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
 "A utilizar não expandida.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7483,12 +7552,12 @@
 "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
 "destinatário\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7568,134 +7637,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confiança: sincronização falhou: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, 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"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transação de base de dados de confiança muito grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de versão: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confiança inválida criada\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confiança criada\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confiança inválida\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de versão: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de versão: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de versão: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confiança: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, 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:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: não é um base de dados de confiança\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de versão com recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diretório: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: base de dados de confiança criada\n"
@@ -8127,7 +8196,7 @@
 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:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verificação da base de dados de confiança a %s\n"
@@ -8157,39 +8226,39 @@
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confiança\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%lu chaves processadas até agora\n"
 msgstr1 "%lu chaves processadas até agora\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, 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:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, 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"
@@ -8261,7 +8330,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8272,12 +8341,12 @@
 "Não se esqueça que o ficheiro com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro a ser dado na linha de comando.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "impossível abrir `%s': %s\n"
@@ -8293,20 +8362,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "a ler opções de `%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Uso: gpg opções ficheiros (-h para ajuda)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8316,16 +8385,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8360,10 +8429,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "motivo da revocação: "
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8383,158 +8452,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "%s' já comprimido\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, 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-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "A geração de chaves falhou: %s\n"
 msgstr1 "A geração de chaves falhou: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revocação: "
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revocação: "
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, 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:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
@@ -8542,43 +8611,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8586,22 +8655,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "motivo da revocação: "
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8609,81 +8678,81 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI não suportado"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
@@ -8704,7 +8773,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8753,333 +8822,333 @@
 msgid "deny the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Uso: gpg opções ficheiros (-h para ajuda)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, 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:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, 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:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, 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:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " novas assinaturas: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra impressão digital"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "gerar um certificado de revogação"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "não processado"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "não"
@@ -9102,7 +9171,7 @@
 msgid "Error - invalid DN"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9117,42 +9186,42 @@
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "certificado incorrecto"
@@ -9378,17 +9447,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
@@ -9398,7 +9467,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
@@ -9423,138 +9492,138 @@
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inválida\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar saída com armadura ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9565,27 +9634,27 @@
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9605,7 +9674,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
@@ -9615,47 +9684,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema ao verificar revogação: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9685,7 +9754,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9700,58 +9769,58 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "algoritmo de protecção %d%s não é suportado\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "armadura: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Assinatura correcta de \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " ou \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9778,587 +9847,582 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "mostra impressão digital"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificado incorrecto"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, 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:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, 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:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "gerar um certificado de revogação"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, fuzzy, c-format
 msgid "creating directory '%s'\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "erro na última linha\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, 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:631
+#: dirmngr/crlcache.c:638
 #, 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:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, 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:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "armadura: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, fuzzy, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "gerar um certificado de revogação"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, 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:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problema ao verificar revogação: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
@@ -10373,24 +10437,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: erro ao escrever registo de diretório: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
@@ -10546,140 +10610,140 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10692,115 +10756,115 @@
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Uso: gpg opções ficheiros (-h para ajuda)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "uso: gpg opções "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "não processado"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10856,32 +10920,32 @@
 msgid "malloc failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "%s: não é um base de dados de confiança\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = saltar esta chave\n"
@@ -10973,163 +11037,163 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "gerar um certificado de revogação"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "sem porta-chaves público por omissão: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "NOTA: a chave foi revogada"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, 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:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11140,135 +11204,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "a verificar a base de dados de confiança\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Uso: gpg opções ficheiros (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -11334,12 +11398,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -11448,88 +11512,107 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "muda a data de validade"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "preferências pessoais de cifra inválidas\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
+
+#~ 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"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "a escrever para `%s'\n"
 
@@ -12178,10 +12261,6 @@
 #~ msgstr "alterna entre listagem de chave secreta e pública"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "frase secreta incorrecta"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "AVISO: opções em `%s' ainda não estão activas nesta execução\n"
 
@@ -13104,9 +13183,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "remove assinaturas"
 
-#~ msgid "set preference list"
-#~ msgstr "configurar lista de preferências"
-
 #~ msgid "updated preferences"
 #~ msgstr "preferências actualizadas"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/ro.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/ro.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/ro.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/ro.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
@@ -30,53 +30,53 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "frază-parolă invalidă"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -87,28 +87,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "frază-parolă prea lungă\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 #, fuzzy
 msgid "Quality:"
 msgstr "validitate: %s"
@@ -119,17 +119,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -137,83 +137,88 @@
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frază-parolă incorectă"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "frază-parolă incorectă"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lungă"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frază-parolă prea lungă\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid în nume\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frază-parolă incorectă"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -221,74 +226,74 @@
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nu am găsit nici un inel de chei secret de scris: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -296,103 +301,96 @@
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: agent/divert-scd.c:118
-#, fuzzy
-msgid "Please insert the card with serial number"
-msgstr ""
-"Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
-" %.*s\n"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|PIN Admin"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduceţi fraza-parolă\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -400,7 +398,7 @@
 msgstr0 "Numele trebuie să fie de cel puţin 5 caractere\n"
 msgstr1 "Numele trebuie să fie de cel puţin 5 caractere\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -408,391 +406,397 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Folosiţi oricum această cheie? (d/N) "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai tăcut"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizează baza de date de încredere"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "nu este suportat(ă)"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|foloseşte modul frază-parolă N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "foloseşte gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Folosire: gpg opţiuni fişiere (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) a eşuat în %s: %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a eşuat: %s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: sărită: %s\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -802,19 +806,19 @@
 "Opţiuni:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -822,8 +826,8 @@
 "@Comenzi:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -833,36 +837,36 @@
 "Opţiuni:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -870,52 +874,54 @@
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "anulată"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fişier opţiuni `%s': %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -928,19 +934,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -953,7 +959,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -963,36 +969,48 @@
 #. 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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+#, fuzzy
+msgid "Please insert the card with serial number"
+msgstr ""
+"Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
+" %.*s\n"
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1000,13 +1018,13 @@
 "%%0A?"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "activează cheia"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1017,8 +1035,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1028,7 +1046,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
@@ -1038,7 +1056,7 @@
 msgid "secret key parts are not available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1056,52 +1074,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algoritm de protecţie %d%s nu este suportat\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
@@ -1122,29 +1140,29 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fişierelor core: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "da"
 
@@ -1198,8 +1216,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
@@ -1214,78 +1232,78 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 #| msgid "can't do this in batch mode\n"
 msgid "connection to the dirmngr established\n"
 msgstr "nu pot face acest lucru în modul batch\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "can't do this in batch mode\n"
 msgid "connection to the keyboxd established\n"
 msgstr "nu pot face acest lucru în modul batch\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "can't do this in batch mode\n"
 msgid "connection to the agent established\n"
 msgstr "nu pot face acest lucru în modul batch\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "can't do this in batch mode\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "nu pot face acest lucru în modul batch\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: "
 msgid "WARNING: %s\n"
 msgstr "AVERTISMENT: "
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1369,7 +1387,7 @@
 msgstr "validitate: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1454,44 +1472,44 @@
 msgid "Root certificate trustworthy"
 msgstr "certificat incorect"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificat incorect"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cheie disponibilă la: "
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "certificat incorect"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "certificat incorect"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versiune necunoscută"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Nici un disponibil disponibil pentru `%s'"
@@ -1501,12 +1519,12 @@
 msgid "ignoring garbage line"
 msgstr "eroare linia de trailer\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "nesetat(ă)"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 invalid %02X sărit\n"
@@ -1541,136 +1559,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "nu pot deschide fişierul: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "cheia publică %s nu a fost găsită: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "eroare la creearea `%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "eroare în `%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "armură: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "header armură invalid: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "header armură: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "header clearsig invalid\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "header armură: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "semnături text în clar încuibărite\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "armură neaşteptată: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniuţă escape invalidă: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 invalid %02X sărit\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (nici un CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (în CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "eroare CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (în trailer)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dată OpenPGP validă găsită.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armură invalidă: linie mai lungă de %d caractere\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1678,13 +1709,13 @@
 "caracter printabil în ghilimele în armură - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "ilizibil"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1693,29 +1724,29 @@
 "un nume de notaţie trebuie să conţină numai caractere imprimabile sau spaţii "
 "şi să se termine cu un '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de notaţie utilizator trebuie să conţină caracterul '@'\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nume de notaţie trebuie să nu conţină mai mult de un caracter '@'\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de notaţie trebuie să nu folosească nici un caracter de control\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 #| msgid "a notation name must not contain more than one '@' character\n"
 msgid "a notation name may not contain an '=' character\n"
 msgstr "un nume de notaţie trebuie să nu conţină mai mult de un caracter '@'\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1725,7 +1756,7 @@
 "un nume de notaţie trebuie să conţină numai caractere imprimabile sau spaţii "
 "şi să se termine cu un '='\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTISMENT: am găsit date de notare invalide\n"
@@ -1739,8 +1770,8 @@
 msgid "Enter passphrase: "
 msgstr "Introduceţi fraza-parolă: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1751,13 +1782,13 @@
 msgid "error from TPM: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemă cu agentul: agentul returnează 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
@@ -1768,205 +1799,210 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "Tor is not properly configured"
 msgstr "amprentă invalidă"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "DNS is not properly configured"
 msgstr "amprentă invalidă"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armură: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru în modul batch\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Selecţia d-voastră? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "nesetat(ă)"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "neforţat(ă)"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forţat(ă)"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdată sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spaţiile duble nu sunt permise.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia publică: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Preferinţe limbă: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalidă pentru şir preferinţe.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide în şir preferinţe.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Eroare: răspuns invalid.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operaţia pe cheie nu e posibilă: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Înlocuiesc cheia existentă? (d/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1974,107 +2010,107 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjită prin adaos la %u biţi\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 #| msgid " (1) Signature key\n"
 msgid "Signature key\n"
 msgstr " (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 #| msgid " (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr " (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 #, fuzzy
 #| msgid " (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr " (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Selectaţi ce fel de cheie doriţi:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (numai semnare)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA şi Elgamal (implicit)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Selecţie invalidă.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Înlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2089,187 +2125,192 @@
 " PIN = `%s' PIN Admin = `%s'\n"
 "Ar trebui să le schimbaţi folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 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:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Doriţi să-l semnaţi? (d/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ieşi din acest meniu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "arată comenzi administrare"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "afişează acest mesaj"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "afişează toate datele disponibile"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "schimbă numele purtătorului cardului"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "schimbă URL-ul de unde să fie adusă cheia"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificată de URL-ul de pe card"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "schimbă numele de login"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "schimbă preferinţele de limbă"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "schimbă sexul purtătorului cardului"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "schimbă o amprentă CA"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "comută fanionul PIN de forţare a semnăturii"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generează noi chei"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "verifică PIN-ul şi listează toate datele"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NUME|foloseşte NUME ca destinatar implicit"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Comandă numai-administrare\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Comandă invalidă (încercaţi \"ajutor\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost găsită: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2330,9 +2371,9 @@
 msgid "subkey"
 msgstr "Pubkey: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
@@ -2359,85 +2400,80 @@
 "folosiţi opţiunea \"--delete-secret-keys\" pentru a o şterge pe aceasta mai "
 "întâi.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
+"destinatarului\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "nu pot crea un pachet ESK simetric datorită modului S2K\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
-"destinatarului\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2446,18 +2482,13 @@
 "AVERTISMENT: forţând algoritmul de compresie %s (%d) violaţi preferinţele "
 "destinatarului\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2474,7 +2505,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2486,425 +2517,430 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problemă cu mânuirea pachetului cifrat\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Semnătura va fi marcată ca non-revocabilă.\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "nici o cheie de revocare găsită pentru \"%s\"\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "cheie secretă de nefolosit"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "generează un certificat de revocare"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "exportul cheilor secrete nu este permis\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: sărită: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "scriu în `%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - sărită\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "eroare la creearea `%s': %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "ID utilizator nu a fost găsit"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Amprenta CA: "
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "|fişier|crează o semnătură"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|fişier|crează o semnătură text în clar"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "crează o semnătură detaşată"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "cifrează datele"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "cifrează numai cu cifru simetric"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "decriptează datele (implicit)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verifică o semnătură"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "enumeră chei"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "enumeră chei şi semnături"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "enumeră şi verifică semnăturile cheii"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "enumeră chei şi amprente"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "enumeră chei secrete"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "şterge chei de pe inelul de chei public"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "şterge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "semnează sau editează o cheie"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exportă chei"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exportă chei pentru un server de chei"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importă chei de la un server de chei"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "caută pentru chei pe un server de chei"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "actualizează toate cheile de la un server de chei"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importă/combină chei"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "afişează starea cardului"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "schimbă data de pe card"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "schimbă PIN-ul unui card"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "actualizează baza de date de încredere"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo fişiere|afişează rezumate mesaje"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "foloseşte comportament strict OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "întreabă înainte de a suprascrie"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "crează ieşire în armură ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "foloseşte modul text canonic"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|setează nivel de compresie N (0 deactivează)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importă chei de la un server de chei"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "enumeră şi verifică semnăturile cheii"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "enumeră chei secrete"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, 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:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2912,7 +2948,7 @@
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2942,13 +2978,13 @@
 " --list-keys nume arată chei\n"
 " --fingerprint nume arată amprente\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2963,7 +2999,7 @@
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2971,79 +3007,79 @@
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "folosire: gpg opţiuni "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comenzi în conflict\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, 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:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, 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:1719
+#: g10/gpg.c:1728
 #, 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:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, 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:1731
+#: g10/gpg.c:1740
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@ -3051,7 +3087,7 @@
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3061,7 +3097,7 @@
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fişier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@ -3069,7 +3105,7 @@
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@ -3077,7 +3113,7 @@
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3088,7 +3124,7 @@
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fişier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@ -3096,490 +3132,483 @@
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
+
+#: g10/gpg.c:2096
 #, 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:2085
+#: g10/gpg.c:2098
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "showpref"
+msgid "show preferences"
+msgstr "showpref"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Această comandă nu este permisă în modul %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, 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:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opţiuni import invalide\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "opţiuni import invalide\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opţiuni export invalide\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "opţiuni export invalide\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execuţie ca %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, 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:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s înlocuieşte %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "algoritm rezumat selectat este invalid\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, 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:3984
+#: g10/gpg.c:4002
 #, 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:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferinţe implicite invalide\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferinţe cifrare personale invalide\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "preferinţe cifrare personale invalide\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferinţe rezumat personale invalide\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferinţe compresie personale invalide\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "lungime cheie invalidă; folosesc %u biţi\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge încă cu %s!\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "AEAD 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/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am eşuat să iniţializez TrustDB:%s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, 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:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepţie server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie eşuat: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "căutare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a eşuat: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a eşuat: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, 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:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@ -3593,7 +3622,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "dă numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informaţii de stare în acest FD"
 
@@ -3624,347 +3653,352 @@
 msgid "No help available for '%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "actualizează baza de date de încredere"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualizează baza de date de încredere"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "nu este suportat(ă)"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key during import"
 msgstr "afişează amprenta cheii"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key but do not actually import"
 msgstr "afişează amprenta cheii"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "cheie secretă de nefolosit"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "repair keys on import"
 msgstr "afişează amprenta cheii"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d sărit\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate până acum\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Număr total procesate: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " chei noi sărite: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " chei noi sărite: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " fără ID-uri utilizator: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importate: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " neschimbate: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " noi subchei: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " noi semnături: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " noi revocări de chei: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " chei secrete citite: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " chei secrete importate: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " ne importate: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr "semnături create până acum: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " chei secrete citite: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVERTISMENT: cheia %s conţine preferinţe pentru indisponibil\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": preferinţă pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\": preferinţă pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " \"%s\": preferinţă pentru algoritm rezumat %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": preferinţă pentru algoritm compresie %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat să vă actualizaţi preferinţele şi re-distribuiţi\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "această cheie pentru a avita probleme potenţiale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "sărită \"%s\": %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK coruptă a fost reparată\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia publică nu a fost găsită: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nouă - sărită\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 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:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia publică \"%s\" importată\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potriveşte cu copia noastră\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nouă semnătură\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semnături\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nouă subcheie\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semnături\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semnături\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbată\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secretă importată\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3973,204 +4007,204 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, 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:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Cheia este înlocuită"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromisă"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosită"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motiv pentru revocare: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentariu revocare: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, 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:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalidă\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am şters multiple legături de subchei\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalidă\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am şters multiple revocări de subcheie\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am sărit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am sărit subcheia\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am adăugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
@@ -4180,38 +4214,38 @@
 msgid "error allocating memory: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 #| msgid "revoke signatures"
 msgid " (reordered signatures follow)"
 msgstr "revocă semnături"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s:\n"
 msgstr "sărită \"%s\": %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "ID utilizator \"%s\" a fost revocat."
 msgstr1 "ID utilizator \"%s\" a fost revocat."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4219,7 +4253,7 @@
 msgstr0 "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
 msgstr1 "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4227,62 +4261,62 @@
 msgstr0 "%d semnături incorecte\n"
 msgstr1 "%d semnături incorecte\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Semnătură bună din \"%s\""
 msgstr1 "Semnătură bună din \"%s\""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 #| msgid "keyblock resource `%s': %s\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "resursă keyblock `%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am eşuat să reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revocare"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "auto-semnătură"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4293,17 +4327,17 @@
 "pentru a verifica cheile altor utilizatori (folosind paşapoarte,\n"
 "verificând amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Am o încredere marginală\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Am toată încrederea\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4313,53 +4347,53 @@
 "O adâncime mai mare de 1 permite ca cheia pe care o semnaţi să facă\n"
 "semnături de încredere în numele d-voastră.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Vă rugăm să introduceţi domeniul de restricţionare al acestei semnături, sau "
 "apăsaţi enter pentru niciunul.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent? (d/N)"
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Nu pot semna.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "ID-ul utilizator \"%s\" poate fi semnat. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Doriţi să-l semnaţi? (d/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4368,11 +4402,11 @@
 "Auto-semnătura pe \"%s\"\n"
 "este o semnătură stil PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Doriţi să o promovaţi la o auto-semnătură OpenPGP? (d/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4381,12 +4415,12 @@
 "Semnătura d-voastră curentă pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Doriţi să creaţi o nouă semnătură pentru a o înlocui pe cea expirată? (d/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4395,43 +4429,43 @@
 "Semnătura d-voastră curentă pe \"%s\"\n"
 "semnătură locală.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Doriţi să o promovaţi la o semnătură total exportabilă? (d/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a fost deja semnată local de cheia %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnată de cheia %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Doriţi să o semnaţi oricum din nou? (d/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Această cheie a expirat!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Această cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Doriţi ca semnătura d-voastră să expire în acelaşi timp? (D/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4442,33 +4476,33 @@
 "într-adevăr persoanei numite deasupra? Dacă nu ştiţi ce să răspundeţi,\n"
 "introduceţi \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Nu voi răspunde.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Am făcut ceva verificări superficiale.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Am făcut verificări foarte atente.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 #| msgid "Your selection? (enter `?' for more information): "
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Selecţia dvs.? (introduceţi `?' pentru informaţii suplimentare): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4477,238 +4511,247 @@
 "Sunteţi într-adevăr sigur(ă) că doriţi să semnaţi\n"
 "această cheie cu cheia d-voastră \"%s\" (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semnătură.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVERTISMENT: semnătura nu va fi marcată ca non-exportabilă.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVERTISMENT: semnătura nu va fi marcată ca non-revocabilă.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semnătura va fi marcată ca non-exportabilă.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semnătura va fi marcată ca non-revocabilă.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat această cheie deloc.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat această cheie superficial.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat această cheie foarte atent.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Doriţi cu adevărat să semnaţi? (d/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a eşuat: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o frază "
 "parolă de schimbat.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "salvează şi termină"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "afişează amprenta cheii"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notare semnătură: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "enumeră chei şi ID-uri utilizator"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "selectează ID utilizator N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "selectează subcheia N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "verifică semnături"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 "semnează ID-urile utilizator selectate * vezi mai jos pentru comenzi "
 "relevante"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "semnează ID-urile utilizatorilor selectaţi local"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "semnează ID-urile utilizatorilor selectaţi cu o semnătură de încredere"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semnează ID-urile utilizatorilor selectaţi cu o semnătură irevocabilă"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "adaugă un ID utilizator"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "adaugă o poză ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "şterge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "adaugă o subcheie"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "adaugă o cheie la un smartcard"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "mută o cheie pe un smartcard"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "mută o cheie de rezervă pe un smartcard"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "şterge subcheile selectate"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "adaugă o cheie de revocare"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "şterge semnăturile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimbă data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "marchează ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "enumeră preferinţele (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "afişează preferinţele (detaliat)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "setează lista de preferinţe pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "setează URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "setează lista de preferinţe pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocă semnăturile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "revocă ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "revocă cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "activează cheia"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "deactivează cheia"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "arată pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Cheia secretă este disponibilă.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Cheia secretă este disponibilă.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Aveţi nevoie de cheia secretă pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 #, fuzzy
 #| msgid ""
 #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@ -4727,305 +4770,295 @@
 " pentru semnături irevocabile (nrsign), sau orice combinaţie a acestora\n"
 " (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Cheia este revocată."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 #| msgid "Really sign all user IDs? (y/N) "
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Semnaţi într-adevăr toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semnaţi într-adevăr toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selectaţi ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "Unknown signature type '%s'\n"
 msgstr "Tip de semnătură necunoscut `%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai întâi să selectaţi cel puţin un ID utilizator.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Ştergeţi într-adevăr toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Ştergeţi într-adevăr acest ID utilizator? (d/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Mutaţi într-adevăr cheia primară? (d/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie să selectaţi exact o cheie.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Comanda aşteaptă un nume de fişier ca argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 #| msgid "Can't open `%s': %s\n"
 msgid "Can't open '%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 #| msgid "Error reading backup key from `%s': %s\n"
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Eroare citind cheia de rezervă de pe `%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Trebuie să selectaţi cel puţin o cheie.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Doriţi într-adevăr să ştergeţi această cheie? (d/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Doriţi într-adevăr să revocaţi toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Doriţi într-adevăr să revocaţi acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Doriţi într-adevăr să revocaţi toată cheia? (d/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Doriţi într-adevăr să revocaţi subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Doriţi într-adevăr să revocaţi această subcheie? (d/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Încrederea proprietar nu poate fi setată când este folosită o bază de date "
 "de încredere furnizată de utilizator\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Setează lista de preferinţe ca:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Doriţi într-adevăr să actualizaţi preferinţele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Doriţi într-adevăr să actualizaţi preferinţele? (d/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Salvaţi schimbările? (d/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Terminaţi fără a salva? (d/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "stergere keyblock a eşuat: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, 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"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valoare invalidă\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Nu există acest ID utilizator.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, 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:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Rezumat: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Capabilităţi: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Server de chei no-modify"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaţie:"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creată: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "revocată: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "expirată: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expiră: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "încredere: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Această cheie a fost deactivată"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5034,17 +5067,17 @@
 "corectă dacă nu reporniţi programul.\n"
 
 #
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "revocată"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expirată"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5054,18 +5087,23 @@
 " Această comandă poate cauza ca un alt ID utilizator\n"
 " să devină ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5074,35 +5112,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură bună? (d/N/t)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură invalidă? (d/N/t)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură necunoscută? (d/N/t)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ştergeţi într-adevăr această auto-semnătură? (d/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5110,37 +5148,37 @@
 msgstr0 "Am şters %d semnături.\n"
 msgstr1 "Am şters %d semnături.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nu am şters nimic.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "invalid(ă)"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "ID utilizator \"%s\" a fost revocat."
 msgstr1 "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5150,43 +5188,59 @@
 " desemnat poate face ca unele versiuni de PGP să respingă "
 "cheia.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(dacă nu specificaţi cheia prin amprentă)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Subcheia %s este deja revocată.\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5197,270 +5251,270 @@
 "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primară.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, 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:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Vă rugăm selectaţi exact un ID utilizator.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduceţi URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 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:5384
+#: g10/keyedit.c:5672
 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:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semnătură: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, 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:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (non-exportabilă)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Această semnătură a expirat pe %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 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:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (non-revocabilă)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocată de cheia d-voastră %s pe %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 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:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "nici o cheie secretă\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, 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:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferinţe de cifrare\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "prea multe preferinţe de rezumat\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "prea multe preferinţe de compresie\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "prea multe preferinţe de cifrare\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, 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:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "scriu semnătură directă\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "scriu auto semnătură\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "scriu semnătură legată de cheie\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalidă; folosesc %u biţi\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjită la %u biţi\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Semnează"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Cifrează"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Autentifică"
 
@@ -5474,185 +5528,185 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Acţiuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Acţiuni permise curent: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Comută capabilitatea de semnare\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Comută capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Comută capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Terminat\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA şi Elgamal (implicit)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA şi Elgamal (implicit)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) ElGamal (sign and encrypt)\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ElGamal (semnare şi cifrare)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "(implicit)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) DSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (2) Cheie de cifrare\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (2) Cheie de cifrare\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notare semnătură: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "deactivează cheia"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesară este %u biţi\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5668,7 +5722,7 @@
 " <n>m = cheia expiră în n luni\n"
 " <n>y = cheia expiră în n ani\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5684,38 +5738,38 @@
 " <n>m = semnătura expiră în n luni\n"
 " <n>y = semnătura expiră în n ani\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Cheia este validă pentru? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semnătura este validă pentru? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "valoare invalidă\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expiră deloc\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Semnătura nu expiră deloc\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expiră pe %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semnătura expiră pe %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5723,11 +5777,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:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5738,7 +5792,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5755,42 +5809,42 @@
 " \"Popa Ioan (popică) <popa.ioan@compania.ro>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid în nume\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Adresă de email: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid în comentariu\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5801,11 +5855,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5820,35 +5874,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Vă rugăm corectaţi mai întâi eroarea\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5860,18 +5914,18 @@
 "î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:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a eşuat: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5879,72 +5933,72 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "cheia există deja\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Creaţi oricum? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Creaţi oricum? "
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulată.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, 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:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, 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:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secretă şi publică au fost create şi semnate.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5954,7 +6008,7 @@
 "să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5962,7 +6016,7 @@
 "cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5970,23 +6024,23 @@
 "cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Creaţi într-adevăr? (d/N) "
 
@@ -5994,27 +6048,43 @@
 msgid "never "
 msgstr "niciodată "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Rezumat: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Capabilităţi: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Server de chei no-modify"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Politică de semnături critică: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Politică de semnături: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Server de chei preferat critic: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Notare semnătură critică: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Notare semnătură: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -6022,7 +6092,7 @@
 msgstr0 "%d semnături incorecte\n"
 msgstr1 "%d semnături incorecte\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -6030,40 +6100,40 @@
 msgstr0 "1 semnătură nu a fost verificată din cauza unei erori\n"
 msgstr1 "1 semnătură nu a fost verificată din cauza unei erori\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Amprentă cheie primară:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Amprentă cheie primară:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Amprentă subcheie:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Amprentă cheie ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Card nr. serie ="
 
@@ -6144,7 +6214,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: sărit\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6152,330 +6222,336 @@
 msgstr0 "reactualizez %d chei de la %s\n"
 msgstr1 "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, 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:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost găsită pe serverul de chei\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, 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:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "sărită \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, 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:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrată\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, 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:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia publică este %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creată %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrată cu %lu fraze-parolă\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrată cu 1 frază-parolă\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie publică a eşuat: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie publică: DEK bun\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejată\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decriptarea a eşuat: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a eşuat: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fişier original='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semnătură INCORECTĂ din \"%s\""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semnătură expirată din \"%s\""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificare semnătură eliminată\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semnătură făcută %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 #| msgid " aka \"%s\""
 msgid " issuer \"%s\"\n"
 msgstr " aka \"%s\""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Cheie disponibilă la: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "nesigur"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " aka \"%s\""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semnătură expirată %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semnătura expiră %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritm pubkey necunoscut"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semnătura: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nu o semnătură detaşată\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, 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:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semnătură de stil vechi (PGP 2.x)\n"
@@ -6581,29 +6657,29 @@
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "opţiune ambiguă `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6662,7 +6738,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "schimbă fraza-parolă"
@@ -6734,7 +6810,7 @@
 "%s"
 msgstr "cheia %u-bit %s, ID %s, creată %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6750,76 +6826,76 @@
 "foarte largă!\n"
 "Încercaţi să folosiţi o imagine de aproximativ 240x288 pixeli.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduceţi nume-fişier JPEG pentru poză ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 #| msgid "unable to open JPEG file `%s': %s\n"
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "nu pot deschide fişierul JPEG `%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Acest JPEG este foarte mare (%d octeţi) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sunteţi sigur(ă) că doriţi să îl folosiţi? (d/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 #| msgid "`%s' is not a JPEG file\n"
 msgid "'%s' is not a JPEG file\n"
 msgstr "`%s' nu este un fişier JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Este această poză corectă (d/N/t)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "nu este suportată execuţia nici unui program la distanţă\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "această platformă necesită fişiere temporare când sunt chemate programe "
 "externe\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 #| msgid "unable to execute shell `%s': %s\n"
 msgid "unable to execute shell '%s': %s\n"
 msgstr "nu pot executa shell-ul `%s': %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "ieşire nenaturală a programului extern\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "eroare de sistem la chemarea programului extern: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "AVERTISMENT: nu pot şterge fişierul temporar (%s) `%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "AVERTISMENT: nu pot şterge directorul temporar `%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6827,7 +6903,7 @@
 "chemarea programelor externe sunt deactivate datorită opţiunilor nesigure "
 "pentru permisiunile fişierului\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afişa poza ID!\n"
@@ -6911,36 +6987,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificatele ce conduc la o cheie cu încredere supremă:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu există nici o indicaţie că această cheie aparţine într-adevăr "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu există nici o indicaţie că această cheie aparţine într-adevăr "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Această cheie aparţine probabil utilizatorului numit\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Această cheie ne aparţine\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 #| msgid ""
 #| "It is NOT certain that the key belongs to the person named\n"
@@ -6955,7 +7031,7 @@
 "utilizator. Dacă ştiţi *cu adevărat* ce faceţi, puteţi\n"
 "răspunde cu da la următoarea întrebare.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6965,105 +7041,105 @@
 "utilizator. Dacă ştiţi *cu adevărat* ce faceţi, puteţi\n"
 "răspunde cu da la următoarea întrebare.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Folosiţi oricum această cheie? (d/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTISMENT: Folosiţi o cheie fără încredere!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISMENT: această cheie poate fi revocată (cheia de revocare nu este "
 "prezentă)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "cheia %s: nu se potriveşte cu copia noastră\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISMENT: Această cheie a fost revocată revocatorul desemnat!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Această cheie a fost revocată de proprietarul ei!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Aceasta ar putea însemna că semnătura e falsificată.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Această cheie a fost revocată de proprietarul ei!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Notă: Această cheie a fost deactivată.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Notă: Această cheie a expirat!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr ""
 "AVERTISMENT: Această cheie nu este certificată de o semnătură de încredere!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "AVERTISMENT: Această cheie nu este certificată de o semnătură de încredere!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Nu există nici o indicaţie că semnătura aparţine proprietarului.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTISMENT: Noi NU avem încredere în această cheie!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Semnătura este probabil un FALS.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7074,7 +7150,7 @@
 "AVERTISMENT: Această cheie nu este certificată cu suficiente semnături de "
 "încredere!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7082,51 +7158,51 @@
 "AVERTISMENT: Această cheie nu este certificată cu suficiente semnături de "
 "încredere!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Nu este sigur că semnătura aparţine proprietarului.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: sărită: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: sărită: cheia publică este deactivată\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: sărită: cheia publică este deja prezentă\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "nu mă pot conecta la `%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nu aţi specificat un ID utilizator. (puteţi folosi \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Destinatari curenţi:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7134,40 +7210,40 @@
 "\n"
 "Introduceţi ID-ul utilizator. Terminaţi cu o linie nouă: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Nu există acest ID utilizator.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "sărită: cheia publică setată deja ca destinatar implicit\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Cheia publică este deactivată.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "sărită: cheia publică setată deja\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatar implicit necunoscut \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, 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:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
@@ -7207,7 +7283,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
@@ -7430,42 +7506,37 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISMENT: conflict pentru rezumat semnătură în mesaj\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificată reciproc (cross-"
 "certified)\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arată-mi mai multe informaţii\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s are o certificare-reciprocă invalidă "
 "(invalid cross-certification)\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu second newer than the signature\n"
@@ -7473,7 +7544,7 @@
 msgstr0 "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
 msgstr1 "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu day newer than the signature\n"
@@ -7481,7 +7552,7 @@
 msgstr0 "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
 msgstr1 "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7496,7 +7567,7 @@
 "cheia %s a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7510,53 +7581,53 @@
 "cheia %s a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 #| msgid "NOTE: signature key %s expired %s\n"
 msgid "Note: signature key %s expired %s\n"
 msgstr "NOTĂ: cheia semnăturii %s a expirat %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, 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"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "AVERTISMENT: nu pot %%-expanda notarea (prea mare). Folosesc neexpandat.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7564,7 +7635,7 @@
 "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare). Îl folosesc "
 "neexpandat.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7573,12 +7644,12 @@
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare). Îl "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semnătură de la: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7586,12 +7657,12 @@
 "AVERTISMENT: forţarea algoritmului rezumat %s (%d) violează preferinţele "
 "destinatarului\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7671,137 +7742,137 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a eşuat: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
 msgstr "nu pot crea încuietoare (lock) pentru `%s'\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 #| msgid "can't lock `%s'\n"
 msgid "can't lock '%s'\n"
 msgstr "nu pot încuia (lock) `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrierea a eşuat (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "tranzacţia trustdb prea mare\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu există!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, 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:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am eşuat să creez înregistrare versiune: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: a fost creat trustdb invalid\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a eşuat: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a eşuat (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fişier trustdb\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: înregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fişier invalidă %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, 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:1872
+#: g10/tdbio.c:1842
 #, 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:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: a fost creat trustdb\n"
@@ -8235,7 +8306,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "următoarea verificare trustdb programată pe %s\n"
@@ -8267,7 +8338,7 @@
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8275,7 +8346,7 @@
 msgstr0 "%lu chei procesate până acum\n"
 msgstr1 "%lu chei procesate până acum\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8283,24 +8354,24 @@
 msgstr0 "%d chei procesate (%d numărători valide anulate)\n"
 msgstr1 "%d chei procesate (%d numărători valide anulate)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am găsit nici o cheie cu încredere supremă\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, 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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8374,7 +8445,7 @@
 msgid "ultimate"
 msgstr " supremă"
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8385,12 +8456,12 @@
 "Vă rugăm amintiţi-vă că fişierul de semnătură (.sig sau .asc)\n"
 "ar trebui să fie primul dat în linia de comandă.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia de intrare %u prea lungă sau lipseşte LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -8407,20 +8478,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "opţiune ambiguă `%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Folosire: gpg opţiuni fişiere (-h pentru ajutor)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8430,16 +8501,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8474,10 +8545,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
@@ -8499,58 +8570,58 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "cheia există deja\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "cheia existentă va fi înlocuită\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "generez o nouă cheie\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "generez o nouă cheie\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "răspunsul nu conţine modulul RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "răspunsul nu conţine exponentul public RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, 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-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "generarea cheii a eşuat\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8558,100 +8629,100 @@
 msgstr0 "generarea cheii este completă (%d secunde)\n"
 msgstr1 "generarea cheii este completă (%d secunde)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "răspunsul nu conţine datele cheii publice\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Notă: Această cheie a fost deactivată.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, 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:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
@@ -8659,43 +8730,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a eşuat: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "cardul este încuiat permanent!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, 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"
@@ -8706,22 +8777,22 @@
 msgstr1 ""
 "%d încercări PIN Admin rămase înainte de a încuia cardul permanent\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, 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:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, 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"
@@ -8729,82 +8800,82 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0Asemnături făcute: %lu"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplicaţiei\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipseşte\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI nesuportat"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structură invalidă a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semnătură %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semnături create până acum: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, 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:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -8826,7 +8897,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8875,333 +8946,333 @@
 msgid "deny the use of admin card commands"
 msgstr "arată comenzi administrare"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Folosire: gpg opţiuni fişiere (-h pentru ajutor)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "ajutor"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr "semnături create până acum: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "certificat incorect"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, fuzzy, c-format
 msgid " ( issuer valid from "
 msgstr " Card nr. serie ="
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Amprenta CA: "
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "generează un certificat de revocare"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifică o semnătură"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "neforţat(ă)"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "nu"
@@ -9224,7 +9295,7 @@
 msgid "Error - invalid DN"
 msgstr "Eroare: răspuns invalid.\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9238,42 +9309,42 @@
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creată %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "certificat incorect"
@@ -9502,17 +9573,17 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9523,7 +9594,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
@@ -9548,135 +9619,135 @@
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dată)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "enumeră chei secrete"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaugă o cheie la un smartcard"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crează ieşire în armură ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "adaugă acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|foloseşte algoritm cifrare NUME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|foloseşte algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "modul batch: nu întreba niciodată"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe întrebări"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe întrebări"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9687,27 +9758,27 @@
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9727,7 +9798,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
@@ -9737,47 +9808,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probleme la verificare revocării: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9807,7 +9878,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9822,59 +9893,59 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "algoritm de protecţie %d%s nu este suportat\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Semnătură făcută %s folosind cheia %s cu ID %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Semnătură făcută %s\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "validitate: %s"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Semnătură bună din \"%s\""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " aka \"%s\""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr "Aceasta va fi o auto-semnătură.\n"
@@ -9899,226 +9970,226 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "Amprenta CA: "
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificat incorect"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, 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:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "amprentă invalidă"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, 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:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "generează un certificat de revocare"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, fuzzy, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "eroare linia de trailer\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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"
@@ -10126,334 +10197,329 @@
 "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
 "folosită\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "eroare în `%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, 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:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error hashing '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "semnarea a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, 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:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, 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:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "generează un certificat de revocare"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verificare semnătură eliminată\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, 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:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
@@ -10461,36 +10527,36 @@
 "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
 "folosită\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? probleme la verificare revocării: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "actualizarea a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
@@ -10505,24 +10571,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
@@ -10679,142 +10745,142 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
 #
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|foloseşte acest server de chei pentru a căuta chei"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
 #
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10827,120 +10893,120 @@
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Folosire: gpg opţiuni fişiere (-h pentru ajutor)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "folosire: gpg opţiuni "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, 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:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "linie prea lungă"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "amprentă invalidă"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, 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:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "neforţat(ă)"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, 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:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10997,33 +11063,33 @@
 msgid "malloc failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, 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/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = sări peste cheia asta\n"
@@ -11116,166 +11182,166 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting responder ID: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "generează un certificat de revocare"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "folosesc cifrul %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "semnarea a eşuat: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "semnarea a eşuat: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "stergere keyblock a eşuat: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, 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:2984
+#: dirmngr/server.c:3135
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11286,135 +11352,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "verific trustdb\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "termină"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "citirea cheii publice a eşuat: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "linie prea lungă"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "semnarea a eşuat: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -11481,12 +11547,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eroare în `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11596,88 +11662,108 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "cheia secretă deja stocată pe un card\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "cheia secretă deja stocată pe un card\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Înlocuiesc cheile existente? (d/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NUME|foloseşte NUME ca destinatar implicit"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "algoritm rezumat selectat este invalid\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "preferinţe cifrare personale invalide\n"
+
+#, fuzzy
+#~| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+#~ msgid "AEAD 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"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "forţând cifrul simetric %s (%d) violaţi preferinţele destinatarului\n"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
@@ -12363,10 +12449,6 @@
 #~ msgstr "comută între listele de chei secrete şi publice"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "frază-parolă incorectă"
-
-#, fuzzy
 #~| msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
@@ -13630,9 +13712,6 @@
 #~ msgid "pref"
 #~ msgstr "pref"
 
-#~ msgid "showpref"
-#~ msgstr "showpref"
-
 #~ msgid "setpref"
 #~ msgstr "setpref"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/ru.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/ru.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/ru.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/ru.po Changed

@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: GnuPG 2.2.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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"
@@ -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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "сбой при блокировке для ввода пароля: %s\n"
@@ -33,49 +33,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|Отмена (_C)"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|Да (_Y)"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|Нет (_N)"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|Сохранить в диспетчере паролей (_S)"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Вы действительно хотите, чтобы фраза-пароль была видна на экране?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Показывать фразу-пароль"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Скрывать фразу-пароль"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -86,7 +86,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -97,14 +97,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -112,7 +112,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Стойкость:"
 
@@ -122,95 +122,101 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Стойкость введенного выше текста. Проконсультируйтесь у администратора о "
 "критериях оценки стойкости."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN, чтобы сделать секретный ключ доступным в этом сеансе"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Введите фразу-пароль, чтобы сделать секретный ключ доступным в этом сеансе"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "не подходит - попробуйте еще раз"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase Entry"
+msgid "Passphrases match."
+msgstr "Ввод фраз-паролей"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (попытка %d из %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Повторите:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "Слишком длинный PIN"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Слишком длинная фраза-пароль"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Недопустимые символы в PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "Слишком короткий PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Неверный PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "ошибка получения серийного номера карты: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Повторите фразу-пароль:"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -221,51 +227,51 @@
 msgstr ""
 "Введите фразу-пароль для защиты импортированных объектов в системе GnuPG."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "не могу создать '%s': %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не могу открыть '%s': %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "на карте не найдено подходящего ключа: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "ошибка получения списка карт: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -274,20 +280,20 @@
 "Процесс ssh запросил доступ к ключу%%0A %s%%0A (%s)%%0AВы хотите это "
 "позволить?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Позволить"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Отказать"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Введите фразу-пароль для ключа ssh%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -296,83 +302,79 @@
 "Введите фразу-пароль для защиты полученного секретного ключа%%0A %s%%0A "
 "%s%%0Aвнутри хранилища ключей агента gpg"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "сбой создания потока из сокета: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Вставьте карту с серийным номером"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Административный PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "Код разблокировки PIN (PUK)"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Код сброса"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Нажмите кнопку подтверждения на карте."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Вводите на клавиатуре считывателя."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Повторите код сброса"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Повторите ввод PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Повторите ввод PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Код сброса повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s для доступа к карте"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "ошибка записи в %s: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Вы не ввели фразу-пароль!%0AПустая фраза-пароль недопустима."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -381,11 +383,11 @@
 "Вы не ввели фразу-пароль - это, как правило, плохая мысль!%0AПодтвердите, "
 "что Вы действительно не хотите защищать свой ключ."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Да, защита не нужна"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -393,7 +395,7 @@
 msgstr1 "Фраза-пароль не должна быть короче %u символов."
 msgstr2 "Фраза-пароль не должна быть короче %u символов."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -408,238 +410,244 @@
 "Фраза-пароль должна содержать по меньшей мере %u цифр или%%0Aспециальных "
 "символов."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Фраза-пароль не должна быть известным выражением и не должна быть составлена"
 "%%0Aпо определенному образцу."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Внимание: Вы ввели небезопасную фразу-пароль."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Все равно принять"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Параметры, полезные для отладки"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (фоновый режим)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (нефоновый режим)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "вывод команд в стиле sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "вывод команд в стиле csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из файла FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры, управляющие выводом диагностики"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "сократить подробности"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Параметры, управляющие настройками"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "не использовать демон криптографических карт"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|использовать программу PGM как демон криптографических карт"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|использовать программу PGM как демон криптографических карт"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|принимать некоторые команды по NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены терминала"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены дисплея XWindow"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "включить поддержку ssh"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|использовать для отображения отпечатков алгоритм ALGO"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "включить поддержку putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "включить поддержку putty"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Параметры, управляющие безопасностью"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|сбрасывать запомненный PIN через N секунд"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|сбрасывать ключи SSH по истечении N секунд"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|установить максимальный срок запоминания PIN N секунд"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|установить максимальный срок действия ключа SSH N секунд"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать запомненный PIN при подписывании"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "не позволять пользоваться внешней памятью паролей"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "не позволять клиентам помечать ключи как \"доверенные\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "разрешить предустанавливать фразу-пароль"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Параметры, обеспечивающие правила для фраз-паролей"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "не позволять обходить правила для фраз-паролей"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|установить минимальную длину фразы-пароля равной N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|n|требовать для новой фразы-пароля не менее N неалфавитных символов"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|проверять новую фразу-пароль по файлу образцов FILE"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|считать фразу-пароль устаревшей через N дней"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "не разрешать повторное использование старых фраз-паролей"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Параметры, управляющие безопасностью"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 "не позволять вызывающей программе замещать собой программу ввода пароля"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "не захватывать клавиатуру и мышь"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать программу PGM для ввода паролей"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|установить время ожидания ввода пароля N секунд"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "разрешить ввод фразы-пароля через Emacs"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Вызов: @GPG_AGENT@ параметры (-h - подсказка)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -647,141 +655,141 @@
 "Синтаксис: @GPG_AGENT@ параметры команда аргументы\n"
 "Управление секретными ключами для @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "запрошен недопустимый уровень отладки '%s'\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана недопустимая хеш-функция\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "чтение параметров из '%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Замечание: '%s' не считается параметром\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Внимание: параметр \"%s\" не рекомендуется\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "слишком длинное имя сокета '%s'\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ошибка получения разового кода для сокета\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "ошибка связывания сокета с '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не удалось задать права доступа для '%s': %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "слушаем сокет '%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не могу создать каталог '%s': %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "создан каталог '%s'\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "сбой stat() для '%s': %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "невозможно использовать '%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "обработчик 0x%lx для файлового дескриптора %d запущен\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s остановлен\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "в этом сеансе агент gpg не работает\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -789,11 +797,11 @@
 "@Параметры:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr "Вызов: gpg-preset-passphrase параметры КОД_КЛЮЧА (-h - подсказка)\n"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -801,8 +809,8 @@
 "Синтаксис: gpg-preset-passphrase параметры КОД_КЛЮЧА\n"
 "Работа с буфером паролей\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -810,8 +818,8 @@
 "@Команды:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -821,11 +829,11 @@
 "Параметры:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Вызов: gpg-protect-tool параметры (-h - подсказка)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -833,22 +841,22 @@
 "Синтаксис: gpg-protect-tool параметры аргументы\n"
 "Средство работы с секретными ключами\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для снятия защиты с объекта PKCS#12."
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового объекта PKCS#12."
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Введите фразу-пароль для защиты импортированных объектов в системе GnuPG."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -856,52 +864,54 @@
 "Введите фразу-пароль или PIN,\n"
 "необходимые для выполнения данной операции."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "отменено\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "ошибка открытия '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "файл '%s', строка %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "выражение \"%s\" в '%s' игнорируется, строка %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "системный список доверия '%s' не доступен\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "недопустимый отпечаток в '%s', строка %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "недопустимый признак ключа в '%s', строка %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "ошибка чтения '%s', строка %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтения списка доверенных корневых сертификатов\n"
@@ -914,7 +924,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -923,11 +933,11 @@
 "Действительно абсолютно верить, что%%0A \"%s\"%%0Aправильно заверяет "
 "сертификаты пользователя?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Нет"
@@ -940,7 +950,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -951,21 +961,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Подтверждаю"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Неверно"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Замечание: Фразу-пароль никогда не меняли.%0AПожалуйста, смените ее сейчас."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -973,26 +983,40 @@
 msgstr ""
 "Фраза-пароль не менялась%%0Aс %.4s-%.2s-%.2s. Пожалуйста, смените ее сейчас."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Сменить фразу-пароль"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Сменю позже"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Вставьте карту с серийным номером"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"Процесс ssh запросил доступ к ключу%%0A %s%%0A (%s)%%0AВы хотите это "
+"позволить?"
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Удалить ключ"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1005,8 +1029,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA требует длины хеша, кратной 8 битам\n"
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s ключ использует небезопасный (%u-битный) хеш\n"
@@ -1016,7 +1040,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu-битный хеш недопустим для %u-битного ключа %s\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
@@ -1026,7 +1050,7 @@
 msgid "secret key parts are not available\n"
 msgstr "секретная часть ключа недоступна\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "алгоритм шифрования с открытым ключом %d (%s) не поддерживается\n"
@@ -1041,52 +1065,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "хеш-функция защиты %d (%s) не поддерживается\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "ошибка при создании канала конвейера: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "ошибка при создании потока для канала конвейера: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "ошибка при дублировании процесса: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "сбой при ожидании завершения процесса %d: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "ошибка выполнения '%s': возможно, не установлен\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "ошибка выполнения '%s': статус завершения %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "ошибка выполнения '%s': прервано\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "сбой при ожидании завершения процесса: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка получения кода возврата процесса %d: %s\n"
@@ -1106,28 +1130,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание файла образа памяти: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Внимание: небезопасный владелец объекта %s \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Внимание: небезопасные права доступа объекта %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ожидаю доступа к файлу '%s'\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "сбой при переименовании '%s' в '%s': %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "да|yes"
 
@@ -1181,8 +1205,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при размещении %lu байтов"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "ошибка выделения достаточной памяти: %s\n"
@@ -1197,82 +1221,82 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "Внимание: параметр \"%s%s\" устарел - он игнорируется\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "неизвестный отладочный флаг '%s' игнорируется\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 #| msgid "waiting for the %s to come up ... (%ds)\n"
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "ожидаю подключения %s ... (%iс)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting for the %s to come up ... (%ds)\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "ожидаю подключения %s ... (%iс)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting for the %s to come up ... (%ds)\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "ожидаю подключения %s ... (%iс)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 #| msgid "connection to %s established\n"
 msgid "connection to the dirmngr established\n"
 msgstr "соединение с %s установлено\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "connection to %s established\n"
 msgid "connection to the keyboxd established\n"
 msgstr "соединение с %s установлено\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "connection to %s established\n"
 msgid "connection to the agent established\n"
 msgstr "соединение с %s установлено\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running Dirmngr - starting '%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "Dirmngr не выполняется - запуск '%s'\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "connection to agent is in restricted mode\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "соединение с агентом в ограниченном режиме\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "ошибка получения версии из '%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "сервер '%s' старше нас (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "Внимание: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 "Замечание: На старых серверах могут оставаться ошибки, критичные для "
 "безопасности.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Замечание: Для их перезагрузки воспользуйтесь командой \"%s\".\n"
@@ -1345,7 +1369,7 @@
 msgstr "алгоритм: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "алгоритм (не поддерживается): %s"
@@ -1420,39 +1444,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Корневой сертификат достоверен"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "для сертификата не найден список отозванных сертификатов"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "доступный список отозванных сертификатов слишком стар"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "проверка списка отозванных сертификатов/OCSP для сертификата"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Задействованные сертификаты"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Записи журнала аудита отсутствуют."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Неизвестная операция"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Агент Gpg годен"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmgr годен"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Нет справки для '%s'."
@@ -1461,11 +1485,11 @@
 msgid "ignoring garbage line"
 msgstr "игнорируем дефектную строку"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "отсутствует"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "недопустимый символ radix64 %02x пропущен\n"
@@ -1500,136 +1524,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "сбой в iconv_open: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "сбой преобразования '%s' в '%s': %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "сбой при создании временного файла '%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "ошибка записи в '%s': %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "удаляю залипшую блокировку (созданную процессом %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "жду снятия блокировки (заблокировано процессом %d%s) %s...\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(мертвая точка?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "блокировка '%s' не выполнена: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "ожидаю снятия блокировки %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "ошибка создания '%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "ошибка закрытия '%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "текстовый формат: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "недопустимый текстовый заголовок: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "текстовый заголовок: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "недопустимый заголовок текстовой подписи\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "неизвестный текстовый заголовок: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "вложенные текстовые подписи\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "неожиданный текстовый формат: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "недопустимая строка с выключенными дефисами: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02X (игнорируется)\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "преждевременный конец файла (нет контрольной суммы)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "преждевременный конец файла (в контрольной сумме)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "поврежденная контрольная сумма\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка контрольной суммы; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "преждевременный конец файла (в дополнении)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "недопустимый текстовый формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1637,12 +1673,12 @@
 "символ quoted printable в текстовом формате - испорчено почтовой "
 "программой?\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " не для чтения человеком (%zu байт: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1651,32 +1687,32 @@
 "имя замечания должно содержать только печатные символы или пробелы и "
 "заканчиваться знаком '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя пользовательского замечания должно содержать символ '@'\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "имя замечания не должно содержать более одного символа '@'\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "в тексте замечания не должно быть управляющих символов\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "имя замечания не должно содержать символа '='\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "имя замечания должно содержать только печатные символы или пробелы\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "Внимание: найдена недопустимая форма записи замечания\n"
@@ -1690,8 +1726,8 @@
 msgid "Enter passphrase: "
 msgstr "Введите фразу-пароль:"
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s не совместим с режимом %s\n"
@@ -1702,13 +1738,13 @@
 msgid "error from TPM: %s\n"
 msgstr "ошибка чтения из %s: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема с агентом: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "в этом сеансе dirmngr не работает\n"
@@ -1719,197 +1755,202 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "параметр сервера ключей \"%s\" нельзя использовать в режиме %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKD пользуется сохраненным результатом"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "Tor не работает"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Tor не настроен должным образом"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNS не настроен должным образом"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "недопустимое перенаправление HTTP с сервера"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "недопустимое перенаправление HTTP с сервера сброшено"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "на сервере применяется непригодный сертификат"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "Замечание: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "в пакетном режиме это действие невозможно\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Эта команда доступна только для карт версии 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Код сброса (больше) не доступен\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Ваш выбор? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "не установлено"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Уважаемый"
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Уважаемая"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "не требуется"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "требуется"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допустим только простой текст ASCII.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\".\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Фамилия держателя карты: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Имя держателя карты: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Слишком длинное полное имя (предел - %d символов).\n"
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "ошибка чтения '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "ошибка записи '%s': %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Секретные данные DO:"
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Предпочтительный язык: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Приветствие (M = Уважаемый, F = Уважаемая, пробел - не задано): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "отпечаток удостоверяющего центра: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: недопустимый формат отпечатка.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "это не карта OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1925,99 +1966,99 @@
 " Если создать ключ не удастся, сверьтесь с документацией\n"
 " на карту и выясните, какие размеры допустимы.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Изменение атрибутов ключа на карте:"
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Ключа для подписи\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Ключа для шифрования\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Ключа для удостоверения личности\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "ошибка изменения атрибута ключа %d: %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "ошибка при считывании информации карты: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Данная команда этой картой не поддерживается\n"
 
-#: g10/card-util.c:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать вне карты архивную копию ключа шифрования? (Y/n) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Замечание: ключи уже хранятся на карте!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2028,181 +2069,186 @@
 " PIN = '%s' Админ. PIN = '%s'\n"
 "Вам следует изменить их командой --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Ключ подписи\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Ключ удостоверения личности\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где хранить ключ:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "сбой записи ключа на карту: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Замечание: эта команда сотрет с карты все ключи!\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Подтвердите сброс к заводским установкам (введите \"yes\") "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "ошибка при настройке KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "ошибка при настройке KDF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "показать административные команды"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "изменить имя держателя карты"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ по заданному картой URL"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "изменить имя учетной записи"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "изменить приветствие для держателя карты"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток удостоверяющего центра"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "переключить признак 'подпись требует PIN'"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "создать новые ключи"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать все данные"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "разблокировать PIN с помощью кода сброса"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "уничтожить все ключи и данные"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "настроить KDF для проверки по PIN"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "изменить атрибут ключа"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Команды администрирования\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Недопустимая команда (список команд: \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output для данной команды не работает\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "не могу открыть '%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2263,9 +2309,9 @@
 msgid "subkey"
 msgstr "подключа"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
@@ -2290,100 +2336,88 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"Внимание: принудительное использование симметричного шифра %s (%d)\n"
+" нарушает предпочтения получателя\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
+
+#: g10/encrypt.c:181 sm/encrypt.c:771
+#, c-format
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "Внимание: ключ %s не подходит для шифрования в режиме %s\n"
+
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании фразы-пароля: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "не могу использовать симметричный пакет ESK из-за режима S2K\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "используется симметричный шифр %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' уже сжат\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "Внимание: файл '%s' пуст\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
-
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "хеш-функцию '%s' нельзя использовать в режиме %s\n"
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "чтение из '%s'\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"Внимание: принудительное использование симметричного шифра %s (%d)\n"
-" нарушает предпочтения получателя\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, c-format
-msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "Внимание: ключ %s не подходит для шифрования в режиме %s\n"
-
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "Внимание: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encrypt.c:1071
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"принудительное использование симметричного шифра %s (%d) нарушает "
-"предпочтения получателя\n"
-
-#: g10/encrypt.c:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для пользователя \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр '%s' нельзя использовать в режиме %s\n"
@@ -2399,7 +2433,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2411,405 +2445,411 @@
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "экспортировать подписи, помеченные как 'только локальные'"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 "экспортировать атрибутные идентификаторы пользователя (обычно "
 "фотоидентификаторы)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "экспортировать ключи отзыва, помеченные как 'особо важные'"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "удалить при экспорте непригодные части ключа"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "при экспорте удалить из ключа как можно больше"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "создать сертификат отзыва"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "пользоваться архивным форматом ключей GnuPG"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "экспорт секретных ключей не разрешен\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - пропущено"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "сохраняю в '%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "ключ %s: материал ключа на карте - пропущен\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "Внимание: нечего экспортировать\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "ошибка создания '%s': %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "Идентификатор пользователя не найден"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "автоматически получили '%s' через %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "ошибка получения '%s' через %s: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Нет отпечатка"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "поиск обновленной копии просроченного ключа по %s\n"
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(проверьте аргумент параметра '%s')\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Внимание: '%s' не используется в качестве основного ключа: %s\n"
 
-#: g10/getkey.c:2098
+#: g10/getkey.c:2107
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr ""
 "\"%s\" используется в качестве основного секретного ключа для подписи\n"
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "все значения, переданные в '%s', игнорируются\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
 "достоверным\n"
 
-#: g10/getkey.c:3830
+#: g10/getkey.c:3868
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подключ %s вместо первичного ключа %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "недопустимые значения для параметра \"%s\"\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "создать подпись"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "создать текстовую подпись"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "шифрование только симметричным шифром"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "быстро создать новую пару ключей"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "быстро добавить новый идентификатор пользователя"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "быстро отозвать идентификатор пользователя"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "быстро установить новый срок действия"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "создание полноценной пары ключей"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы секретных ключей"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "быстро подписать ключ"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "быстро подписать ключ локально"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "быстро отозвать идентификатор пользователя"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "сменить фразу-пароль"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "обновить таблицу доверия"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "вывести хеши сообщений"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|установить правила TOFU для ключа"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|использовать NAME как основной секретный ключ"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|зашифровывать также для идентификатора пользователя NAME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|установить синонимы электронной почты"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Параметры, управляющие безопасностью"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Параметры, управляющие выводом диагностики"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "вывод в текстовом формате"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|выводить данные в файл FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Параметры, управляющие интерактивностью и принудительными действиями"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMS|использовать механизмы MECHANISMS для поиска ключей по адресу "
 "электронной почты"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "импортировать недостающий ключ из подписи"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "вносить открытый ключ в подписи"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "полностью запретить доступ к dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Параметры, управляющие настройками"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифровать для пользователя USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2817,7 +2857,7 @@
 "@\n"
 "(Полный список команд и параметров см. на странице man)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2837,11 +2877,11 @@
 " --list-keys имена показать ключи\n"
 " --fingerprint имена показать отпечатки\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Вызов: @GPG@ параметры файлы (-h - подсказка)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2851,7 +2891,7 @@
 "Подписи и их проверка, шифрование и расшифровка\n"
 "Действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2859,95 +2899,95 @@
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Хеш-функции: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "вызов: %s параметры %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "в определении группы '%s' отсутствует знак =\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "Внимание: небезопасный владелец каталога,\n"
 " содержащего модуль расширения '%s'\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопасные права доступа к каталогу,\n"
 " содержащему домашний каталог '%s'\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2955,482 +2995,476 @@
 "ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
 " содержащему файл настроек '%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "Внимание: небезопасные права доступа к каталогу,\n"
 " содержащему файл модуля расширения '%s'\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "неизвестный элемент в файле настроек '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "показывать в списке ключей фотоидентификаторы"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "показывать в списке ключей сведения о назначении ключа"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "показывать в списке подписей URL правил"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "показывать в списке подписей все замечания"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать в списке подписей замечания стандарта IETF"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "показывать в списке подписей пользовательские замечания"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать в списке подписей URL предпочтительных серверов ключей"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 "показывать в списке ключей действительность идентификаторов пользователей"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показывать в списке ключей отозванные и просроченные идентификаторы "
 "пользователей"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать в списке ключей отозванные и просроченные подключи"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "показывать в списке подписей сроки действия"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "показывать в списке ключей название таблицы ключей"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "показывать в списке подписей сроки действия"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "список предпочтений (экспертам)"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "неизвестные правила TOFU '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" выведет список вариантов)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда в режиме %s недопустима.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Замечание: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' - не допустимый срок действия подписи\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" не является адресом электронной почты\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "недопустимый режим ввода пароля '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "недопустимый источник запроса '%s'\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' - не допустимая таблица символов\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не могу интерпретировать URL сервера ключей\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры сервера ключей\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры сервера ключей\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "недопустимый параметр фильтра: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимые параметры списка\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "недопустимые параметры списка\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "показать при проверке подписи фотоидентификаторы"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "показать при проверке подписи URL правил"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "показать при проверке подписей все замечания"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "показать при проверке подписей замечания стандарта IETF"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "показать при проверке подписей пользовательские замечания"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показать при проверке подписей действительность идентификаторов пользователей"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показать при проверке подписей отозванные и просроченные идентификаторы "
 "пользователя"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показать при проверке подписей только первичный идентификатор пользователя"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "недопустимый аргумент для параметра \"%.50s\"\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "Внимание: возможно создание файла образа памяти!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Внимание: %s отменяет %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s с %s недопустимо!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s с %s не имеет смысла!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Внимание: работаем с фальшивым системным временем: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "отказываюсь работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран недопустимый алгоритм шифрования\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "выбрана недопустимая хеш-функция\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран недопустимый алгоритм сжатия\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана недопустимая хеш-функция для сертификации\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:4016
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые личные предпочтения шифра\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "недопустимые личные предпочтения шифра\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые личные предпочтения хеш-функции\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "неверный размер ключа; использую %u бит\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм сжатия '%s' нельзя использовать в режиме %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверия: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "сбой симметричного шифрования '%s': %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "сбой при экспорте в виде ключа ssh: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из текстового формата: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в текстовый формат: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "недопустимая хеш-функция '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr "Внимание: команда не отдана. Пытаюсь угадать, что имелось в виду ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Пишите сообщение ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил сертификации неверен\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочтительного сервера ключей неверен\n"
@@ -3443,7 +3477,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии метки времени - только предупреждение"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить информацию в файл с дескриптором FD"
 
@@ -3472,157 +3506,157 @@
 msgid "No help available for '%s'"
 msgstr "Нет справки по ключевому слову '%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "импортировать подписи, обозначенные как 'только локальные'"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "устранить при импорте повреждения от сервера ключей pks"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "не сбрасывать уровни доверия владельцам при импорте"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "не обновлять таблицу доверия после импорта"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "enable putty support"
 msgid "enable bulk import mode"
 msgstr "включить поддержку putty"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "показывать ключ во время импорта"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key during import"
 msgid "show key but do not actually import"
 msgstr "показывать ключ во время импорта"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "обновлять только существующие ключи"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "удалить после импорта непригодные части ключа"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "удалить после импорта из ключа как можно больше"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "игнорировать подписи ключей, кроме самоподписей"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "применить фильтры импорта и немедленно экспортировать ключ"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "ожидать ключи в архивном формате GnuPG"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "исправлять ключи при импорте"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "обработано %lu ключей\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " пропущено ключей PGP-2: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " пропущено новых ключей: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " без идентификатора пользователя: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " импортировано: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " неизмененных: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " новых идентификаторов пользователя: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " новых подключей: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " новых подписей: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " новых отзывов ключей: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизмененных секретных ключей: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " не импортировано: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " очищено подписей: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " очищено идентификаторов пользователей: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3631,179 +3665,184 @@
 "Внимание: ключ %s содержит предпочтения для недоступных\n"
 "алгоритмов для следующих идентификаторов пользователей:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": предпочитает алгоритм сжатия %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили свои предпочтения и\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространили этот ключ во избежание возможных нестыковок алгоритмов\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: нет идентификатора пользователя\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "ключ %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "исключен фильтром импорта"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: повреждение подключа PKS исправлено\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "ключ %s: принят без самозаверенного идентификатора пользователя \"%s\"\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных идентификаторов пользователя\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "может быть, из-за отсутствия самоподписи\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "ошибка записи таблицы ключей '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с нашей копией\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый идентификатор пользователя\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых идентификаторов пользователя\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d подписей очищено\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d идентификатор пользователя очищен\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d идентификаторов пользователя очищено\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: импортирован секретный ключ\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "ключ %s: секретный ключ уже имеется\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "ключ %s: ошибка отправки в агент: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3812,203 +3851,203 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Для переноса '%s' выполните на каждой криптографической карте: %s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "секретный ключ %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "импорт секретного ключа не допускается\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Причина не указана"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Ключ заменен другим"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Ключ был раскрыт"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Идентификатор пользователя больше не действителен"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "причина отзыва: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "пояснение к отзыву: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет идентификатора пользователя для подписи\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: алгоритм с открытым ключом у идентификатора пользователя \"%s\" не "
 "поддерживается\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неправильная самоподпись на идентификаторе пользователя \"%s\"\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ключ %s: недействительная прямая подпись ключа\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания ключей\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: недопустимая связь подключей\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалена многократная связь подключей\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзыва ключа\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неверный отзыв подключа\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удален многократный отзыв подключей\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен идентификатор пользователя \"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "ключ %s: обнаружено дублирование идентификатора пользователя - объединены\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr ""
 "ключ %s: обнаружено дублирование идентификатора пользователя - объединены\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: добавлена прямая подпись ключа\n"
@@ -4018,29 +4057,29 @@
 msgid "error allocating memory: %s\n"
 msgstr "ошибка выделения памяти: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr ""
 "не удалось проверить подпись: алгоритм с открытым ключом %d не "
 "поддерживается: %s.\n"
 
-#: g10/key-check.c:405
+#: g10/key-check.c:406
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
 msgstr "не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
 
-#: g10/key-check.c:571
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr "(порядок подписей изменен)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "ключ %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
@@ -4048,7 +4087,7 @@
 msgstr1 "%d повторные подписи удалены\n"
 msgstr2 "%d повторных подписей удалено\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
@@ -4056,7 +4095,7 @@
 msgstr1 "%d подписи не проверены за отсутствием ключа\n"
 msgstr2 "%d подписей не проверено за отсутствием ключа\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
@@ -4064,7 +4103,7 @@
 msgstr1 "%d плохих подписи\n"
 msgstr2 "%d плохих подписей\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
@@ -4072,7 +4111,7 @@
 msgstr1 "Порядок %d подписей изменен\n"
 msgstr2 "Порядок %d подписей изменен\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -4081,45 +4120,45 @@
 "Внимание: обнаружены ошибки, проверялись только самоподписи; для проверки "
 "всех подписей выполните '%s'.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "ошибка создания щита с ключами '%s': %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "ошибка создания таблицы ключей '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "создан щит с ключами '%s'\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "создана таблица ключей '%s'\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "источник блока ключей '%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "отзыв"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "самоподпись"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4130,17 +4169,17 @@
 "достоверности ключей других пользователей (проверяет паспорт,\n"
 "сверяет отпечатки ключей из разных источников и т.п.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4150,53 +4189,53 @@
 "позволяет ключу, который Вы подписываете, делать подписи доверия\n"
 "от Вашего имени.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 "Идентификатор пользователя \"%s\" пропущен: это не текстовый идентификатор.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Идентификатор пользователя \"%s\" отозван."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы все равно хотите его подписать? (y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Не могу подписать.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Срок действия идентификатора пользователя \"%s\" истек."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Идентификатор пользователя \"%s\" не самозаверен."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Идентификатор пользователя \"%s\" можно подписать."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Подписать его? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4205,11 +4244,11 @@
 "Самоподпись у \"%s\" -\n"
 "это подпись типа PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите преобразовать ее в самоподпись OpenPGP? (y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4218,11 +4257,11 @@
 "Ваша текущая подпись на \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4231,44 +4270,44 @@
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите преобразовать ее в полную экспортируемую подпись? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы все равно хотите снова подписать его? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действия данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4277,31 +4316,31 @@
 "Насколько хорошо Вы проверили, что ключ действительно принадлежит\n"
 "указанному выше человеку? Если не знаете, что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Никакой проверки не было.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Была частичная проверка.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Проверка была очень тщательной.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Ваш выбор? (введите '?' для получения информации): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4310,235 +4349,249 @@
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "Внимание: подпись не будет помечена как неэкспортируемая.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "Внимание: подпись не будет помечена как неотзываемая.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как неэкспортируемая.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как неотзываемая.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Этот ключ мной никак не проверялся.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Мной проведена поверхностная проверка этого ключа.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Этот ключ проверен мной очень тщательно.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "подписать не удалось: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "В ключе только заготовка или элементы для карты -\n"
 "фразы-пароля для изменения нет.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "ключ %s: ошибка изменения фразы-пароля: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "показать код ключа"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "вывести список ключей и идентификаторов пользователя"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "выбрать идентификатор пользователя N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 "подписать выбранные идентификаторы пользователя * описание команд см. ниже"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные идентификаторы пользователя"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные идентификаторы пользователя подписью доверия"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные идентификаторы пользователя без возможности отзыва"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "добавить идентификатор пользователя"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "добавить фотоидентификатор"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "удалить выбранные идентификаторы пользователя"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на криптографическую карту"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на криптографическую карту"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "переместить архивный ключ на криптографическую карту"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Данные успешно расшифрованы"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи с выбранных идентификаторов пользователя"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действия ключа или выбранных подключей"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранный идентификатор пользователя как первичный"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "установить список предпочтений для выбранных идентификаторов пользователя"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "установить URL предпочтительного сервера ключей для выбранных "
 "идентификаторов пользователя"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "установить замечание для выбранных идентификаторов пользователя"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "сменить фразу-пароль"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных идентификаторов пользователя"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "отозвать выбранные идентификаторы пользователя"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "отозвать ключ или выбранные подключи"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "подключить ключ"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "показать выбранные фотоидентификаторы"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "сжать непригодные идентификаторы пользователей и удалить непригодные подписи "
 "из ключа"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "сжать непригодные идентификаторы пользователей и удалить все подписи из ключа"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Секретные подключи доступны.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+#, fuzzy
+#| msgid "Note: Only the secret part of the shown subkey will be deleted.\n"
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+"Замечание: Будет удалена только секретная часть показанного подключа.\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4549,264 +4602,255 @@
 " 't' (подписи доверия, tsign), 'nr' (неотзываемые, \n"
 " nrsign) или любое их сочетание (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr ""
 "Действительно подписать все текстовые идентификаторы пользователя? (y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Действительно подписать все идентификаторы пользователя? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 "Подсказка: Выберите идентификаторы пользователей, которые нужно подписать\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Неизвестный тип подписи '%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один идентификатор пользователя.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Команда '%s'.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний идентификатор пользователя!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Действительно удалить все выбранные идентификаторы пользователей? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Действительно удалить этот идентификатор пользователя? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно переместить первичный ключ? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Команде нужен аргумент-имя файла\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Не могу открыть '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Ошибка чтения архивного ключа из '%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Действительно отозвать все выбранные идентификаторы пользователей? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный идентификатор пользователя? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Вы действительно хотите отозвать ключ целиком? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы действительно хотите отозвать данный подключ? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Нельзя присваивать степень доверия, когда таблица доверия указана "
 "пользователем\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Установить предпочтения, равные:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Действительно обновить предпочтения для выбранных идентификаторов "
 "пользователей? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "сбой при удалении секретного %s: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "нельзя удалять последний действительный идентификатор пользователя.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "сбой отзыва идентификатора пользователя: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "сбой установки первичного идентификатора пользователя: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" - не отпечаток\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" - не первичный отпечаток\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Недопустимый идентификатор пользователя '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "Нет подходящих идентификаторов пользователей."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Подписывать нечего.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Вами не подписано.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' - не допустимый срок действия\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" - не правильный отпечаток\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "подключ \"%s\" не найден\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Хеш: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Характеристики: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Не изменять на сервере"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Предпочтительный сервер ключей: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Замечания: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "В идентификаторе пользователя типа PGP 2.x не может быть предпочтений.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3849
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(особо важный)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr " создан: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr " отозван: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
@@ -4815,30 +4859,30 @@
 # perhaps this should be somewhere in help/man
 # (S - подпись, C - сертификация, E - шифрование, A - удостоверение личности)
 # too long for repeating messages.
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "назначение: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "номер карты: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4846,18 +4890,18 @@
 "Учтите, что показанная достоверность ключа может быть неверной,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "просрочен"
 
 # check it
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4867,17 +4911,23 @@
 " Эта команда может привести к тому, что первичным станет считаться\n"
 " другой идентификатор пользователя.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Возможно, надо поменять также срок действия.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4886,37 +4936,37 @@
 "Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
 " в некоторых версиях PGP вызвать отбраковку ключа.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
 
-#: g10/keyedit.c:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "Такой идентификатор пользователя на этом ключе уже есть!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4924,20 +4974,20 @@
 msgstr1 "Удалены %d подписи.\n"
 msgstr2 "Удалено %d подписей.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "недопустим"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Идентификатор пользователя \"%s\" сжат: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4945,17 +4995,17 @@
 msgstr1 "Идентификатор пользователя \"%s\": %d подписи удалены\n"
 msgstr2 "Идентификатор пользователя \"%s\": %d подписей удалено\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Идентификатор пользователя \"%s\" уже минимизирован\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Идентификатор пользователя \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4964,39 +5014,55 @@
 "Внимание: Это ключ типа PGP 2.x. Добавление особого отзывающего ключа\n"
 " может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите идентификатор пользователя ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4713
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим самого себя\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4735
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(если только ключ не задан отпечатком)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Подключ %s уже отозван.\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5004,242 +5070,242 @@
 "Вы уверены, что хотите изменить срок действия сразу нескольких подключей? (y/"
 "N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действия подключа.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия первичного ключа.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Нельзя изменить срок действия ключа v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Смена режимов использования подключа.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Смена режимов использования первичного ключа.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подписывающий подключ %s уже перекрестно заверен\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите ровно один идентификатор пользователя.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск самоподписи v3 на идентификаторе пользователя \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтительного сервера ключей: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Введите замечание: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет идентификатора пользователя с индексом %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет идентификатора пользователя с хешем %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Нет подключа с идентификатором ключа '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Идентификатор пользователя: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (неэкспортируемая)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действия подписи истек %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали эти идентификаторы пользователей на ключе %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (неотзываемая)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отозвано Вашим ключом %s %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "попытка отзыва непользовательского идентификатора: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Идентификатор пользователя \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Внимание: подпись идентификатора пользователя датирована %d секундами в "
 "будущем\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Нельзя удалять последний действительный идентификатор пользователя.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "недопустимое значения параметра \"%s\"\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "предпочтение '%s' дублируется\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "слишком много предпочтений шифров\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "слишком много предпочтений хеш-функций\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "слишком много предпочтений методов сжатия\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "слишком много предпочтений шифров\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "недопустимый элемент '%s' в строке предпочтений\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "запись прямой подписи\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "запись самоподписи\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "запись связующей подписи\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; использую %u бит\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа округлен вверх до %u бит\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5247,19 +5313,19 @@
 "Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA с "
 "такой длиной хеша\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Подписать"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Заверить"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Зашифровать"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Удостоверить личность"
 
@@ -5273,180 +5339,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "11223300"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Возможные действия для ключа %s: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Допустимы действия: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Переключить возможность подписи\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Переключить возможность шифрования\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Переключить возможность удостоверения личности\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Завершено\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA и RSA (по умолчанию)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA и Elgamal\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (только для шифрования)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (задать возможности)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (задать возможности)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) sign, encrypt\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) подпись, шифрование\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (только для подписи)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) ECC (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (задать возможности)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) ECC (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (только для шифрования)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Имеющийся ключ\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Имеющийся на карте ключ\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Введите код ключа:"
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Недопустимый код ключа (ожидается 40 шестнадцатеричных цифр)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Нет ключа с таким кодом\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "ошибка чтения карты: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Серийный номер карты: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Доступные ключи:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "длина ключей %s может быть от %u до %u.\n"
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Какой размер подключа необходим? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрошенный размер ключа - %u бит\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Выберите эллиптическую кривую:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5462,7 +5528,7 @@
 " <n>m = срок действия ключа - n месяцев\n"
 " <n>y = срок действия ключа - n лет\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5478,38 +5544,38 @@
 " <n>m = срок действия подписи - n месяцев\n"
 " <n>y = срок действия подписи - n лет\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Срок действия ключа? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Срок действия подписи? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Срок действия ключа не ограничен\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Срок действия подписи не ограничен\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5517,11 +5583,11 @@
 "Ваша система не может отображать даты после 2038 года.\n"
 "Однако даты до 2106 года будут обрабатываться верно.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5535,7 +5601,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5551,41 +5617,41 @@
 " \"Вася Пушкин (персонаж) <vp@test.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Ваше полное имя: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в имени\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Символы '%s' и '%s' в имени появляться не могут\n"
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Адрес электронной почты: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Неправильный адрес электронной почты\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Примечание: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в примечании\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Используется таблица символов '%s'.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5596,12 +5662,12 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Не вставляйте адрес электронной почты в имя пользователя или примечание\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Такой идентификатор пользователя на этом ключе уже есть!\n"
 
@@ -5616,31 +5682,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес; (Q)Выход? "
 
-#: g10/keygen.c:3130
+#: g10/keygen.c:3114
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес; (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Сменить (N)Имя, (E)Адрес; (Q)Выход? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Сменить (N)Имя, (E)Адрес; (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5653,18 +5719,18 @@
 "случайных чисел больше возможностей получить достаточное количество "
 "энтропии.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5675,65 +5741,65 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Продолжить? (Y/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ключ пользователя \"%s\" уже существует\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Все равно создать новый? (y/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "принудительное создание\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "не могу создать архивную копию, файл '%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "сохранение открытого ключа в '%s'\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и секретный ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5741,7 +5807,7 @@
 "Учтите, что данный ключ не может использоваться для шифрования. Можно\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5749,7 +5815,7 @@
 "ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
 "часами)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5757,22 +5823,22 @@
 "ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
 "часами)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретные части первичного ключа отсутствуют.\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретные части первичного ключа хранятся на карте.\n"
 
-#: g10/keygen.c:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N) "
 
@@ -5780,27 +5846,43 @@
 msgid "never "
 msgstr "никогда "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Хеш: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Характеристики: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Не изменять на сервере"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Критические правила подписи: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Правила подписи: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Критический предпочтительный сервер ключей: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Критическое замечание к подписи: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Замечание к подписи: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
@@ -5808,7 +5890,7 @@
 msgstr1 "%d хороших подписи\n"
 msgstr2 "%d хороших подписей\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
@@ -5816,7 +5898,7 @@
 msgstr1 "%d подписи не проверены из-за ошибки\n"
 msgstr2 "%d подписей не проверено из-за ошибки\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
@@ -5824,33 +5906,33 @@
 msgstr1 "Внимание: %lu ключа пропущены из-за большого размера\n"
 msgstr2 "Внимание: %lu ключей пропущено из-за большого размера\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Отпечаток первичного ключа:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток первичного ключа:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Отпечаток подключа:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Отпечаток ключа ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " серийный номер карты ="
 
@@ -5930,7 +6012,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" - не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5938,141 +6020,141 @@
 msgstr1 "обновление %d ключей из %s\n"
 msgstr2 "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Внимание: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" на сервере ключей не найден\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "не известно ни одного сервера ключей\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "запрос ключа из '%s'\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Внимание: невозможно получить URI %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован по %s\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "данные зашифрованы алгоритмом %s\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "фраза-пароль создана с незнакомой хеш-функцией %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ - %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s с идентификатором %s, созданным %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с идентификатором %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Внимание: наблюдается несколько текстов\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано %lu фразами-паролями\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано одной фразой-паролем\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифровки с открытым ключом: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "предполагаются данные, зашифрованные по %s\n"
 
-#: g10/mainproc.c:660
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробую вместо него %s\n"
 
-#: g10/mainproc.c:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "Внимание: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -6082,179 +6164,185 @@
 "оно правомерно, поскольку в те времена защита целостности широко\n"
 "не применялась.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Воспользуйтесь параметром '%s', чтобы тем не менее расшифровать.\n"
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "принудительный сбой расшифровки!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "расшифровано нормально\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Внимание: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифровки: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Замечание: отправитель запросил \"только между нами\"\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "первоначальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "отдельный сертификат отзыва: задействуется командой \"gpg --import\"\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "подпись не найдена\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись пользователя \"%s\""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись пользователя \"%s\""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись пользователя \"%s\""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти неоднозначные данные подписи\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " ключом %s с идентификатором %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись сделана %s ключом %s с идентификатором %s\n"
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " издатель \"%s\"\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ доступен на: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Замечание: Параметр '%s' включает использование этой информации\n"
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "сомнительно"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " или \"%s\""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "Внимание: Данный ключ не подходит для подписи в режиме %s\n"
 
-#: g10/mainproc.c:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "формат подписи: %s, хеш-функция %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
 msgstr ""
 "Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "отдельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "подпись старого типа (PGP 2.x)\n"
@@ -6359,27 +6447,27 @@
 msgid "uncompressed|none"
 msgstr "без сжатия|без|none"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть непригодно для %s\n"
 
-#: g10/misc.c:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "неоднозначный параметр '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "неизвестный параметр '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "неизвестный слабый хеш '%s'\n"
@@ -6434,7 +6522,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "в подпакете типа %d установлен критический бит\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6499,7 +6587,7 @@
 "создан %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6513,70 +6601,70 @@
 "Помните, что изображение будет храниться в Вашем открытом ключе и увеличит\n"
 "его размер! Рекомендуется размер около 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Введите имя файла JPEG для фотоидентификатора: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "не могу открыть файл JPEG '%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Этот JPEG очень велик (%d байт)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s' - не файл JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Это правильная фотография? (y/N/q) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "удаленный запуск программы не поддерживается\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "на данной платформе при вызове внешних программ требуются временные файлы\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "не могу выполнить оболочку '%s': %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "ненормальное завершение внешней программы\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "ошибка системы при вызове внешней программы: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "Внимание: не могу удалить временный файл (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "Внимание: не могу удалить временный каталог '%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6584,7 +6672,7 @@
 "вызов внешних программ отключен из-за небезопасных прав доступа к файлу "
 "настроек\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить фотоидентификатор!\n"
@@ -6666,36 +6754,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Сертификаты, ведущие к абсолютно доверенному ключу:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Нет свидетельств того, что данный ключ принадлежит названному "
 "пользователю\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Мало свидетельств того, что данный ключ принадлежит названному "
 "пользователю\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Этот ключ, вероятно, принадлежит названному владельцу\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Данный ключ принадлежит нам\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: Некачественный ключ! Он помечен как недоверенный!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6704,7 +6792,7 @@
 "Некачественный ключ! Он помечен как недоверенный! Если Вы ТОЧНО знаете,\n"
 "что делаете, можете ответить на следующий вопрос утвердительно.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6714,102 +6802,102 @@
 "в идентификаторе пользователя. Если Вы ТОЧНО знаете, что делаете,\n"
 "можете ответить на следующий вопрос утвердительно.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Все равно использовать данный ключ? (y/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "Внимание: Использование недоверенного ключа!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "Внимание: возможно, данный ключ отозван (ключ отзыва отсутствует)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "Идентификатор пользователя: \"%s\"\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "задан параметр '%s', но параметр '%s' не задан\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "ключ %s: не совпадает с нашей копией\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but no matching User ID found\n"
 msgstr "задан параметр '%s', но параметр '%s' не задан\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "Внимание: Данный ключ отозван ключом, назначенным отзывающим!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "Внимание: Данный ключ отозван его владельцем!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Это может означать, что подпись подделана.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "Внимание: Данный подключ был отозван его владельцем!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Замечание: Данный ключ отключен.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Замечание: Данный ключ просрочен!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "Внимание: Данный ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "Внимание: Данный ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " Нет указаний на то, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "Внимание: НЕТ ДОВЕРИЯ данному ключу!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Возможно, что подпись ПОДДЕЛАНА.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6819,57 +6907,57 @@
 msgstr ""
 "Внимание: Этот ключ не заверен достаточным количеством доверенных подписей!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "Внимание: Этот ключ не заверен достаточным количеством доверенных подписей!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Нет уверенности в том, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущено: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: пропущено: открытый ключ отключен\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: открытый ключ уже существует\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "не могу зашифровать для '%s'\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "задан параметр '%s', но не заданы ключи по умолчанию\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "задан параметр '%s', но параметр '%s' не задан\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Не задан идентификатор пользователя (можно использовать \"-r\").\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Текущие получатели:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6877,40 +6965,40 @@
 "\n"
 "Введите идентификатор пользователя. Завершите пустой строкой: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Нет такого идентификатора пользователя.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Открытый ключ отключен.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "пропущено: открытый ключ уже установлен\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "неизвестный получатель по умолчанию \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "нет пригодных адресов\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Замечание: у ключа %s нет функции %s\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
@@ -6948,7 +7036,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "не могу открыть подписанные данные fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "ключ %s не пригоден для расшифрования в режиме %s\n"
@@ -7174,37 +7262,32 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "Ключ %s %s требует %zu-битного или более длинного хеша (хеш %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "ключ %s нельзя использовать для подписи в режиме %s\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Внимание: конфликт хешей подписей в сообщении\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "Внимание: подписывающий подключ %s не был перекрестно заверен\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "за подробностями обращайтесь к %s\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "Внимание: подписывающий подключ %s неправильно перекрестно заверен\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
@@ -7212,7 +7295,7 @@
 msgstr1 "открытый ключ %s на %lu секунды новее подписи\n"
 msgstr2 "открытый ключ %s на %lu секунд новее подписи\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
@@ -7220,7 +7303,7 @@
 msgstr1 "открытый ключ %s на %lu дня новее подписи\n"
 msgstr2 "открытый ключ %s на %lu дней новее подписи\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7236,7 +7319,7 @@
 "ключ %s создан на %lu секунд в будущем (петля во времени или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7251,50 +7334,50 @@
 "ключ %s создан на %lu дней в будущем (петля во времени или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "Замечание: срок действия подписавшего ключа %s истек %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "Замечание: ключ для подписей %s отозван\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "подпись ключа %s считается плохой из-за неизвестного критического бита\n"
 
-#: g10/sig-check.c:1241
+#: g10/sig-check.c:1235
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: нет подключа для отзывающей подписи подключа\n"
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "Внимание: не могу развернуть %% в замечании (слишком длинное).\n"
 " Использую неразвернутым.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7302,7 +7385,7 @@
 "Внимание: не могу развернуть %% в URL правил (слишком длинный). Использую "
 "неразвернутым.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7311,12 +7394,12 @@
 "Внимание: невозможно развернуть %% в URL предпочтительного сервера ключей "
 "(слишком длинный). Использую неразвернутым.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "подпись %s/%s пользователя \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7324,12 +7407,12 @@
 "Внимание: использование хеш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7407,133 +7490,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "таблица доверия: сбой синхронизации: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "не удается создать блокировку для '%s'\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "не удается заблокировать '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "таблица доверия, запись %lu: сбой lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "таблица доверия, запись %lu: сбой записи (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "слишком большая операция над таблицей доверия\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не существует!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "нет доступа к '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: сбой создания записи о версии: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: создана недопустимая таблица доверия\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: создана таблица доверия\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Замечание: таблица доверия недоступна для записи\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недопустимая таблица доверия\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: сбой создания таблицы хешей: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновления записи о версии: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтения записи о версии: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка сохранения записи о версии: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "таблица доверия: сбой lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "таблица доверия: сбой чтения (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не является файлом таблицы доверия\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запись о версии с номером записи %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильная версия файла %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка сохранения записи каталога: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: сбой обнуления записи: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: сбой добавления записи: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Ошибка: таблица доверия повреждена.\n"
@@ -8004,7 +8087,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "проверка таблицы доверия не нужна\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверия %s\n"
@@ -8034,7 +8117,7 @@
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверия\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8042,7 +8125,7 @@
 msgstr1 "обработаны %d ключа"
 msgstr2 "обработано %d ключей"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8050,17 +8133,17 @@
 msgstr1 " (сброшены %d счетчика достоверности)\n"
 msgstr2 " (сброшено %d счетчиков достоверности)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "абсолютно доверенных ключей не найдено\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8068,7 +8151,7 @@
 "глубина: %d достоверных: %3d подписанных: %3d доверие: %d-, %dq, %dn, "
 "%dm, %df, %du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8138,7 +8221,7 @@
 msgid "ultimate"
 msgstr " абсолютно "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8149,12 +8232,12 @@
 "Файл подписи (.sig или .asc) должен быть\n"
 "указан в командной строке первым.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "слишком длинная входная строка %u или пропущен перевод строки\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "не могу открыть fd %d: %s\n"
@@ -8171,19 +8254,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "неоднозначный параметр '%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "установить отладочные признаки"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "полностью включить отладку"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Вызов: kbxutil параметры файлы (-h - подсказка)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8194,16 +8277,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%sНомер&#x1f;: %s%%0AДержатель&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Осталось попыток: %d"
@@ -8244,10 +8327,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|Введите код разблокировки PIN (PUK) для стандартных ключей."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Функция обработки PIN возвратила ошибку: %s\n"
@@ -8269,57 +8352,57 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "запись нового ключа\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "в ответе отсутствует открытый ключ эллиптической кривой\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8327,63 +8410,63 @@
 msgstr1 "создание ключа завершено (%d секунды)\n"
 msgstr2 "создание ключа завершено (%d секунд)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Введите PIN ключа для создания квалифицированных подписей."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Введите административный PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Введите код разблокировки PIN (PUK) для стандартных ключей."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Введите PIN для стандартных ключей."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены, или их размер не равен %d бит\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA, или ее размер превышает %d бит\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "пустой PIN до сих пор не изменен\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "пустой PIN до сих пор не изменен\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|A|Введите новый PIN для стандартных ключей."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Введите новый код разблокировки PIN (PUK) для стандартных ключей."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Введите новый PIN ключа для создания квалифицированных подписей."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8391,7 +8474,7 @@
 "|NP|Введите новый код разблокировки PIN (PUK) ключа для создания "
 "квалифицированных подписей."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8399,27 +8482,27 @@
 "|P|Введите код разблокировки PIN (PUK) ключа для создания квалифицированных "
 "подписей."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой при сохранении отпечатка: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой при сохранении даты создания: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой при чтении открытого ключа: %s\n"
@@ -8427,44 +8510,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%sНомер&#x1f;: %s%%0AДержатель&#x1f;: %s%%0AСчетчик&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "основной PIN применяется как %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Разблокируйте карту"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "сбой при проверке CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "карта окончательно заблокирована!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8476,20 +8559,20 @@
 msgstr2 ""
 "осталось %d попыток ввода административного PIN перед блокировкой карты\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Введите код сброса для карты"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Код сброса слишком короток; минимальная длина %d\n"
@@ -8497,79 +8580,79 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Новый код сброса"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Введите административный PIN и новый административный PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Введите PIN и новый PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "пропущена метка времени создания\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или его размер не равен %d\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "кривая не поддерживается\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопустимая структура карты OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "отпечаток на карте не совпадает с запрошенным\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает хеш-функцию %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "создано подписей: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа к %s - непригодная карта OpenPGP?\n"
@@ -8589,7 +8672,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "работать в многосерверном режиме (нефоновый режим)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
 
@@ -8633,11 +8716,11 @@
 msgid "deny the use of admin card commands"
 msgstr "не позволять использовать административные команды карты"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Вызов: @SCDAEMON@ параметры (-h - подсказка)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8645,319 +8728,319 @@
 "Синтаксис: scdaemon параметры команда аргументы\n"
 "Демон криптографических карт для @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "ошибка получения информации применимости ключа: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "схема проверки, запрошенная сертификатом: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "цепь"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "оболочка"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "критичное расширение сертификата %s не поддерживается"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "издатель сертификата не помечен как удостоверяющий центр"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "незаданные правила помечены как критичные"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "не могу открыть '%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Замечание: некритичные правила сертификата недопустимы"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "правила сертификата недопустимы"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "сбой получения отпечатка\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "внешний поиск издателя\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "число соответствующих издателей: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "не могу получить authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "поиск издателя в буфере Dirmngr\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "число соответствующих сертификатов: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "ключ в буфере dirmngr не найден: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "сбой при выделении памяти под указатель на базу данных\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "сертификат был отозван"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "статус сертификата неизвестен"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "проверьте, что \"dirmngr\" установлен корректно\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "сбой проверки списка отозванных сертификатов: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "сертификат с недействительной достоверностью: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "сертификат еще не достоверен"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "корневой сертификат еще не достоверен"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "промежуточный сертификат еще не достоверен"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "сертификат просрочен"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "корневой сертификат просрочен"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "промежуточный сертификат просрочен"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "сертификат не имеет требуемых атрибутов: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "сертификат с недействительной достоверностью"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "подпись создана вне времени действия сертификата"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "сертификат создан вне времени действия издателя"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "промежуточный сертификат создан вне времени действия издателя"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( подпись создана "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " ( сертификат создан "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (сертификат действителен с "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( издатель действителен с "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "отпечаток=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "корневой сертификат теперь помечен как доверенный\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "в агенте gpg нельзя интерактивно сделать сертификат доверенным\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "для данного сеанса запрещено интерактивно делать сертификат доверенным\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "Внимание: время создания подписи неизвестно - предполагается текущий момент"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "в сертификате не найден издатель"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "у самозаверенного сертификата ПЛОХАЯ подпись"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "корневой сертификат не помечен как доверенный"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "сбой проверки списка доверия: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "слишком длинная цепочка сертификатов\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "не найден издатель сертификата"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "сертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "найден еще один возможный сертификат удостоверяющего центра - повторная "
 "попытка"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "цепочка сертификатов длиннее допускаемой удостоверяющим центром (%d)"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "хороший сертификат\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "хороший промежуточный сертификат\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "хороший корневой сертификат\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "переключение на цепную схему"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "используется схема проверки: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "нехватка выделенной памяти\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(это алгоритм MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "нет"
 
@@ -8977,7 +9060,7 @@
 msgid "Error - invalid DN"
 msgstr "Ошибка - недопустимый DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8991,42 +9074,42 @@
 "S/N %s, идентификатор 0x%08lX,\n"
 "создан %s, истекает %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не задана применимость ключа - подразумеваем все\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "сертификат не следовало использовать для заверения\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "сертификат не следовало использовать для подписывания ответа OCSP\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "сертификат не следовало использовать для шифрования\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "сертификат не следовало использовать для подписей\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "сертификат не пригоден для шифрования\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "сертификат не пригоден для подписи\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9246,17 +9329,17 @@
 msgid "resource problem: out of core\n"
 msgstr "проблема ресурсов: нехватка выделенной памяти\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(это алгоритм RC2)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(это не похоже на зашифрованное сообщение)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9267,7 +9350,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "сертификат '%s' не найден: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "ошибка блокировки щита с ключами: %s\n"
@@ -9292,123 +9375,123 @@
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "вывести список внешних ключей"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "вывести список цепочек сертификатов"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "импорт сертификатов"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "экспорт сертификатов"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "зарегистрировать криптографическую карту"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "не использовать терминал совсем"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|число включаемых сертификатов"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взять информацию о правилах из файла FILE"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "предполагаю, что входные данные в формате PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "предполагаю, что входные данные в формате base64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "предполагаю, что входные данные в двоичном формате"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "вывод в кодировке base64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|добавить таблицу ключей в список таблиц ключей"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "запросить недостающих издателей сертификатов"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|использовать кодировку NAME для фраз-паролей PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "не сверять со списком отозванных сертификатов"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "не проверять списки отозванных сертификатов для корневых сертификатов"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "проверка достоверности с помощью OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "не проверять правила сертификата"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|использовать алгоритм шифрования NAME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|использовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не спрашивать"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "принять 'да' как ответ на большинство вопросов"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "принять 'нет' как ответ на большинство вопросов"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|сохранять журнал аудита в файле FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Вызов: @GPGSM@ параметры файлы (-h - подсказка)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9418,27 +9501,27 @@
 "Подписать, проверить, зашифровать или расшифровать по протоколу S/MIME\n"
 "Операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Замечание: не могу зашифровать для '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "неизвестная схема проверки '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "импорт общих сертификатов '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "невозможно подписать с помощью '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "недопустимая команда (неявной команды нет)\n"
@@ -9458,7 +9541,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "ошибка базовой проверки сертификата - не импортирован\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "ошибка получения сохраненных признаков: %s\n"
@@ -9468,48 +9551,48 @@
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импорта сертификата: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "в этом сеансе dirmngr не работает\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "ошибка открытия базы данных ключей: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "проблема поиска существующего сертификата: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "ошибка при поиске базы данных ключей для записи: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "ошибка сохранения сертификата: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "проблема повторного поиска сертификата: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "ошибка сохранения признаков: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Ошибка - "
 
@@ -9547,7 +9630,7 @@
 "\n"
 "%s%sВы уверены, что хотите этого?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9567,44 +9650,44 @@
 "\"%s\"\n"
 "Обратите внимание, что этот сертификат НЕ создает квалифицированных подписей!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "хеш-функция %d (%s) для пользователя %d не поддерживается; использую %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "хеш-функция для пользователя %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "сбой при проверке квалифицированной подписи: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Подпись сделана %s ключом %s с идентификатором %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Подпись сделана "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "дата не указана"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "алгоритм:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9612,17 +9695,17 @@
 "недопустимая подпись: атрибут хеш-функции сообщения не соответствует "
 "вычисленному\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Хорошая подпись пользователя"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " или"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Это квалифицированная подпись\n"
@@ -9647,319 +9730,314 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "не могу снять блокировку буфера сертификатов: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "опускается %u сертификатов из буфера\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "не могу интерпретировать сертификат '%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "сертификат '%s' уже в буфере\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "доверенный сертификат '%s' загружен\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "сертификат '%s' удален\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " отпечаток SHA1 =% s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " издатель ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " субъект ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "ошибка загрузки сертификата '%s': %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr " постоянно загруженных сертификатов: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "сертификатов в буфере времени исполнения: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " достоверных сертификатов: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "сертификат уже в буфере\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "сертификат в буфере\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "ошибка помещения сертификата в буфер: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "неверная строка отпечатока SHA1 '%s'\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "ошибка получения сертификата по серийному номеру: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "ошибка получения сертификата по субъекту: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "в сертификате не найден издатель\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "ошибка получения authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "создание каталога '%s'\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "ошибка создания каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "игнорируем каталог базы данных '%s'\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "ошибка чтения из каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "удаление файла буфера '%s'\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "не удаляю файл '%s'\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "ошибка закрытия файла буфера: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "не могу открыть файл буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "ошибка создания нового файла буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "ошибка записи нового файла буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:434
+#: dirmngr/crlcache.c:441
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "ошибка закрытия нового файла буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "создан новый файл буферного каталога '%s'\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "сбой при повторном открытии файла буферного каталога '%s': %s\n"
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "первая запись '%s' - не версия\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "старая версия каталога буфера - очищаю\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "старая версия каталога буфера - не продолжаю\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "лишнее поле в записи списка отозванных сертификатов '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "недопустимая строка в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "удвоенный элемент в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "запись неподдерживаемого типа в '%s', строка %u (игнорируется)\n"
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "неправильный хеш издателя в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "нет DN издателя в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "недопустимая метка времени в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "Внимание: недопустимый хеш файла буфера в '%s', строка %u\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "в файле каталога буфера обнаружены ошибки\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "выясните причину и удалите этот файл вручную\n"
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "невозможно создание временного файла '%s': %s\n"
 
-#: dirmngr/crlcache.c:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "ошибка закрытия '%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "ошибка переименования '%s' в '%s': %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "невозможно получить хеш '%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "ошибка установки контекста хеша MD5: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "ошибка при получении хеша '%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "недопустимая отформатированная контрольная сумма для '%s'\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "слишком много открытых файлов буферов; не могу открыть еще один\n"
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "открываю файл буфера '%s'\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "ошибка при открытии файла буфера '%s': '%s'\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "ошибка инициализации файла буфера '%s' на чтение: %s\n"
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "вызов unlock_db_file для закрытого файла\n"
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "вызов unlock_db_file для неразблокированного файла\n"
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "сбой создания нового объекта буфера: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr ""
 "списка отозванных сертификатов для издателя с идентификатором %s нет в "
 "наличии\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 "список отозванных сертификатов для издателя с идентификатором %s в буфере "
 "слишком стар; требуется обновление\n"
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9968,213 +10046,213 @@
 "действует force-crl-refresh и прошло %d минут для издателя с идентификатором "
 "%s; требуется обновление\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 "для издателя с идентификатором %s действует force-crl-refresh; требуется "
 "обновление\n"
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 "доступный список отозванных сертификатов для издателя с идентификатором %s "
 "нельзя использовать\n"
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "список отозванных сертификатов для издателя с идентификатором %s в буфере "
 "поврежден; его нужно обновить\n"
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "Внимание: недопустимая для серийного номера длина буферной записи "
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "проблема чтения буферной записи для серийного номера %s: %s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr "Серийный номер %s недопустим; причина=%02X, дата=%.15s\n"
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 "Серийный номер %s допустим, он не перечислен в списке отозванных "
 "сертификатов\n"
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "ошибка получения данных из файла буфера: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "из libksba получено недопустимое S-выражение\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "сбой преобразования S-выражения: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "недопустимая хеш-функция '%s'\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "сбой gcry_md_open для алгоритма %d: %s\n"
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "сбой создания S-выражения: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "сбой ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 "ошибка получения времен обновления списка отозванных сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 "времена обновления этого списка отозванных сертификатов: текущее=%s, "
 "следующее=%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "не задано nextUpdate; предполагаю срок действия в один день\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "ошибка получения элемента списка отозванных сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "ошибка вставки элемента во временный файл буфера: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "в списке отозванных сертификатов не найден издатель списка: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "поиск сертификата издателя списка отозванных сертификатов по "
 "authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "сбой проверки подписи списка отозванных сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "ошибка проверки достоверности сертификата издателя списка отозванных "
 "сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "сбой ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "сбой ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "удален залипший временный файл буфера '%s'\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "проблема удаления залипшего временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "ошибка создания временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "сбой crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "ошибка завершения временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "ошибка закрытия временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "Внимание: новый список отозванных сертификатов тоже слишком стар; срок "
 "действия истек %s - тем не менее загружаю\n"
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 "новый список отозванных сертификатов тоже слишком стар; срок действия истек "
 "%s\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "неизвестное критическое расширение списка отозванных сертификатов %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "ошибка чтения расширений списка отозванных сертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "создание файла буфера '%s'\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "проблема при переименовании '%s' в '%s': %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10183,12 +10261,12 @@
 "сбой обновления файла каталога - запись буфера будет утеряна при следующем "
 "запуске программы\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Начало вывода списка отозванных сертификатов (полученного через %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10196,57 +10274,57 @@
 " Ошибка: Список отозванных сертификатов использован не будет, потому что "
 "после обновления он все равно слишком стар!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " Ошибка: Список отозванных сертификатов не будет использован из-за "
 "неизвестного критического расширения!\n"
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " Ошибка: Список отозванных сертификатов использован не будет\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " Ошибка: Этот список отозванных сертификатов в буфере, возможно, подменен!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "Внимание: найдена недопустимая длина буферной записи\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "проблема при чтении буферной записи: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "проблема при чтении ключа буфера: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "ошибка чтения записи буфера из базы данных: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Конец вывода списка отозванных сертификатов\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "сбой crl_fetch через DP: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "сбой crl_cache_insert через DP: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "сбой crl_cache_insert через издателя: %s\n"
@@ -10264,25 +10342,25 @@
 "Доступ к списку отозванных сертификатов невозможен\n"
 "из-за режима Tor\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 "Доступ к списку отозванных сертификатов невозможен\n"
 "из-за того, что не задействуется %s\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "ошибка получения '%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "ошибка инициализации объекта устройства чтения: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "поиск сертификата невозможен из-за того, что не задействуется %s\n"
@@ -10429,145 +10507,145 @@
 msgid "looking up '%s'\n"
 msgstr "поиск '%s'\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "вывести содержание буфера списков отозванных сертификатов"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|загрузить список отозванных сертификатов из файла FILE в буфер"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|получить список отозванных сертификатов из URL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "выключить dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "записать буфер на диск"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "разрешить проверку версий программ по сети"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|не возвращать более чем N результатов одного поиска"
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "проводить весь сетевой обмен через Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Настройки серверов HTTP"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "запретить использование HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 "игнорировать точки распространения списков отозванных сертификатов по HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|перенаправлять все запросы HTTP на URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "использовать системные настройки промежуточного сервера HTTP"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Настройки серверов HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|использовать север ключей по URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 "|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
 "по TLS"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Настройки серверов HTTP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "запретить использование LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 "игнорировать точки распространения списков отозванных сертификатов по LDAP"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|использовать хост HOST для поиска LDAP"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "не пользоваться запасными хостами с --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|искать ключи на данном сервере ключей"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|взять список серверов LDAP из файла FILE"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "добавлять новые серверы, обнаруженные в точках распространения списков "
 "отозванных сертификатов, в список серверов"
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|установить время ожидания LDAP N секунд"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "разрешить посылку запросов OCSP"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "игнорировать URL служб OCSP из сертификата"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|использовать ответчик OCSP по URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10576,11 +10654,11 @@
 "@\n"
 "(Полный список команд и параметров см. в руководстве \"info\")\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Вызов: @DIRMNGR@ параметры (-h - подсказка)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10588,103 +10666,103 @@
 "Синтаксис: @DIRMNGR@ параметры команда аргументы\n"
 "Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "допустимые уровни отладки: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "вызов: %s параметры "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "двоеточия в имени сокета недопустимы\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: слишком длинная строка - пропущена\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: обнаружен неверный отпечаток\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: ошибка чтения: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: мусор в конце строки игнорируется\n"
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "получен SIGUSR2 - действие не определено\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "получен SIGTERM - завершение работы ...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "получен SIGTERM - осталось %d активных соединений\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "принудительное выключение\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "получен SIGINT - немедленное завершение работы\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "получен сигнал %d - действие не определено\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "ошибка чтения '%s': статус HTTP %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' перенаправлен на '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "слишком много перенаправлений\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "перенаправление изменилось на '%s'\n"
@@ -10739,32 +10817,32 @@
 msgid "malloc failed: %s\n"
 msgstr "сбой malloc: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s' - не URL LDAP\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' - недопустимый URL LDAP\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search достиг предела сервера по размеру\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: задан пароль, но не задан пользователь\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: пропускаю эту строку\n"
@@ -10855,161 +10933,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "не подписано основным сертификатом подписывающего OCSP"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "сбой размещения элемента списка: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "ошибка при получении идентификатора ответчика: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "не найдено подходящего сертификата для проверки ответа OCSP\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "не найден сертификат издателя: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "вызывавший не вернул целевой сертификат\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "вызывавший не вернул издающий сертификат\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "сбой при выделении памяти под контекст OCSP: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "не определен основной ответчик OCSP\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "не определен основной подписывающий в OCSP\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "используется основной ответчик OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "используется ответчик OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "ошибка получения статуса OCSP для целевого сертификата: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "статус сертификата: %s (этот=%s, следующий=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "хороший"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "сертификат был отозван %s по причине: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "ответчик OCSP возвратил статус в будущем\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "ответчик OCSP возвратил нетекущий статус\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "ответчик OCSP возвратил слишком старый статус\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "сбой assuan_inquire(%s): %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "в идентификаторе сертификата нет серийного номера"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "сбой assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "сбой fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "ошибка отправки данных: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "сбой start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "сбой fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "превышено max_replies %d\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "сбой размещения контекста Assuan: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "сбой инициализации сервера: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "сбой регистрации команд с помощью Assuan: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема с приемом Assuan: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "сбой обработки Assuan: %s\n"
@@ -11020,87 +11098,87 @@
 msgstr ""
 "принимающий коренной удостоверяющий центр не помечен как удостоверяющий центр"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "слишком глубоко вложенная проверка списка отозванных сертификатов\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "не проверяю список отозванных сертификатов для"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "проверка списка отозванных сертификатов для"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "сбой при проверке доверенности корневого сертификата: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "хорошая цепочка сертификатов\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 "сертификат не следовало использовать для подписывания списка отозванных "
 "сертификатов\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "менее подробно"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "выводить данные в шестнадцатеричном виде"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "декодировать полученные строки данных"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "подключиться к dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "подключиться к dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|подключиться к сокету Assuan NAME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|подключиться к серверу Assuan по адресу ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "запустить сервер Assuan, заданный в командной строке"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "не пользоваться расширенным режимом подключения"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|выполнить при запуске команды из файла FILE"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "выполнить при запуске подстановку subst"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Вызов: @GPG@-connect-agent параметры (-h - подсказка)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11108,49 +11186,49 @@
 "Синтаксис: @GPG@-connect-agent: параметры\n"
 "Связывается с запущенным агентом и посылает команды\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "параметр \"%s\" требует программы и необязательных аргументов\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр \"%s\" игнорируется; причина - \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "сбой получения строки: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "слишком длинная строка - пропущена\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "строка сокращена из-за содержащегося в ней нулевого символа\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "неизвестная команда '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "сбой отправки строки: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "в этом сеансе dirmngr не работает\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
@@ -11212,12 +11290,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Обратите внимание, что спецификации групп игнорируются\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "ошибка закрытия '%s'\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "ошибка при интерпретации '%s'\n"
@@ -11322,90 +11400,110 @@
 "Синтаксис: gpg-check-pattern параметры файл_образцов\n"
 "Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Замечание: ключи уже хранятся на карте!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Замечание: ключи уже хранятся на карте!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "добавить сертификат в буфер"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "настроить KDF для проверки по PIN"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "добавить сертификат в буфер"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "добавить сертификат в буфер"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "выбрана недопустимая хеш-функция\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "недопустимые личные предпочтения шифра\n"
+
+#, fuzzy
+#~| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "принудительное использование симметричного шифра %s (%d) нарушает "
+#~ "предпочтения получателя\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "ошибка записи во временный файл: %s\n"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/sk.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/sk.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/sk.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/sk.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,7 +18,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
@@ -29,52 +29,52 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "nesprávne heslo"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,28 +85,28 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "heslo je príliš dlhé\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -116,273 +116,274 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nesprávne heslo"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr ""
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+msgid "Passphrases match."
+msgstr "nesprávne heslo"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je príliš dlhý\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je príliš dlhé\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak ve mene\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nesprávne MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nesprávne heslo"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, fuzzy, c-format
 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:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenájdený zapisovateľný súbor tajných kľúčov (secring): %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 msgid "error writing to pipe: %s\n"
 msgstr "chyba pri zápise súboru kľúčov (keyring) `%s': %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Vložiť heslo\n"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -390,7 +391,7 @@
 msgstr0 "Meno musí byť dlhé aspoň 5 znakov\n"
 msgstr1 "Meno musí byť dlhé aspoň 5 znakov\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -398,236 +399,242 @@
 msgstr0 ""
 msgstr1 ""
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Použiť napriek tomu tento kľúč? "
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "s dodatočnými informáciami"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "byť o trochu tichší"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovať databázu dôvery"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "nepodporované"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|použiť mód hesla N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "použite gpg-agenta"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -635,155 +642,155 @@
 "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:571
+#: agent/gpg-agent.c:580
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Použitie: gpg možnosti súbory (-h pre pomoc)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: adresár vytvorený\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, 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:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, 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:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: preskočené: %s\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, 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:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -793,19 +800,19 @@
 "Možnosti:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 #, 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -813,8 +820,8 @@
 "@Príkazy:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -824,86 +831,88 @@
 "Možnosti:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 #, 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 #, 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 #, 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 #, 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:735
+#: agent/protect-tool.c:733
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Zrušiť"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "tajné časti kľúča nie sú dostupné\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -916,19 +925,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -941,7 +950,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -951,48 +960,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 #, fuzzy
 msgid "Change passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, 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:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 msgid "Delete key"
 msgstr "nastaviť kľúč ako platný (enable)"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1003,8 +1021,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr ""
@@ -1014,7 +1032,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
@@ -1024,7 +1042,7 @@
 msgid "secret key parts are not available\n"
 msgstr "tajné časti kľúča nie sú dostupné\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1042,52 +1060,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
@@ -1108,28 +1126,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "nemôžem vypnúť vytváranie core súborov: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, 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:448
+#: common/sysutils.c:452
 #, 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:905
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ano"
 
@@ -1184,8 +1202,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
@@ -1200,74 +1218,74 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "nemožno previesť v dávkovom móde\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "nemožno previesť v dávkovom móde\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 msgid "connection to the agent established\n"
 msgstr "nemožno previesť v dávkovom móde\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "nemožno previesť v dávkovom móde\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "VAROVANIE: %s prepíše %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1351,7 +1369,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:4215
+#: scd/app-openpgp.c:4270
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1435,44 +1453,44 @@
 msgid "Root certificate trustworthy"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kľúč k dispozícii na: "
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 #, fuzzy
 msgid "Included certificates"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 #, fuzzy
 msgid "Unknown operation"
 msgstr "neznáma verzia"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 msgid "No help available for '%s'."
 msgstr "Pomoc nie je dostupná pre '%s'"
@@ -1482,12 +1500,12 @@
 msgid "ignoring garbage line"
 msgstr "chyba v pätičke\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "none"
 msgstr "neznáme"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatný znak vo formáte radix64 %02x bol preskočený\n"
@@ -1522,136 +1540,149 @@
 msgid "iconv_open failed: %s\n"
 msgstr "nemožno otvoriť súbor: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, 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:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "verejný kľúč %08lX nebol nájdený: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "chyba pri vytváraní `%s': %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "chyba pri čítaní `%s': %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII kódovanie: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "neplatná hlavička ASCII kódovania: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "ASCII hlavička: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "neplatná hlavička podpisu v čitateľnom formáte\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, fuzzy, c-format
 msgid "unknown armor header: "
 msgstr "ASCII hlavička: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "vnorené podpisy v čitateľnom formátu\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, fuzzy, c-format
 msgid "unexpected armor: "
 msgstr "neočakávané kódovanie ASCII:"
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "nesprávne označenie riadku mínusmi: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatný znak vo formáte radix64 %02x bol preskočený\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "predčasný koniec súboru (žiadne CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "predčasný koniec súboru (v CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "nesprávny formát CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, fuzzy, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "predčasný koniec súboru (v pätičke)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "chyba v pätičke\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatné kódovanie ASCII: riadok je dlhší ako %d znakov\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1659,13 +1690,13 @@
 "neplatný znak (quoted-printable) v ASCII kódovaní - pravdepodobne bol "
 "použitý nesprávny MTA\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "nie je v priamo čitateľnom formáte"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1674,27 +1705,27 @@
 "meno môže obsahovať len písmená, číslice, bodky, podčiarníky alebo medzery a "
 "končiť s '='\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota musí obsahovať znak '@'\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "hodnota musí obsahovať znak '@'\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahovať žiadne kontrolné znaky\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "hodnota musí obsahovať znak '@'\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1704,7 +1735,7 @@
 "meno môže obsahovať len písmená, číslice, bodky, podčiarníky alebo medzery a "
 "končiť s '='\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROVANIE: nájdený neplatný formát zápisu dátumu\n"
@@ -1718,8 +1749,8 @@
 msgid "Enter passphrase: "
 msgstr "Vložte heslo: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1730,13 +1761,13 @@
 msgid "error from TPM: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problém s agentom: agent vracia 0x%lx\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
@@ -1749,209 +1780,214 @@
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "vytvoriť revokačný certifikát"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, 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:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nemožno previesť v dávkovom móde\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, fuzzy, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Váš výber? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr ""
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "nespracované"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "žiadny zodpovedajúci verejný kľúč: %s\n"
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, 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:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizovať predvoľby"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1959,102 +1995,102 @@
 " key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Akú veľkosť kľúča si prajete? (1024) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrúhlené na %u bitov\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 msgid "Encryption key\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA (len na podpis)\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Neplatný výber.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2062,197 +2098,202 @@
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 #, 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 #, fuzzy
 msgid " (1) Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 #, fuzzy
 msgid " (2) Encryption key\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 #, 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:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Skutočne podpísať? "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ukončiť toto menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "ukázať túto pomoc"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Kľúč k dispozícii na: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeniť dobu platnosti"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Neplatný príkaz (skúste \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2314,9 +2355,9 @@
 msgid "subkey"
 msgstr "Verejné kľúče: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
@@ -2341,80 +2382,75 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, 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:136 g10/encrypt.c:683
+#, fuzzy, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "v móde S2K nemožno použiť symetrický ESK paket\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "použitá šifra %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "čítam z `%s'\n"
 
-#: g10/encrypt.c:777
-#, 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:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2422,18 +2458,13 @@
 msgstr ""
 "vyžiadaný kompresný algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zašifrovaný pre: %s\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2452,7 +2483,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2464,434 +2495,438 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problém so zašifrovaným paketom\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis bude označený ako neodvolateľný (non-revocable).\n"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:123
+#: g10/export.c:129
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "žiadne revokačné kľúče pre `%s' nenájdené\n"
 
-#: g10/export.c:125
+#: g10/export.c:131
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "nepoužiteľný tajný kľúč"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "vytvoriť revokačný certifikát"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+msgid "export secret keys using the GnuPG format"
+msgstr "zapisujem tajný kľúč do `%s'\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: preskočené: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kľúč %08lX: podpis subkľúča na zlom mieste - preskočené \n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, fuzzy, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kľúč %08lX: PGP 2.x kľúč - preskočené\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: nič nebolo vyexportované\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "chyba pri vytváraní `%s': %s\n"
-
 #: g10/getkey.c:252
 #, fuzzy
 msgid "User ID not found"
 msgstr "User id not found"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 #, fuzzy
 msgid "No fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 #, fuzzy
 msgid "make a signature"
 msgstr "vytvoriť podpis oddelený od dokumentu"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|súbor|vytvoriť podpis v čitateľnom dokumente"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "vytvoriť podpis oddelený od dokumentu"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "šifrovať dáta"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "šifrovanie len so symetrickou šifrou"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "dešifrovať dáta (implicitne)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "verifikovať podpis"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "vypísať zoznam kľúčov"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "vypísať zoznam kľúčov a podpisov"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolovať podpisy kľúčov"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "vypísať zoznam kľúčov a fingerprintov"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "vypísať zoznam tajných kľúčov"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "vytvoriť revokačný certifikát"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "odstrániť kľúč zo súboru verejných kľúčov"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "odstrániť kľúč zo súboru tajných kľúčov"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "podpísať kľúč"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "podpísať kľúč lokálne"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "podpísať kľúč"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "podpísať kľúč lokálne"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "podpísať alebo modifikovať kľúč"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeniť heslo"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exportovať kľúče"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exportovať kľúče na server kľúčov"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importovať kľúče zo servera kľúčov"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "vyhľadať kľúče na serveri kľúčov"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "aktualizovať všetky kľúče zo servera kľúčov"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importovať/zlúčiť kľúče"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "aktualizovať databázu dôvery"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo súbory|vypíš hash"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|MENO|šifrovať pre MENO"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "nevykonať žiadne zmeny"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "vyžiadať potvrdenie pred prepísaním"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "použiť kánonický textový mód"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 #, 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:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importovať kľúče zo servera kľúčov"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "skontrolovať podpisy kľúčov"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "vypísať zoznam tajných kľúčov"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|MENO|šifrovať pre MENO"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 #, 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:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2900,7 +2935,7 @@
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2930,13 +2965,13 @@
 " --list-keys mená vypísať kľúče\n"
 " --fingerprint mená vypísať fingerprinty\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -2951,7 +2986,7 @@
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2959,578 +2994,572 @@
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Verejné kľúče: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Šifry: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 msgid "usage: %s options %s\n"
 msgstr "použitie: gpg možnosti "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, 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:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, 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:1719
+#: g10/gpg.c:1728
 #, 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:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, 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:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, 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:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, 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:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, 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:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 #, 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:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "V súbore tajných kľúčov chýba zodpovedajúci podpis\n"
+
+#: g10/gpg.c:2096
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "ukáž v ktorom súbore kľúčov je vypísaný kľúč"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 #, 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:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "nastaviť zoznam predvolieb"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, 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:3354
+#: g10/gpg.c:3367
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prepíše %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedáva s %s zmysel!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "vybraný hashovací algoritmus je neplatný\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, 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:3984
+#: g10/gpg.c:4002
 #, 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:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné defaultné predvoľby\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "neplatná dĺžka kľúča; použijem %u bitov\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ešte nepracuje s %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo poslať kľúč na server: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prijať kľúč zo servera: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export kľúča: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa nájsť server: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualizácia servera zlyhala: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Začnite písať svoju správu ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pre certifikačnú politiku je neplatné\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@ -3544,7 +3573,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt časového razítka"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapísať informácie o stave do tohto FD"
 
@@ -3575,341 +3604,346 @@
 msgid "No help available for '%s'"
 msgstr "Pomoc nie je dostupná pre '%s'"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 msgid "do not clear the ownertrust values during import"
 msgstr "aktualizovať databázu dôvery"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualizovať databázu dôvery"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "not supported"
 msgid "enable bulk import mode"
 msgstr "nepodporované"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 msgid "show key during import"
 msgstr "vypísať fingerprint"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 msgid "show key but do not actually import"
 msgstr "vypísať fingerprint"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "nepoužiteľný tajný kľúč"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr ""
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 msgid "repair keys on import"
 msgstr "vypísať fingerprint"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol preskočený\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kľúče boli doteraz spracované\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovaných kľúčov: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " preskočené nové kľúče: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " preskočené nové kľúče: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " bez identifikátorov: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importované: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " bez zmien: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nové id užívateľov: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nové podkľúče: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nové podpisy: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " nové revokácie kľúčov: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " prečítané tajné kľúče: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " importované tajné kľúče: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " tajné kľúče nezmenené: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " neimportované: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, fuzzy, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " nové podpisy: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, fuzzy, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " prečítané tajné kľúče: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "preskočený `%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kľúč %08lX: HKP poškodenie podkľúča opravené\n"
 
 # c-format
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "kľúč %08lX: prijaté id užívateľa '%s', ktorý nie je podpísaný ním samým\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kľúč %08lX: chýba platný identifikátor užívateľa\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kľúč %08lX: verejný kľúč nenájdený: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kľúč %08lX: nový kľúč - preskočený\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenájdený zapisovateľný súbor kľúčov (keyring): %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "chyba pri zápise súboru kľúčov (keyring) `%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kľúč %08lX: verejný kľúč \"%s\" importovaný\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kľúč %08lX: nezodpovedá našej kópii\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kľúč %08lX: \"%s\" 1 nový identifikátor užívateľa\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kľúč %08lX: \"%s\" 1 nový podpis\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kľúč %08lX: \"%s\" 1 nový podkľúč\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kľúč %08lX: \"%s\" %d nových podkľúčov\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kľúč %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kľúč %08lX: tajný kľúč importovaný\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3918,204 +3952,204 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Dôvod nebol špecifikovaný"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Kľúč je nahradený"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Kľúč bol skompromitovaný"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Kľúč sa už nepoužíva"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Identifikátor užívateľa už neplatí"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "dôvod na revokáciu: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revokačná poznámka: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, 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:3547
+#: g10/import.c:3643
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kľúč %08lX: \"%s\" revokačný certifikát importovaný\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, 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:3684
+#: g10/import.c:3780
 #, 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:3699
+#: g10/import.c:3795
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kľúč %08lX: neplatná väzba podkľúča\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, 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:3742
+#: g10/import.c:3838
 #, 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:3755
+#: g10/import.c:3851
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kľúč %08lX: neplatný revokačný podkľúč\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, 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:3814
+#: g10/import.c:3913
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kľúč %08lX: identifikátor užívateľa preskočený '"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kľúč %08lX: podkľúč preskočený\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, 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:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "kľúč %08lX: zistený duplikovaný identifikátor užívateľa - zlúčený\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kľúč %08lX: pridaný revokačný certifikát \"%s\"\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, 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"
@@ -4125,35 +4159,35 @@
 msgid "error allocating memory: %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 msgid " (reordered signatures follow)"
 msgstr "Dobrý podpis od \""
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 msgid "key %s:\n"
 msgstr "preskočený `%s': %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "Užívateľské ID \"%s\" je revokované."
 msgstr1 "Užívateľské ID \"%s\" je revokované."
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4161,7 +4195,7 @@
 msgstr0 "1 podpis neoverený, pretože chýba kľúč\n"
 msgstr1 "1 podpis neoverený, pretože chýba kľúč\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4169,61 +4203,61 @@
 msgstr0 "%d zlých podpisov\n"
 msgstr1 "%d zlých podpisov\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "Dobrý podpis od \""
 msgstr1 "Dobrý podpis od \""
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, 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:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "súbor kľúčov (keyring) `%s' vytvorený\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, 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:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "revokácia"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "podpis kľúča ním samým"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4236,68 +4270,68 @@
 "kontrolou fingerprintov z rôznych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, fuzzy, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Dôverujem čiastočne\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Dôverujem úplne\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si istý, že stále chcete podpísať tento kľúč? (a/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Nemožno podpísať.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID užívateľa \"%s\" nie je podpísané ním samým."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "ID užívateľa \"%s\" nie je podpísané ním samým."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skutočne podpísať? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4306,11 +4340,11 @@
 "Podpis kľúča \"%s\" ním samým je\n"
 "podpis vo formáte PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeniť na formát OpenPGP? (a/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4320,11 +4354,11 @@
 "je len lokálny.\n"
 "\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnosť Vášho podpisu vypršala v rovnakom čase? (A/n) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4334,43 +4368,43 @@
 "je len lokálny.\n"
 "\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeniť na plne exportovateľný podpis? (a/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je už lokálne podpísaný kľúčom %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je už podpísaný kľúčom %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si istý, že stále chcete podpísať tento kľúč? (a/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nič na podpísanie kľúčom %08lX\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Platnosť kľúča vypršala!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnosť kľúča vyprší %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnosť Vášho podpisu vypršala v rovnakom čase? (A/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4380,32 +4414,32 @@
 "patrí vyššie uvedenej osobe?\n"
 "Pokiaľ nepoznáte odpoveď, zadajte \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Vôbec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Čiastočne som to overil(a).%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Veľmi dôkladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Váš výber? ('?' - viac informácií): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4414,28 +4448,28 @@
 "Ste si istý, že chcete podpísať tento kľúč\n"
 "svojím kľúčom: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis kľúča ním samým\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude označený ako neexportovateľný.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude označený ako neodvolateľný (non-revocable).\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -4443,247 +4477,256 @@
 "Podpis bude označený ako neexportovateľný.\n"
 "\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude označený ako neodvolateľný (non-revocable).\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Vôbec som tento kľúč neoveril.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Čiastočne som overil tento kľúč.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi dôkladne som overil tento kľúč.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skutočne podpísať? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "uložiť a ukončiť"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Podpisová notácia: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "vypísať zoznam kľúčov a id užívateľov"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "vyberte identifikátor užívateľa N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifikátor užívateľa N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 #, fuzzy
 msgid "check signatures"
 msgstr "revokovať podpisy"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podpísať kľúč lokálne"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Nápoveda: Vyberte id užívateľa na podpísanie\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "pridať identifikátor užívateľa"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "pridať fotografické ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmazať identifikátor užívateľa"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmazať sekundárny kľúč"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "pridať revokačný kľúč"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr ""
+
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "označiť užívateľské ID ako primárne"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "vypísať zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "vypísať zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "zmeniť heslo"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skutočne revokovať všetky vybrané id užívateľa? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokovať identifikátor užívateľa"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokovať sekundárny kľúč"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 #, fuzzy
 msgid "enable key"
 msgstr "nastaviť kľúč ako platný (enable)"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 #, fuzzy
 msgid "disable key"
 msgstr "nastaviť kľúč ako neplatný (disable)"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "ukázať fotografické ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Tajný kľúč je dostupný.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Tajný kľúč je dostupný.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto operácie je potrebný tajný kľúč.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4691,309 +4734,299 @@
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Kľúč revokovaný."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Skutočne podpísať všetky id užívateľa? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skutočne podpísať všetky id užívateľa? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápoveda: Vyberte id užívateľa na podpísanie\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "neznáma trieda podpisu"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Musíte vybrať aspoň jedno id užívateľa.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Nemôžete zmazať posledné id užívateľa!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skutočne odstrániť všetky vybrané id užívateľa? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skutočne odstrániť toto id užívateľa? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skutočne odstrániť toto id užívateľa? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrať aspoň jeden kľúč.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Musíte vybrať aspoň jeden kľúč.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skutočne chcete zmazať vybrané kľúče? "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skutočne chcete zmazať tento kľúč? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skutočne revokovať všetky vybrané id užívateľa? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skutočne revokovať toto id užívateľa? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skutočne chcete revokovať tento kľúč? "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skutočne chcete revokovať vybrané kľúče? "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skutočne chcete revokovať tento kľúč? "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastaviť zoznam predvolieb"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skutočne aktualizovať predvoľby? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Uložiť zmeny? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukončiť bez uloženia? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "kľúč nebol zmenený, takže nie je potrebné ho aktualizovať.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Takýto identifikátor užívateľa neexistuje.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nič na podpísanie kľúčom %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr " podpísané %08lX v %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Charakteristiky: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 #, fuzzy
 msgid "Notations: "
 msgstr "Notácie: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citlivá informácia)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revokované"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " platnosť skončí: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " platnosť skončí: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Tento kľúč bol označený za neplatný (disabled)"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5001,19 +5034,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 #, fuzzy
 msgid "revoked"
 msgstr "revokované"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5022,18 +5055,23 @@
 "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:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5042,35 +5080,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmazať tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmazať tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmazať tento neznámy podpis? (a/N/u)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skutočne zmazať tento podpis podpísaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5078,38 +5116,38 @@
 msgstr0 "Zmazaný %d podpis.\n"
 msgstr1 "Zmazaný %d podpis.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Nič nebolo zmaznané.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid "invalid"
 msgstr "neplatný spôsob reprezentácie v ASCII"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "Užívateľské ID \"%s\" je revokované."
 msgstr1 "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5118,308 +5156,323 @@
 "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:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 #, 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:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(pokiaľ neurčíte kľúč jeho fingerprintom)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "užívateľské ID \"%s\" je už revokované\n"
+
+#: g10/keyedit.c:5007
 #, 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:4726
+#: g10/keyedit.c:5012
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľúča.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kľúča.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľúča.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, 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:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte práve jedno id užívateľa.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 #, 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:5384
+#: g10/keyedit.c:5672
 #, 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:5449
+#: g10/keyedit.c:5737
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisová notácia: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prepísať (a/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, 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:5829
+#: g10/keyedit.c:6117
 #, 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:5851
+#: g10/keyedit.c:6139
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id užívateľa: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnosť podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvoriť pre tento podpis revokačný certifikát? (a/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr " revokované %08lX v %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte sa revokovať tieto podpisy:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skutočne vytvoriť revokačné certifikáty? (a/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný kľúč\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis kľúča ním samým (direct signature)\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapisujem podpis kľúča sebou samým\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná dĺžka kľúča; použijem %u bitov\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dĺžka kľúča zaokrúhlená na %u bitov\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 #, fuzzy
 msgid "Encrypt"
 msgstr "šifrovať dáta"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr ""
 
@@ -5433,179 +5486,179 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%d) ElGamal (len na šifrovanie)\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal (len na šifrovanie)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) RSA (pro šifrování a podpis)\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "dešifrovať dáta (implicitne)"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, 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:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) RSA (len na šifrovanie)\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Podpisová notácia: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, 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:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "nastaviť kľúč ako neplatný (disable)"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Požadovaná dĺžka kľúča je %u bitov.\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5621,7 +5674,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:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5637,40 +5690,40 @@
 " <n>m = doba platnosti podpisu skončí za n mesiacov\n"
 " <n>y = doba platnosti podpisu skončí za n rokov\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Kľúč je platný na? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platný na? (0) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnosť %s neskončí\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnosť %s neskončí\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnosť %s skončí %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5678,12 +5731,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:2904
+#: g10/keygen.c:2888
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to správne (a/n)? "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5694,7 +5747,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:2987
+#: g10/keygen.c:2971
 #, fuzzy
 msgid ""
 "\n"
@@ -5711,42 +5764,42 @@
 " \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve mene\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Komentár: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentári\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5757,11 +5810,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5776,35 +5829,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Najskôr, prosím, opravte chybu\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5816,18 +5869,18 @@
 "používať disky); vďaka tomu má generátor lepšiu šancu získať dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5835,67 +5888,67 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Použiť napriek tomu tento kľúč? "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Vytváranie kľúča bolo zrušené.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, 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:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "verejný a tajný kľúč boli vytvorené a podpísané.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption. You may want to use\n"
@@ -5904,7 +5957,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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5912,7 +5965,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:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5920,23 +5973,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:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skutočne vytvoriť? "
@@ -5945,27 +5998,43 @@
 msgid "never "
 msgstr "nikdy "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Charakteristiky: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kritická podpisová politika: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Podpisová politika: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kritická podpisová notácia: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Podpisová notácia: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -5973,7 +6042,7 @@
 msgstr0 "%d zlých podpisov\n"
 msgstr1 "%d zlých podpisov\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -5981,41 +6050,41 @@
 msgstr0 "1 podpis neoverený, pretože vznikla chyba\n"
 msgstr1 "1 podpis neoverený, pretože vznikla chyba\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "súbor kľúčov (keyring)"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Primárny fingerprint kľúča:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " Primárny fingerprint kľúča:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Fingerprint podkľúča:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 #, fuzzy
 msgid " Key fingerprint ="
 msgstr " Fingerprint kľúča ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr ""
 
@@ -6095,340 +6164,346 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "požadujem kľúč %08lX z %s\n"
 msgstr1 "požadujem kľúč %08lX z %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "požadujem kľúč %08lX z %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 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:1619
+#: g10/keyserver.c:1621
 #, 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:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "požadujem kľúč %08lX z %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, 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:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s kľúč šifrovaného sedenia\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s zašifrované dáta\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejný kľúč je %08lX\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 msgid "encrypted with %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:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, 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:540
+#: g10/mainproc.c:572
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrovaná %s kľúčom, ID %08lX\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrované s %lu heslami\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrované jedným heslom\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrovanie verejným kľúčom zlyhalo: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, 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:653 g10/mainproc.c:674
+#: 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:660
+#: 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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: správa nemá ochranu integrity\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrovanie o.k.\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so zašifrovanou správou bolo manipulované!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pôvodné meno súboru='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZLÝ podpis od \""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršanou platnosťou od \""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikácia podpisu potlačená\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, 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:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, 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:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 msgid " issuer \"%s\"\n"
 msgstr " alias \""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Kľúč k dispozícii na: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "neistý "
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid " aka \"%s\""
 msgstr " alias \""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binárne"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "textový mód"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "neznáme"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "neznámy algoritmus verejného kľúča"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemôžem overiť podpis: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelený od dokumentu\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, 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:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
@@ -6533,27 +6608,27 @@
 msgid "uncompressed|none"
 msgstr "Nekomprimované"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "čítam možnosti z `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "neznáma trieda podpisu"
@@ -6611,7 +6686,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d má nastavený kritický bit\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 msgid "Please enter the passphrase for decryption."
 msgstr "zmeniť heslo"
@@ -6675,7 +6750,7 @@
 "%s"
 msgstr "dĺžka %u bitov, typ %s, ID %08lX, vytvorený %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6690,73 +6765,73 @@
 "Ak použijete veľmi veľký obrázok, kľúč bude tiež veľký! Odporúčaná veľkosť\n"
 "obrázka je okolo 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Meno súbor s fotografiou vo formáte JPEG: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "nemožno otvoriť súbor: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Ste si istý, že ho chcete použiť? (a/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\" nie je súbor JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je táto fotografia správna (a/N/u)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "žiadne vzialené vykonávanie programu nie je podporované\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "táto platforma potrebuje dočasné súbory na spustenie externého programu\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "nemožno spustiť %s \"%s\": %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "nekorektné ukončenie externého programu\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systémová chyba pri volaní externého programu: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "VAROVANIE: nemôžem vymazať dočasný súbor (%s) `%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "VAROVANIE: nemôžem vymazať dočasný adresár `%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6764,7 +6839,7 @@
 "volanie externého programu zrušené kvôli nebezpečným právam súboru "
 "nastavení\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
@@ -6851,34 +6926,34 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikáty vedúce k finálnemu dôveryhodnému kľúču:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Nič nenaznačuje tomu, že tento podpis patrí vlastníkovi kľúča.\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Nič nenaznačuje tomu, že tento podpis patrí vlastníkovi kľúča.\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, fuzzy, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento kľúč pravdepodobne patrí jeho majiteľovi\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Tento kľúč patrí nám (máme zodpovedajúci tajný kľúč)\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr ""
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 msgid ""
 "This key is bad! It has been marked as untrusted! If you\n"
@@ -6890,7 +6965,7 @@
 "odpovedať áno\n"
 "\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -6902,100 +6977,100 @@
 "odpovedať áno\n"
 "\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Použiť napriek tomu tento kľúč? "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROVANIE: Je použitý nedôveryhodný kľúč!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROVANIE: kľúč môže byť revokovaný (revokačný kľúč neexistuje)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "id užívateľa: \""
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "kľúč %08lX: nezodpovedá našej kópii\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROVANIE: Tento kľúč bol revokovaný jeho určeným revokátorom/!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento kľúč bol revokovaný jeho vlastníkom!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, fuzzy, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " To môže znamenať, že podpis je falošný.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento podkľúč bol revokovaný jeho vlastníkom!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Poznámka: Tento kľúč bol označený ako neplatný (disabled).\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Poznámka: Skončila platnosť tohto kľúča!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "VAROVANIE: Tento kľúč nie certifikovaný dôveryhodným podpisom!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROVANIE: Tento kľúč nie certifikovaný dôveryhodným podpisom!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Nič nenaznačuje tomu, že tento podpis patrí vlastníkovi kľúča.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROVANIE: NEdôverujeme tomuto kľúču!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Tento podpis je pravdepodobne FALOŠNÝ.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7006,7 +7081,7 @@
 "VAROVANIE: Tento kľúč nie je certifikovaný dostatočne dôveryhodnými "
 "podpismi!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7014,52 +7089,52 @@
 "VAROVANIE: Tento kľúč nie je certifikovaný dostatočne dôveryhodnými "
 "podpismi!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Nie je isté, že tento podpis patrí vlastníkovi.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: preskočené: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: preskočené: verejný kľúč je neplatný (disabled)\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: preskočené: verejný kľúč je už obsiahnutý v databáze\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "nemôžem sa pripojiť k `%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nešpecifikovali ste identifikátor užívateľa (user ID). Môžete použiť \"-r\"\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7067,40 +7142,40 @@
 "\n"
 "Napíšte identifikátor užívateľa (user ID). Ukončite prázdnym riadkom: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Takýto identifikátor užívateľa neexistuje.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "preskočené: verejný kľúč je už nastavený podľa implicitného adresáta\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Verejný kľúč je neplatný (disabled).\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "preskočené: verejný kľúč je už nastavený\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "žiadne platné adresy\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, 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:1760
+#: g10/pkclist.c:1786
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
@@ -7139,7 +7214,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nemôžem otvoriť podpísané dáta '%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
@@ -7362,7 +7437,7 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr ""
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
@@ -7370,47 +7445,42 @@
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROVANIE: konflikt hashu podpisu v správe\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROVANIE: podpisovací podkľúč %08lX nie je krížovo certifikovaný\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = prosím o viac informácíi\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROVANIE: podpisovací podkľúč %08lX má neplatnú krížovú certifikáciu\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, 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"
 msgstr0 "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
 msgstr1 "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, 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"
 msgstr0 "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
 msgstr1 "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7423,7 +7493,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/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7435,53 +7505,53 @@
 "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/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "POZNÁMKA: podpisovému kľúču %08lX skončila platnosť %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "POZNÁMKA: kľúč bol revokovaný"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kľúč %08lX: neexistuje podkľúč pre viazanie podkľúčov\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "VAROVANIE: nemožno %%-expandovať notácie (príliš dlhé). Použité "
 "neexpandované.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7489,7 +7559,7 @@
 "VAROVANIE: nemôžem %%-expandovať URL politiky (príliš dlhé). Použité "
 "neexpandované.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7498,24 +7568,24 @@
 "VAROVANIE: nemôžem %%-expandovať URL politiky (príliš dlhé). Použité "
 "neexpandované.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, 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:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7600,134 +7670,134 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "nemožno otvoriť `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, 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:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, 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"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transakcia s databázou dôvery je príliš dlhá\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adresár neexistuje!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvoriť záznam verzie: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvorená neplatná databáza dôvery\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: databáza dôvery vytvorená\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatná databáze dôvery\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualizácii záznamu verzie: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri čítaní záznamu verzie: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri zápise záznamu verzie: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "databáze dôvery: procedúra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, 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:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je súbor databázy dôvery\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: záznam verzie s číslom %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatná verzia súboru %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, 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:1827
+#: g10/tdbio.c:1797
 #, 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:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie záznamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie záznamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: databáza dôvery vytvorená\n"
@@ -8160,7 +8230,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutné kontrolovať databázu dôvery\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dalšia kontrola databázy dôvery %s\n"
@@ -8190,14 +8260,14 @@
 msgid "checking the trustdb\n"
 msgstr "kontrolujem databázu dôvery\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "%lu kľúče boli doteraz spracované\n"
 msgstr1 "%lu kľúče boli doteraz spracované\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8205,23 +8275,23 @@
 msgstr0 "%d kľúčov spracovaných (%d počtov platnosti vymazaných)\n"
 msgstr1 "%d kľúčov spracovaných (%d počtov platnosti vymazaných)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli nájdené žiadne absolútne dôveryhodné kľúče\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, 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"
@@ -8295,7 +8365,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8306,12 +8376,12 @@
 "Prosím, nezabúdajte, že súbor s podpisom (.sig alebo .asc)\n"
 "by mal byť prvým súborom zadaným na príkazovom riadku.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupný riadok %u je príliš dlhý alebo na konci chýba znak LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
@@ -8327,20 +8397,20 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "čítam možnosti z `%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 #, fuzzy
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Použitie: gpg možnosti súbory (-h pre pomoc)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 msgid ""
 "Syntax: kbxutil options files\n"
@@ -8350,16 +8420,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8394,10 +8464,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8417,158 +8487,158 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "vytvoriť nový pár kľúčov"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "Vytvorenie kľúča sa nepodarilo: %s\n"
 msgstr1 "Vytvorenie kľúča sa nepodarilo: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 #, 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "zmeniť heslo"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Poznámka: Tento kľúč bol označený ako neplatný (disabled).\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "zmeniť heslo"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 #, 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:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, 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:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
@@ -8576,43 +8646,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo poslať kľúč na server: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8620,22 +8690,22 @@
 msgstr0 ""
 msgstr1 ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 #, 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:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8643,81 +8713,81 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "chyba pri čítaní bloku kľúča: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, 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:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "toto URI nie je podporované"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
@@ -8738,7 +8808,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8787,333 +8857,333 @@
 msgid "deny the use of admin card commands"
 msgstr "konfliktné príkazy\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Použitie: gpg možnosti súbory (-h pre pomoc)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, 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/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 #, fuzzy
 msgid "shell"
 msgstr "help"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, fuzzy, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, fuzzy, c-format
 msgid "certificate policy not allowed"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZNÁMKA: kľúč bol revokovaný"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Platnosť kľúča vypršala!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Platnosť kľúča vypršala!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Platnosť kľúča vypršala!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Platnosť kľúča vypršala!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, fuzzy, c-format
 msgid " ( signature created at "
 msgstr " nové podpisy: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, fuzzy, c-format
 msgid " (certificate created at "
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, fuzzy, c-format
 msgid " (certificate valid from "
 msgstr "nesprávny certifikát"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "vypísať fingerprint"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvoriť revokačný certifikát"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifikovať podpis"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "nesprávny certifikát"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, c-format
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "nespracované"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "nie"
@@ -9136,7 +9206,7 @@
 msgid "Error - invalid DN"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9149,42 +9219,42 @@
 "\"%.*s\"\n"
 "kľúč s dĺžkou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "nesprávny certifikát"
@@ -9410,19 +9480,19 @@
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # kw
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "zašifrovaná %s kľúčom, ID %08lX\n"
@@ -9432,7 +9502,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "chyba pri čítaní bloku kľúča: %s\n"
@@ -9457,136 +9527,136 @@
 msgid "no valid recipients given\n"
 msgstr "(Žiadny popis)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 #, fuzzy
 msgid "list external keys"
 msgstr "vypísať zoznam tajných kľúčov"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 #, fuzzy
 msgid "import certificates"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "export certificates"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "vôbec nepoužívať terminál"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 #, 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:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|použiť šifrovací algoritmus ALG"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|použiť hashovací algoritmus ALG"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy sa na nič nepýtať"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "automaticky odpovedať áno na väčšinu otázok"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "automaticky odpovedať NIE na väčšinu otázok"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ options files\n"
@@ -9597,27 +9667,27 @@
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9637,7 +9707,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
@@ -9647,47 +9717,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problém overenia revokácie: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9717,7 +9787,7 @@
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9732,59 +9802,59 @@
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Podpis vytvorený %.*s pomocou %s kľúča ID %08lX\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, fuzzy, c-format
 msgid "Signature made "
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr ""
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 msgid "algorithm:"
 msgstr "ASCII kódovanie: %s\n"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Dobrý podpis od \""
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, fuzzy, c-format
 msgid " aka"
 msgstr " alias \""
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9811,588 +9881,583 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr ""
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr "vypísať fingerprint"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "nesprávny certifikát"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, fuzzy, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "vytvoriť revokačný certifikát"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, 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:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "chyba v pätičke\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, fuzzy, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 msgid "removing cache file '%s'\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, fuzzy, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, fuzzy, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, fuzzy, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, fuzzy, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, fuzzy, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, fuzzy, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, fuzzy, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, fuzzy, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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:936
-#, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "chyba pri čítaní `%s': %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, fuzzy, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, fuzzy, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, fuzzy, c-format
 msgid "opening cache file '%s'\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, fuzzy, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, fuzzy, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, 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:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, 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
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "vytvoriť revokačný certifikát"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, 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:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, 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:2568
+#: dirmngr/crlcache.c:2597
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problém overenia revokácie: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
@@ -10407,24 +10472,24 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
@@ -10580,142 +10645,142 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 #, 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"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, 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:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10729,115 +10794,115 @@
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, fuzzy
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Použitie: gpg možnosti súbory (-h pre pomoc)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 msgid "usage: %s options "
 msgstr "použitie: gpg možnosti "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "riadok je príliš dlhý\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "chyba: neplatný odtlačok\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "chyba pri čítaní: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nespracované"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10893,32 +10958,32 @@
 msgid "malloc failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, fuzzy, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "\"%s\" nie je súbor JPEG\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = preskočiť tento kľúč\n"
@@ -11010,164 +11075,164 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "kľúč `%s' nebol nájdený: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "vytvoriť revokačný certifikát"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "nie je nastavený implicitný súbor tajných kľúčov %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "použitá šifra %s\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "POZNÁMKA: kľúč bol revokovaný"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11178,135 +11243,135 @@
 msgid "accepting root CA not marked as a CA"
 msgstr ""
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "kontrolujem databázu dôvery\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 msgid "checking CRL for"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 msgid "certificate chain is good\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "ukončiť"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "riadok je príliš dlhý\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
@@ -11372,12 +11437,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba pri čítaní `%s': %s\n"
@@ -11486,88 +11551,105 @@
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "preskočené: tajný kľúč je už v databáze\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "preskočené: tajný kľúč je už v databáze\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "zmeniť dobu platnosti"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Revokačný certifikát bol vytvorený.\n"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "vybraný hashovací algoritmus je neplatný\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
+
+#, fuzzy
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
+
+#, fuzzy
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "zapisujem do '%s'\n"
 
@@ -12227,10 +12309,6 @@
 #~ msgstr "prepnúť medzi vypísaním zoznamu tajných a verejných kľúčov"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "nesprávne heslo"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "VAROVANIE: nastavenie v `%s' ešte nie je aktívne\n"
 
@@ -13182,9 +13260,6 @@
 #~ msgid "delete signatures"
 #~ msgstr "zmazať podpisy"
 
-#~ msgid "set preference list"
-#~ msgstr "nastaviť zoznam predvolieb"
-
 #~ msgid "updated preferences"
 #~ msgstr "aktualizovať predvoľby"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/sv.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/sv.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/sv.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/sv.po Changed

@@ -24,7 +24,7 @@
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
@@ -45,59 +45,59 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "_Avbryt"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "PIN-kod:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Avbryt"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Ange ny lösenfras"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -108,7 +108,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -122,14 +122,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -137,7 +137,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -147,7 +147,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@ -156,7 +156,7 @@
 "och specialtecken. Fråga din administratör om mer exakt information hur\n"
 "man anger säkra lösenfraser."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -164,84 +164,90 @@
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 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:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase"
+msgid "Passphrases match."
+msgstr "Lösenfras"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fel när serienumret hämtades från kortet: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -252,7 +258,7 @@
 msgstr ""
 "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
@@ -260,68 +266,68 @@
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, 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:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, 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:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen lämplig kortnyckel hittades: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Ange lösenfrasen för ssh-nyckeln%0A %c"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -330,85 +336,81 @@
 "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A %s%%0Ai "
 "gpg-agents nyckellager"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Mata in kortet med serienummer"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin PIN-kod"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK-kod"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Nollställ kod"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's keypad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AAnvänd läsarens knappsats för inmatning."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Upprepa denna nollställningskod"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Upprepa denna PUK-kod"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Upprepa denna PIN-kod"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nollställningskoden repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK-koden repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "fel vid skrivning till %s: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Ange ny lösenfras"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Du har inte angivit en lösenfras!%0AEn tom lösenfras tillåts inte."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -417,11 +419,11 @@
 "Du har inte angivet en lösenfras - det här är oftast en dålig idé!"
 "%0ABekräfta att du inte vill ha något som helst skydd för din nyckel."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Ja, skydd behövs inte"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -429,7 +431,7 @@
 msgstr0 "Namnet måste vara åtminstone 5 tecken långt\n"
 msgstr1 "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -447,7 +449,7 @@
 "Varning: Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska "
 "innehålla minst %u tecken eller%%0Aspecialtecken."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -457,7 +459,7 @@
 "Varning: Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras får "
 "inte vara ett känd ord eller matcha%%0Avissa mönster."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -470,243 +472,249 @@
 "Varning: Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska "
 "vara minst %u tecken lång."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Ta den här ändå"
 
 # fel kapitalisering i originalet?
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, 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:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Flaggor användbara för felsökning"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, 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:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable ssh-agent emulation"
+msgid "enable Win32-OpenSSH support"
+msgstr "aktivera ssh-agent-emulering"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, 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:252
+#: agent/gpg-agent.c:259
 #, 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:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "tillåt inte att gå förbi lösenfraspolicyn"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|ställ in minimal nödvändig längd för nya lösenfraser till N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|kräv minst N icke-alfabetiska tecken för en ny lösenfras"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillåt inte återanvändning av gamla lösenfraser"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 #, 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:573
+#: agent/gpg-agent.c:582
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent options command args\n"
@@ -718,156 +726,156 @@
 "Syntax: gpg-agent flaggor kommando argument\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, 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:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, 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:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, 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:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, 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:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, 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:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, 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:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, 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:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, 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:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, 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:2388
+#: agent/gpg-agent.c:2416
 #, 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:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, 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:2750
+#: agent/gpg-agent.c:2871
 #, 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:2755
+#: agent/gpg-agent.c:2876
 #, 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:2830
+#: agent/gpg-agent.c:2951
 #, 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:2835
+#: agent/gpg-agent.c:2956
 #, 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:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, 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:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -876,12 +884,12 @@
 " "
 
 # KEYGRIP är ett hexadecimalt värde som representerar hashen för den publika nyckeln
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -889,8 +897,8 @@
 "Syntax: gpg-preset-passphrase flaggor NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -899,8 +907,8 @@
 " "
 
 # 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/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -910,11 +918,11 @@
 "Flaggor:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 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:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -922,22 +930,22 @@
 "Syntax: gpg-protect-tool flaggor argument\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 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:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -945,59 +953,61 @@
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, fuzzy, c-format
 #| msgid "file `%s', line %d: %s\n"
 msgid "file '%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, 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:207
+#: agent/trustlist.c:226
 #, 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:251
+#: agent/trustlist.c:270
 #, 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:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, 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:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, 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:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
@@ -1010,7 +1020,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -1019,11 +1029,11 @@
 "Litar du förbehållslöst på%%0A \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Nej"
@@ -1036,7 +1046,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -1048,22 +1058,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Fel"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -1072,15 +1082,24 @@
 "Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s. Du bör ändra "
 "den nu."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "ändra lösenfras"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Jag ändrar den senare"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Mata in kortet med serienummer"
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1766
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1088,13 +1107,13 @@
 "%%0A?"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "aktivera nyckel"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1105,8 +1124,8 @@
 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:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
@@ -1117,7 +1136,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:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
@@ -1127,7 +1146,7 @@
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1145,13 +1164,13 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, fuzzy, c-format
@@ -1159,43 +1178,43 @@
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, fuzzy, c-format
 #| msgid "error running `%s': probably not installed\n"
 msgid "error running '%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error running '%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, fuzzy, c-format
 #| msgid "error running `%s': terminated\n"
 msgid "error running '%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
@@ -1216,31 +1235,31 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, 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:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, 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:931
+#: common/sysutils.c:911
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ja"
 
@@ -1294,8 +1313,8 @@
 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:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
@@ -1311,82 +1330,82 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "väntar %d sekunder för att agenten ska komma igång\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "väntar %d sekunder för att agenten ska komma igång\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "väntar %d sekunder för att agenten ska komma igång\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, fuzzy, c-format
 #| msgid "can't connect to the dirmngr - trying fall back\n"
 msgid "connection to the dirmngr established\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "can't connect to the dirmngr - trying fall back\n"
 msgid "connection to the keyboxd established\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "can't connect to the dirmngr - trying fall back\n"
 msgid "connection to the agent established\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running dirmngr - starting `%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "ingen körande dirmngr - startar \"%s\"\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "can't connect to the dirmngr - trying fall back\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1460,7 +1479,7 @@
 msgstr "algoritm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmen stöds inte: %s"
@@ -1535,39 +1554,39 @@
 msgid "Root certificate trustworthy"
 msgstr "rotcertifikatet är pålitligt"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "ingen spärrlista hittades för certifikatet"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "den tillgängliga spärrlistan är för gammal"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP-kontroll av certifikat"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Inkluderade certifikat"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Inga poster i granskningslogg."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Okänd åtgärd"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent användbar"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr användbar"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, fuzzy, c-format
 #| msgid "No help available for `%s'."
 msgid "No help available for '%s'."
@@ -1577,12 +1596,12 @@
 msgid "ignoring garbage line"
 msgstr "ignorerar skräprad"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "ingen"
 
 # överhoppad eller hoppades över?
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
@@ -1618,143 +1637,157 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open misslyckades: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, 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:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, 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:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "tar bort gammal låsfil (skapad av %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, 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:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(dödläge?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, 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:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "väntar på låset %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "Fel när \"%s\" skapades: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, fuzzy, c-format
+#| msgid "error closing %s: %s\n"
+msgid "error closing '%s': %s\n"
+msgstr "fel vid stängning av %s: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "ogiltig rubrikrad i ASCII-skalet: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "ASCII-skal: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "ogiltig rubrikrad i klartextsignatur\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "okänt ASCII-skalhuvud: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "oväntat skal: "
 
 # rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "ogiltig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
 
 # CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1764,13 +1797,13 @@
 "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
 "använts\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "inte läsbart"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1779,28 +1812,28 @@
 "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
 "sluta med ett \"'=\"\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en användares notationsnamn måste innehåller tecknet \"@\"\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte använda några styrtecken\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 #| msgid "a notation name must not contain more than one '@' character\n"
 msgid "a notation name may not contain an '=' character\n"
 msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1810,7 +1843,7 @@
 "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
 "sluta med ett \"'=\"\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
@@ -1826,8 +1859,8 @@
 msgid "Enter passphrase: "
 msgstr "Ange lösenfrasen\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1839,13 +1872,13 @@
 msgid "error from TPM: %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1857,206 +1890,211 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "Tor is not properly configured"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "DNS is not properly configured"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, 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:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, 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:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "inte inställt"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 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:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, 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:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, 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:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -2073,73 +2111,73 @@
 " kontrollera dokumentationen för ditt kort för att se vilka storlekar\n"
 " som tillåts.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, 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:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 #| msgid " (1) Signature key\n"
 msgid "Signature key\n"
 msgstr " (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 #| msgid " (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr " (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 #, fuzzy
 #| msgid " (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr " (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 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:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) ECC\n"
 msgstr " (%d) DSA och Elgamal\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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"
@@ -2147,41 +2185,41 @@
 "Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
 "bitar\n"
 
-#: g10/card-util.c:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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:1692
+#: g10/card-util.c:1700
 #, 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:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2196,196 +2234,201 @@
 " PIN-kod = \"%s\" Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 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:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, 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:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "lås upp PIN-koden med en nollställningskod"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ändra ägartillitsvärdet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 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:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2447,9 +2490,9 @@
 msgid "subkey"
 msgstr "Publik nyckel: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
@@ -2474,87 +2517,82 @@
 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:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
+"mottagarinställningarna\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "använder %s-chiffer\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
-"mottagarinställningarna\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2563,19 +2601,13 @@
 "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encrypt.c:1071
-#, 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:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2593,7 +2625,7 @@
 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:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2606,428 +2638,433 @@
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "exportera signaturer som är märkta som endast lokala"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exportera spärrnycklar markerade som \"känslig\""
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "ta bort oanvändbara delar från nyckeln under exportering"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "ta bort så mycket som möjligt från nyckeln under exportering"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "generera ett spärrcertifikat"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "export av hemliga nycklar tillåts inte\n"
+
+#: g10/export.c:1525
 #, fuzzy
 #| msgid "%s: skipped: %s\n"
 msgid " - skipped"
 msgstr "%s: hoppade över: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "writing to '%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "export av hemliga nycklar tillåts inte\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: ingenting exporterat\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "Fel när \"%s\" skapades: %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "Användaridentiteten hittades inte"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, 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:1330
+#: g10/getkey.c:1331
 #, 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:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Inget fingeravtryck"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, 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:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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:3830
+#: g10/getkey.c:3868
 #, 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, 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:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "skapa en signatur"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "skapa en klartextsignatur"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 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:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "skriv ut kontrollsummor"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|ange e-postalias (ett eller flera)"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|skriv utdata till FIL"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 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:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MEKANISMER|använd MEKANISMER för att hitta nycklar efter e-postadress"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "inaktivera all åtkomst till dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 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:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -3035,7 +3072,7 @@
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3065,14 +3102,14 @@
 "--list-keys namn visa nycklar\n"
 "--fingerprint namn visa fingeravtryck\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 #, 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:1174
+#: g10/gpg.c:1190
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg options files\n"
@@ -3087,7 +3124,7 @@
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3095,85 +3132,85 @@
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, fuzzy, c-format
 #| msgid "usage: gpgsm options "
 msgid "usage: %s options %s\n"
 msgstr "användning: gpgsm flaggor "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, 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:1707
+#: g10/gpg.c:1716
 #, 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:1710
+#: g10/gpg.c:1719
 #, 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:1713
+#: g10/gpg.c:1722
 #, 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:1719
+#: g10/gpg.c:1728
 #, 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:1722
+#: g10/gpg.c:1731
 #, 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:1725
+#: g10/gpg.c:1734
 #, 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:1731
+#: g10/gpg.c:1740
 #, 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:1734
+#: g10/gpg.c:1743
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3183,21 +3220,21 @@
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, 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:1743
+#: g10/gpg.c:1752
 #, 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:1746
+#: g10/gpg.c:1755
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3208,505 +3245,498 @@
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, 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:1965
+#: g10/gpg.c:1974
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 #, 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:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "visa utgångsdatum under signaturlistningar"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "lista inställningar (expertläge)"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, 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:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, 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:3219
+#: g10/gpg.c:3229
 #, 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:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, 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:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, 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:3314
+#: g10/gpg.c:3327
 #, 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:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, 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:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, 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"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, 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:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "vald sammandragsalgoritm är ogiltig\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, 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:3982
+#: g10/gpg.c:4000
 #, 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:3984
+#: g10/gpg.c:4002
 #, 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:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, 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:3998
+#: g10/gpg.c:4016
 #, 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:4005
+#: g10/gpg.c:4023
 #, 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:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\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:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "ogiltig inställning av personligt chiffer\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "AEAD 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/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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:4385
+#: g10/gpg.c:4399
 #, 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:4414
+#: g10/gpg.c:4428
 #, 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:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, 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:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, 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:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@ -3722,7 +3752,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -3752,164 +3782,164 @@
 msgid "No help available for '%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "importera signaturer som är markerade som endast lokala"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparera skada från pks-nyckelservern under importering"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 #| msgid "do not update the trustdb after import"
 msgid "do not clear the ownertrust values during import"
 msgstr "uppdatera inte tillitsdatabasen efter importering"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "uppdatera inte tillitsdatabasen efter importering"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr ""
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key during import"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key but do not actually import"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "acceptera endast uppdateringar till befintliga nycklar"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "ta bort oanvändbara delar från nyckeln efter importering"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 #, fuzzy
 #| msgid "assume input is in binary format"
 msgid "assume the GnuPG key backup format"
 msgstr "anta att inmatning är i binärformat"
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "repair keys on import"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nycklar behandlade än så länge\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " utan användaridentiteter: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " importerade: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " oförändrade: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " nya användaridentiteter: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " nya undernycklar: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " nya signaturer: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " nya nyckelspärrningar: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " inte importerade: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " signaturer rensade: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " användaridentiteter rensade: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3918,186 +3948,191 @@
 "VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
 "algoritmer för dessa användaridentiteter:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " \"%s\": inställning för sammandragsalgoritmen %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": inställning för komprimeringsalgoritmen %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
 "med att algoritmerna inte stämmer\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr ""
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %s: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 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:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, 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:2732
+#: g10/import.c:2817
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -4106,208 +4141,208 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, 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:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, 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:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 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:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Nyckeln är åsidosatt"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Nyckeln har blivit komprometterad"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "spärrningskommentar: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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:3485
+#: g10/import.c:3581
 #, 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:3492
+#: g10/import.c:3588
 #, 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:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, 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:3650
+#: g10/import.c:3746
 #, 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:3652
+#: g10/import.c:3748
 #, 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:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, 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:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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:3884
+#: g10/import.c:3983
 #, 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:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, 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:3924
+#: g10/import.c:4043
 #, 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:4097
+#: g10/import.c:4216
 #, 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:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr ""
 "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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:4285
+#: g10/import.c:4404
 #, 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:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
@@ -4318,32 +4353,32 @@
 msgid "error allocating memory: %s\n"
 msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 #| msgid "Good signature from"
 msgid " (reordered signatures follow)"
 msgstr "Korrekt signatur från"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s:\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "%d duplicate signature removed\n"
@@ -4351,7 +4386,7 @@
 msgstr0 "Användaridentitet \"%s\": %d signaturer borttagna\n"
 msgstr1 "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
@@ -4359,7 +4394,7 @@
 msgstr0 "1 signatur validerades inte eftersom nyckeln saknades\n"
 msgstr1 "1 signatur validerades inte eftersom nyckeln saknades\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
@@ -4367,7 +4402,7 @@
 msgstr0 "%d felaktiga signaturer\n"
 msgstr1 "%d felaktiga signaturer\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 #| msgid "Good signature from"
 msgid "%d signature reordered\n"
@@ -4375,57 +4410,57 @@
 msgstr0 "Korrekt signatur från"
 msgstr1 "Korrekt signatur från"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, 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:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, 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:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, fuzzy, c-format
 #| msgid "keybox `%s' created\n"
 msgid "keybox '%s' created\n"
 msgstr "nyckelskåpet \"%s\" skapat\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, fuzzy, c-format
 #| msgid "keyring `%s' created\n"
 msgid "keyring '%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, fuzzy, c-format
 #| msgid "keyblock resource `%s': %s\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "spärr"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "självsignatur"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4436,17 +4471,17 @@
 "korrekt validera andra användares nycklar (genom att undersöka pass,\n"
 "undersöka fingeravtryck från olika källor, etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4456,51 +4491,51 @@
 "Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
 "skapa tillitssignaturer åt dig.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användaridentiteten \"%s\" är spärrad."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Kan inte signera.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användaridentiteten \"%s\" är inte självsignerad."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Användaridentiteten \"%s\" är signerbar. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4509,11 +4544,11 @@
 "Självsignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4522,13 +4557,13 @@
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
 "n) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4537,44 +4572,44 @@
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4583,33 +4618,33 @@
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan? Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Jag vill inte svara.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Jag har inte kontrollerat alls.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Jag har gjort viss kontroll.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Jag har gjort en noggrann kontroll.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 #, fuzzy
 #| msgid "Your selection? (enter `?' for more information): "
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Ditt val? (skriv \"?\" för mer information): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4618,240 +4653,251 @@
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel \"%s\" (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Detta kommer att bli en självsignatur.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
 "att ändra.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, fuzzy, c-format
 #| msgid "error creating passphrase: %s\n"
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 #| msgid "Enter the keygrip: "
 msgid "show the keygrip"
 msgstr "Ange nyckelhashen: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "lista nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "välj användaridentiteten N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "välj undernyckel N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "kontrollera signaturer"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 "signera valda användaridentiteter * se nedan för relaterade kommandon"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "signera valda användaridentiteter lokalt"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "signera valda användaridentiteter med en tillitssignatur"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "lägg till ett foto-id"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "ta bort valda användaridentiteter"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "lägg till en undernyckel"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "lägg till en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "flytta en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "flytta en nyckelkopia till ett smartkort"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "ta bort valda undernycklar"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Datadekryptering lyckades"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "ta bort signaturer från valda användaridentiteter"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "flagga vald användaridentitet som primär"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "lista inställningar (expertläge)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "lista inställningar (utförligt)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "ställ in inställningslista för valda användaridentiteter"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "ställ in url till föredragen nyckelserver för valda användaridentiteter"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "ställ in en notation för valda användaridentiteter"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "ändra lösenfrasen"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "spärra signaturer på valda användaridentiteter"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "spärra valda användaridentiteter"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "spärra nyckel eller valda undernycklar"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "aktivera nyckel"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "inaktivera nyckel"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "visa valda foto-id:n"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
 "signaturer från nyckeln"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
 "nyckeln"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 #, fuzzy
 #| msgid ""
 #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@ -4871,308 +4917,299 @@
 "signaturer\n"
 " (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 #| msgid "Really sign all user IDs? (y/N) "
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "Unknown signature type '%s'\n"
 msgstr "Okänd signaturtyp \"%s\"\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Kommandot förväntar ett filnamnsargument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, fuzzy, c-format
 #| msgid "Can't open `%s': %s\n"
 msgid "Can't open '%s': %s\n"
 msgstr "Kan inte öppna \"%s\": %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 #| msgid "Error reading backup key from `%s': %s\n"
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Verkligen spärra denna användaridentitet? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
 "tillhandahåller\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Ställ in inställningslista till:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
 "(j/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting certificate \"%s\" failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, fuzzy, c-format
 #| msgid "failed to get the fingerprint\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Ingen sådan användaridentitet.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Inte signerad av dig.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, 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:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, 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:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Sammandrag: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Funktioner: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Nyckelserver no-modify"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
+#: g10/keyedit.c:3849
 #, 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:3802
+#: g10/keyedit.c:3873
 #, 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:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5180,17 +5217,17 @@
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -5200,18 +5237,23 @@
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, 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:4247
+#: g10/keyedit.c:4295
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -5220,38 +5262,38 @@
 "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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 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:4258
+#: g10/keyedit.c:4364
 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:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 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:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5259,20 +5301,20 @@
 msgstr0 "Raderade %d signatur.\n"
 msgstr1 "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5280,17 +5322,17 @@
 msgstr0 "Användaridentitet \"%s\": %d signaturer borttagna\n"
 msgstr1 "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5300,42 +5342,58 @@
 "denna\n"
 " nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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:4647
+#: g10/keyedit.c:4753
 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:4653
+#: g10/keyedit.c:4759
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Undernyckeln %s är redan spärrad.\n"
+
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:5007
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5345,253 +5403,253 @@
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, 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:4845
+#: g10/keyedit.c:5131
 #, 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:4848
+#: g10/keyedit.c:5134
 #, 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:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, 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:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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:5301
+#: g10/keyedit.c:5589
 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:5383
+#: g10/keyedit.c:5671
 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:5384
+#: g10/keyedit.c:5672
 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:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, 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:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, 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:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (icke exporterbar)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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:6011
+#: g10/keyedit.c:6299
 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:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, 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:339
+#: g10/keygen.c:336
 #, 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:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "för många sammandragsinställningar\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "för många komprimeringsinställningar\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, 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:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5599,19 +5657,19 @@
 "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
 "sammandragsstorleken\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Signera"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Certifiera"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -5629,185 +5687,185 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) Växla signeringsförmågan\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) Växla krypteringsförmågan\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) Växla autentiseringsförmågan\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Färdig\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA och RSA (standard)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA och Elgamal\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (endast kryptering)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) sign, encrypt\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) signering, kryptering\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Befintlig nyckel\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Befintlig nyckel från kort\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Ange nyckelhashen: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 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:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nyckel med denna nyckelhash\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "fel vid läsning av kortet: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serienummer för kortet: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tillgängliga nycklar:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, 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:2558
+#: g10/keygen.c:2542
 #, 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:2566
+#: g10/keygen.c:2550
 #, 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:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 #, 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:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5824,7 +5882,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:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5840,38 +5898,38 @@
 " <n>m = signaturen blir ogiltig efter n månader\n"
 " <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5879,11 +5937,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:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5898,7 +5956,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5916,42 +5974,42 @@
 " \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, 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:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5962,11 +6020,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 
@@ -5982,35 +6040,35 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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:3130
+#: g10/keygen.c:3114
 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:3135
+#: g10/keygen.c:3119
 #, 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:3136
+#: g10/keygen.c:3120
 #, 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:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -6022,18 +6080,18 @@
 "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:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -6041,73 +6099,73 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 #, 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:4630
+#: g10/keygen.c:4707
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "genererar ny nyckel\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, 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:5218
+#: g10/keygen.c:5295
 #, 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:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, 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:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, 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:5623
+#: g10/keygen.c:5714
 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:5639
+#: g10/keygen.c:5730
 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"
@@ -6117,7 +6175,7 @@
 "syfte.\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6125,7 +6183,7 @@
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6133,23 +6191,23 @@
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, 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:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
@@ -6157,27 +6215,43 @@
 msgid "never "
 msgstr "aldrig"
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Sammandrag: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Funktioner: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Nyckelserver no-modify"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Viktig signaturpolicy: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Signaturpolicy: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Föredragen kritisk nyckelserver: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kritisk signaturnotation: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Signaturnotation: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
@@ -6185,7 +6259,7 @@
 msgstr0 "%d felaktiga signaturer\n"
 msgstr1 "%d felaktiga signaturer\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
@@ -6193,40 +6267,40 @@
 msgstr0 "1 signatur validerades inte eftersom ett fel uppstod\n"
 msgstr1 "1 signatur validerades inte eftersom ett fel uppstod\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 ""
 msgstr1 ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " Kortets serienr ="
 
@@ -6306,7 +6380,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6314,135 +6388,135 @@
 msgstr0 "uppdaterar %d nycklar från %s\n"
 msgstr1 "uppdaterar %d nycklar från %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, 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:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, 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:1680
+#: g10/keyserver.c:1682
 #, 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:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VARNING: multipla klartexter har påträffats\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
@@ -6450,191 +6524,197 @@
 "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:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, 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:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, 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:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 #| msgid " aka \"%s\""
 msgid " issuer \"%s\"\n"
 msgstr " även känd som \"%s\""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, 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:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "osäkert"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " även känd som \"%s\""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, 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:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritm: %s"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
@@ -6642,12 +6722,12 @@
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
@@ -6754,30 +6834,30 @@
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, 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:1625
+#: g10/misc.c:1619
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6834,7 +6914,7 @@
 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:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6907,7 +6987,7 @@
 "%s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6921,76 +7001,76 @@
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär formatet 240x288 pixlar.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-id: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, fuzzy, c-format
 #| msgid "unable to open JPEG file `%s': %s\n"
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "kunde inte öppna JPEG-filen \"%s\": %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Den här JPEG-bilden är verkligen stor (%d byte)!\n"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Vill du verkligen använda den? (j/N)? "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, fuzzy, c-format
 #| msgid "`%s' is not a JPEG file\n"
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\" är inte en JPEG-fil\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "ingen körning av fjärrprogram stöds\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "denna plattform kräver temporärfiler vid anrop till externa program\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, fuzzy, c-format
 #| msgid "unable to execute shell `%s': %s\n"
 msgid "unable to execute shell '%s': %s\n"
 msgstr "kunde inte köra skalet \"%s\": %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "externt program avslutades felaktigt\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) \"%s\": %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, fuzzy, c-format
 #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen \"%s\": %s\n"
 
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6998,7 +7078,7 @@
 "anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-id!\n"
@@ -7081,36 +7161,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finns viss information om att nyckeln tillhör den angivna "
 "användaren\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, fuzzy, c-format
 #| msgid "root certificate has now been marked as trusted\n"
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "rotcertifikatet har nu markerats som betrott\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 #| msgid ""
 #| "It is NOT certain that the key belongs to the person named\n"
@@ -7125,7 +7205,7 @@
 "användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
 "ja på nästkommande fråga.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -7135,103 +7215,103 @@
 "användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
 "ja på nästkommande fråga.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Vill du använda nyckeln ändå? (j/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "option %s given but no matching User ID found\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Detta kan betyda att signaturen är förfalskad.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Obs: Denna nyckel har stängts av.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 " Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7242,7 +7322,7 @@
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -7250,54 +7330,54 @@
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
 
 # överhoppad?
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppades över: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 #| msgid "line %d: invalid algorithm\n"
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Nuvarande mottagare:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -7305,26 +7385,26 @@
 "\n"
 "Ange användaridentiteten. Avsluta med en tom rad: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Ingen sådan användaridentitet.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är inaktiverad.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "hoppade över: publik nyckel redan angiven\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "okänd standardmottagare \"%s\"\n"
@@ -7332,17 +7412,17 @@
 # plural av adressee
 # dvs. den som meddelandet är adresserat till.
 # Åtskillnad görs mellan adressee och receiver.
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, 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:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@ -7383,7 +7463,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan inte öppna signerad data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -7618,41 +7698,36 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
 # Vad betyder det?
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
 # cross-certification?
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VARNING signeringsundernyckel %s har en ogiltig korscertifiering\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu second newer than the signature\n"
@@ -7661,7 +7736,7 @@
 msgstr1 "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu day newer than the signature\n"
@@ -7670,7 +7745,7 @@
 msgstr1 "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
 
 # c-format behövs inte i singularis
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7686,7 +7761,7 @@
 "klocka)\n"
 
 # c-format behövs inte i singularis
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7700,54 +7775,54 @@
 "nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
 "klocka)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, fuzzy, c-format
 #| msgid "NOTE: signature key %s expired %s\n"
 msgid "Note: signature key %s expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, fuzzy, c-format
 #| msgid "NOTE: signature key %s has been revoked\n"
 msgid "Note: signature key %s has been revoked\n"
 msgstr "OBSERVERA: signaturnyckeln %s har spärrats\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, 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:1241
+#: g10/sig-check.c:1235
 #, 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:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "VARNING: kan inte %%-expandera anteckning (för stor). Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7755,7 +7830,7 @@
 "VARNING: kunde inte %%-expandera policy-url (för stor). Använder "
 "oexpanderad.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7764,12 +7839,12 @@
 "VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
 "stor). Använder oexpanderad.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7777,12 +7852,12 @@
 "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7864,138 +7939,138 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
 msgstr "kan inte skapa lås för \"%s\"\n"
 
 # se förra kommentaren
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 #| msgid "can't lock `%s'\n"
 msgid "can't lock '%s'\n"
 msgstr "kan inte låsa \"%s\"\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, 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:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, 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:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, 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:1872
+#: g10/tdbio.c:1842
 #, 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:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fel: Tillitsdatabasen är skadad.\n"
@@ -8443,7 +8518,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@ -8478,7 +8553,7 @@
 msgid "checking the trustdb\n"
 msgstr "kontrollerar tillitsdatabasen\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8487,7 +8562,7 @@
 msgstr1 "%lu nycklar behandlade än så länge\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8495,24 +8570,24 @@
 msgstr0 "%d nycklar behandlade (%d validity counts rensade)\n"
 msgstr1 "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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:2290
+#: g10/trustdb.c:2302
 #, 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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -8596,7 +8671,7 @@
 msgid "ultimate"
 msgstr "förbehållslös"
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8607,12 +8682,12 @@
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "kan inte öppna fd %d: %s\n"
@@ -8630,19 +8705,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "ställ in felsökningsflaggor"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "aktivera fullständigt felsökningsläge"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Användning: kbxutil flaggor filer (-h för hjälp)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 #, fuzzy
 #| msgid ""
 #| "Syntax: kbxutil options files\n"
@@ -8657,16 +8732,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8707,10 +8782,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|Ange upplåsningskoden (PUK-kod) för standardnycklarna."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
@@ -8732,58 +8807,58 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nyckel\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8791,64 +8866,64 @@
 msgstr0 "nyckelgenereringen är färdig (%d sekunder)\n"
 msgstr1 "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Ange PIN-koden för nyckeln att skapa kvalificerade signaturer med."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 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-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Ange PIN-koden för standardnycklarna."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN har ännu inte ändrats\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN har ännu inte ändrats\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 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:2026
+#: scd/app-nks.c:2096
 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:2036
+#: scd/app-nks.c:2106
 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:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8856,7 +8931,7 @@
 "|NP|Ange en ny upplåsningskod (PUK-kod) för nyckeln att skapa kvalificerade "
 "signaturer med."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8864,27 +8939,27 @@
 "|P|Ange upplåsningskoden (PUK-koden) för nyckeln att skapa kvalificerade "
 "signaturer med."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, 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:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, 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:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
@@ -8892,46 +8967,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "använder standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, 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"
@@ -8942,20 +9017,20 @@
 msgstr1 ""
 "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Ange nollställningskoden för kortet"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, 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"
@@ -8963,77 +9038,77 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny nollställningskod"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 #, 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:3545
+#: scd/app-openpgp.c:3600
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "algoritmen stöds inte: %s"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, 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:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, 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:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -9041,7 +9116,7 @@
 "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
 "kommando\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -9063,7 +9138,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
@@ -9109,13 +9184,13 @@
 msgid "deny the use of admin card commands"
 msgstr "neka användning av administratörskommandon för kort"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, 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:327
+#: scd/scdaemon.c:328
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon options command args\n"
@@ -9127,320 +9202,320 @@
 "Syntax: scdaemon flaggor kommando argument\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, 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:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "valideringsmodellen begärd av certifikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "kedja"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "skal"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 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:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "utfärdarens certifikat är inte markerat som en CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "kritisk markerad policy utan konfigurerade policier"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, 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:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 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:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "certifikatpolicy tillåts inte"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår upp utfärdare på extern plats\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, 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:792
+#: sm/certchain.c:809
 #, 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:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "certifikatet har spärrats"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "status för certifikatet är okänt"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll mot spärrlistan misslyckades: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med felaktig giltighetstid: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "rotcertifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "tillfälligt certifikat är ännu inte giltigt"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikatet har gått ut"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "rotcertifikatet har gått ut"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "tillfälligt certifikat har gått ut"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "nödvändiga certifikattillägg saknas: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "certifikat med felaktig giltighetstid"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "signaturen inte skapad under certifikatets livstid"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikatet skapades inte under utfärdarens livstid"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "tillfälligt certifikat är inte skapat under utfärdarens livstid"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( signatur skapad "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " (certifikat skapat "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (certifikat giltigt från "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( utfärdare giltig från "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotcertifikatet har nu markerats som betrott\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 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:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "självsignerat certifikat har en FELAKTIG signatur"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rotcertifikatet har inte markerats som betrott"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikatet har en FELAKTIG signatur"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 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:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, 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:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikatet är korrekt\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "tillfälligt certifikat är korrekt\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rotcertifikatet är korrekt\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "växlar till kedjemodell"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodell använd: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "slut på minne\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ingen"
 
@@ -9460,7 +9535,7 @@
 msgid "Error - invalid DN"
 msgstr "Fel - ogiltigt DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9475,46 +9550,46 @@
 "S/N %s, ID 0x%08lX,\n"
 "skapad %s, går ut %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, 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:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, 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:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, 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:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, 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:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, 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:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikatet är inte användbart för kryptering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikatet är inte användbart för signering\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "looking for another certificate\n"
@@ -9759,17 +9834,17 @@
 msgid "resource problem: out of core\n"
 msgstr "resursproblem: slut på minne\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(det här är RC2-algoritmen)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9781,7 +9856,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fel vid låsning av nyckelskåp: %s\n"
@@ -9808,126 +9883,126 @@
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 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:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMN|använd kodningen NAMN för PKCS#12-lösenfraser"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 #, 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:623
+#: sm/gpgsm.c:643
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm options files\n"
@@ -9942,31 +10017,31 @@
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, 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:842
+#: sm/gpgsm.c:862
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, 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:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@ -9986,7 +10061,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
@@ -9996,49 +10071,49 @@
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fel vid lagring av flaggor: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Fel - "
 
@@ -10077,7 +10152,7 @@
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -10098,61 +10173,61 @@
 "Observera att det här certifikatet INTE kommer att skapa en kvalificerad "
 "signatur!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "hashalgoritm %d (%s) för signerare %d stöds inte; använder %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "hashalgoritm som används för signerare %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Signatur gjord "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "datum inte angivet"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 #| msgid "algorithm: %s"
 msgid "algorithm:"
 msgstr "algoritm: %s"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, 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:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Korrekt signatur från"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " även känd som"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Det här är en kvalificerad signatur\n"
@@ -10179,652 +10254,646 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, fuzzy, c-format
 #| msgid "looking up issuer from the Dirmngr cache\n"
 msgid "dropping %u certificates from the cache\n"
 msgstr "slår upp utfärdare från Dirmngr-cachen\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't parse certificate '%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, fuzzy, c-format
 #| msgid "certificate `%s' deleted\n"
 msgid "certificate '%s' already cached\n"
 msgstr "certifikatet \"%s\" togs bort\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, fuzzy, c-format
 #| msgid "duplicated certificate `%s' deleted\n"
 msgid "trusted certificate '%s' loaded\n"
 msgstr "dubblett av certifikatet \"%s\" borttaget\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, fuzzy, c-format
 #| msgid "certificate `%s' deleted\n"
 msgid "certificate '%s' loaded\n"
 msgstr "certifikatet \"%s\" togs bort\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, fuzzy, c-format
 #| msgid "fingerprint=%s\n"
 msgid " SHA1 fingerprint = %s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr ""
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr ""
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error loading certificate '%s': %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "permanently loaded certificates: %u\n"
 msgstr "Inkluderade certifikat"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, 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:840
+#: dirmngr/certcache.c:858
 #, 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:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 #| msgid " (certificate created at "
 msgid "certificate already cached\n"
 msgstr " (certifikat skapat "
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate cached\n"
 msgstr "certifikatet är korrekt\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, 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:960
+#: dirmngr/certcache.c:978
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, 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:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, 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:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, 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:1749
+#: dirmngr/certcache.c:1767
 #, 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:212
+#: dirmngr/crlcache.c:219
 #, 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:216
+#: dirmngr/crlcache.c:223
 #, 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:244
+#: dirmngr/crlcache.c:251
 #, fuzzy, c-format
 #| msgid "ignoring garbage line"
 msgid "ignoring database dir '%s'\n"
 msgstr "ignorerar skräprad"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, 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:274
+#: dirmngr/crlcache.c:281
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "removing cache file '%s'\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, 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:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, 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:420
+#: dirmngr/crlcache.c:427
 #, 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:427
+#: dirmngr/crlcache.c:434
 #, 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:434
+#: dirmngr/crlcache.c:441
 #, 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:439
+#: dirmngr/crlcache.c:446
 #, 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:444
+#: dirmngr/crlcache.c:451
 #, 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:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, 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:631
+#: dirmngr/crlcache.c:638
 #, 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:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, 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:678
+#: dirmngr/crlcache.c:685
 #, 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:685
+#: dirmngr/crlcache.c:692
 #, 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:691
+#: dirmngr/crlcache.c:698
 #, 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:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, 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: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:948
+#: dirmngr/crlcache.c:955
 #, 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:1002
+#: dirmngr/crlcache.c:1009
 #, 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:1010
+#: dirmngr/crlcache.c:1017
 #, 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:1026
+#: dirmngr/crlcache.c:1033
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error hashing '%s': %s\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, 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:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, 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:1144
+#: dirmngr/crlcache.c:1151
 #, 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:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, 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:1287
+#: dirmngr/crlcache.c:1294
 #, 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:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr ""
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, 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:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, 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:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 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:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "unknown hash algorithm '%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, 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:1922
+#: dirmngr/crlcache.c:1933
 #, 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:1937
+#: dirmngr/crlcache.c:1948
 #, 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:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, 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:1983
+#: dirmngr/crlcache.c:1994
 #, 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:2010
+#: dirmngr/crlcache.c:2021
 #, 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:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, 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:2225
+#: dirmngr/crlcache.c:2236
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "ksba_crl_new failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, 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:2266
+#: dirmngr/crlcache.c:2277
 #, 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:2270
+#: dirmngr/crlcache.c:2281
 #, 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:2280
+#: dirmngr/crlcache.c:2291
 #, 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:2290
+#: dirmngr/crlcache.c:2301
 #, 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:2300
+#: dirmngr/crlcache.c:2311
 #, 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:2307
+#: dirmngr/crlcache.c:2318
 #, 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:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, 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:2413
+#: dirmngr/crlcache.c:2434
 #, 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:2445
+#: dirmngr/crlcache.c:2466
 #, 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:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, 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:2557
+#: dirmngr/crlcache.c:2586
 #, 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:2568
+#: dirmngr/crlcache.c:2597
 #, 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:2599
+#: dirmngr/crlcache.c:2628
 #, 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:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, 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:2734
+#: dirmngr/crlcache.c:2760
 #, 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:2794
+#: dirmngr/crlcache.c:2806
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -10841,25 +10910,25 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, fuzzy, c-format
 #| msgid "error retrieving `%s' via %s: %s\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, fuzzy, c-format
 #| msgid "certificate `%s' not found: %s\n"
 msgid "certificate search not possible due to disabled %s\n"
@@ -11028,153 +11097,153 @@
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "|FILE|run commands from FILE on startup"
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FIL|kör kommandon från FIL vid uppstart"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "shutdown the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL| använd nyckelservern på URL"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 #, 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:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 #, 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:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 #, fuzzy
 #| msgid "allow PKA lookups (DNS requests)"
 msgid "allow sending OCSP requests"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL| använd nyckelservern på URL"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -11187,13 +11256,13 @@
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 #, 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:460
+#: dirmngr/dirmngr.c:476
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent options command args\n"
@@ -11205,114 +11274,114 @@
 "Syntax: gpg-agent flaggor kommando argument\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, 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:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, fuzzy, c-format
 #| msgid "usage: gpgsm options "
 msgid "usage: %s options "
 msgstr "användning: gpgsm flaggor "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, 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:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, 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:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, 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:1733
+#: dirmngr/dirmngr.c:1786
 #, 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:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, 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:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "inte tvingad"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, 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:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, 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:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11373,33 +11442,33 @@
 msgid "malloc failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, 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/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: lösenord angivet utan användare\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hoppar över denna rad\n"
@@ -11501,183 +11570,183 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "allocating list item failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting responder ID: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, fuzzy, c-format
 #| msgid "issuer certificate not found"
 msgid "issuer certificate not found: %s\n"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "caller did not return the target certificate\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 #| msgid "error storing certificate\n"
 msgid "caller did not return the issuing certificate\n"
 msgstr "fel vid lagring av certifikat\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 #| msgid "failed to allocate keyDB handle\n"
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, fuzzy, c-format
 #| msgid "using default PIN as %s\n"
 msgid "using default OCSP responder '%s'\n"
 msgstr "använder standard-PIN som %s\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "använder %s-chiffer\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 #| msgid "certificate has been revoked"
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certifikatet har spärrats"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error sending data: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "start_cert_fetch failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_next_cert failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, 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:2984
+#: dirmngr/server.c:3135
 #, 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:3005
+#: dirmngr/server.c:3156
 #, 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:3013
+#: dirmngr/server.c:3164
 #, 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:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11690,97 +11759,97 @@
 msgstr "utfärdarens certifikat är inte markerat som en CA"
 
 # originalet borde ha ett value
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, fuzzy, c-format
 #| msgid "checking the trustdb\n"
 msgid "CRL checking too deeply nested\n"
 msgstr "kontrollerar tillitsdatabasen\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr ""
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 #, fuzzy
 #| msgid "checking the CRL failed: %s"
 msgid "checking CRL for"
 msgstr "kontroll mot spärrlistan misslyckades: %s"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, fuzzy, c-format
 #| msgid "checking for qualified certificate failed: %s\n"
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate chain is good\n"
 msgstr "certifikatet är korrekt\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, 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:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "tyst"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "skriv ut data hexkodat"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "avkoda mottagna datarader"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "skicka ett kommando till dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 #, 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:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "kör Assuan-servern som angivits på kommandoraden"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "använd inte utökat anslutningsläge"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIL|kör kommandon från FIL vid uppstart"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "kör /subst vid uppstart"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 #, 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:226
+#: tools/gpg-connect-agent.c:231
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-connect-agent options\n"
@@ -11792,50 +11861,50 @@
 "Syntax: gpg-connect-agent flaggor\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
+#: tools/gpg-connect-agent.c:1907
 #, fuzzy, c-format
 #| msgid "unknown command `%s'\n"
 msgid "unknown command '%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
@@ -11903,13 +11972,13 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Observera att gruppspecifikationer ignoreras\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, 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:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -12033,92 +12102,113 @@
 "Syntax: gpg-check-pattern flaggor mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, 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"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid " (certificate created at "
 msgid "authenticate to the card"
 msgstr " (certifikat skapat "
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid " (certificate created at "
 msgid "read a certificate from a data object"
 msgstr " (certifikat skapat "
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid " (certificate created at "
 msgid "store a certificate to a data object"
 msgstr " (certifikat skapat "
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "vald sammandragsalgoritm är ogiltig\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).
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "ogiltig inställning av personligt chiffer\n"
+
+#, fuzzy
+#~| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+#~ msgid "AEAD 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"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "tvinga symmetriskt chiffer med %s (%d) strider mot "
+#~ "mottagarinställningarna\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "fel vid skrivning till temporärfil: %s\n"
 
@@ -12919,9 +13009,6 @@
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "växla mellan att lista hemliga och publika nycklar"
 
-#~ msgid "Passphrase"
-#~ msgstr "Lösenfras"
-
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/tr.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/tr.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/tr.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/tr.po Changed

@@ -1,24 +1,22 @@
 # Turkish translations for GnuPG messages.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>, 2001-2008,
+# Emir SARI <emir_sari@icloud.com>, 2022, 2023
 #
-# Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>, 2001, ..., 2008.
-# Nilgün Belma Bugüner <nilgunbelma@gmail.com>.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 2.0.10rc1\n"
+"Project-Id-Version: gnupg 2.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
-"PO-Revision-Date: 2015-02-11 19:18+0100\n"
-"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
+"PO-Revision-Date: 2023-05-30 23:45+0300\n"
+"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish\n"
 "Language: tr\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: KBabel 1.11.4\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
@@ -29,55 +27,51 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
-msgstr ""
+msgstr "_Tamam"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
-msgstr ""
+msgstr "İ_ptal"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
-msgstr ""
+msgstr "_Evet"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
-msgstr ""
+msgstr "_Hayır"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
-msgstr ""
+msgstr "PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
-msgstr ""
+msgstr "Parola yöneticisinde _kaydet"
 
-#: agent/call-pinentry.c:562
-#, fuzzy
-#| msgid "Do you really want to delete the selected keys? (y/N) "
+#: agent/call-pinentry.c:560
 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) "
+msgstr "Anahtar parolanızı ekranda gerçekten görünür yapmak istiyor musunuz?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
-msgstr ""
+msgstr "Anahtar parolasını görünür yap"
 
-#: agent/call-pinentry.c:565
-#, fuzzy
-#| msgid "Enter new passphrase"
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
-msgstr "Yeni anahtar parolasını giriniz"
+msgstr "Anahtar parolasını gizle"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
-msgstr ""
+msgstr "Caps Lock açık"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
-msgstr ""
+msgstr "Öner"
 
 #. TRANSLATORS: This string is a tooltip, shown by pinentry when
 #. hovering over the generate button. Please use an appropriate
@@ -86,29 +80,29 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
+"Yukarıda girilen metnin kalıcılığı. 81 kalıcılık kriteri hakkında daha fazla "
+"bilgi için yöneticiye danışın."
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
-msgstr ""
+msgstr "Not: Boş kısımlar anahtar parolaya dahil değildir."
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
-#, fuzzy
-#| msgid "Passphrase too long"
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
-msgstr "Anahtar Parolası çok uzun"
+msgstr "Anahtar parolası geçersiz"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kalite:"
 
@@ -118,264 +112,259 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
+"Yukarıda girilen metnin kalıcılığı. Kalıcılık kriterleri hakkında daha fazla "
+"bilgi için yöneticiye danışın."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
-"Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
-"olabilecek"
+"Gizli anahtarın bu oturumda kilidinin açılabilmesi için lütfen PIN'inizi "
+"giriniz"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
-"Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
-"kilitsiz olabilecek"
+"Gizli anahtarın bu oturumda kilidinin açılabilmesi için lütfen anahtar "
+"parolanızı giriniz"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
-msgstr ""
+msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
-msgstr "aynı değiller - tekrar deneyin"
+msgstr "eşleşmiyor - yeniden deneyin"
+
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+msgid "Passphrases match."
+msgstr "Anahtar parolaları eşleşiyor."
 
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (%d/%d dene)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
-msgstr ""
+msgstr "Yinele:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
-msgstr "Anahtar Parolası çok uzun"
+msgstr "Anahtar parolası çok uzun"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
-msgstr "PIN hatalı"
+msgstr "PIN kötü"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
-msgstr "Anahtar Parolası hatalı"
+msgstr "Anahtar parolası kötü"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
-msgstr ""
+msgstr "Not: İstek, bir web tarayıcısından yapıldı."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
-msgstr ""
+msgstr "Not: İstek, uzak bir konumdan yapıldı."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "kartın seri numarası alınırken hata: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
-msgstr "Lütfen bu anahtar parolasını tekrar girin"
+msgstr "Lütfen bu anahtar parolasını yeniden girin"
 
-#: agent/command.c:2703
-#, fuzzy, c-format
-#| msgid ""
-#| "Please enter the passphrase to protect the imported object within the "
-#| "GnuPG system."
+#: agent/command.c:2908
+#, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr ""
-"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
-"giriniz."
+"İçe aktarılan nesneyi %s sisteminde koruyacak anahtar parolasını girin."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
+"Bu anahtar (veya yardımcı anahtar), bir anahtar parolası ile korunmuyor. "
+"Dışa aktarmak için yeni bir anahtar parolası girin."
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
-msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
+msgstr "%d bitten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
-#, fuzzy, c-format
-#| msgid "can't create `%s': %s\n"
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
+#, c-format
 msgid "can't create '%s': %s\n"
-msgstr "\"%s\" oluşturulamıyor: %s\n"
+msgstr "'%s' oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
-#, fuzzy, c-format
-#| msgid "can't open `%s': %s\n"
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
+#, c-format
 msgid "can't open '%s': %s\n"
-msgstr "`%s' açılamıyor: %s\n"
+msgstr "'%s' açılamıyor: %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "uygun bir kart anahtarı yok: %s\n"
 
-#: agent/command-ssh.c:2513
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
+#: agent/command-ssh.c:2499
+#, c-format
 msgid "error getting list of cards: %s\n"
-msgstr "saklanmış bayraklar alınırken hata: %s\n"
+msgstr "kart listesi alınırken hata: %s\n"
 
-#: agent/command-ssh.c:2688
+# Check
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
+"Bir ssh işlemi,%%0A %s%%A (%s)%%0Aanahtarının kullanımı için istekte "
+"bulundu. Buna izin vermek istiyor musunuz?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
-msgstr ""
+msgstr "İzin ver"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
-msgstr ""
+msgstr "Reddet"
 
-#: agent/command-ssh.c:2704
-#, fuzzy, c-format
+#: agent/command-ssh.c:2926
+#, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
-msgstr "Lütfen SSH anahtarı %0A %c için anahtar parolasını giriniz"
+msgstr "Lütfen%%0A %F%%0A (%c) ssh anahtarı için anahtar parolasını giriniz"
 
-#: agent/command-ssh.c:3011
-#, fuzzy, c-format
+#: agent/command-ssh.c:3233
+#, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
-"gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A %s%%0A "
-"için lütfen anahtar parolası giriniz"
+"Alınan%%0A %s%%0A %s%%0Agizli anahtarını gpg-agent anahtar deposunda "
+"saklamak için lütfen bir anahtar parolası girin"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
-msgstr "sokette akım oluşturulamadı: %s\n"
-
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
+msgstr "soketten akım oluşturulamadı: %s\n"
 
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Yönetici PIN'i"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
-msgstr ""
+msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Sıfırlama Kodu"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
-msgstr ""
+msgstr "Kart/jeton üzerinde ACK düğmesine basın."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
-#, fuzzy
-#| msgid "do not use a reader's keypad"
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
-msgstr "bir okuyucu tuştakımı kullanılmaz"
+msgstr "Girdi için okuyucunun düğme takımını kullan."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
-msgstr "Bu Sıfırlama Kodu tekrarlansın"
+msgstr "Bu Sıfırlama Kodunu yinele"
 
-#: agent/divert-scd.c:377
-#, fuzzy
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
-msgstr "Bu PIN tekrarlansın "
+msgstr "Bu PUK'u yinele"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
-msgstr "Bu PIN tekrarlansın "
+msgstr "Bu PIN'i yinele"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
-msgstr "Sıfırlama Kodu doğru tekrarlanmadı; tekrar deneyin"
+msgstr "Sıfırlama Kodu doğru yinelenmedi; yeniden deneyin"
 
-#: agent/divert-scd.c:385
-#, fuzzy
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
-msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
+msgstr "PUK doğru yinelenmedi; yeniden deneyin"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
-msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
+msgstr "PIN doğru yinelenmedi; yeniden deneyin"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
-msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
+msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s girin"
 
-#: agent/genkey.c:154
-#, fuzzy, c-format
-#| msgid "error writing to %s: %s\n"
+#: agent/genkey.c:155
+#, c-format
 msgid "error writing to pipe: %s\n"
-msgstr "%s yazılırken hata: %s\n"
+msgstr "veri yoluna yazılırken hata: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
-msgstr "Yeni anahtar parolasını giriniz"
+msgstr "Yeni anahtar parolasını girin"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Bir anahtar parolası girmediniz!%0ABoş parolaya izin verilmez."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -384,452 +373,396 @@
 "Bir anahtar parolası girmediniz - bu aslında kötü bir fikir!%0A Lütfen "
 "anahtarınıza herhangi bir koruma istemediğinizi onaylayınız."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
-msgstr "Evet, korumak gereksiz"
+msgstr "Evet, koruma gereksiz"
 
-#: agent/genkey.c:243
-#, fuzzy, c-format
-#| msgid "Name must be at least 5 characters long\n"
+#: agent/genkey.c:244
+#, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
-msgstr0 "Ad ve soyadınız en az 5 harfli olmalı\n"
-msgstr1 "Ad ve soyadınız en az 5 harfli olmalı\n"
+msgstr0 "Bir anahtar parolası en az %u karakter uzunluğunda olmalıdır."
+msgstr1 "Bir anahtar parolası en az %u karakter uzunluğunda olmalıdır."
 
-#: agent/genkey.c:262
-#, fuzzy, c-format
-#| msgid ""
-#| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
-#| "contain at least %u digit or%%0Aspecial character."
-#| msgid_plural ""
-#| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
-#| "contain at least %u digits or%%0Aspecial characters."
+#: agent/genkey.c:263
+#, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr0 ""
-"Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola en az %u rakam "
-"veya%%0Aözel karakter içermeli."
+"Bir anahtar parolası en az %u rakam veya %%0Aözel karakter içermelidir."
 msgstr1 ""
-"Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola en az %u rakam "
-"veya%%0Aözel karakter içermeli."
+"Bir anahtar parolası en az %u rakam veya %%0Aözel karakter içermelidir."
 
-#: agent/genkey.c:289
-#, fuzzy, c-format
-#| msgid ""
-#| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
-#| "be a known term or match%%0Acertain pattern."
+#: agent/genkey.c:290
+#, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
-"Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola bilinen bir "
-"terim olmamalı ve%%0Abelli bir kalıpla eşleşmemeli."
+"Anahtar parolası bilinen bir terim olamaz veya kimi dizgilerle%%0Aeşleşemez."
 
-#: agent/genkey.c:304
-#, fuzzy
-#| msgid ""
-#| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
-#| "be at least %u character long."
-#| msgid_plural ""
-#| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
-#| "be at least %u characters long."
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
-msgstr ""
-"Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola en az %u "
-"karakterlik olmalı."
+msgstr "Uyarı: Güvenli olmayan bir anahtar parolası girdiniz."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
-msgstr "Ne olursa olsun bunu al"
+msgstr "Yine de bunu kullan"
 
-#: agent/genkey.c:493
-#, fuzzy, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
+#: agent/genkey.c:494
+#, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
-msgstr "Yeni anahtarınızı korumak için Lütfen%0AAnahtar Parolanızı giriniz"
+msgstr "Yeni anahtarınızı korumak için lütfen anahtar%0Aparolanızı girin"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
-#, fuzzy
-#| msgid "Options useful for debugging"
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
-msgstr "Hata ayıklamaya elverişli seçenekler"
+msgstr "Başlangıçta kullanılan seçenekler"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
-msgstr "artalan süreci olarak çalışır"
+msgstr "ardalan süreci olarak çalıştır"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
-msgstr "sunucu olarak (önalanda) çalışır"
+msgstr "sunucu kipinde (önalanda) çalıştır"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
-msgstr "konsoldan kopulmaz"
+msgstr "konsoldan ayırma"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
-msgstr "|DOSYA|seçenekler DOSYAdan okunur"
+msgstr "|FILE|seçenekleri FILE'dan oku"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
-msgstr "biraz daha sessiz olur"
+msgstr "biraz daha sessiz ol"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
-msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
+msgstr "|FILE|sunucu kipi günlüklerini FILE'a yaz"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
-msgstr "Akıllı kart süreci kullanılmaz"
+msgstr "SCdaemon kullanma"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "UYG|Akıllı kart uygulaması olarak UYG kullanılır"
+msgstr "PGM|SCdaemon programı olarak PGM kullan"
 
-#: agent/gpg-agent.c:209
-#, fuzzy
-#| msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
-msgstr "UYG|Akıllı kart uygulaması olarak UYG kullanılır"
+msgstr "PGM|tpm2daemon programı olarak PGM kullan"
 
-#: agent/gpg-agent.c:213
-#, fuzzy
-#| msgid "|NAME|connect to Assuan socket NAME"
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
-msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
+msgstr "|NAME|NAME aracılığıyla bazı komutları kabul et"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
-msgstr "TTY değiştirme istekleri yoksayılır"
+msgstr "TTY değiştirme isteklerini yok say"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
-msgstr "X birimi değiştirme istekleri yoksayılır"
+msgstr "X ekranını değiştirme isteklerini yok say"
 
-#: agent/gpg-agent.c:220
-#, fuzzy
-#| msgid "enable ssh-agent emulation"
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
-msgstr "ssh-agent öykünümü etkinleşir"
+msgstr "ssh desteğini etkinleştir"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr ""
+msgstr "|ALGO|ssh parmak izlerini göstermek için ALGO kullan"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
-msgstr ""
+msgstr "putty desteğini etkinleştir"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+msgid "enable Win32-OpenSSH support"
+msgstr "Win32-OpenSSH desteğini etkinleştir"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
-msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
+msgstr "|N|arabellekteki PIN'leri N saniyede zaman aşımına uğrat"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|SSH anahtarları N saniyede zamanaşımına uğrar"
+msgstr "|N|SSH anahtarlarını N saniyede zaman aşımına uğrat"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
+msgstr "|N|azami PIN önbelleği ömrünü N saniye olarak ayarla"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
+msgstr "|N|azami SSH anahtarı ömrünü N saniye olarak ayarla"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
-msgstr "imzalarken PIN arabelleği kullanılmaz"
+msgstr "imzalarken PIN arabelleğini kullanma"
 
-#: agent/gpg-agent.c:250
-#, fuzzy
-#| msgid "do not allow the reuse of old passphrases"
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
-msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
+msgstr "eski anahtar parolalarının yeniden kullanılmasına izin verme"
 
-#: agent/gpg-agent.c:252
-#, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
-msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
+msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verme"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
-msgstr "anahtar parolasının önceden atanmasına izin verilir"
+msgstr "anahtar parolasının önceden ayarlanmasına izin ver"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
-msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
+msgstr "anahtar parolası poliçesinin atlanmasına izin verme"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|yeni anahtar parolası için gereken en küçük uzunluk N'ye ayarlanır"
+msgstr "|N|en kısa yeni anahtar parolası uzunluğunu N olarak ayarla"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
-"|N|yeni bir anahtar parolası için en azından harf olmayan N karakter gerekir"
+"|N|yeni anahtar parolası için en azından N harf olmayan karakter gerektir"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|DOSYA|yeni anahtar parolası DOSYAdaki kalıba göre sınanır"
+msgstr "|FILE|yeni anahtar parolalarını FILE'daki dizgilere göre denetle"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
-msgstr "|N|anahtar parolası N gün sonra zaman aşımına uğrar"
+msgstr "|N|anahtar parolalarının N gün sonra zaman aşımına uğrat"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
-msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
+msgstr "eski anahtar parolaların yeniden kullanılmasına izin verme"
 
-#: agent/gpg-agent.c:279
-#, fuzzy
-#| msgid "Options controlling the security"
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
-msgstr "Güvenliği denetleyen seçenekler"
+msgstr "PIN girişini denetleyen seçenekler"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
-msgstr ""
+msgstr "PIN girişini hiçbir zaman kullanma"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
-msgstr ""
+msgstr "arayanın pin girişini geçersiz kılmasına izin verme"
 
-#: agent/gpg-agent.c:285
-#, fuzzy
-#| msgid "do not grab keyboard and mouse"
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
-msgstr "klavye ve fare gaspedilmez"
+msgstr "PIN girişinin klavye ve fareyi yakalamasına izin ver"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
+msgstr "|PGM|PIN giriş uygulaması olarak PGM kullan"
 
-#: agent/gpg-agent.c:292
-#, fuzzy
-#| msgid "|N|set maximum PIN cache lifetime to N seconds"
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
+msgstr "|N|pin giriş zaman aşımını N saniye olarak ayarla"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
-msgstr ""
+msgstr "anahtar parolasının Emacs üzerinden istenmesine izin ver"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
-#, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
-msgstr "Yazılım hatalarını lütfen <"
+msgstr "Bulduğunuz hataları lütfen <@EMAIL@> adresine bildirin.\n"
 
-#: agent/gpg-agent.c:571
-#, fuzzy
-#| msgid "Usage: gpgconf options (-h for help)"
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
-msgstr "Kullanımı: gpgconf seçenekler (yardım için -h)"
+msgstr "Kullanım: @GPG_AGENT@ seçenekler (yardım için -h)"
 
-#: agent/gpg-agent.c:573
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg-agent options command args\n"
-#| "Secret key management for GnuPG\n"
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
-"Sözdizimi: gpg-agent seçenekler komut arg ...\n"
-"GnuPG için gizli anahtar yönetimi\n"
+"Sözdizim: @GPG_AGENT@ seçenekler komut argümanlar\n"
+"@GNUPG@ için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
-#, fuzzy, c-format
-#| msgid "invalid debug-level `%s' given\n"
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
+#, c-format
 msgid "invalid debug-level '%s' given\n"
-msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
+msgstr "geçersiz hata ayıklama düzeyi '%s' verildi\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
-msgstr "seçilen özet algoritması geçersiz\n"
+msgstr "seçili özet algoritması geçersiz\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
-#, fuzzy, c-format
-#| msgid "reading options from `%s'\n"
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
+#, c-format
 msgid "reading options from '%s'\n"
-msgstr "\"%s\"den seçenekler okunuyor\n"
+msgstr "seçenekler, '%s' ögesinden okunuyor\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is a deprecated option\n"
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
+#, c-format
 msgid "Note: '%s' is not considered an option\n"
-msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+msgstr "Not: '%s', bir seçenek olarak kabul edilmiyor\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+msgstr "UYARI: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
-#, fuzzy, c-format
-#| msgid "socket name `%s' is too long\n"
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
+#, c-format
 msgid "socket name '%s' is too long\n"
-msgstr "soketin ismi `%s' çok uzun\n"
+msgstr "soket adı '%s' pek uzun\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
-msgstr ""
+msgstr "çalışmakta olan %s ögesinden soket aşırılmaya çalışılıyor\n"
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, 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:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
-#, fuzzy, c-format
-#| msgid "error binding socket to `%s': %s\n"
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
+#, c-format
 msgid "error binding socket to '%s': %s\n"
-msgstr "soket `%s'e bağlanırken hata: %s\n"
+msgstr "soket '%s' ögesine bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
-#, fuzzy, c-format
-#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
+#, c-format
 msgid "can't set permissions of '%s': %s\n"
-msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
+msgstr "'%s' izinleri ayarlanamıyor: %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
-#, fuzzy, c-format
-#| msgid "listening on socket `%s'\n"
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
+#, c-format
 msgid "listening on socket '%s'\n"
-msgstr "`%s' soketi dinlemede\n"
+msgstr "'%s' soketinde dinleniyor\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
-#, fuzzy, c-format
-#| msgid "can't create directory `%s': %s\n"
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
+#, c-format
 msgid "can't create directory '%s': %s\n"
-msgstr "`%s' dizini oluşturulamıyor: %s\n"
+msgstr "'%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
-#, fuzzy, c-format
-#| msgid "directory `%s' created\n"
+#, c-format
 msgid "directory '%s' created\n"
-msgstr "dizin `%s' oluşturuldu\n"
+msgstr "'%s' dizini oluşturuldu\n"
 
-#: agent/gpg-agent.c:2384
-#, fuzzy, c-format
-#| msgid "stat() failed for `%s': %s\n"
+#: agent/gpg-agent.c:2412
+#, c-format
 msgid "stat() failed for '%s': %s\n"
-msgstr "%s için stat() başarısız oldu: %s\n"
+msgstr "'%s' için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:2388
-#, fuzzy, c-format
-#| msgid "can't use `%s' as home directory\n"
+#: agent/gpg-agent.c:2416
+#, c-format
 msgid "can't use '%s' as home directory\n"
-msgstr "`%s' ev dizini olarak kullanılamıyor\n"
+msgstr "'%s', ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
-msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
+msgstr "tutaç 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
-msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
+msgstr "tutaç 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, 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"
+msgstr "ssh tutacı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, 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"
+msgstr "ssh tutacı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
-#, fuzzy, c-format
-#| msgid "pth_select failed: %s - waiting 1s\n"
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
+#, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
-msgstr "pth_select başarısız: %s - 1s bekliyor\n"
+msgstr "npth_pselect başarısız: %s - 1sn bekliyor\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -837,21 +770,21 @@
 "@Seçenekler:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 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"
+"Kullanım: gpg-preset-passphrase seçenekler ANHMAŞASI (yardım için -h)\n"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
 msgstr ""
-"Sözdizimi: gpg-preset-passphrase seçenekler ANHMAŞASI\n"
+"Sözdizim: gpg-preset-passphrase seçenekler ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -859,8 +792,8 @@
 "@Komutlar:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -870,36 +803,36 @@
 "Seçenekler:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
-msgstr "Kullanımı: gpg-protect-tool seçenekler (yardım için -h)\n"
+msgstr "Kullanım: gpg-protect-tool seçenekler (yardım için -h)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
 msgstr ""
-"Sözdizimi: gpg-protect-tool seçenekler arg ...\n"
+"Sözdizim: gpg-protect-tool seçenekler argümanlar ...\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 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:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 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:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
-"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
+"Lütfen GnuPG sistemine içe aktarılan nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -907,59 +840,54 @@
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, 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:366 tools/gpgconf.c:480
-#, fuzzy, c-format
-#| msgid "error opening `%s': %s\n"
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
+#, c-format
 msgid "error opening '%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
-#, fuzzy, c-format
-#| msgid "file `%s', line %d: %s\n"
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
+#, c-format
 msgid "file '%s', line %d: %s\n"
-msgstr "`%s' dosyası, %d. satır: %s\n"
+msgstr "'%s' dosyası, %d. satır: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
-#, fuzzy, c-format
-#| msgid "statement \"%s\" ignored in `%s', line %d\n"
+#: agent/trustlist.c:212 agent/trustlist.c:220
+#, c-format
 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"
+msgstr "\"%s\" beyanı; '%s', %d. satırda yok sayıldı\n"
 
-#: agent/trustlist.c:207
-#, fuzzy, c-format
-#| msgid "system trustlist `%s' not available\n"
+#: agent/trustlist.c:226
+#, c-format
 msgid "system trustlist '%s' not available\n"
-msgstr "sistem güvence listesi `%s' kullanım dışı\n"
+msgstr "sistem güvence listesi '%s' kullanım dışı\n"
 
-#: agent/trustlist.c:251
-#, fuzzy, c-format
-#| msgid "bad fingerprint in `%s', line %d\n"
+#: agent/trustlist.c:270
+#, c-format
 msgid "bad fingerprint in '%s', line %d\n"
-msgstr "`%s', %d. satırda parmakizi hatalı\n"
+msgstr "'%s', %d. satırda parmak izi kötü\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
-#, fuzzy, c-format
-#| msgid "invalid keyflag in `%s', line %d\n"
+#: agent/trustlist.c:295 agent/trustlist.c:302
+#, c-format
 msgid "invalid keyflag in '%s', line %d\n"
-msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
+msgstr "'%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
-#, fuzzy, c-format
-#| msgid "error reading `%s', line %d: %s\n"
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
+#, c-format
 msgid "error reading '%s', line %d: %s\n"
-msgstr "`%s' okunurken %d. satırda hata: %s\n"
+msgstr "'%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
@@ -972,7 +900,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -981,11 +909,11 @@
 "Kullanıcı sertifikalarının%%0A \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Hayır"
@@ -998,33 +926,33 @@
 #. "%%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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
 "fingerprint:%%0A %s"
 msgstr ""
-"Sertifikanın böyle tanındığını lütfen doğrulayın:%%0A \"%s\"%%0Abu "
-"parmakizine sahip:%%0A %s"
+"Sertifikanın böyle tanındığını lütfen doğrulayın:%%0A \"%s\"%%0Abu parmak "
+"izine iye:%%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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Doğru"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
-msgstr ""
+msgstr "Yanlış"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, 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."
+"Not: Bu anahtar parolası hiç değiştirilmedi.%0ALütfen şimdi değiştirin."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -1033,52 +961,64 @@
 "Bu anahtar parolası %.4s-%.2s-%.2s tarihinden beri hiç değişmedi%%0ALütfen "
 "şimdi değiştirin."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Anahtar parolasını değiştir"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Sonra değiştireceğim"
 
-#: agent/findkey.c:1472
-#, fuzzy, c-format
-#| msgid "Do you really want to delete the selected keys? (y/N) "
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Lütfen seri numarayı içeren kartı takın"
+
+# Check
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"%%0A %s%%0A %s%%0Aanahtarının kullanımı için istekte bulunuldu. Buna izin "
+"vermek istiyor musunuz?"
+
+#: agent/findkey.c:1766
+#, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
 "%%0A?"
-msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
+msgstr ""
+"%%0A %s%%0A %%C%%0A anahtar maşası tarafından tanımlanan anahtarı silmek "
+"istediğnizden emin misiniz?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
-#, fuzzy
-#| msgid "enable key"
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
-msgstr "anahtarı kullanıma sokar"
+msgstr "Anahtarı sil"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
 msgstr ""
+"Uyarı: Bu anahtar aynı zamanda SSH ile kullanım için listelenmiş!\n"
+"Bu anahtarı silmek, uzak makinelere erişiminizi ortadan kaldırabilir."
 
 #: agent/pksign.c:174 g10/seskey.c:286 sm/certcheck.c:91
 #, 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"
+msgstr "DSA sekizin katlarında bir sağlama uzunluğu gerektirir\n"
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
-msgstr "%s anahtarı, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
+msgstr "%s anahtarı, güvensiz bir sağlama (%u bit) kullanıyor\n"
 
 #: agent/pksign.c:200
-#, fuzzy, c-format
-#| msgid "a %u bit hash is not valid for a %u bit %s key\n"
+#, c-format
 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"
+msgstr "bir %zu bit sağlama, bir %u bit %s anahtarı için geçerli değildir\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
@@ -1088,84 +1028,75 @@
 msgid "secret key parts are not available\n"
 msgstr "gizli anahtar parçaları kullanım dışı\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
-#, fuzzy, c-format
-#| msgid "protection algorithm %d%s is not supported\n"
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
+#, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
-msgstr "koruma algoritması %d%s desteklenmiyor\n"
+msgstr "genel anahtar algoritması %d (%s), desteklenmiyor\n"
 
 #: agent/cvt-openpgp.c:493
-#, fuzzy, c-format
-#| msgid "protection algorithm %d%s is not supported\n"
+#, c-format
 msgid "protection algorithm %d (%s) is not supported\n"
-msgstr "koruma algoritması %d%s desteklenmiyor\n"
+msgstr "koruma algoritması %d (%s), desteklenmiyor\n"
 
 #: agent/cvt-openpgp.c:500
-#, 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 "koruma algoritması %d%s desteklenmiyor\n"
+msgstr "koruma algoritması %d (%s), desteklenmiyor\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
-msgstr "boru oluşturulurken hata: %s\n"
+msgstr "veri yolu oluşturulurken hata: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
-#, fuzzy, c-format
-#| msgid "error creating a pipe: %s\n"
+#, c-format
 msgid "error creating a stream for a pipe: %s\n"
-msgstr "boru oluşturulurken hata: %s\n"
+msgstr "veri yolu için bir akım oluşturulurken hata: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
-msgstr "süreç çatallanırken hata: %s\n"
+msgstr "işlem çatallanırken hata: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+msgstr "%d işleminin sonlanmasını bekleme başarısız: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
-#, fuzzy, c-format
-#| msgid "error running `%s': probably not installed\n"
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
+#, c-format
 msgid "error running '%s': probably not installed\n"
-msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
+msgstr "'%s' çalıştırılırken hata: Muhtemelen kurulu değil\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
-#, fuzzy, c-format
-#| msgid "error running `%s': exit status %d\n"
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
+#, c-format
 msgid "error running '%s': exit status %d\n"
-msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
+msgstr "'%s' çalıştırılırken hata: Çıkış durumu: %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
-#, fuzzy, c-format
-#| msgid "error running `%s': terminated\n"
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
+#, c-format
 msgid "error running '%s': terminated\n"
-msgstr "`%s' çalışırken hata: sonlandırıldı\n"
+msgstr "'%s' çalıştırılırken hata: Sonlandırıldı\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
+#, c-format
 msgid "waiting for processes to terminate failed: %s\n"
-msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+msgstr "işlemin sonlanmasını bekleme başarısız: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
-msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
+msgstr "%d işleminin çıkış kodu alınırken hata: %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 "\"%s\" sunucusuna bağlanılamadı: %s\n"
+msgstr "'%s' sunucusuna bağlanılamıyor: %s\n"
 
 #: common/simple-pwquery.c:271
 #, c-format
@@ -1175,32 +1106,30 @@
 #: common/sysutils.c:176
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
+msgstr "çekirdek boşaltması devre dışı bırakılamıyor: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
+msgstr "Uyarı: %s üzerinde güvenli olmayan iyelik: \"%s\"\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
+msgstr "Uyarı: %s üzerinde güvenli olmayan izinler: \"%s\"\n"
 
-#: common/sysutils.c:905
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
+#: common/sysutils.c:885
+#, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
-msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+msgstr "'%s' dosyasının erişilebilir olması için bekleniyor ...\n"
 
-#: common/sysutils.c:931
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
+#: common/sysutils.c:911
+#, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
-msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+msgstr "'%s' > '%s' olarak yeniden adlandırma başarısız: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "evet"
 
@@ -1224,7 +1153,7 @@
 
 #: common/yesno.c:89
 msgid "qQ"
-msgstr "çÇ"
+msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #: common/yesno.c:123
@@ -1234,7 +1163,7 @@
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #: common/yesno.c:125
 msgid "cancel|cancel"
-msgstr "iptal|iptal"
+msgstr "iptal|İPTAL"
 
 #: common/yesno.c:126
 msgid "oO"
@@ -1242,20 +1171,20 @@
 
 #: common/yesno.c:127
 msgid "cC"
-msgstr "iİ"
+msgstr "pP"
 
 #: common/miscellaneous.c:86
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
-msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
+msgstr "%lu bayt ayrılırken güvenli bellekte çekirdek dışına çıkıldı"
 
 #: common/miscellaneous.c:89
 #, c-format
 msgid "out of core while allocating %lu bytes"
-msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
+msgstr "%lu bayt ayrılırken çekirdek dışına çıkıldı"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "yeterli bellek ayrılırken hata: %s\n"
@@ -1266,139 +1195,122 @@
 msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
 
 #: common/miscellaneous.c:157
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+#, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
+msgstr "UYARI: \"%s%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
-msgstr ""
+msgstr "bilinmeyen hata ayıklama bayrağı '%s' yok sayıldı\n"
 
-#: common/asshelp.c:348
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
+#: common/asshelp.c:342
+#, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
-msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+msgstr "dirmngr'nin gelmesi bekleniyor ... (%ds)\n"
 
-#: common/asshelp.c:350
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
+#: common/asshelp.c:344
+#, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
-msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+msgstr "keyboxd'nin gelmesi bekleniyor ... (%ds)\n"
 
-#: common/asshelp.c:351
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
+#: common/asshelp.c:345
+#, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
-msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+msgstr "aracının gelmesi bekleniyor ... (%ds)\n"
 
-#: common/asshelp.c:364
-#, fuzzy, c-format
-#| msgid "can't connect to the dirmngr - trying fall back\n"
+#: common/asshelp.c:358
+#, c-format
 msgid "connection to the dirmngr established\n"
-msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
+msgstr "dirmngr bağlantısı kuruldu\n"
 
-#: common/asshelp.c:366
-#, fuzzy, c-format
-#| msgid "can't connect to the dirmngr - trying fall back\n"
+#: common/asshelp.c:360
+#, c-format
 msgid "connection to the keyboxd established\n"
-msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
+msgstr "keyboxd bağlantısı kuruldu\n"
 
-#: common/asshelp.c:367
-#, fuzzy, c-format
-#| msgid "can't connect to the dirmngr - trying fall back\n"
+#: common/asshelp.c:361
+#, c-format
 msgid "connection to the agent established\n"
-msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
+msgstr "aracı bağlantısı kuruldu\n"
 
-#: common/asshelp.c:485
-#, fuzzy, c-format
-#| msgid "no running dirmngr - starting `%s'\n"
+#: common/asshelp.c:479
+#, c-format
 msgid "no running %s - starting '%s'\n"
-msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
+msgstr "çalışan %s yok - '%s' başlatılıyor\n"
 
-#: common/asshelp.c:588
-#, fuzzy, c-format
-#| msgid "can't connect to the dirmngr - trying fall back\n"
+#: common/asshelp.c:582
+#, c-format
 msgid "connection to the agent is in restricted mode\n"
-msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
+msgstr "aracı bağlantısı kısıtlı kipte\n"
 
-#: common/asshelp.c:725
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
+#: common/asshelp.c:719
+#, c-format
 msgid "error getting version from '%s': %s\n"
-msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
+msgstr "'%s' sürüm bilgisi alınırken hata: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
-msgstr ""
+msgstr "'%s' sunucusu bizden daha eski (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
-#, fuzzy, c-format
-#| msgid "WARNING: %s overrides %s\n"
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
+#, c-format
 msgid "WARNING: %s\n"
-msgstr "UYARI: %s %s'i aşıyor\n"
+msgstr "UYARI: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
+"Not: Eski sunucular önemli güvenlik düzeltmelerini içermiyor olabilir.\n"
 
-#: common/asshelp.c:742
-#, fuzzy, c-format
-#| msgid "Please use the command \"toggle\" first.\n"
+#: common/asshelp.c:736
+#, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
-msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
+msgstr "Not: Onları yeniden başlatmak için \"%s\" komutunu kullanın.\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|İyi"
 
 #: common/audit.c:477
 msgid "|audit-log-result|Bad"
-msgstr ""
+msgstr "|audit-log-result|Kötü"
 
 #: common/audit.c:479
 msgid "|audit-log-result|Not supported"
-msgstr ""
+msgstr "|audit-log-result|Desteklenmiyor"
 
 #: common/audit.c:481
-#, fuzzy
 msgid "|audit-log-result|No certificate"
-msgstr "sertifikaları ithal eder"
+msgstr "|audit-log-result|Sertifika yok"
 
 #: common/audit.c:483
-#, fuzzy
 msgid "|audit-log-result|Not enabled"
-msgstr "sertifikaları ithal eder"
+msgstr "|audit-log-result|Etkin değil"
 
 #: common/audit.c:485
 msgid "|audit-log-result|Error"
-msgstr ""
+msgstr "|audit-log-result|Hata"
 
 #: common/audit.c:487
-#, fuzzy
 msgid "|audit-log-result|Not used"
-msgstr "sertifikaları ithal eder"
+msgstr "|audit-log-result|Kullanılmıyor"
 
 #: common/audit.c:489
-#, fuzzy
 msgid "|audit-log-result|Okay"
-msgstr "sertifikaları ithal eder"
+msgstr "|audit-log-result|Tamam"
 
 #: common/audit.c:491
-#, fuzzy
 msgid "|audit-log-result|Skipped"
-msgstr "sertifikaları ithal eder"
+msgstr "|audit-log-result|Atlandı"
 
 #: common/audit.c:493
-#, fuzzy
 msgid "|audit-log-result|Some"
-msgstr "sertifikaları ithal eder"
+msgstr "|audit-log-result|Kimisi"
 
 #: common/audit.c:726
 msgid "Certificate chain available"
@@ -1426,7 +1338,7 @@
 msgstr "algoritma: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "desteklenmeyen algoritma: %s"
@@ -1442,53 +1354,51 @@
 #: common/audit.c:792 common/audit.c:956
 #, c-format
 msgid "Recipient %d"
-msgstr "%d. alıcı"
+msgstr "Alıcı %d"
 
 #: common/audit.c:825
 msgid "Data signing succeeded"
-msgstr "Verinin imzalanması başarılı"
+msgstr "Veri imzalanması başarılı"
 
 #: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
-#, fuzzy, c-format
+#, c-format
 msgid "data hash algorithm: %s"
-msgstr "Kötü çittirim algoritması: %s"
+msgstr "veri sağlama algoritması: %s"
 
 #: common/audit.c:862
-#, fuzzy, c-format
+#, c-format
 msgid "Signer %d"
-msgstr "İmza %d"
+msgstr "İmzalayan %d"
 
 #: common/audit.c:866 common/audit.c:1065
-#, fuzzy, c-format
+#, c-format
 msgid "attr hash algorithm: %s"
-msgstr "Kötü çittirim algoritması: %s"
+msgstr "attr sağlama algoritması: %s"
 
 #: common/audit.c:901
 msgid "Data decryption succeeded"
-msgstr "Verinin şifresinin çözülmesi başarılı"
+msgstr "Veri şifresi çözülmesi başarılı"
 
 #: common/audit.c:910
-#, fuzzy
 msgid "Encryption algorithm supported"
-msgstr "koruma algoritması %d%s desteklenmiyor\n"
+msgstr "Şifreleme algoritması destekleniyor"
 
 #: common/audit.c:993
 msgid "Data verification succeeded"
-msgstr "Verinin doğrulanması başarılı"
+msgstr "Veri doğrulanması başarılı"
 
 #: common/audit.c:1002
 msgid "Signature available"
 msgstr "İmza kullanılabilir"
 
 #: common/audit.c:1024
-#, fuzzy
 msgid "Parsing data succeeded"
-msgstr "İmzanın çözümlenmesi başarılı"
+msgstr "Veri ayrıştırılması başarılı"
 
 #: common/audit.c:1036
-#, fuzzy, c-format
+#, c-format
 msgid "bad data hash algorithm: %s"
-msgstr "Kötü çittirim algoritması: %s"
+msgstr "kötü veri sağlama algoritması: %s"
 
 #: common/audit.c:1051
 #, c-format
@@ -1501,55 +1411,54 @@
 
 #: common/audit.c:1090
 msgid "Root certificate trustworthy"
-msgstr "Kök sertifika güvenilir"
+msgstr "Kök sertifikası güvenilir"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "sertifika için bir CRL yok"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "mevcut CRL çok eski"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "sertifikalar için CRL/OCSP sınaması"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "İçerilen sertifikalar"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Hiç denetim günlük girdisi yok."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Bilinmeyen işlem"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent elverişli"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr elverişli"
 
-#: common/audit.c:1308
-#, fuzzy, c-format
-#| msgid "No help available for `%s'."
+#: common/audit.c:1309
+#, c-format
 msgid "No help available for '%s'."
-msgstr "`%s' için yardım mevcut değil."
+msgstr "'%s' için yardım mevcut değil."
 
 #: common/helpfile.c:90
 msgid "ignoring garbage line"
-msgstr "bozuk satır yok sayılıyor"
+msgstr "anlamsız satır yok sayılıyor"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "yok"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "geçersiz radix64 karakteri %02x atlandı\n"
@@ -1557,835 +1466,813 @@
 #: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
-msgstr ""
+msgstr "Üzgünüz, şu anda toplu iş kipinde - girdi alınamıyor\n"
 
 #: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
-msgstr ""
+msgstr "Üzgünüz, hiçbir uçbirim istekte bulunmadı - girdi alınamıyor\n"
 
 #: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
-msgstr ""
+msgstr "pek fazla hata: bırakılıyor\n"
 
 #: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
-msgstr ""
+msgstr "Control-D algılandı\n"
 
 #: common/utf8conv.c:127
-#, fuzzy, c-format
-#| msgid "conversion from `%s' to `%s' not available\n"
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
-msgstr "`%s' > `%s' dönüşümü elverişli değil\n"
+msgstr "'%s' > '%s' dönüşümü kullanılabilir değil\n"
 
 #: common/utf8conv.c:135
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open başarısız: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
-#, fuzzy, c-format
-#| msgid "conversion from `%s' to `%s' failed: %s\n"
+#: common/utf8conv.c:387 common/utf8conv.c:653
+#, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
-msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
+msgstr "'%s' > '%s' dönüşümü başarısız: %s\n"
 
-#: common/dotlock.c:728
-#, fuzzy, c-format
-#| msgid "failed to create temporary file `%s': %s\n"
+#: common/dotlock.c:723
+#, c-format
 msgid "failed to create temporary file '%s': %s\n"
-msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
+msgstr "'%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: common/dotlock.c:790
-#, fuzzy, c-format
-#| msgid "error writing to `%s': %s\n"
+#: common/dotlock.c:785 common/homedir.c:178
+#, c-format
 msgid "error writing to '%s': %s\n"
-msgstr "`%s' yazılırken hata: %s\n"
+msgstr "'%s' konumuna yazılırken hata: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "bayat kilit dosyası siliniyor (%d tarafından oluşturulmuş)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "kilit için bekleniyor (%d%s tarafından tutulmuş) %s...\n"
+msgstr "kilit için bekleniyor (%d%s tarafından tutuluyor) %s...\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(ölükilit?) "
 
-#: common/dotlock.c:1242
-#, fuzzy, c-format
-#| msgid "lock `%s' not made: %s\n"
+#: common/dotlock.c:1237
+#, c-format
 msgid "lock '%s' not made: %s\n"
-msgstr "kilit `%s' yapılmadı: %s\n"
+msgstr "'%s' kilidi yapılmadı: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "%s kilidi için bekleniyor...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "'%s' oluşturulurken hata: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "'%s' kapatılırken hata: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "zırh başlığı geçersiz: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "zırh başlığı: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "açıkça okunabilen imza başlığı geçersiz\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "bilinmeyen zırh başlığı: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
-msgstr "açıkça okunabilen imzalar dahil edildi\n"
+msgstr "iç içe geçmiş açık metin imzalar\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "beklenmeyen zırh: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
-msgstr "araçizgisi escape'lı satır geçersiz: "
+msgstr "geçersiz tire kaçışlı satır: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
-msgstr "dosya sonu belirsiz (CRC yok)\n"
+msgstr "beklenmedik dosya sonu (CRC yok)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
-msgstr "dosya sonu belirsiz (CRC içinde)\n"
+msgstr "beklenmedik dosya sonu (CRC içinde)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
-msgstr "CRC bozulmuş\n"
+msgstr "yanlış oluşturulmuş CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hatası; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
-msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
+msgstr "beklenmedik dosya sonu (artbilgi içinde)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
-msgstr "kuyruk satırında hata\n"
+msgstr "artbilgi satırında hata\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "geçersiz zırh: satır %d karakterden uzun\n"
+msgstr "geçersiz zırh: Satır %d karakterden uzun\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
-"sunucusu kullanılmış\n"
+"zırhta tırnak içinde yazdırılabilir karakter - büyük olasılıkla hatalı bir "
+"MTA kullanılmış\n"
 
-#: g10/build-packet.c:1459
-#, fuzzy, c-format
-#| msgid "not human readable"
+#: g10/build-packet.c:1492
+#, c-format
 msgid " not human readable (%zu bytes: %s%s) "
-msgstr "insan okuyabilir değil"
+msgstr " insan okuyabilir biçimde değil (%zu bayt: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
-"bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
-"sonuna bir '=' gelir.\n"
+"bir simgelem adı yalnızca harfler, rakamlar ve altçizgiler içerebilir ve bir "
+"'=' ile sonlanmalıdır\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
-msgstr "bir kullanıcı simgelem ismi '@' karakteri içermeli\n"
+msgstr "bir kullanıcı simgelem adı '@' karakteri içermelidir\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
-msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
+msgstr "bir simgelem adının birden çok '@' karakteri içermemesi gerekir\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
-msgstr "bir simgelem değerinde kontrol karakterleri kullanılamaz\n"
+msgstr "bir simgelem değerinde denetim karakterleri kullanılamaz\n"
 
-#: g10/build-packet.c:1603
-#, fuzzy, c-format
-#| msgid "a notation name must not contain more than one '@' character\n"
+#: g10/build-packet.c:1636
+#, c-format
 msgid "a notation name may not contain an '=' character\n"
-msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
+msgstr "bir simgelem adı, bir '=' karakteri içeremez\n"
 
-#: g10/build-packet.c:1609
-#, fuzzy, c-format
-#| msgid ""
-#| "a notation name must have only printable characters or spaces, and end "
-#| "with an '='\n"
+#: g10/build-packet.c:1642
+#, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
-"bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
-"sonuna bir '=' gelir.\n"
+"bir simgelem adı, yalnızca yazdırılabilir karakterler veya boşluklar "
+"içermelidir\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
-msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
+msgstr "UYARI: Geçersiz simgelem verisi bulundu\n"
 
 #: g10/call-agent.c:155 sm/call-agent.c:214
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
-msgstr ""
+msgstr "istemciye %s sorgusu vekille aktarılamadı\n"
 
 #: g10/call-agent.c:181
-#, fuzzy
-#| msgid "Enter passphrase\n"
 msgid "Enter passphrase: "
-msgstr "Anahtar parolasını giriniz\n"
+msgstr "Anahtar parolasını girin: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
-#, fuzzy, c-format
-#| msgid "%s does not yet work with %s\n"
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
+#, c-format
 msgid "%s is not compliant with %s mode\n"
-msgstr "%s, %s ile henüz çalışmıyor\n"
+msgstr "%s, %s kipine uyum sağlamıyor\n"
 
 #: g10/call-agent.c:1088
-#, fuzzy, c-format
-#| msgid "error reading from %s: %s\n"
+#, c-format
 msgid "error from TPM: %s\n"
-msgstr "%s okunurken hata: %s\n"
+msgstr "TPM kaynaklı hata: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
-#, fuzzy, c-format
-#| msgid "no gpg-agent running in this session\n"
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
+#, c-format
 msgid "no dirmngr running in this session\n"
-msgstr "bu oturumda çalışan gpg-agent yok\n"
+msgstr "bu oturumda çalışan bir dirmngr yok\n"
 
 #: g10/call-dirmngr.c:212
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
+#, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
-msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+msgstr ""
+"anahtar sunucusu seçeneği \"honor-keyserver-url\", Tor kipinde "
+"kullanılamayabilir\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
-msgstr ""
+msgstr "WKD, arabelleklenmiş bir sonuç kullanıyor"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
-msgstr ""
+msgstr "Tor çalışmıyor"
 
-#: g10/call-dirmngr.c:390
-#, fuzzy
-#| msgid "invalid fingerprint"
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
-msgstr "parmakizi geçersiz"
+msgstr "Tor düzgün bir biçimde yapılandırılmamış"
 
-#: g10/call-dirmngr.c:392
-#, fuzzy
-#| msgid "invalid fingerprint"
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
-msgstr "parmakizi geçersiz"
+msgstr "DNS düzgün bir biçimde yapılandırılmamış"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
-msgstr ""
+msgstr "sunucudan kabul edilemeyen HTTP yeniden yönlendirmesi"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
-msgstr ""
+msgstr "sunucudan kabul edilemeyen HTTP yeniden yönlendirmesi temizlendi"
 
-#: g10/call-dirmngr.c:398
-#, fuzzy
-#| msgid "generate a revocation certificate"
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
-msgstr "bir yürürlükten kaldırma sertifikası üretir"
+msgstr "sunucu geçersiz bir sertifika kullanıyor"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
-#, fuzzy, c-format
-#| msgid "armor: %s\n"
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
+#, c-format
 msgid "Note: %s\n"
-msgstr "zırh: %s\n"
+msgstr "Not: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, 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:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr "%s numaralı OpenPGP kartı saptandı\n"
+msgstr "%s numaralı OpenPGP kartı algılandı\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
-msgstr "bu önceden betik kipinde yapılamaz\n"
+msgstr "bu, toplu iş kipinde yapılamaz\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 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"
+msgstr "Bu komut yalnızca 2. sürüm kartlar için kullanılabilir\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, 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:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "belirtilmedi"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
-msgstr ""
+msgstr "Bay"
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
-msgstr ""
+msgstr "Bayan"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr "Listeleme doğru görünmüyorsa lütfen \"%s\" komutunu deneyin\n"
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
+msgstr "Hata: Şimdilik yalnızca US-ASCII mümkün.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
-msgstr "Kart sahibinin soyadı: "
+msgstr "Kart iyesinin soyadı: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
-msgstr "Kart sahibinin adı: "
+msgstr "Kart iyesinin adı: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, 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"
+msgstr "Hata: Bileştirilmiş adlar çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
+#, c-format
 msgid "error reading '%s': %s\n"
-msgstr "\"%s\" okunurken hata: %s\n"
+msgstr "'%s' okunurken hata: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
-#, fuzzy, c-format
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
+#, c-format
 msgid "error writing '%s': %s\n"
-msgstr "`%s' yazılırken hata: %s\n"
+msgstr "'%s' yazılırken hata: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
-msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
+msgstr "Hata: Tercih dizisinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
-msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
+msgstr "Hata: Tercih dizisindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
-msgstr ""
+msgstr "Hitap: (M = Bay, F = Bayan veya boşluk): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
-msgstr "Hata: yanıt geçersiz.\n"
+msgstr "Hata: Geçersiz yanıt.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "Hata: biçimli parmakizi geçersiz\n"
+msgstr "Hata: Geçersiz biçimlendirilmiş parmak izi.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
-msgstr "anahtar işlemi mümkün değil: %s\n"
+msgstr "anahtar işlemi olanaklı değil: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, 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:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
-msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
+msgstr "Mevcut anahtar başkasıyla değiştirilsin mi? (e/H) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
 " please check the documentation of your card to see which\n"
 " key types and sizes are supported.\n"
 msgstr ""
+"Not: Kartın istenen anahtar türünü veya boyutunu desteklediği\n"
+" garanti değildir. Eğer anahtar oluşturması başarılı olmazsa\n"
+" kartınızın hangi anahtar türlerini ve boyutlarını desteklediğini\n"
+" görmek için kartınızın belgelendirmesine bakın.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
-msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
+msgstr "İstediğiniz anahtar boyutu nedir? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
+msgstr "%s anahtar uzunlukları %u-%u eriminde olmalıdır\n"
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
-msgstr ""
+msgstr "Şunun için anahtar özniteliği değiştiriliyor: "
 
-#: g10/card-util.c:1473
-#, fuzzy
-#| msgid " (1) Signature key\n"
+#: g10/card-util.c:1481
 msgid "Signature key\n"
-msgstr " (1) İmzalama anahtarı\n"
+msgstr "İmzalama anahtarı\n"
 
-#: g10/card-util.c:1475
-#, fuzzy
-#| msgid " (2) Encryption key\n"
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
-msgstr " (2) Şifreleme anahtarı\n"
+msgstr "Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1477
-#, fuzzy
-#| msgid " (3) Authentication key\n"
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
-msgstr " (3) Kimlik kanıtlama anahtarı\n"
+msgstr "Kimlik doğrulama anahtarı\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
-msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
+msgstr "Lütfen istediğiniz anahtar türünü seçin:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
-#, fuzzy, c-format
+#: g10/card-util.c:1489
+#, c-format
 msgid " (%d) ECC\n"
-msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
+msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
+"Kart, %u bitlik bir anahtar oluşturacak biçimde yeniden yapılandırılacak\n"
 
-#: g10/card-util.c:1574
+#: g10/card-util.c:1582
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
+"Kart, şu türde bir anahtar oluşturacak biçimde yeniden yapılandırılacak: %s\n"
 
-#: g10/card-util.c:1610
-#, fuzzy, c-format
+#: g10/card-util.c:1618
+#, c-format
 msgid "error changing key attribute for key %d: %s\n"
-msgstr "soket `%s'e bağlanırken hata: %s\n"
+msgstr "%d anahtarı için öznitelik değiştirilirken hata: %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
-#, fuzzy, c-format
-#| msgid "error getting current key info: %s\n"
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
+#, c-format
 msgid "error getting card info: %s\n"
-msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
+msgstr "kart bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
-#, fuzzy, c-format
-#| msgid "This command is not allowed while in %s mode.\n"
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
+#, c-format
 msgid "This command is not supported by this card\n"
-msgstr "%s kipindeyken bu komut kullanılamaz.\n"
+msgstr "Bu komut, bu kart tarafından desteklenmiyor\n"
 
-#: g10/card-util.c:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 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) "
+msgstr "Şifre anahtarının kart dışında bir yedeği yapılsın mı? (E/h) "
 
-#: g10/card-util.c:1692
-#, fuzzy, c-format
+#: g10/card-util.c:1700
+#, c-format
 msgid "Note: keys are already stored on the card!\n"
-msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
+msgstr "Not: Anahtarlar halihazırda kart üzerinde depolanıyor!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
-msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
+msgstr "Var olan anahtarlar başkalarıyla değiştirilsin mi? (e/H) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
-#, fuzzy, 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"
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
+#, 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 ""
 "Lütfen dikkat edin, PIN'lerin öntanımlı ayarları böyledir:\n"
-" PIN = `%s' Admin PIN = `%s'\n"
+" PIN = '%s' Admin PIN = '%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
-msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
+msgstr "Lütfen üretilecek anahtar türünü seçin:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
-msgstr " (3) Kimlik kanıtlama anahtarı\n"
+msgstr " (3) Kimlik doğrulama anahtarı\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
-msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
+msgstr "Lütfen anahtarın depolanacağı yeri seçin:\n"
 
-#: g10/card-util.c:1877
-#, fuzzy, c-format
-#| msgid "read failed: %s\n"
+#: g10/card-util.c:1898
+#, c-format
 msgid "KEYTOCARD failed: %s\n"
-msgstr "read başarısız: %s\n"
+msgstr "KEYTOCARD başarısız: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
-#, fuzzy, c-format
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
+#, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
-msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
+msgstr "Not: Bu komut kartta depolanan tüm anahtarları yok eder!\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
-#, fuzzy
-#| msgid "Sign it? (y/N) "
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
-msgstr "İmzalayacak mısınız? (e/H veya y/N) "
+msgstr "Sürdürülsün mü? (e/H) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
-msgstr ""
+msgstr "İlk ayarlara sıfırlamak istediğinize emin misiniz? (\"yes\" girin) "
 
-#: g10/card-util.c:2183
-#, fuzzy, c-format
-#| msgid "error closing %s: %s\n"
+#: g10/card-util.c:2209
+#, c-format
 msgid "error for setup KDF: %s\n"
-msgstr "%s kapanırken hata: %s\n"
+msgstr "KDF ayarlanırken hata: %s\n"
 
-#: g10/card-util.c:2229
-#, fuzzy, c-format
-#| msgid "error closing %s: %s\n"
+#: g10/card-util.c:2255
+#, c-format
 msgid "error for setup UIF: %s\n"
-msgstr "%s kapanırken hata: %s\n"
+msgstr "UIF ayarlanırken hata: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
-msgstr "yönetici komutlarını gösterir"
+msgstr "yönetici komutlarını göster"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
-msgstr "bunu gösterir"
+msgstr "bu yardımı göster"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
-msgstr "tüm kullanılabilir veriyi listeler"
+msgstr "tüm kullanılabilir veriyi listele"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
-msgstr "kart sahibinin ismini değiştirir"
+msgstr "kart iyesinin adını değiştir"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
-msgstr "anahtarın alınacağı URL değiştirilir"
+msgstr "anahtarın alınacağı URL'yi değiştir"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
-msgstr "kart URL'sinde belirtilmiş anahtarı alır"
+msgstr "kart URL'sinde belirtilmiş anahtarı al"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
-msgstr "oturum açma ismini değiştirir"
+msgstr "oturum açma adını değiştir"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
-msgstr "dil tercihlerini değiştirir"
+msgstr "dil tercihlerini değiştir"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
-#, fuzzy
-#| msgid "change card holder's sex"
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
-msgstr "kart sahibinin cinsiyetini değiştirir"
+msgstr "kart iyesinin hitabını değiştir"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
-msgstr "bir CA parmakizini değiştirir"
+msgstr "bir CA parmak izini değiştir"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
-msgstr "imza zorlama PIN'i bayrağını değiştirir"
+msgstr "imza zorlama PIN'i bayrağını değiştir"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
-msgstr "yeni anahtarlar üretir"
+msgstr "yeni anahtarlar oluştur"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
-msgstr "PIN'i değiştirme veya engelleme menüsü"
+msgstr "PIN'i değiştirme veya blokunu kaldırma menüsü"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
-msgstr "PIN'i doğrular ve tüm veriyi listeler"
+msgstr "PIN'i doğrula ve tüm veriyi listele"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
-msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
+msgstr "bir sıfırlama kodu kullanarak PIN'in blokunu kaldır"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
-msgstr ""
+msgstr "tüm anahtarları ve veriyi yok et"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
-msgstr ""
+msgstr "KDF'yi PIN kimlik doğrulaması için ayarla (on/single/off)"
 
-#: g10/card-util.c:2277
-#, fuzzy
-#| msgid "change the ownertrust"
+#: g10/card-util.c:2303
 msgid "change the key attribute"
-msgstr "sahibiningüvencesini değiştirir"
+msgstr "anahtar özniteliğini değiştir"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
-#, fuzzy
-#| msgid "change the ownertrust"
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
-msgstr "sahibiningüvencesini değiştirir"
+msgstr "Kullanıcı etkileşim bayrağını değiştir"
+
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr "OpenPGP uygulamasına geç"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
-msgstr ""
+msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, 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:5363 g10/keyring.c:399 g10/keyring.c:750
-#, fuzzy, c-format
-#| msgid "can't open `%s'\n"
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
+#, c-format
 msgid "can't open '%s'\n"
-msgstr "`%s' açılamadı\n"
+msgstr "'%s' açılamıyor\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "anahtar \"%s\" yok: %s\n"
+msgstr "\"%s\" anahtarı bulunamadı: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "anahtar bloğu okunurken hata: %s\n"
+msgstr "anahtar bloku okunurken hata: %s\n"
 
 #: g10/delkey.c:148
-#, fuzzy, c-format
-#| msgid "key \"%s\" not found: %s\n"
+#, c-format
 msgid "key \"%s\" not found\n"
-msgstr "anahtar \"%s\" yok: %s\n"
+msgstr "\"%s\" anahtarı bulunamadı\n"
 
 #: g10/delkey.c:158 g10/delkey.c:171
 #, c-format
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "betik kipinde \"--yes\" olmaksızın bu yapılamaz\n"
+msgstr "\"--yes\" olmadan toplu iş kipinde bu yapılamaz\n"
 
 #: g10/delkey.c:165 g10/delkey.c:172
 #, c-format
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
+msgstr "(anahtar parmak izi ile belirtilmedikçe)\n"
 
 #: g10/delkey.c:182
 msgid "Note: The public primary key and all its subkeys will be deleted.\n"
-msgstr ""
+msgstr "Not: Genel asıl anahtar ve tüm yardımcı anahtarları silinecek.\n"
 
 #: g10/delkey.c:187
 msgid "Note: Only the shown public subkey will be deleted.\n"
-msgstr ""
+msgstr "Not: Yalnızca gösterilen genel yardımcı anahtar silinecek.\n"
 
 #: g10/delkey.c:192
 msgid "Note: Only the secret part of the shown primary key will be deleted.\n"
-msgstr ""
+msgstr "Not: Yalnızca gösterilen genel asıl anahtarın gizli kısmı silinecek.\n"
 
 #: g10/delkey.c:197
 msgid "Note: Only the secret part of the shown subkey will be deleted.\n"
-msgstr ""
+msgstr "Not: Yalnızca gösterilen yardımcı anahtarın gizli kısmı silinecek.\n"
 
 #: g10/delkey.c:206
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Bu anahtar, anahtar zincirinden silinsin mi? (e/H ya da y/N) "
+msgstr "Bu anahtar, anahtar zincirinden silinsin mi? (e/H) "
 
 #: g10/delkey.c:216
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? (e/H veya y/N)"
+msgstr "Bu bir gizli anahtar! - gerçekten silinsin mi? (e/H) "
 
 #: g10/delkey.c:263
-#, fuzzy, c-format
-#| msgid "deleting certificate \"%s\" failed: %s\n"
+#, c-format
 msgid "deleting secret %s failed: %s\n"
-msgstr "\"%s\" sertifikası silinemedi: %s\n"
+msgstr "gizli %s silinmesi başarısız: %s\n"
 
 #: g10/delkey.c:265
 msgid "key"
-msgstr ""
+msgstr "anahtar"
 
 #: g10/delkey.c:265
-#, fuzzy
-#| msgid "Pubkey: "
 msgid "subkey"
-msgstr "GenAnah: "
+msgstr "yardımcı anahtar"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
@@ -2393,12 +2280,12 @@
 #: g10/delkey.c:308
 #, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "anahtar bloğu silinemedi: %s\n"
+msgstr "anahtar bloku silinemedi: %s\n"
 
 #: g10/delkey.c:322
 #, c-format
 msgid "ownertrust information cleared\n"
-msgstr "sahibinin güvencesi bilgisi temizlendi\n"
+msgstr "iye güvencesi bilgisi temizlendi\n"
 
 #: g10/delkey.c:359
 #, c-format
@@ -2410,576 +2297,504 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
 #, c-format
-msgid "error creating passphrase: %s\n"
-msgstr "anahtar parolası oluşturulurken hata: %s\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "UYARI: Simetrik şifreleme %s (%d), alıcı tercihlerine karşı geliyor\n"
 
-#: g10/encrypt.c:339
+#: g10/encrypt.c:136 g10/encrypt.c:683
 #, 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:370
-#, fuzzy, c-format
-#| msgid "using cipher %s\n"
-msgid "using cipher %s.%s\n"
-msgstr "%s şifrelemesi kullanılıyor\n"
-
-#: g10/encrypt.c:382 g10/encrypt.c:874
-#, 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:443 g10/encrypt.c:911 g10/sign.c:833
-#, 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:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
+msgstr "şifreleme algoritması '%s', şifreleme için kullanılamayabilir\n"
 
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
-msgstr ""
+msgstr "(geçersiz kılmak için \"%s\" seçeneğini kullanın)\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
+msgstr "şifreleme algoritması '%s', %s kipinde kullanılamayabilir\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
-#, 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:181 sm/encrypt.c:771
+#, c-format
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "UYARI: %s anahtarı, %s kipinde şifreleme için uygun değil\n"
 
-#: g10/encrypt.c:721
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "reading from '%s'\n"
-msgstr "`%s'den okunuyor\n"
+#: g10/encrypt.c:477 g10/sign.c:1636
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encrypt.c:777
+#: g10/encrypt.c:484
 #, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
-"zorlanıyor\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
+msgstr "S2K kipi nedeniyle bir SKESK paketi kullanılamıyor\n"
 
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:514
+#, c-format
+msgid "using cipher %s.%s\n"
+msgstr "%s.%s şifrelemesi kullanılıyor\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
+msgid "'%s' already compressed\n"
+msgstr "'%s' halihazırda sıkıştırılmış\n"
+
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "UYARI: '%s', boş bir dosya\n"
+
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "özet algoritması '%s', %s kipinde kullanılamayabilir\n"
+
+#: g10/encrypt.c:867
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "'%s konumundan okunuyor\n"
 
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
-"kullanılmak isteniyor\n"
+"UYARI: %s (%d) sıkıştırma algoritmasını zorlamak alıcı tercihlerine karşı "
+"geliyor\n"
 
-#: g10/encrypt.c:1071
+#: g10/encrypt.c:1179
 #, 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:1164
-#, fuzzy, c-format
-#| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
-msgstr "%s/%s \"%s\" için şifrelendi\n"
+msgstr "%s/%s.%s, şunun için şifrelendi: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
-#, fuzzy, c-format
-#| msgid "you may not use %s while in %s mode\n"
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
+#, c-format
 msgid "option '%s' may not be used in %s mode\n"
-msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+msgstr "'%s' seçeneği, %s kipinde kullanılamayabilir\n"
 
 #: g10/decrypt-data.c:245
-#, fuzzy, c-format
-#| msgid "%s encrypted data\n"
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
 #: g10/decrypt-data.c:248
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
+msgstr "%d bilinmeyen algoritması ile şifrelenmiş\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, 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"
+msgstr "UYARI: İleti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
 #: g10/decrypt-data.c:383 g10/decrypt-data.c:436
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "şifreli paketin elde edilmesinde sorun var\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
-msgstr "sadece-yerel olarak imli imzalar ihraç edilir"
+msgstr "yalnızca yerel olarak imli imzalar dışa aktar"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
-"öznitelik kullanıcı kimliklerini (genellikle foto kimliklerini) ihraç eder"
+"öznitelik kullanıcı kimliklerini (genellikle foto kimliklerini) dışa aktar"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
-msgstr "\"hassas\" olarak imli yürürlükten kaldırma anahtarlarını ihraç eder"
+msgstr "\"hassas\" olarak imli yürürlükten kaldırma anahtarlarını dışa aktar"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
-msgstr "ihraç sırasında anahtardan kullanışsız parçalar kaldırılır"
+msgstr "dışa aktarım sırasında anahtardan kullanışsız parçaları kaldır"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
-msgstr "ihraç sırasında anahtardan mümkün olduğunca çok şey kaldırılır"
+msgstr "dışa aktarım sırasında anahtardan olabildiğince çok şey kaldır"
+
+#: g10/export.c:138
+msgid "export only revocation certificates"
+msgstr "yalnızca yürürlükten kaldırma sertifikalarını dışa aktar"
 
-#: g10/export.c:132
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
-msgstr ""
+msgstr "GnuPG yedekleme biçimini kullan"
+
+#: g10/export.c:145
+msgid "export secret keys using the GnuPG format"
+msgstr "GnuPG biçimini kullanan gizli anahtarları dışa aktar"
 
-#: g10/export.c:1300
-#, fuzzy
-#| msgid "%s: skipped: %s\n"
+#: g10/export.c:1525
 msgid " - skipped"
-msgstr "%s: atlandı: %s\n"
+msgstr " - atlandı"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
-#, fuzzy, c-format
-#| msgid "writing to `%s'\n"
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
+#, c-format
 msgid "writing to '%s'\n"
-msgstr "\"%s\"e yazıyor\n"
+msgstr "'%s' konumuna yazılıyor\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
-msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
+msgstr "%s anahtarı: Anahtar malzemesi kartta - atlandı\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
-msgstr "gizli anahtarların ihracına izin verilmez\n"
+msgstr "gizli anahtarların dışa aktarımına izin verilmez\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
+msgstr "%s anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
-msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
-
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "`%s' oluşturulurken hata: %s\n"
+msgstr "UYARI: Hiçbir şey dışa aktarılmadı\n"
 
 #: g10/getkey.c:252
 msgid "User ID not found"
-msgstr "Kullanıcı kimliği yok"
+msgstr "Kullanıcı kimliği bulunamadı"
 
-#: g10/getkey.c:1324
-#, fuzzy, c-format
-#| msgid "automatically retrieved `%s' via %s\n"
+#: g10/getkey.c:1325
+#, c-format
 msgid "automatically retrieved '%s' via %s\n"
-msgstr "`%s' %s üzerinden özdevinimli olarak alındı\n"
+msgstr "'%s', %s üzerinden kendiliğinden alındı\n"
 
-#: g10/getkey.c:1330
-#, fuzzy, c-format
-#| msgid "error retrieving `%s' via %s: %s\n"
+#: g10/getkey.c:1331
+#, c-format
 msgid "error retrieving '%s' via %s: %s\n"
-msgstr "`%s' %s üzerinden alınırken hata: %s\n"
+msgstr "'%s', %s üzerinden alınırken hata: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Parmak izi yok"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
-msgstr ""
+msgstr "%s ile süresi geçmiş bir anahtarın taze kopyası denetleniyor\n"
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "gizli anahtar \"%s\" yok: %s\n"
+msgstr "gizli anahtar \"%s\" bulunamadı: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
+#: g10/getkey.c:2021 g10/pkclist.c:1032
+#, c-format
 msgid "(check argument of option '%s')\n"
-msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+msgstr "('%s' seçeneğinin argümanını denetle)\n"
 
-#: g10/getkey.c:2090
-#, fuzzy, c-format
-#| msgid "|NAME|use NAME as default secret key"
+#: g10/getkey.c:2099
+#, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
-msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+msgstr "Uyarı: '%s', öntanımlı anahtar olarak kullanılmıyor: %s\n"
 
-#: g10/getkey.c:2098
-#, fuzzy, c-format
-#| msgid "|NAME|use NAME as default secret key"
+#: g10/getkey.c:2107
+#, c-format
 msgid "using \"%s\" as default secret key for signing\n"
-msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+msgstr "imzalama için öntanımlı gizli anahtar olarak \"%s\" kullanılıyor\n"
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
-msgstr ""
+msgstr "'%s' ögesine geçirilen tüm değerler yok sayıldı\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, 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"
+"Geçersiz %s anahtarı, --allow-non-selfsigned-uid kullanılarak geçerli "
+"yapıldı\n"
 
-#: g10/getkey.c:3830
+#: g10/getkey.c:3868
 #, 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"
+msgstr "%s asıl anahtarı yerine %s yardımcı anahtarı kullanılıyordu\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
+#: g10/getkey.c:4424 g10/gpg.c:2213
+#, c-format
 msgid "valid values for option '%s':\n"
-msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+msgstr "'%s' seçeneği için geçerli değerler:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
-msgstr "bir imza yapar"
+msgstr "bir imza yap"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
-msgstr "açıkça okunabilen bir imza yapar"
+msgstr "açıkça okunabilen bir imza yap"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
-msgstr "bağımsız bir imza yapar"
+msgstr "bağımsız bir imza yap"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
-msgstr "veriyi şifreler"
+msgstr "veri şifrele"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
-msgstr "sadece simetrik şifre ile şifreler"
+msgstr "yalnızca simetrik şifre ile şifrele"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
-msgstr "veri şifresini açar (öntanımlı)"
+msgstr "veri şifresini çöz (öntanımlı)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
-msgstr "bir imzayı doğrular"
+msgstr "bir imzayı doğrula"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
-msgstr "anahtarları listeler"
+msgstr "anahtarları listele"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
-msgstr "anahtarları ve imzaları listeler"
+msgstr "anahtarları ve imzaları listele"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
-msgstr "anahtar imzalarını listeler ve sınar"
+msgstr "anahtar imzalarını listele ve denetle"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
-msgstr "anahtarları ve parmak izlerini listeler"
+msgstr "anahtarları ve parmak izlerini listele"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
-msgstr "gizli anahtarları listeler"
+msgstr "gizli anahtarları listele"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
-msgstr "yeni bir anahtar çifti üretir"
+msgstr "yeni bir anahtar çifti üret"
 
-#: g10/gpg.c:480
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
-msgstr "yeni bir anahtar çifti üretir"
+msgstr "tez yeni bir anahtar çifti üret"
 
-#: g10/gpg.c:483
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
-msgstr "yeni bir anahtar çifti üretir"
+msgstr "tez yeni bir kullanıcı kimliği ekle"
 
-#: g10/gpg.c:488
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
-msgstr "yeni bir anahtar çifti üretir"
+msgstr "tez bir kullanıcı kimliğini yürürlükten kaldır"
 
-#: g10/gpg.c:491
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
-msgstr "yeni bir anahtar çifti üretir"
+msgstr "tez yeni bir son kullanım tarihi ayarla"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
-msgstr ""
+msgstr "tam özellikli anahtar çifti üretimi"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
-msgstr "bir yürürlükten kaldırma sertifikası üretir"
+msgstr "bir yürürlükten kaldırma sertifikası üret"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
-msgstr "anahtarları genel anahtar zincirinden siler"
+msgstr "anahtarları genel anahtar zincirinden sil"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
-msgstr "anahtarları gizli anahtar zincirinden siler"
+msgstr "anahtarları gizli anahtar zincirinden sil"
 
-#: g10/gpg.c:504
-#, fuzzy
-#| msgid "sign a key"
+#: g10/gpg.c:514
 msgid "quickly sign a key"
-msgstr "bir anahtarı imzalar"
+msgstr "tez bir anahtar imzala"
 
-#: g10/gpg.c:506
-#, fuzzy
-#| msgid "sign a key locally"
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
-msgstr "bir anahtarı yerel olarak imzalar"
+msgstr "tez bir anahtarı yerel olarak imzala"
 
-#: g10/gpg.c:508
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
-msgstr "yeni bir anahtar çifti üretir"
+msgstr "tez bir anahtar imzasını yürürlükten kaldır"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
-msgstr "bir anahtarı imzalar"
+msgstr "bir anahtar imzala"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
-msgstr "bir anahtarı yerel olarak imzalar"
+msgstr "bir anahtarı yerel olarak imzala"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
-msgstr "bir anahtarı düzenler ve imzalar"
+msgstr "bir anahtarı düzenle ve imzala"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
-msgstr "anahtar parolası değiştirir"
+msgstr "anahtar parolasını değiştir"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
-msgstr "anahtarları gönderir"
+msgstr "anahtarları dışa aktar"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
-msgstr "anahtarları bir anahtar sunucusuna gönderir"
+msgstr "anahtarları bir anahtar sunucusuna dışa aktar"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
-msgstr "anahtarları bir anahtar sunucusundan indirir"
+msgstr "anahtarları bir anahtar sunucusundan içe aktar"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
-msgstr "bir anahtar sunucusunda anahtarları arar"
+msgstr "bir anahtar sunucusunda anahtar ara"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
-msgstr "anahtarları bir anahtar sunucusundan günceller"
+msgstr "anahtarları bir anahtar sunucusundan güncelle"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
-msgstr "anahtarları indirir/katıştırır"
+msgstr "anahtar içe aktar/birbiriyle birleştir"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
-msgstr "kart durumunu basar"
+msgstr "kart durumunu yazdır"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
-msgstr "kart üzerindeki veriyi değiştirir"
+msgstr "kart üzerindeki veriyi değiştir"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
-msgstr "bir kartın PIN'ini değiştirir"
+msgstr "bir kartın PIN'ini değiştir"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
-msgstr "güvence veritabanını günceller"
+msgstr "güvence veritabanını güncelle"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
-msgstr "ileti özetlerini gösterir"
+msgstr "ileti özetlerini göster"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
-msgstr "sunucu kipinde çalışır"
+msgstr "sunucu kipinde çalış"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
-msgstr ""
+msgstr "|VALUE|bir düğme için TOFU poliçesini ayarla"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
-msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+msgstr "|NAME|öntanımlı gizli anahtar olarak NAME'i kullan"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|İSİM|İSİM kullanıcısı için de şifreleme yapar"
+msgstr "|NAME|kullanıcı NAME kimliği için de şifreleme yapar"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
-msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
+msgstr "|SPEC|e-posta armalarını ayarla"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
-msgstr "kesin OpenPGP davranışı etkin olur"
+msgstr "katı OpenPGP davranışı kullan"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
-msgstr "hiçbir değişiklik yapmaz"
+msgstr "hiçbir değişiklik yapma"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
-msgstr "üzerine yazmadan önce sorar"
+msgstr "üzerine yazmadan önce sor"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
-#, fuzzy
-#| msgid "Options controlling the security"
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
-msgstr "Güvenliği denetleyen seçenekler"
+msgstr "Girdiyi denetleyen seçenekler"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
-#, fuzzy
-#| msgid "Options controlling the diagnostic output"
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
-msgstr "Tanı çıktısını denetleyen seçenekler"
+msgstr "Çıktıyı denetleyen seçenekler"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
-msgstr "ascii zırhlı çıktı oluşturur"
+msgstr "ascii zırhlı çıktı oluştur"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
-msgstr "|DOSYA|çıktı DOSYAya yazılır"
+msgstr "|FILE|çıktıyı FILE'a yaz"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
-msgstr "kurallı metin kipini kullanır"
+msgstr "kurallı metin kipini kullan"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
+msgstr "|N|sıkıştırma düzeyini N olarak ayarla (0 devre dışı bırakır)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
-#, fuzzy
-#| msgid "Options controlling the interactivity and enforcement"
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
-msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
+msgstr "Anahtar içe/dışa aktarmayı denetleyen seçenekler"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
-"|MEKANİZMALAR|anahtarları eposta adreslerine göre konumlamak için "
-"MEKANİZMALAR kullanılır"
+"|MECHANISMS|anahtarları posta adreslerine göre konumlamak için MECHANISMS'i "
+"kullan"
 
-#: g10/gpg.c:775
-#, fuzzy
-#| msgid "import keys from a keyserver"
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
-msgstr "anahtarları bir anahtar sunucusundan indirir"
+msgstr "eksik anahtarı bir imzadan içe aktar"
 
-#: g10/gpg.c:780
-#, fuzzy
-#| msgid "list and check key signatures"
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
-msgstr "anahtar imzalarını listeler ve sınar"
+msgstr "imzalarda genel anahtarı içer"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
-msgstr "dirmngr'a tüm erişim iptal edilir"
+msgstr "dirmngr'a tüm erişimi devre dışı bırak"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
-#, fuzzy
-#| msgid "Options controlling the configuration"
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
-msgstr "Yapılandırmayı denetleyen seçenekler"
+msgstr "Anahtar listelemelerini denetleyen seçenekler"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
-#, fuzzy
-#| msgid "list secret keys"
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
-msgstr "gizli anahtarları listeler"
+msgstr "Anahtarları belirten seçenekler"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
+msgstr "|USER-ID|USER-ID için şifreleme yap"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 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"
+msgstr "|USER-ID|imzalamak veya şifre çözmek için USER-ID'yi kullan"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
-msgstr ""
+msgstr "Katılınmayan kullanım için seçenekler"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
-msgstr ""
+msgstr "Diğer seçenekler"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 "@\n"
-"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
+"(Tüm komut ve seçeneklerin tam bir listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:978
-#, 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:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2993,34 +2808,27 @@
 "@\n"
 "Örnekler:\n"
 "\n"
-" -se -r Ali dosya kullanıcı Ali için imzalar ve şifreler\n"
-" --clear-sign dosya açıkça okunabilir bir imza yapar\n"
-" --detach-sign dosya bağımsız bir imza yapar\n"
-" --list-keys isimler anahtarları listeler\n"
-" --fingerprint isimler parmak izlerini gösterir\n"
-
-#: g10/gpg.c:1171
-#, fuzzy
-#| msgid "Usage: gpg options files (-h for help)"
+" -se -r Gökhan dosya Gökhan kullanıcısı için imzala ve şifrele\n"
+" --clear-sign dosya açıkça okunabilir bir imza yap\n"
+" --detach-sign dosya bağımsız bir imza yap\n"
+" --list-keys adlar anahtarları göster\n"
+" --fingerprint adlar parmak izlerini göster\n"
+
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
-msgstr "Kullanımı: gpg seçenekler dosyalar (yardım için -h)"
+msgstr "Kullanım: @GPG@ seçenekler dosyalar (yardım için -h)"
 
-#: g10/gpg.c:1174
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg options files\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
-"Yazılışı: gpg seçenekler dosyalar\n"
-"imzalama, kontrol, şifreleme veya çözme\n"
-"öntanımlı işlem girilen veriye bağımlıdır\n"
+"Sözdizim: @GPG@ seçenekler dosyalar\n"
+"İmzala, denetle, şifrele veya şifre çöz\n"
+"Öntanımlı işlem girilen veri ile bağıntılıdır\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3028,992 +2836,933 @@
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
-msgstr "Hash: "
+msgstr "Sağlama: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
-#, fuzzy, c-format
-#| msgid "usage: gpgsm options "
+#: g10/gpg.c:1300 sm/gpgsm.c:735
+#, c-format
 msgid "usage: %s options %s\n"
-msgstr "kullanımı: gpgsm seçenekler "
+msgstr "kullanım: %s seçenekler %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
-msgstr "çelişen komutlar\n"
+msgstr "çakışan komutlar\n"
 
-#: g10/gpg.c:1508
-#, fuzzy, c-format
-#| msgid "no = sign found in group definition `%s'\n"
+#: g10/gpg.c:1517
+#, c-format
 msgid "no = sign found in group definition '%s'\n"
-msgstr "grup tanımı '%s' içinde = işareti yok\n"
+msgstr "hayır = '%s' grup tanımında imza bulundu\n"
 
-#: g10/gpg.c:1707
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
+#: g10/gpg.c:1716
+#, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
+msgstr "UYARI: '%s' ev dizininde güvenli olmayan iyelik\n"
 
-#: g10/gpg.c:1710
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
+#: g10/gpg.c:1719
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
-msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
+msgstr "UYARI: '%s' yapılandırma dosyasında güvenli olmayan iyelik\n"
 
-#: g10/gpg.c:1713
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on extension `%s'\n"
+#: g10/gpg.c:1722
+#, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
-msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
+msgstr "UYARI: '%s' eklentisinde güvenli olmayan iyelik\n"
 
-#: g10/gpg.c:1719
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
+#: g10/gpg.c:1728
+#, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
-msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
+msgstr "UYARI: '%s' ev dizininde güvenli olmayan izinler\n"
 
-#: g10/gpg.c:1722
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
+#: g10/gpg.c:1731
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
-msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
+msgstr "UYARI: '%s' yapılandırma dosyasında güvenli olmayan izinler\n"
 
-#: g10/gpg.c:1725
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on extension `%s'\n"
+#: g10/gpg.c:1734
+#, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
-msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
+msgstr "UYARI: '%s' eklentisinde güvenli olmayan izinler\n"
 
-#: g10/gpg.c:1731
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
+#: g10/gpg.c:1740
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
-msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
+msgstr "UYARI: '%s' ev dizinindeki ilgili dizinin iyeliği güvenli değil\n"
 
-#: g10/gpg.c:1734
-#, fuzzy, c-format
-#| msgid ""
-#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+#: g10/gpg.c:1743
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
-msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
+msgstr ""
+"UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvenli değil\n"
 
-#: g10/gpg.c:1737
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
+#: g10/gpg.c:1746
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
-msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
+msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvenli değil\n"
 
-#: g10/gpg.c:1743
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
+#: g10/gpg.c:1752
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
-msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
+msgstr "UYARI: '%s' ev dizinindeki ilgili dizinin izinleri güvenli değil\n"
 
-#: g10/gpg.c:1746
-#, fuzzy, c-format
-#| msgid ""
-#| "WARNING: unsafe enclosing directory permissions on configuration file `"
-#| "%s'\n"
+#: g10/gpg.c:1755
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
-msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
+msgstr ""
+"UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvenli değil\n"
 
-#: g10/gpg.c:1749
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
+#: g10/gpg.c:1758
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
-msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
+msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvenli değil\n"
 
-#: g10/gpg.c:1965
-#, fuzzy, c-format
-#| msgid "unknown configuration item `%s'\n"
+#: g10/gpg.c:1974
+#, c-format
 msgid "unknown configuration item '%s'\n"
-msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
+msgstr "bilinmeyen yapılandırma öğesi '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
-msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
+msgstr "anahtarların listelenmesi sırasında fotoğraf kimlikleri göster"
 
-#: g10/gpg.c:2063
-#, fuzzy
-#| msgid "show user ID validity during key listings"
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
-msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
+msgstr "anahtar listelemesi sırasında kullanım bilgisi göster"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
-msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
+msgstr "imza listelemesi sırasında poliçe URL'leri göster"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
-msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
+msgstr "imza listelemesi sırasında tüm simgelemi göster"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
-msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
+msgstr "imza listelemesi sırasında IETF standart simgelemlerini göster"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
-msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
+msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri göster"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
-"imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
+"imza listelemesi sırasında tercih edilen anahtar sunucusu URL'leri göster"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
-msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
+msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini göster"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 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"
+"anahtar listelerinde yürürlükten kaldırılmış ve zaman aşımına uğramış "
+"kullanıcı kimlikleri göster"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 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"
+"anahtar listelerinde yürürlükten kaldırılmış ve zaman aşımına uğramış "
+"yardımcı anahtarlar göster"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "imza listelemesi sırasında geçersiz algoritmalı imzaları göster"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
-msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
+msgstr "anahtar zinciri adını anahtar listelerinde göster"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
-msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
+msgstr "imza listelemesi sırasında zaman aşımı tarihleri göster"
 
-#: g10/gpg.c:2202
-#, fuzzy, c-format
-#| msgid "unknown option `%s'\n"
+#: g10/gpg.c:2100 g10/gpg.c:2102
+msgid "show preferences"
+msgstr "tercihleri göster"
+
+#: g10/gpg.c:2224
+#, c-format
 msgid "unknown TOFU policy '%s'\n"
-msgstr "`%s' seçeneği bilinmiyor\n"
+msgstr "bilinmeyen TOFU poliçesi '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
-msgstr ""
+msgstr "(seçimleri listelemek için \"help\" kullanın)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
-#, fuzzy, c-format
-#| msgid "NOTE: %s is not for normal use!\n"
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
+#, c-format
 msgid "Note: %s is not for normal use!\n"
-msgstr "BİLGİ: %s normal kullanım için değil!\n"
+msgstr "Not: %s, normal kullanım için değildir!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid signature expiration\n"
+#: g10/gpg.c:3195 g10/gpg.c:3207
+#, c-format
 msgid "'%s' is not a valid signature expiration\n"
-msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
+msgstr "'%s' geçerli bir imza zaman aşımı değil\n"
 
-#: g10/gpg.c:3219
-#, fuzzy, c-format
-#| msgid "line %d: not a valid email address\n"
+#: g10/gpg.c:3229
+#, c-format
 msgid "\"%s\" is not a proper mail address\n"
-msgstr "%d. satır: geçerli bir eposta adresi değil\n"
+msgstr "\"%s\", geçerli bir e-posta adresi değil\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
-#, fuzzy, c-format
-#| msgid "invalid country code in `%s', line %d\n"
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
+#, c-format
 msgid "invalid pinentry mode '%s'\n"
-msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
+msgstr "geçersiz pin girdisi kipi '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
+#, c-format
 msgid "invalid request origin '%s'\n"
-msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+msgstr "geçersiz istek kaynağı '%s\n"
 
-#: g10/gpg.c:3314
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid character set\n"
+#: g10/gpg.c:3327
+#, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
-msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
+msgstr "anahtar sunucusu URL'si ayrıştırılamadı\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
+msgstr "%s:%d: Geçersiz anahtar sunucusu seçenekleri\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
-msgstr "anahtar sunucusu seçenekleri geçersiz\n"
+msgstr "geçersiz anahtar sunucusu seçenekleri\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
+msgstr "%s:%d: Geçersiz içe aktarma seçenekleri\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
-msgstr "içselleştirme seçenekleri geçersiz\n"
+msgstr "geçersiz içe aktarma seçenekleri\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
-#, fuzzy, c-format
-#| msgid "invalid list options\n"
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
+#, c-format
 msgid "invalid filter option: %s\n"
-msgstr "liste seçenekleri geçersiz\n"
+msgstr "geçersiz süzgeç seçeneği: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
+msgstr "%s:%d: Geçersiz dışa aktarma seçenekleri\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
-msgstr "dışsallaştırma seçenekleri geçersiz\n"
+msgstr "geçersiz dışa aktarma seçenekleri\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: liste seçenekleri geçersiz\n"
+msgstr "%s:%d: Geçersiz liste seçenekleri\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
-msgstr "liste seçenekleri geçersiz\n"
+msgstr "geçersiz liste seçenekleri\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
-msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
+msgstr "imza doğrulaması sırasında fotoğraf kimlikleri göster"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
-msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
+msgstr "imza doğrulaması sırasında poliçe adresleri göster"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
-msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
+msgstr "imza doğrulaması sırasında tüm simgelemi göster"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
-msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
+msgstr "imza doğrulaması sırasında IETF standart simgelemlerini göster"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
-msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
+msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri göster"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
-"imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
-"gösterilir"
+"imza doğrulaması sırasında tercih edilen anahtar sunucusu URL'leri göster"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
-msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
+msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini göster"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 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"
+"imza doğrulamasında yürürlükten kaldırılan ve süresi geçen kullanıcı "
+"kimliklerini göster"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
-msgstr "imza doğrulamasında sadece birincil kullanıcı kimlik gösterilir"
+msgstr "imza doğrulamasında yalnızca asıl kullanıcı kimliği göster"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
+msgstr "%s:%d: Geçersiz doğrulama seçenekleri\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
-msgstr "doğrulama seçenekleri geçersiz\n"
+msgstr "geçersiz doğrulama seçenekleri\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
+msgstr "çalıştırılabilirler yolu %s olarak ayarlanamıyor\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
+msgstr "%s:%d: Geçersiz auto-key-locate listesi\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
-msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
+msgstr "geçersiz auto-key-locate listesi\n"
 
-#: g10/gpg.c:3659
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
+#: g10/gpg.c:3680
+#, c-format
 msgid "invalid argument for option \"%.50s\"\n"
-msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+msgstr "\"%.50s\" seçeneği için geçersiz argüman\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
-msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
+msgstr "UYARI: Program bir çekirdek dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "UYARI: %s %s'i aşıyor\n"
+msgstr "UYARI: %s, %s ögesini geçersiz kılıyor\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s ile %s birlikte kullanılmaz!\n"
+msgstr "%s ve %s birlikte kullanılamaz!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s, %s ile etkisiz olur!\n"
+msgstr "%s, %s ile bir anlam ifade etmiyor!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
-msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
+msgstr "UYARI: Sahte sistem zamanıyla çalışıyor: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, 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:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "seçilen özet algoritması geçersiz\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
-msgstr "seçilen şifre algoritması geçersiz\n"
+msgstr "seçili sıkıştırma algoritması geçersiz\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
+msgstr "seçili sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
-msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
+msgstr "\"completes-needed\" 0'dan büyük olmalıdır\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
-msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
+msgstr "\"marginals-needed\" 1'den büyük olmalıdır\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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"
+msgstr "\"max-cert-depth\" 1-255 arasında olmalıdır\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:4006
 #, 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"
+msgstr "öntanımlı sertifika düzeyi geçersiz; 0, 1, 2 veya 3 olmalıdır\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:4008
 #, 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"
+msgstr "en küçük sertifika düzeyi geçersiz; 1, 2 veya 3 olmalıdır\n"
 
-#: g10/gpg.c:3994
-#, fuzzy, c-format
-#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+#: g10/gpg.c:4012
+#, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
+msgstr "Not: Basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:4016
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
+msgstr "geçersiz S2K kipi; 0, 1 veya 3 olmalıdır\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
-msgstr "öntanımlı tercihler geçersiz\n"
+msgstr "geçersiz öntanımlı tercihler\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
-msgstr "kişisel şifre tercihleri geçersiz\n"
-
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "kişisel şifre tercihleri geçersiz\n"
+msgstr "geçersiz kişisel şifre tercihleri\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
-msgstr "kişisel özet tercihleri geçersiz\n"
+msgstr "geçersiz kişisel özet tercihleri\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
-msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
+msgstr "geçersiz kişisel sıkıştırma tercihleri\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
-#, fuzzy, c-format
-#| msgid "keysize invalid; using %u bits\n"
+#: g10/gpg.c:4044 g10/gpg.c:4049
+#, c-format
 msgid "chunk size invalid - using %d\n"
-msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
+msgstr "parça boyutu geçersiz - %d kullanılıyor\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
-
-#: g10/gpg.c:4146
-#, fuzzy, c-format
-#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
+#: g10/gpg.c:4149
+#, c-format
 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"
+msgstr "'%s' sıkıştırma algoritması, %s kipinde kullanılamayabilir\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, 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"
+msgstr "TrustDB ilklendirilemedi: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, 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"
+"UYARI: Alıcılar (-r), genel anahtar şifrelemesi kullanılmadan verilmiştir\n"
 
-#: g10/gpg.c:4385
-#, fuzzy, c-format
-#| msgid "symmetric encryption of `%s' failed: %s\n"
+#: g10/gpg.c:4399
+#, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
+msgstr "'%s' ögesinin simetrik şifrelemesi başarısız: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr "--s2k-mode 0 ile --symmetric --encrypt kullanamazsınız\n"
+msgstr "--s2k-mode 0 ile --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4417
-#, fuzzy, c-format
-#| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+#: g10/gpg.c:4431
+#, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
-msgstr "%s kipindeyken --symmetric --encrypt kullanamazsınız\n"
+msgstr "%s kipinde --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, 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:4478
-#, fuzzy, c-format
-#| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+#: g10/gpg.c:4492
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
-msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
+msgstr "%s kipinde --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
+msgstr "anahtar sunucusuna gönderim başarısız: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
+msgstr "anahtar sunucusundan alım başarısız: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
-msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
+msgstr "anahtar dışa aktarımı başarısız: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
-#, fuzzy, c-format
-#| msgid "key export failed: %s\n"
+#: g10/gpg.c:4935 g10/gpg.c:4946
+#, c-format
 msgid "export as ssh key failed: %s\n"
-msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
+msgstr "ssh anahtarı olarak dışa aktarma başarısız: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:5123
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
+#: g10/gpg.c:5175
+#, c-format
 msgid "invalid hash algorithm '%s'\n"
-msgstr "`%s' çittirim algoritması geçersiz\n"
+msgstr "geçersiz sağlama algoritması '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
-#, fuzzy, c-format
-#| msgid "error storing certificate: %s\n"
+#: g10/gpg.c:5327 g10/tofu.c:2160
+#, c-format
 msgid "error parsing key specification '%s': %s\n"
-msgstr "serifika saklanırken hata: %s\n"
+msgstr "'%s' anahtar belirtimi ayrıştırılırken hata: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
+"'%s', geçerli bir anahtar kimliği, parmak izi veya anahtar maşası olarak "
+"görünmüyor\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
+"UYARI: Bir komut verilmedi. Ne anlama geldiğini anlamaya çalışıyorum ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
-msgstr "belirtilen sertifika güvence adresi geçersiz\n"
+msgstr "belirtilen sertifika güvence URL'si geçersiz\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
-msgstr "belirtilen imza güvence adresi geçersiz\n"
+msgstr "belirtilen imza güvence URL'si geçersiz\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
+msgstr "belirtilen anahtar sunucusu URL'si geçersiz\n"
 
 #: g10/gpgv.c:81
 msgid "|FILE|take the keys from the keyring FILE"
-msgstr "|DOSYA|anahtarlar DOSYA anahtar zincirinden alınır"
+msgstr "|FILE|anahtarlar FILE anahtar zincirinden al"
 
 #: g10/gpgv.c:84
 msgid "make timestamp conflicts only a warning"
-msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
+msgstr "zaman damgası çelişkilerini uyarı olarak bildir"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
-msgstr "|FD|durum bilgisini bu FD'ye yazar"
+msgstr "|FD|durum bilgisini bu FD'ye yaz"
 
 #: g10/gpgv.c:91
 msgid "|ALGO|reject signatures made with ALGO"
-msgstr ""
+msgstr "|ALGO|ALGO ile yapılan algoritmaları reddet"
 
 #: g10/gpgv.c:152
 msgid "Usage: gpgv options files (-h for help)"
-msgstr "Kullanımı: gpgv seçenekler dosyalar (yardım için -h)"
+msgstr "Kullanım: gpgv seçenekler dosyalar (yardım için -h)"
 
 #: g10/gpgv.c:154
-#, fuzzy
 msgid ""
 "Syntax: gpgv options files\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
-"Kullanımı: gpg seçenekler dosyalar\n"
-"Bilinen güvenli anahtarlara göre imzaları kontrol eder\n"
+"Kullanım: gpgv seçenekler dosyalar\n"
+"Bilinen güvenli anahtarlara göre imzaları denetler\n"
 
 #: g10/helptext.c:72
 msgid "No help available"
-msgstr "yardım mevcut değil"
+msgstr "Yardım mevcut değil"
 
 #: g10/helptext.c:82
-#, fuzzy, c-format
-#| msgid "No help available for `%s'"
+#, c-format
 msgid "No help available for '%s'"
-msgstr "\"%s\" için yardım mevcut değil"
+msgstr "'%s' için yardım mevcut değil"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
-msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
+msgstr "yalnızca yerel olarak imlenmiş sertifikaları içe aktar"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
-msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
+msgstr "içe aktarım sırasında pks anahtar sunucusundaki bozukluğu onar"
 
-#: g10/import.c:175
-#, fuzzy
-#| msgid "do not update the trustdb after import"
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
-msgstr "ithalat sonrası güvence veritabanını güncellemez"
+msgstr "içe aktarım sırasında iye güvencesi değerlerini temizleme"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
-msgstr "ithalat sonrası güvence veritabanını güncellemez"
+msgstr "içe aktarım sonrasında trustdb'yi güncelleme"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
-msgstr ""
+msgstr "toptan içe aktarım kipini etkinleştir"
 
-#: g10/import.c:184
-#, fuzzy
-#| msgid "show key fingerprint"
+#: g10/import.c:185
 msgid "show key during import"
-msgstr "parmakizini gösterir"
+msgstr "içe aktarım sırasında anahtarı göster"
 
-#: g10/import.c:187
-#, fuzzy
-#| msgid "show key fingerprint"
+#: g10/import.c:188
 msgid "show key but do not actually import"
-msgstr "parmakizini gösterir"
+msgstr "anahtarı göster; ancak gerçekte içe aktarma"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
-msgstr "güncellemeleri sadece mevcut anahtarlar için kabul eder"
+msgstr "güncellemeleri yalnızca mevcut anahtarlar için kabul et"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
-msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
+msgstr "içe aktarım sonrası anahtardan kullanışsız parçaları kaldır"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
-msgstr "ithalat sonrası anahtardan mümkün olduğunca çok şey kaldırır"
+msgstr "içe aktarım sonrası anahtardan olabildiğince çok şey kaldır"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
-msgstr ""
+msgstr "öz imzalı olmayan anahtar imzalarını yok say"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
-msgstr ""
+msgstr "içe aktarma süzgeçlerini çalıştır ve anahtarı hemen dışa aktar"
 
-#: g10/import.c:205
-#, fuzzy
-#| msgid "assume input is in binary format"
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
-msgstr "girdinin ikilik biçimde olduğu kabul edilir"
+msgstr "GnuPG anahtar yedekleme biçimini varsay"
 
-#: g10/import.c:209
-#, fuzzy
-#| msgid "show key fingerprint"
+#: g10/import.c:210
 msgid "repair keys on import"
-msgstr "parmakizini gösterir"
+msgstr "içe aktarırken anahtarları onar"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d türündeki blok atlanıyor\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "şu ana kadar %lu anahtar işlendi\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "İşlenmiş toplam miktar: %lu\n"
+msgstr "İşlenen toplam sayı: %lu\n"
 
-#: g10/import.c:842
-#, fuzzy, c-format
-#| msgid " skipped new keys: %lu\n"
+#: g10/import.c:843
+#, c-format
 msgid " skipped PGP-2 keys: %lu\n"
-msgstr " yeni anahtarlar atlandı: %lu\n"
+msgstr " atlanan PGP-2 anahtarları: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
-msgstr " yeni anahtarlar atlandı: %lu\n"
+msgstr " atlanan yeni anahtarlar: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
-msgstr " kullanıcı kimliksiz: %lu\n"
+msgstr " kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
-msgstr " alınan: %lu"
+msgstr " içe aktarılan: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
-msgstr " değişmedi: %lu\n"
+msgstr " değiştirilmeyen: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
-msgstr " yeni kullanıcı kimliği: %lu\n"
+msgstr " yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
-msgstr " yeni yardımcı anahtarlar: %lu\n"
+msgstr " yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
-msgstr " yeni imzalar: %lu\n"
+msgstr " yeni imzalar: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
-msgstr " yeni anahtar iptalleri: %lu\n"
+msgstr " yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
-msgstr " gizli anahtarlar okundu: %lu\n"
+msgstr " okunan gizli anahtarlar: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
-msgstr " gizli anahtarlar indirildi: %lu\n"
+msgstr " içe aktarılan gizli anahtarlar: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr " gizli anahtarlar değişmedi: %lu\n"
+msgstr " değişmemiş gizli anahtarlar: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
-msgstr " alınamadı: %lu\n"
+msgstr " içe aktarılmayanlar: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
-msgstr " temizlenen imzalar: %lu\n"
+msgstr " temizlenen imzalar: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
-msgstr " temizlenen kullanıcı kimlikleri: %lu\n"
+msgstr "temizlenen kullanıcı kimlikleri: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
-"UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
-"tercihler içeriyor:\n"
+"UYARI: %s anahtarı bu kullanıcı kimliklerinde kullanılmayan\n"
+"algoritmalar için tercihler içeriyor:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
-msgstr " \"%s\": şifreleme algoritması %s için tercih edilir\n"
+msgstr " \"%s\": %s şifreleme algoritması tercih edilir\n"
 
-#: g10/import.c:1359
-#, fuzzy, c-format
-#| msgid " \"%s\": preference for cipher algorithm %s\n"
+#: g10/import.c:1360
+#, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
-msgstr " \"%s\": şifreleme algoritması %s için tercih edilir\n"
+msgstr " \"%s\": %s AEAD algoritması tercih edilir\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
-msgstr " \"%s\": özet algoritması %s için tercih edilir\n"
+msgstr " \"%s\": %s özet algoritması tercih edilir\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
-msgstr ""
-" \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
-"\n"
+msgstr " \"%s\": %s sıkıştırma algoritması tercih edilir\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
-"olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
-"tekrar dağıtmanızı şiddetle öneririz.\n"
+"olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı yeniden "
+"dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr ""
-"tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
+msgstr "tercihlerinizi güncellemek için: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
-msgstr "anahtar %s: kullanıcı kimliği yok\n"
+msgstr "%s anahtarı: Kullanıcı kimliği yok\n"
 
-#: g10/import.c:1946
-#, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
+#: g10/import.c:2018
+#, c-format
 msgid "key %s: %s\n"
-msgstr "\"%s\" atlandı: %s\n"
+msgstr "%s anahtarı: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
-msgstr ""
+msgstr "içe aktarma tarayıcısı tarafından reddedildi"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
+msgstr "%s anahtarı: PKS yardımcı anahtar bozulması onarıldı\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
+msgstr "%s anahtarı: Öz imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
+msgstr "%s anahtarı: Geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
-msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
+msgstr "bu kayıp bir öz imza yüzünden meydana gelmiş olabilir\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "anahtar %s: genel anahtar yok: %s\n"
+msgstr "%s anahtarı: Genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "anahtar %s: yeni anahtar - atlandı\n"
+msgstr "%s anahtarı: Yeni anahtar - atlandı\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
+msgstr "yazılabilir bir anahtar zinciri bulunamadı: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
-#, fuzzy, c-format
-#| msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
+#, c-format
 msgid "error writing keyring '%s': %s\n"
-msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
+msgstr "'%s' anahtarlığı yazılırken hata: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
+msgstr "%s anahtarı: Genel anahtar \"%s\" içe aktarıldı\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
+msgstr "%s anahtarı: Bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
+msgstr "%s anahtarı: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
+msgstr "%s anahtarı: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
+msgstr "%s anahtarı: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "anahtar %s: \"%s\" %d yeni imza\n"
+msgstr "%s anahtarı: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
+msgstr "%s anahtarı: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
+msgstr "%s anahtarı: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
+msgstr "%s anahtarı: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
+msgstr "%s anahtarı: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
+msgstr "%s anahtarı: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
+msgstr "%s anahtarı: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "anahtar %s: \"%s\" değişmedi\n"
+msgstr "%s anahtarı: \"%s\" değiştirilmedi\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
-msgstr "anahtar %s: gizli anahtar alındı\n"
+msgstr "%s anahtarı: Gizli anahtar alındı\n"
 
-#: g10/import.c:2724
-#, fuzzy, c-format
-#| msgid "skipped: secret key already present\n"
+#: g10/import.c:2809
+#, c-format
 msgid "key %s: secret key already exists\n"
-msgstr "atlandı: gizli anahtar zaten var\n"
+msgstr "%s anahtarı: Gizli anahtar halihazırda var\n"
 
-#: g10/import.c:2732
-#, fuzzy, c-format
-#| msgid "error sending %s command: %s\n"
+#: g10/import.c:2817
+#, c-format
 msgid "key %s: error sending to agent: %s\n"
-msgstr "%s komutu gönderilirken hata: %s\n"
+msgstr "%s anahtarı: Aracıya gönderirken hata: %s\n"
+
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+"%s anahtarı: Kart başvurusu, anahtar malzemesi tarafından geçersiz kılındı\n"
 
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
@@ -4023,415 +3772,403 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
+"'%s' ögesini her bir akıllı kartla birlikte göç ettirmek için şunu "
+"çalıştırın: %s\n"
 
-#: g10/import.c:3048
-#, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
+#: g10/import.c:3143
+#, c-format
 msgid "secret key %s: %s\n"
-msgstr "gizli anahtar \"%s\" yok: %s\n"
+msgstr "gizli anahtar %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
-msgstr "gizli anahtarı alımına izin verilmez\n"
+msgstr "gizli anahtarların içe aktarımına izin verilmez\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
+msgstr "%s anahtarı: Geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "yürürlükten kaldırma sebebi: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "yürürlükten kaldırma açıklaması: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, 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ı "
+"%s anahtarı: Genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
+msgstr "%s anahtarı: Özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
+msgstr "%s anahtarı: Özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, 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"
+"%s anahtarı: Yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
+msgstr "%s anahtarı: \"%s\" yürürlükten kaldırma sertifikası içe aktarıldı\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
+msgstr "%s anahtarı: İmza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, 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"
+"%s anahtarı: Kullanıcı kimliği \"%s\" üzerinde desteklenmeyen genel anahtar "
+"algoritması\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, 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"
+msgstr "%s anahtarı: Kullanıcı kimliği \"%s\" için öz imza geçersiz\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
+msgstr "%s anahtarı: Desteklenmeyen genel anahtar algoritması\n"
 
-#: g10/import.c:3670
-#, fuzzy, c-format
+#: g10/import.c:3766
+#, c-format
 msgid "key %s: invalid direct key signature\n"
-msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
+msgstr "%s anahtarı: Geçersiz doğrudan anahtar imzası\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
+msgstr "%s anahtarı: Anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
+msgstr "%s anahtarı: Yardımcı anahtar garantilemesi geçersiz\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
+msgstr "%s anahtarı: Çok sayıda yardımcı anahtar bağlantısı kaldırıldı\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, 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"
+msgstr "%s anahtarı: Anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
+msgstr "%s anahtarı: Yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, 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"
+"%s anahtarı: Çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
+msgstr "%s anahtarı: Kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "anahtar %s: yardımcı anahtar atlandı\n"
+msgstr "%s anahtarı: Yardımcı anahtar atlandı\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, 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"
+msgstr "%s anahtarı: İmza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, 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"
+msgstr "%s anahtarı: Yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, 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"
+msgstr "%s anahtarı: Yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
+msgstr "%s anahtarı: Yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
+msgstr "%s anahtarı: Umulmadık imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
+msgstr "%s anahtarı: Çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:4204
-#, fuzzy, c-format
-#| msgid "key %s: duplicated user ID detected - merged\n"
+#: g10/import.c:4323
+#, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
-msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
+msgstr "%s anahtarı: Çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, 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"
+"UYARI: %s anahtarı yürürlükten kaldırılmış olmalı: Yürürlükten kaldırma "
+"anahtarı %s getiriliyor\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, 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 "
+"UYARI: %s anahtarı yürürlükten kaldırılmış olabilir: Yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
+msgstr "%s anahtarı: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
+msgstr "%s anahtarı: Doğrudan anahtar imzası eklendi\n"
 
 #: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
-#, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
+#, c-format
 msgid "error allocating memory: %s\n"
-msgstr "yeterli bellek ayrılırken hata: %s\n"
+msgstr "bellek ayrılırken hata: %s\n"
 
-#: g10/key-check.c:396
-#, fuzzy, c-format
-#| msgid "key %s: unsupported public key algorithm\n"
+#: g10/key-check.c:397
+#, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
+msgstr ""
+"imza, desteklenmeyen genel anahtar algoritmasıyla denetlenemiyor (%d): %s.\n"
 
-#: g10/key-check.c:405
-#, fuzzy, c-format
-#| msgid "card does not support digest algorithm %s\n"
+#: g10/key-check.c:406
+#, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "kart %s özet algoritmasını desteklemiyor\n"
+msgstr ""
+"imza, desteklenmeyen %d ileti özetleme algoritmasıyla denetlenemiyor: %s.\n"
 
-#: g10/key-check.c:571
-#, fuzzy
-#| msgid "Good signature from"
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
-msgstr "Buradaki imzeler iyi:"
+msgstr " (yeniden sıralanan imzalar izler)"
 
-#: g10/key-check.c:708
-#, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
+#: g10/key-check.c:709
+#, c-format
 msgid "key %s:\n"
-msgstr "\"%s\" atlandı: %s\n"
+msgstr "%s anahtarı:\n"
 
-#: g10/key-check.c:716
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
+#: g10/key-check.c:717
+#, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
-msgstr0 "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
-msgstr1 "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
+msgstr0 "%d yinelenen imza kaldırıldı\n"
+msgstr1 "%d yinelenen imza kaldırıldı\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
+#: g10/key-check.c:726 g10/keylist.c:725
+#, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr0 "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
-msgstr1 "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
+msgstr0 "%d imza kayıp bir anahtar yüzünden denetlenemedi\n"
+msgstr1 "%d imza kayıp bir anahtar yüzünden denetlenemedi\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
+#: g10/key-check.c:734 g10/keylist.c:721
+#, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d kötü imza\n"
 msgstr1 "%d kötü imza\n"
 
-#: g10/key-check.c:742
-#, fuzzy, c-format
-#| msgid "Good signature from"
+#: g10/key-check.c:743
+#, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
-msgstr0 "Buradaki imzeler iyi:"
-msgstr1 "Buradaki imzeler iyi:"
+msgstr0 "%d imza yeniden sıralandı\n"
+msgstr1 "%d imza yeniden sıralandı\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
+"Uyarı: Yalnızca öz imzalar denetlendi ve hatalar bulundu, tüm imzaları "
+"denetlemek için '%s' çalıştırın.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
-#, fuzzy, c-format
-#| msgid "error creating keybox `%s': %s\n"
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
+#, c-format
 msgid "error creating keybox '%s': %s\n"
-msgstr "anahtar bloku `%s' oluşturulurken hata: %s\n"
+msgstr "anahtar bloku '%s' oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
+#: g10/keydb.c:369 g10/keydb.c:396
+#, c-format
 msgid "error creating keyring '%s': %s\n"
-msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
+msgstr "'%s' anahtarlığı oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
-#, fuzzy, c-format
-#| msgid "keybox `%s' created\n"
+#: g10/keydb.c:405 sm/keydb.c:324
+#, c-format
 msgid "keybox '%s' created\n"
-msgstr "`%s' anahtar bloğu oluşturuldu\n"
+msgstr "'%s' anahtar bloku oluşturuldu\n"
 
-#: g10/keydb.c:390
-#, fuzzy, c-format
-#| msgid "keyring `%s' created\n"
+#: g10/keydb.c:407
+#, c-format
 msgid "keyring '%s' created\n"
-msgstr "`%s' anahtarlığı oluşturuldu\n"
+msgstr "'%s' anahtarlığı oluşturuldu\n"
 
-#: g10/keydb.c:777
-#, fuzzy, c-format
-#| msgid "keyblock resource `%s': %s\n"
+#: g10/keydb.c:797
+#, c-format
 msgid "keyblock resource '%s': %s\n"
-msgstr "anahtar bloku özkaynağı `%s': %s\n"
+msgstr "anahtar bloku özkaynağı: '%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "yürürlükten kaldırma"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
-msgstr "öz-imza"
+msgstr "öz imza"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 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 ""
-"Diğer kullanıcıların anahtarlarını doğrulayacak bu kullanıcının güven\n"
-"derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
-"kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
+"Diğer kullanıcıların anahtarlarını doğrulayacak bu kullanıcıya ne kadar\n"
+"güvendiğinize karar verin (kimliğine bakın, parmak izlerini denetleyin "
+"vb.).\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr " %d = Şöyle böyle güveniyorum\n"
+msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
-msgstr " %d = Tamamen güveniyorum\n"
+msgstr " %d = Tümüyle güveniyorum\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 "Lütfen bu güvence imzasının derinliğini belirtin.\n"
-"1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
-"güvence imzaları yapmayı mümkün kılar.\n"
+"1'den büyük bir derinlik imzaladığınız anahtarın kendi\n"
+"adınıza imzalara güvenmesini olanaklı kılar.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
+msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa Enter'a basın.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
-msgstr ""
+msgstr "Bir metin kimliği olmayan \"%s\" kullanıcı kımlığı atlanıyor.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
+msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " İmzalanamıyor.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
-msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
+msgstr "Kullanıcı kimliği \"%s\" süresi geçti."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
-msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
+msgstr "Kullanıcı kimliği \"%s\" öz imzalı değil."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Kullanıcı kimliği \"%s\" imzalanabilir. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
-msgstr "İmzalayacak mısınız? (e/H veya y/N) "
+msgstr "İmzalansın mı? (e/H) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"\"%s\" üzerindeki öz-imza\n"
-"bir PGP 2.x tarzı imza.\n"
+"\"%s\" üzerindeki öz imza\n"
+"PGP 2.x tarzı bir imza.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr ""
-"Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H veya y/N) "
+msgstr "Bir OpenPGP öz imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4440,96 +4177,93 @@
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
-"Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H "
-"veya y/N) "
+"Süresi geçen imzayı yenilemek için yeni bir imza oluşturmak ister misiniz? "
+"(e/H) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 "\"%s\" üzerindeki imzanız\n"
-"dahili bir imza.\n"
+"yerel bir imza.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
-"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H veya "
-"y/N) "
+"Bu imzanın tam bir dışa aktarılabilir imza haline getirilmesini istiyor "
+"musunuz? (e/H) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
+msgstr "Onu yine de yeniden imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
+msgstr "Bu anahtarın geçerliliği %s tarihinde bitiyor.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr ""
-"İmzanızın da aynı süreyle geçerli olmasını ister misiniz? (E/h veya Y/n) "
+msgstr "İmzanızın da aynı süreyle geçerli olmasını istiyor musunuz? (E/h) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above? If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
-"doğruladınız? Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
+"Bu anahtarın adının yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
+"doğruladınız? Bu sorunun yanıtını bilmiyorsanız \"0\" girin.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
-msgstr " (0) Cevabı bilmiyorum. %s\n"
+msgstr " (0) Yanıtlamayacağım.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
-msgstr " (1) Tamamen kontrol edildi.%s\n"
+msgstr " (1) Hiçbir denetim yapmadım.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
-msgstr " (2) İlişkisel denetim yaptım.%s\n"
+msgstr " (2) Öylesine bir baktım.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
-msgstr " (3) Çok dikkatli bir denetim yaptım.%s\n"
+msgstr " (3) Çok dikkatlice denetledim.%s\n"
 
-#: g10/keyedit.c:887
-#, fuzzy
-#| msgid "Your selection? (enter `?' for more information): "
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4539,1022 +4273,979 @@
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
-msgstr "Bu bir öz-imza olacak.\n"
+msgstr "Bu bir öz imza olacak.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
+msgstr "UYARI: Bu imza dışa aktarılamayan bir imza olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
+msgstr "UYARI: İmza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
-msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
+msgstr "İmza dışa aktarılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
-msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
+msgstr "Bu anahtarı hiç denetlemedim.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
-msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
+msgstr "Bu anahtarı öylesine denetledim.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
-msgstr "Bu anahtarı çok dikkatle sınadım.\n"
+msgstr "Bu anahtarı çok dikkatlice denetledim.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
-msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
+msgstr "Gerçekten imzalansın mı? (e/H) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
-"Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
-"değiştirilecek bir anahtar parolası yok.\n"
+"Anahtar yalnızca kısa veya karta özel öğeler içeriyor, değiştirilecek bir "
+"anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1151
-#, fuzzy, c-format
-#| msgid "error creating passphrase: %s\n"
+#: g10/keyedit.c:1154
+#, c-format
 msgid "key %s: error changing passphrase: %s\n"
-msgstr "anahtar parolası oluşturulurken hata: %s\n"
+msgstr "%s anahtarı: Anahtar parolası değiştirilirken hata: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
-msgstr "parmakizini gösterir"
+msgstr "anahtar parmak izini göster"
 
-#: g10/keyedit.c:1269
-#, fuzzy
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
-msgstr "Simgelemi giriniz: "
+msgstr "anahtar yakalamayı göster"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
-msgstr "anahtarı ve kullanıcı kimliğini gösterir"
+msgstr "anahtar ve kullanıcı kimliğini listele"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
-msgstr "N kullanıcı kimliğini seçer"
+msgstr "N kullanıcı kimliğini seç"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
-msgstr "N yardımcı anahtarını"
+msgstr "N yardımcı anahtarını seç"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
-msgstr "imzaları sınar"
+msgstr "imzaları denetle"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
-"seçilen kullanıcı kimliği imzalar * ilgili komutlar için aşağıya bakın"
+"seçilen kullanıcı kimliğini imzala * ilgili komutlar için aşağı bakın"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
-msgstr "kullanıcı kimlikleri yerel olarak imzalar"
+msgstr "kullanıcı kimliklerini yerel olarak imzala"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
-msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
+msgstr "seçili kullanıcı kimliklerini bir güvence imzasıyla imzala"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
-"seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
+"seçili kullanıcı kimliklerini yürürlükten kaldırılamayan bir imzayla imzala"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
-msgstr "bir kullanıcı kimliği ekler"
+msgstr "bir kullanıcı kimliği ekle"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
-msgstr "bir foto kimliği ekler"
+msgstr "bir fotoğraf kimliği ekle"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
-msgstr "seçili kullanıcı kimlikleri siler"
+msgstr "seçili kullanıcı kimliklerini sil"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
-msgstr "bir yardımcı anahtar ekler"
+msgstr "bir yardımcı anahtar ekle"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
-msgstr "bir akıllı karta bir anahtar ekler"
+msgstr "bir akıllı karta bir anahtar ekle"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
-msgstr "bir akıllı karttan bir anahtarı taşır"
+msgstr "bir akıllı karttan bir anahtarı taşı"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
-msgstr ""
+msgstr "bir anahtarı yerel TPM kullanarak TPM biçimine dönüştür"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
-msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
+msgstr "bir akıllı karttan bir yedekleme anahtarını taşı"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
-msgstr "seçili yardımcı anahtarları siler"
+msgstr "seçili yardımcı anahtarları sil"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
-msgstr "bir yürürlükten kaldırma anahtarı ekler"
+msgstr "bir yürürlükten kaldırma anahtarı ekle"
+
+#: g10/keyedit.c:1314
+msgid "add an additional decryption subkey"
+msgstr "ek bir şifre çözümü alt anahtarı ekle"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
-msgstr "seçili kullanıcı kimliklerden imzaları siler"
+msgstr "seçili kullanıcı kimliklerinden imzaları sile"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
-"anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
-"değiştirir"
+"anahtar veya seçili yardımcı anahtarlar için zaman aşımı tarihini değiştir"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
-msgstr "seçili kullanıcı kimliğini asıl olarak imler"
+msgstr "seçili kullanıcı kimliğini asıl olarak imle"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
-msgstr "tercihleri listeler (uzman)"
+msgstr "tercihleri listele (uzman)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
-msgstr "tercihleri listeler (ayrıntılı)"
+msgstr "tercihleri listele (ayrıntılı)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
-msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
+msgstr "seçili kullanıcı kimlikleri için tercih listesini ayarla"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
-"seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
-"belirler"
+"seçili kullanıcı kimlikleri için tercih edilen anahtar sunucusunu ayarla"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
-msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
+msgstr "seçili kullanıcı kimlikleri için bir simgelem belirle"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
-msgstr "anahtar parolasını değiştirir"
+msgstr "anahtar parolasını değiştir"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
-msgstr "sahibiningüvencesini değiştirir"
+msgstr "iye güvencesini değiştir"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
-msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
+msgstr "Seçili tüm kullanıcı kimliklerindeki imzaları yürürlükten kaldır"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
-msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
+msgstr "Seçili tüm kullanıcı kimliklerini yürürlükten kaldır"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
-msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
+msgstr "anahtarı veya seçili yardımcı anahtarları yürürlükten kaldır"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
-msgstr "anahtarı kullanıma sokar"
+msgstr "anahtarı etkinleştir"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
-msgstr "anahtarı iptal eder"
+msgstr "anahtarı devre dışı bırak"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
-msgstr "seçili foto kimlikleri gösterir"
+msgstr "seçili fotoğraf kimliklerini göster"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
-"kullanışsız kullanıcı kimlikleri sıkıştırır ve kullanışsız imzaları "
-"anahtardan kaldırır"
+"kullanışsız kullanıcı kimlikleri sıkıştır ve kullanışsız imzaları anahtardan "
+"kaldır"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
-"kullanışsız kullanıcı kimlikleri sıkıştırır ve tüm imzaları anahtardan "
-"kaldırır"
+"kullanışsız kullanıcı kimliklerini sıkıştır ve tüm imzaları anahtardan kaldır"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1471
-#, fuzzy
-#| msgid "Secret key is available.\n"
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
-msgstr "Gizli anahtar mevcut.\n"
+msgstr "Gizli yardımcı anahtarlar mevcut.\n"
+
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr "Not: Gizli anahtarın yerel kopyası yalnızca \"save\" ile silinir.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1596
-#, fuzzy
-#| msgid ""
-#| "* The `sign' command may be prefixed with an `l' for local signatures "
-#| "(lsign),\n"
-#| " a `t' for trust signatures (tsign), an `nr' for non-revocable "
-#| "signatures\n"
-#| " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
 " a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
 " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
-"* `sign' komutu şu harflerden bir veya birkaçı ile başlayabilir:\n"
-" güvence imzaları için 't' (tsign), yürürlükten kaldırılmayan imzalar\n"
-" için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı olarak "
-"(ltsign, tnrsign gibi).\n"
+"'sign' komutunun başlatılabileceği harfler şunlardır: Yerel imzalar için\n"
+"'l' (lsign), güvence imzaları için 't' (tsign), yürürlükten kaldırılamaz\n"
+"imzalar için 'nr' (nrsign) veya hepsinin birleşimi (ltsign, tnrsign vb.)\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1677
-#, fuzzy
-#| msgid "Really sign all user IDs? (y/N) "
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
-msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
+msgstr "Tüm metin kullanıcı kimlikleri gerçekten imzalansın mi? (e/H) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
-msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
+msgstr "Tüm kullanıcı kimlikleri gerçekten imzalansın mı? (e/H) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
+msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçin\n"
 
-#: g10/keyedit.c:1700
-#, fuzzy, c-format
-#| msgid "Unknown signature type `%s'\n"
+#: g10/keyedit.c:1716
+#, c-format
 msgid "Unknown signature type '%s'\n"
-msgstr "imza türü `%s' bilinmiyor\n"
+msgstr "Bilinmeyen imza türü '%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
-msgstr ""
+msgstr "('%s' komutunu kullanın.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr ""
-"Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
+msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinsin mi? (e/H) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
-msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
+msgstr "Bu kullanıcı kimliği gerçekten silinsin mi? (e/H) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
-msgstr "Bu öz-imza gerçekten taşınacak mı? (e/H ya da y/N) "
+msgstr "Bu asıl imza gerçekten taşınsın mı? (e/H) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
-msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
+msgstr "Yalnızca ve yalnızca bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
-msgstr "Komut değiştirge olarak bir dosya ismi gerektiriyor\n"
+msgstr "Komut, argüman olarak bir dosya adı bekliyor\n"
 
-#: g10/keyedit.c:1914
-#, fuzzy, c-format
-#| msgid "Can't open `%s': %s\n"
+#: g10/keyedit.c:1932
+#, c-format
 msgid "Can't open '%s': %s\n"
-msgstr "`%s' açılamıyor: %s\n"
+msgstr "'%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1933
-#, fuzzy, c-format
-#| msgid "Error reading backup key from `%s': %s\n"
+#: g10/keyedit.c:1951
+#, c-format
 msgid "Error reading backup key from '%s': %s\n"
-msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
+msgstr "Yedekleme anahtarı '%s' konumundan okunurken hata: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
+msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
+msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
-"Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
-"ya da y/N) "
+"Seçilen tüm kullanıcı kimlikleri gerçekten yürürlükten kaldırılsın mı? (e/H) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
-msgstr ""
-"Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
+msgstr "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılsın mı? (e/H) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
-"Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
-"da y/N) "
+"Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
-"Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
-"(e/H ya da y/N) "
+"Seçili yardımcı anahtarları yürürlükten kaldırmayı gerçekten istiyor "
+"musunuz? (e/H) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr ""
-"Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
-"ya da y/N) "
+msgstr "Bu yardımcı anahtarı yürürlükten kaldırmayı gerçekten musunuz? (e/H) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
-"Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
-"sahibiningüvencesi belirlenemez\n"
+"Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak iye "
+"güvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
-"Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
-"musunuz? (e/H ya da y/N) "
+"Seçili kullanıcı kimlikleri için tercihleri gerçekten güncellemek istiyor "
+"musunuz? (e/H) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
-msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
+msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
-msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
+msgstr "Değişiklikler kaydedilsin mi? (e/H) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
-msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
+msgstr "Kaydetmeden çıkılsın mı? (e/H) "
+
+#: g10/keyedit.c:2294
+#, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "gizli anahtarın kopyasının silinmesi başarısız: %s\n"
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
-msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
+msgstr "Anahtar değişmediğinden güncellemeye gerek yok.\n"
 
-#: g10/keyedit.c:2496
-#, fuzzy, c-format
-#| msgid "You can't delete the last user ID!\n"
+#: g10/keyedit.c:2606
+#, c-format
 msgid "cannot revoke the last valid user ID.\n"
-msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
+msgstr "Son geçerli kullanıcı kimliğini yürürlükten kaldıramazsınız.\n"
 
-#: g10/keyedit.c:2523
-#, fuzzy, c-format
-#| msgid "checking the trust list failed: %s\n"
+#: g10/keyedit.c:2632
+#, c-format
 msgid "revoking the user ID failed: %s\n"
-msgstr "güvence listesinin sınanması başarısız: %s\n"
+msgstr "kullanıcı kimliğinin yürürlükten kaldırılması başarısız: %s\n"
 
-#: g10/keyedit.c:2589
-#, fuzzy, c-format
-#| msgid "checking the trust list failed: %s\n"
+#: g10/keyedit.c:2695
+#, c-format
 msgid "setting the primary user ID failed: %s\n"
-msgstr "güvence listesinin sınanması başarısız: %s\n"
+msgstr "asıl kullanıcı kimliğini ayarlama başarısız: %s\n"
 
-#: g10/keyedit.c:2618
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
+#, c-format
 msgid "\"%s\" is not a fingerprint\n"
-msgstr "parmakizi geçersiz"
+msgstr "\"%s\", bir parmak izi değil\n"
 
-#: g10/keyedit.c:2638
-#, fuzzy, c-format
-#| msgid "failed to get the fingerprint\n"
+#: g10/keyedit.c:2785
+#, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
-msgstr "parmakizinin alınması başarısız oldu\n"
+msgstr "\"%s\", asıl parmak izi değil\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
-#, fuzzy, c-format
-#| msgid "invalid value\n"
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
+#, c-format
 msgid "Invalid user ID '%s': %s\n"
-msgstr "değer hatalı\n"
+msgstr "Geçersiz kullanıcı kimliği '%s': %s\n"
 
-#: g10/keyedit.c:2780
-#, fuzzy
-#| msgid "No such user ID.\n"
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
-msgstr "Böyle bir kullanıcı kimliği yok.\n"
+msgstr "Eşleşen kullanıcı kimliği yok."
 
-#: g10/keyedit.c:2780
-#, fuzzy
-#| msgid "Nothing to sign with key %s\n"
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
-msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
+msgstr "İmzalanacak bir şey yok.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
-msgstr ""
+msgstr "Sizin tarafınızdan imzalanmamış.\n"
 
-#: g10/keyedit.c:3031
-#, fuzzy, c-format
-#| msgid "checking created signature failed: %s\n"
+#: g10/keyedit.c:3181
+#, c-format
 msgid "revoking the key signature failed: %s\n"
-msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
+msgstr "anahtar imzasını yürürlükten kaldırma başarısız: %s\n"
 
-#: g10/keyedit.c:3152
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid signature expiration\n"
+#: g10/keyedit.c:3365
+#, c-format
 msgid "'%s' is not a valid expiration time\n"
-msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
+msgstr "'%s', geçerli bir son kullanma tarihi değil\n"
 
-#: g10/keyedit.c:3194
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
+#: g10/keyedit.c:3407
+#, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
-msgstr "parmakizi geçersiz"
+msgstr "\"%s\", düzgün bir parmak izi değil\n"
 
-#: g10/keyedit.c:3218
-#, fuzzy, c-format
-#| msgid "key \"%s\" not found: %s\n"
+#: g10/keyedit.c:3431
+#, c-format
 msgid "subkey \"%s\" not found\n"
-msgstr "anahtar \"%s\" yok: %s\n"
-
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Özet: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Özellikler: "
+msgstr "yardımcı anahtar \"%s\" bulunamadı\n"
 
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Anahtar sunucusu değişmez"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 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:3778
-#, fuzzy, c-format
+#: g10/keyedit.c:3849
+#, 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"
+"Aşağıdaki anahtar %s tarihinde %s tarafından yürürlükten kaldırıldı, anahtar "
+"%s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, 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"
+msgstr "Bu anahtar %s tarafından yürürlükten kaldırılmış olabilir, anahtar %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
-msgstr "kullanımı: %s"
+msgstr "kullanım: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
-msgstr "kart-no: "
+msgstr "kart numarası: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
-msgstr "Bu anahtar iptal edilmişti"
+msgstr "Bu anahtar iptal edilmiş"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
-"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"
+"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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
-msgstr "zamanaşımına uğradı"
+msgstr "zaman aşımına uğradı"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, 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 ""
-"UYARI: birincil olarak imlenmiş bir kullanıcı kimlik yok. Bu komutla\n"
-" farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
-" kabul edilmesini sağlayabilirsiniz.\n"
+"UYARI: Asıl imlenmiş bir kullanıcı kimliği yok. Bu komut, başka bir\n"
+" kimliğin varsayılan asıl olmasını sağlayabilir.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
-msgstr ""
+msgstr "UYARI: Şifreleme yardımcı anahtarının yakın zamanda süresi dolacak.\n"
 
-#: g10/keyedit.c:4188
-#, fuzzy, c-format
-#| msgid "You can't change the expiration date of a v3 key\n"
+#: g10/keyedit.c:4260
+#, c-format
 msgid "You may want to change its expiration date too.\n"
-msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
+msgstr "Son kullanma tarihini de değiştirmek isteyebilirsiniz.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "UYARI: Şifreleme yardımcı anahtarının yakın zamanda süresi dolacak.\n"
+
+#: g10/keyedit.c:4353
 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 ""
-"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"
+"UYARI: Bu PGP-2 tarzı bir anahtardır. Bir fotoğraf kimliği eklenmesi bu "
+"anahtarın\n"
+" bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
+msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 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"
+msgstr "PGP2 tarzı bir anahtara bir fotoğraf kimliği ekleyemezsiniz.\n"
 
-#: g10/keyedit.c:4273
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
-msgstr ""
+msgstr "Böyle bir kullanıcı kimliği bu anahtarda halihazırda var!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
-msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
+msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
+msgstr "Bu geçersiz imza silinsin mi? (e/H/k"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
+msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
-msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
+msgstr "Bu öz imza gerçekten silinsin mi? (e/H)"
 
-#: g10/keyedit.c:4412
-#, fuzzy, c-format
-#| msgid "Deleted %d signature.\n"
+#: g10/keyedit.c:4518
+#, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "%d imza silindi.\n"
 msgstr1 "%d imza silindi.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
-msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
+msgstr "Kullanıcı kimliği \"%s\" kompaktlaştırıldı: %s\n"
 
-#: g10/keyedit.c:4459
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
+#: g10/keyedit.c:4565
+#, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 msgstr1 "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
-msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
+msgstr "kullanıcı kimliği \"%s\": Zaten küçültülmüş\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
-msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
+msgstr "kullanıcı kimliği \"%s\": Zaten temiz\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 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 ""
-"UYARI: Bu PGP-2 tarzı bir anahtar. Tasarlanmış bir yürürlükten kaldırıcı\n"
+"UYARI: Bu PGP-2 tarzı bir anahtardır. Tasarlanmış bir yürürlükten kaldırıcı\n"
 " eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 " ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 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:4565
+#: g10/keyedit.c:4671
 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:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, 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:4607
+#: g10/keyedit.c:4713
 #, 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:4629
+#: g10/keyedit.c:4735
 #, 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"
+msgstr "bu anahtar zaten bir yürürlükten kaldırıcı olarak belirlenmiş\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 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"
+"UYARI: Yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla "
+"kullanılamaz!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 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) "
+"Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinize emin "
+"misiniz? (e/H) "
+
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr "Ek şifre çözümü alt anahtarının parmak izini gir: "
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, c-format
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "Bir alt anahtarın parmak izini mi belirttiniz?\n"
 
-#: g10/keyedit.c:4721
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+#: g10/keyedit.c:4915
+#, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "\"%s\" anahtarı halihazırda bu anahtar blokunda\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (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) "
+"Birden çok yardımcı anahtarın son kullanım süresini değiştirmek istediğinize "
+"emin misiniz? (e/H) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 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:4729
+#: g10/keyedit.c:5015
 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:4785
+#: g10/keyedit.c:5071
 #, 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:4845
-#, fuzzy
-#| msgid "Changing expiration time for a subkey.\n"
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
-msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
+msgstr "Bir yardımcı anahtarın kullanımı değiştiriliyor.\n"
 
-#: g10/keyedit.c:4848
-#, fuzzy
-#| msgid "Changing expiration time for the primary key.\n"
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
-msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
+msgstr "Asıl anahtarın kullanımı değiştiriliyor.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, 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ı "
+"%s yardımcı anahtarı imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
-msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
+msgstr "Lütfen yalnızca ve yalnızca bir kullanıcı kimliği seçin.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, 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"
+msgstr "kullanıcı kimliği \"%s\" için v3 öz imzası atlanıyor\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 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) "
+msgstr "Onu başkasıyla değiştirmek istediğinize emin misiniz? (e/H) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
+msgstr "Onu silmek istediğinize emin misiniz? (e/H) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
-msgstr "Devam? (e/H ya da y/N) "
+msgstr "Sürdür? (e/H) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
+msgstr "%d endeksine iye kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
-msgstr "%s çittirmeli kullanıcı kimliği yok\n"
+msgstr "%s sağlamalı kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5829
-#, fuzzy, c-format
-#| msgid "No subkey with index %d\n"
+#: g10/keyedit.c:6117
+#, c-format
 msgid "No subkey with key ID '%s'.\n"
-msgstr "%d indisli bir yardımcı anahtar yok\n"
+msgstr "'%s' anahtar kimlikli bir yardımcı anahtar yok.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
-msgstr "%d indisli bir yardımcı anahtar yok\n"
+msgstr "%d indeksli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
+msgstr "%s anahtarınızla %s%s%s üzerinde imzalandı\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
-msgstr " (dışarda geçersiz)"
+msgstr " (dışa aktarılamaz)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
-msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
+msgstr "Bu anahtarın geçerliliği %s tarihinde bitti.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 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) "
+msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 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) "
+msgstr "Bu imza için bir yürürlükten kaldırma sertifikası üretilsin mi? (e/H) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, 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:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
-msgstr " (yürülükten kaldırılmaz)"
+msgstr " (yürürlükten kaldırılamaz)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, 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:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 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) "
+msgstr "Yürürlükten kaldırma sertifikaları gerçekten üretilsin mi? (e/H) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
-msgstr ""
+msgstr "kullanıcı olmayan bir kimlik yürürlükten kaldırılmaya çalışıldı: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+msgstr "kullanıcı kimliği \"%s\" zaten yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, 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"
+msgstr "UYARI: Bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:6359
-#, fuzzy, c-format
-#| msgid "You can't delete the last user ID!\n"
+#: g10/keyedit.c:6647
+#, c-format
 msgid "Cannot revoke the last valid user ID.\n"
-msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
+msgstr "Son geçerli kullanıcı kimliğini yürürlükten kaldıramazsınız.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
+msgstr "%s anahtarı zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
+msgstr "%s yardımcı anahtarı zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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"
+"%s fotoğraf kimliği görüntüleniyor, %ld boyutlu, %s anahtarı için (uid %d)\n"
 
-#: g10/keygen.c:185
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
+#: g10/keygen.c:179
+#, c-format
 msgid "invalid value for option '%s'\n"
-msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+msgstr "'%s' seçeneği için geçersiz değer\n"
 
-#: g10/keygen.c:339
-#, fuzzy, c-format
-#| msgid "preference `%s' duplicated\n"
+#: g10/keygen.c:336
+#, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "çok fazla özet tercihi\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:352
-#, fuzzy, c-format
-#| msgid "too many cipher preferences\n"
+#: g10/keygen.c:349
+#, c-format
 msgid "too many AEAD preferences\n"
-msgstr "çok fazla şifreleme tercihi\n"
+msgstr "çok fazla AEAD tercihi\n"
 
-#: g10/keygen.c:520
-#, fuzzy, c-format
-#| msgid "invalid item `%s' in preference string\n"
+#: g10/keygen.c:529
+#, c-format
 msgid "invalid item '%s' in preference string\n"
-msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
+msgstr "tercih dizisindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
-msgstr "öz-imza yazılıyor\n"
+msgstr "öz imza yazılıyor\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
-"UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
+"UYARI: Bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
 "çalışamayabilir\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
-msgstr "İmzalama"
+msgstr "İmzala"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Onayla"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Şifrele"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
-msgstr "Kimlik kanıtla"
+msgstr "Kimlik doğrula"
 
 #. TRANSLATORS: Please use only plain ASCII characters for the
 #. * translation. If this is not possible use single digits. The
@@ -5566,185 +5257,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
-msgstr "OoŞşKkçÇ"
+msgstr "MmFfDdKk"
 
-#: g10/keygen.c:1965
-#, fuzzy, c-format
-#| msgid "Possible actions for a %s key: "
+#: g10/keygen.c:1949
+#, c-format
 msgid "Possible actions for this %s key: "
-msgstr "bir %s anahtarı için olası eylemler: "
+msgstr "bu %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
-msgstr "Şimdilik mümkün eylemler: "
+msgstr "Şu anda izin verilen eylemler: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
-msgstr " (%c) İmzalama yeteneğini açar/kapar\n"
+msgstr " (%c) İmzalama yeteneğini aç/kapat\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
-msgstr " (%c) Şifreleme yeteneğini açar/kapar\n"
+msgstr " (%c) Şifreleme yeteneğini aç/kapat\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
-msgstr " (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
+msgstr " (%c) Kimlik doğrulama yeteneğini aç/kapat\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) Bitti\n"
 
-#: g10/keygen.c:2115
-#, fuzzy, c-format
+#: g10/keygen.c:2099
+#, c-format
 msgid " (%d) RSA and RSA%s\n"
-msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
+msgstr " (%d) RSA ve RSA%s\n"
 
-#: g10/keygen.c:2119
-#, fuzzy, c-format
+#: g10/keygen.c:2103
+#, c-format
 msgid " (%d) DSA and Elgamal%s\n"
-msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
+msgstr " (%d) DSA ve ElGamal%s\n"
 
-#: g10/keygen.c:2122
-#, fuzzy, c-format
-#| msgid " (%d) DSA (sign only)\n"
+#: g10/keygen.c:2106
+#, c-format
 msgid " (%d) DSA (sign only)%s\n"
-msgstr " (%d) DSA (yalnız imzalamak için)\n"
+msgstr " (%d) DSA (yalnızca imzalama)%s\n"
 
-#: g10/keygen.c:2124
-#, fuzzy, c-format
-#| msgid " (%d) RSA (sign only)\n"
+#: g10/keygen.c:2108
+#, c-format
 msgid " (%d) RSA (sign only)%s\n"
-msgstr " (%d) RSA (sadece imzalamak için)\n"
+msgstr " (%d) RSA (yalnızca imzalama)%s\n"
 
-#: g10/keygen.c:2130
-#, fuzzy, c-format
-#| msgid " (%d) Elgamal (encrypt only)\n"
+#: g10/keygen.c:2114
+#, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
-msgstr " (%d) ElGamal (yalnız şifrelemek için)\n"
+msgstr " (%d) ElGamal (yalnızca şifreleme)%s\n"
 
-#: g10/keygen.c:2132
-#, fuzzy, c-format
-#| msgid " (%d) RSA (encrypt only)\n"
+#: g10/keygen.c:2116
+#, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
-msgstr " (%d) RSA (sadece şifrelemek için)\n"
+msgstr " (%d) RSA (yalnızca şifreleme)%s\n"
 
-#: g10/keygen.c:2138
-#, fuzzy, c-format
-#| msgid " (%d) DSA (set your own capabilities)\n"
+#: g10/keygen.c:2122
+#, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
-msgstr " (%d) DSA (yeteneklerini belirtin)\n"
+msgstr " (%d) DSA (kendi yeteneklerinizi ayarlayın)%s)\n"
 
-#: g10/keygen.c:2140
-#, fuzzy, c-format
-#| msgid " (%d) RSA (set your own capabilities)\n"
+#: g10/keygen.c:2124
+#, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
-msgstr " (%d) RSA (yeteneklerini belirtin)\n"
+msgstr " (%d) RSA (kendi yeteneklerinizi ayarlayın)%s\n"
 
-#: g10/keygen.c:2146
-#, fuzzy, c-format
-#| msgid " (%d) sign, encrypt\n"
+#: g10/keygen.c:2130
+#, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
-msgstr " (%d) imza, şifreleme\n"
+msgstr " (%d) ECC (imza ve şifreleme)%s\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
-msgstr ""
+msgstr " *öntanımlı*"
 
-#: g10/keygen.c:2147
-#, fuzzy, c-format
-#| msgid " (%d) DSA (sign only)\n"
+#: g10/keygen.c:2131
+#, c-format
 msgid " (%d) ECC (sign only)\n"
-msgstr " (%d) DSA (yalnız imzalamak için)\n"
+msgstr " (%d) DSA (yalnızca imzalama)\n"
 
-#: g10/keygen.c:2149
-#, fuzzy, c-format
-#| msgid " (%d) DSA (set your own capabilities)\n"
+#: g10/keygen.c:2133
+#, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
-msgstr " (%d) DSA (yeteneklerini belirtin)\n"
+msgstr " (%d) DSA (kendi yeteneklerinizi belirtin)%s\n"
 
-#: g10/keygen.c:2151
-#, fuzzy, c-format
-#| msgid " (%d) RSA (encrypt only)\n"
+#: g10/keygen.c:2135
+#, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
-msgstr " (%d) RSA (sadece şifrelemek için)\n"
+msgstr " (%d) RSA (yalnızca şifreleme)%s\n"
 
-#: g10/keygen.c:2155
-#, fuzzy, c-format
-#| msgid " (%d) Existing key\n"
+#: g10/keygen.c:2139
+#, c-format
 msgid " (%d) Existing key%s\n"
-msgstr " (%d) Mevcut anahtar\n"
+msgstr " (%d) Var olan anahtar%s\n"
 
-#: g10/keygen.c:2157
-#, fuzzy, c-format
-#| msgid " (%d) Existing key from card\n"
+#: g10/keygen.c:2141
+#, c-format
 msgid " (%d) Existing key from card%s\n"
-msgstr " (%d) Karttaki mevcut anahtar\n"
+msgstr " (%d) Karttaki var olan anahtar%s\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
-#, fuzzy
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
-msgstr "Simgelemi giriniz: "
+msgstr "Anahtar maşasını girin: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
-msgstr ""
+msgstr "Geçerli bir anahtar maşası değil (40 onaltılık basamak bekleniyor)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
-#, fuzzy
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
-msgstr "%d indisli bir yardımcı anahtar yok\n"
+msgstr "Bu anahtar maşasında bir anahtar yok\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
-#, fuzzy, c-format
+#, c-format
 msgid "error reading the card: %s\n"
-msgstr "%s: serbest kaydı okuma hatası: %s\n"
+msgstr "kart okunurken hata: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
-#, fuzzy, c-format
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
+#, c-format
 msgid "Serial number of the card: %s\n"
-msgstr "kartın seri numarası alınırken hata: %s\n"
+msgstr "Kartın seri numarası: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
-#, fuzzy
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
-msgstr "anahtarı iptal eder"
+msgstr "Kullanılabilir anahtarlar:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
+#: g10/keygen.c:2487 g10/keygen.c:2501
+#, c-format
 msgid "rounded to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, 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"
+msgstr "%s anahtarları %u bit ile %u bit arasında olmalıdır.\n"
 
-#: g10/keygen.c:2566
-#, fuzzy, c-format
+#: g10/keygen.c:2550
+#, c-format
 msgid "What keysize do you want for the subkey? (%u) "
-msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
+msgstr "Yardımcı anahtar için istediğiniz anahtar boyutu nedir? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "İstenen anahtar uzunluğu: %u bit\n"
+msgstr "İstenen anahtar boyutu: %u bit\n"
 
-#: g10/keygen.c:2629
-#, fuzzy
-#| msgid "Please select what kind of key you want:\n"
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
-msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
+msgstr "Lütfen hangi eliptik eğriyi istediğinizi seçin:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5760,7 +5432,7 @@
 " <n>m = anahtar n ay geçerli\n"
 " <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5769,72 +5441,71 @@
 " <n>m = signature expires in n months\n"
 " <n>y = signature expires in n years\n"
 msgstr ""
-"Lütfen imzanınn ne kadar süreyle geçerli olacağını belirtin.\n"
+"Lütfen imzanın ne kadar süreyle geçerli olacağını belirtin.\n"
 " 0 = imza süresiz geçerli\n"
 " <n> = imza n gün geçerli\n"
 " <n>w = imza n hafta geçerli\n"
 " <n>m = imza n ay geçerli\n"
 " <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
-msgstr "Anahtar ne kadar geçerli olacak? (0) "
+msgstr "Anahtar ne kadar süre için geçerli olsun? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
-msgstr "İmza ne kadar geçerli olacak? (%s) "
+msgstr "İmza ne kadar süre için geçerli olsun? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
-msgstr "değer hatalı\n"
+msgstr "geçersiz değer\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
-msgstr "Anahtar hep geçerli olacak\n"
+msgstr "Anahtarın geçerliliği hiçbir zaman bitmeyecek\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
-msgstr "İmza hep geçerli olacak\n"
+msgstr "İmzanın geçerliliği hiçbir zaman bitmeyecek\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
-msgstr "Anahtarın geçerliliği %s de bitecek.\n"
+msgstr "Anahtarın geçerliliği %s tarihinde bitecek\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
-msgstr "İmzanın geçerliliği %s de bitecek.\n"
+msgstr "İmzanın geçerliliği %s tarihinde bitecek\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
-"Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
+"Ancak 2106 yılına kadar düzgünce çalışacak.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
-msgstr "Bu doğru mu? (e/H ya da y/N) "
+msgstr "Bu doğru mu? (e/H) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 "\n"
-"GnuPG anahtarınızı betimlemek için bir kullanıcı kimliği oluşturmaya ihtiyaç "
-"duyuyor.\n"
+"GnuPG'nin anahtarınızı tanımlaması için bir kimlik yapması gerekiyor.\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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5844,66 +5515,64 @@
 "\n"
 msgstr ""
 "\n"
-"Anahtarınızın size ait olduğunu belirten bir Kullanıcı-Kimliği olmalı;\n"
-"Kullanıcı-Kimliği, Gerçek İsminiz, Bir Önbilgi ve e-Posta Adresiniz\n"
-"alanlarının birleşiminden oluşur. Örneğin:\n"
-"\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
+"Anahtarınızı tanımlamak için bir kullanıcı kimliği gerekir; yazılım, "
+"kimliği\n"
+"Gerçek Adınızdan, Önbilginizden ve E-posta Adresinizden şu biçimde yapar:\n"
+" \"Kül Tigin (Eş Kağan) <kueltigin@goektueruek.gk>\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
-msgstr "Adınız ve Soyadınız: "
+msgstr "Gerçek adınız: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
-msgstr "Ad ve soyadınızda geçersiz karakter var\n"
+msgstr "Adda geçersiz karakter\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
-msgstr ""
+msgstr "'%s' ve '%s' karakterleri adınızda görünemez\n"
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
-msgstr "geçerli bir E-posta adresi değil\n"
+msgstr "Geçerli bir e-posta adresi değil\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
-msgstr "Önbilgi alanında geçersiz karakter var\n"
+msgstr "Önbilgi alanında geçersiz karakter\n"
 
-#: g10/keygen.c:3083
-#, fuzzy, c-format
-#| msgid "You are using the `%s' character set.\n"
+#: g10/keygen.c:3067
+#, c-format
 msgid "You are using the '%s' character set.\n"
-msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
+msgstr "'%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 " \"%s\"\n"
 "\n"
 msgstr ""
-"Seçtiğiniz KULLANICI-KİMLİĞİ:\n"
+"Seçtiğiniz KULLANICI KİMLİĞİ:\n"
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 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"
+msgstr "Lütfen e-posta adresinizi gerçek ad veya önbilgi alanına koymayın\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
-msgstr ""
+msgstr "Böyle bir kullanıcı kimliği bu anahtarda halihazırda var!\n"
 
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase. Below you will find the matching
@@ -5916,134 +5585,124 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
-msgstr "AaYyEeTtKk"
+msgstr "AaNnEeTtKk"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 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)? "
+msgstr "(A)d, Ö(n)bilgi, (E)-posta değiştir veya Çı(k)? "
 
-#: g10/keygen.c:3130
+#: g10/keygen.c:3114
 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)? "
+msgstr "(A)d, Ö(n)bilgi, (E)-posta değiştir veya (T)amam/Çı(k)? "
 
-#: g10/keygen.c:3135
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+#: g10/keygen.c:3119
 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)? "
+msgstr "(A)d, Ö(n)bilgi, (E)-posta değiştir veya Çı(k)? "
 
-#: g10/keygen.c:3136
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+#: g10/keygen.c:3120
 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)? "
+msgstr "(A)d, Ö(n)bilgi, (E)-posta değiştir veya (T)amam/Çı(k)? "
 
-#: g10/keygen.c:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"Bir miktar rasgele bayt üretilmesi gerekiyor. İlk üretim sırasında biraz\n"
-"hareket (klavyeyi kullanmak, fareyi hareket ettirmek, disklerden "
-"yararlanmak)\n"
-"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
-"üretecine yardımcı olur. \n"
+"Çok fazla rastgele bayt üretmemiz gerekiyor. İlk üretim sırasında biraz\n"
+"hareket (klavyeyi kullanma, fareyi hareket ettirme, disklerden yararlanma)\n"
+"iyi olacaktır; bu yeterli rastgele bayt kazanımı için rastgele sayı\n"
+"üretecine yardımcı olur.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
-msgstr ""
+msgstr "UYARI: v4 tanımlı; ancak v5 tarafından geçersiz kılındı.\n"
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+msgstr "Anahtar üretimi başarısız: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
 " \"%s\"\n"
 "\n"
 msgstr ""
+"Şunun için bir anahtar üretilecek:\n"
+" \"%s\"\n"
+"\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
-msgstr ""
+msgstr "Sürdürülsün mü? (E/h) "
 
-#: g10/keygen.c:4619
-#, fuzzy, c-format
-#| msgid "key already exists\n"
+#: g10/keygen.c:4696
+#, c-format
 msgid "A key for \"%s\" already exists\n"
-msgstr "anahtar zaten mevcut\n"
+msgstr "\"%s\" için bir anahtar halihazırda mevcut\n"
 
-#: g10/keygen.c:4624
-#, fuzzy
-#| msgid "Use this key anyway? (y/N) "
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
-msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
+msgstr "Yine de üretilsin mi? (e/H) "
 
-#: g10/keygen.c:4630
-#, fuzzy, c-format
-#| msgid "generating new key\n"
+#: g10/keygen.c:4707
+#, c-format
 msgid "creating anyway\n"
-msgstr "yeni anahtar üretiliyor\n"
+msgstr "yine de üretiliyor\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
+"Not: Tam ayrıntılı bir anahtar oluşturma iletişim kutusu için \"%s %s\" "
+"kullanın.\n"
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
-msgstr "Anahtar üretimi durduruldu.\n"
+msgstr "Anahtar üretimi iptal edildi.\n"
 
-#: g10/keygen.c:5198
-#, fuzzy, c-format
-#| msgid "can't create backup file `%s': %s\n"
+#: g10/keygen.c:5275
+#, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:5218
-#, fuzzy, c-format
-#| msgid "NOTE: backup of card key saved to `%s'\n"
+#: g10/keygen.c:5295
+#, c-format
 msgid "Note: backup of card key saved to '%s'\n"
-msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
+msgstr "Not: Kart anahtar yedeği '%s' konumuna kaydedildi\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
-#, fuzzy, c-format
-#| msgid "writing public key to `%s'\n"
+#: g10/keygen.c:5470 g10/keygen.c:5675
+#, c-format
 msgid "writing public key to '%s'\n"
-msgstr "genel anahtarı `%s'e yazıyor\n"
+msgstr "genel anahtar '%s' konumuna yazılıyor\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:5592
-#, fuzzy, c-format
-#| msgid "error writing public keyring `%s': %s\n"
+#: g10/keygen.c:5683
+#, c-format
 msgid "error writing public keyring '%s': %s\n"
-msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
+msgstr "'%s' genel anahtar zinciri yazılırken hata: %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -6051,185 +5710,193 @@
 "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:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, 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"
+"anahtar %lu saniye gelecekte üretilmiş (zaman sapması veya saat sorunu)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
-"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
-"problemi)\n"
+"anahtar %lu saniye gelecekte üretilmiş (zaman sapması veya saat sorunu)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
-#, fuzzy, c-format
-#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+#: g10/keygen.c:5925 g10/keygen.c:6133
+#, c-format
 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"
+"Not: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, 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:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, 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:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
-msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
+msgstr "Gerçekten üretilsin mi? (e/H) "
 
 #: g10/keyid.c:753 g10/keyid.c:768 g10/keyid.c:783
 msgid "never "
-msgstr "asla "
+msgstr "asla "
+
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Özet: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Özellikler: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Anahtar sunucusu değişmez"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Kritik imza guvencesi: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
-msgstr "imza guvencesi: "
+msgstr "İmza poliçesi: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Kritik tercihli anahtar sunucusu: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Kritik imza simgelemi: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
-msgstr "imza simgelemi: "
+msgstr "İmza simgelemi: "
 
-#: g10/keylist.c:495
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
+#: g10/keylist.c:717
+#, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d kötü imza\n"
 msgstr1 "%d kötü imza\n"
 
-#: g10/keylist.c:508
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
+#: g10/keylist.c:730
+#, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
-msgstr0 "1 imza bir hata yüzünden kontrol edilmedi\n"
-msgstr1 "1 imza bir hata yüzünden kontrol edilmedi\n"
+msgstr0 "%d imza, bir hata yüzünden denetlenmedi\n"
+msgstr1 "%d imza, bir hata yüzünden denetlenmedi\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Uyarı: %lu imza, büyük boyut nedeniyle atlandı\n"
+msgstr1 "Uyarı: %lu imza, büyük boyut nedeniyle atlandı\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Anahtar zinciri"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
-msgstr "Birincil anahtar parmak izi:"
+msgstr " Asıl anahtar parmak izi:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
-msgstr "Birincil anahtar parmak izi:"
+msgstr " Asıl anahtar parmak izi:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
-msgstr " Anahtar parmakizi ="
+msgstr " Anahtar parmak izi ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
-msgstr " Kart seri no. ="
+msgstr " Kart seri numarası ="
 
 #: g10/keyring.c:1477
-#, fuzzy, c-format
-#| msgid "caching keyring `%s'\n"
+#, c-format
 msgid "caching keyring '%s'\n"
-msgstr "`%s' anahtar zinciri önbellekleniyor\n"
+msgstr "'%s' anahtar zinciri önbellekleniyor\n"
 
 #: g10/keyring.c:1551
-#, fuzzy, c-format
-#| msgid "%lu keys cached so far (%lu signatures)\n"
+#, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
-msgstr0 "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
-msgstr1 "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
+msgstr0 "Şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
+msgstr1 "Şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 
 #: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%lu anahtar arabelleklendi"
+msgstr1 "%lu anahtar arabelleklendi"
 
 #: g10/keyring.c:1569
-#, fuzzy, c-format
-#| msgid "1 bad signature\n"
+#, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
-msgstr0 "1 kötü imza\n"
-msgstr1 "1 kötü imza\n"
+msgstr0 " (%lu imza)\n"
+msgstr1 " (%lu imza)\n"
 
 #: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
-msgstr "%s: anahtar zinciri oluşturuldu\n"
+msgstr "%s: Anahtar zinciri oluşturuldu\n"
 
 #: g10/keyserver.c:90
 msgid "override proxy options set for dirmngr"
-msgstr ""
+msgstr "dirmngr için ayarlanmış vekil ayarlarını geçersiz kıl"
 
 #: g10/keyserver.c:92
 msgid "include revoked keys in search results"
-msgstr "yürürlükten kaldırılan anahtarlar arama sonuçlarına dahil edilir"
+msgstr "yürürlükten kaldırılan anahtarları arama sonuçlarına dahil et"
 
 #: g10/keyserver.c:93
 msgid "include subkeys when searching by key ID"
-msgstr ""
-"anahtar kimliğine göre arama yapılırken yardımcı anahtarlar dahil edilir"
+msgstr "anahtar kimliğine göre arama yapılırken yardımcı anahtarları dahil et"
 
 #: g10/keyserver.c:95
 msgid "override timeout options set for dirmngr"
-msgstr ""
+msgstr "dirmngr için ayarlanmış zaman aşımı seçeneklerini geçersiz kıl"
 
 #: g10/keyserver.c:99
 msgid "automatically retrieve keys when verifying signatures"
-msgstr "imzaları doğrularken anahtarları özdevinimli olarak alır"
+msgstr "imzaları doğrularken anahtarları kendiliğinden al"
 
 #: g10/keyserver.c:101
 msgid "honor the preferred keyserver URL set on the key"
-msgstr "tercihli anahtar sunucusunun adresini adrese atar"
+msgstr "tercihli anahtar sunucusunun adresini adrese ata"
 
 #: g10/keyserver.c:360
 msgid "disabled"
-msgstr "iptal edildi"
+msgstr "devre dışı bırakıldı"
 
 #: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
+msgstr "(S)ayıları gir, So(n)raki veya Çık(q) > "
 
 #: g10/keyserver.c:669
 #, c-format
@@ -6239,361 +5906,354 @@
 #: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
+msgstr "\"%s\" bir anahtar kimliği değil: Atlanıyor\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
-#, fuzzy, c-format
-#| msgid "refreshing %d keys from %s\n"
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
+#, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
-msgstr0 "%d anahtar %s adresinden tazeleniyor\n"
-msgstr1 "%d anahtar %s adresinden tazeleniyor\n"
+msgstr0 "%d anahtar %s adresinden yenileniyor\n"
+msgstr1 "%d anahtar %s adresinden yenileniyor\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
+msgstr "UYARI: %s anahtarı %s üzerinden yenilenemiyor: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
+msgstr "\"%s\" anahtarı, anahtar sunucusunda bulunamadı\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
-#, fuzzy, c-format
-#| msgid "no keyserver action!\n"
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
+#, c-format
 msgid "no keyserver known\n"
-msgstr "bir anahtar sunucusu eylemi yok!\n"
+msgstr "bilinen bir anahtar sunucusu yok\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1662
-#, fuzzy, c-format
-#| msgid "requesting key %s from %s\n"
+#: g10/keyserver.c:1664
+#, c-format
 msgid "requesting key from '%s'\n"
-msgstr "%s anahtarı %s adresinden isteniyor\n"
+msgstr "%s adresinden anahtar isteniyor\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
+msgstr "UYARI: URI %s alınamıyor: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, 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:380
-#, fuzzy, c-format
-#| msgid "%s encrypted session key\n"
+#: g10/mainproc.c:398
+#, c-format
 msgid "%s.%s encrypted session key\n"
-msgstr "%s şifreli oturum anahtarı\n"
+msgstr "%s.%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
-#, fuzzy, c-format
-#| msgid "%s encrypted data\n"
+#: g10/mainproc.c:400 sm/decrypt.c:884
+#, c-format
 msgid "%s.%s encrypted data\n"
-msgstr "%s şifreli veri\n"
+msgstr "%s.%s şifreli veri\n"
 
-#: g10/mainproc.c:387
-#, fuzzy, c-format
-#| msgid "encrypted with unknown algorithm %d\n"
+#: g10/mainproc.c:405
+#, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
-msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
+msgstr "%d.%s bilinmeyen algoritması ile şifrelenmiş\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özet algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:532
-#, fuzzy, c-format
-#| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+#: g10/mainproc.c:564
+#, c-format
 msgid "encrypted with %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"
+msgstr "%s anahtarı ile şifrelendi, %s kimliği, %s tarihinde oluşturuldu\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
+msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelendi\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
-msgstr "UYAR: çok sayıda salt metin görüldü\n"
+msgstr "UYAR: Çok sayıda düz metin görüldü\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
-msgstr "genel anahtarla şifreli veri: doğru DEK\n"
+msgstr "genel anahtarla şifreli veri: Doğru DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: 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:660
+#: 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"
+msgstr "IDEA şifresi kullanılamıyor, iyi niyetle %s kullanılması denenecek\n"
 
-#: g10/mainproc.c:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
-msgstr "UYARI: ileti bütünlük korumalı değildi\n"
+msgstr "UYARI: İleti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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 ""
+"İpucu: Eğer bu ileti 2003 yılından önce oluşturulmuşsa büyük olasılıkla\n"
+"meşrudur. Bunun nedeni, o tarihte bütünlük koruması yaygın olarak\n"
+"kullanılmıyordu.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
-msgstr ""
+msgstr "Yine de şifresini çözmek için '%s' seçeneğini kullanın.\n"
 
-#: g10/mainproc.c:776
-#, fuzzy, c-format
-#| msgid "decryption failed: %s\n"
+#: g10/mainproc.c:818
+#, c-format
 msgid "decryption forced to fail!\n"
-msgstr "şifre çözme başarısız: %s\n"
+msgstr "şifre çözme başarısız olmaya zorlandı!\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
+msgstr "UYARI: Şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:902
-#, fuzzy, c-format
-#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+"yerine getirilmemiş uyum kurallarından dolayı işlem başarısız olmaya "
+"zorlandı\n"
+
+#: g10/mainproc.c:944
+#, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
-msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
+msgstr "Not: Gönderen \"yalnız-siz-bakın\" ricasında bulundu\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
-msgstr "özgün dosya adı = '%.*s'\n"
+msgstr "özgün dosya adı='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, 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"
+"tek başına yürürlükten kaldırma uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
-msgstr "\"%s\" deki imza KÖTÜ"
+msgstr "\"%s\" konumundaki imza KÖTÜ"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
-msgstr "\"%s\" deki imza zamanaşımına uğramış"
+msgstr "\"%s\" konumundaki imza zaman aşımına uğramış"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
-msgstr "\"%s\" deki imza iyi"
+msgstr "\"%s\" konumundaki imza iyi"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
-msgstr "İmza %s de\n"
+msgstr "İmza %s içinde\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
-msgstr " %s kullanılarak anahtar %s ile yapılmış\n"
+msgstr " %s kullanılarak %s anahtarı ile yapılmış\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, 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:1988
-#, fuzzy, c-format
-#| msgid " aka \"%s\""
+#: g10/mainproc.c:2030
+#, c-format
 msgid " issuer \"%s\"\n"
-msgstr " nam-ı diğer \"%s\""
+msgstr " veren: \"%s\"\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
-msgstr "Anahtar burada:"
+msgstr "Anahtar burada: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
-msgstr ""
+msgstr "Not: Bu bilgiden yararlanmak için '%s' kullanın\n"
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "şüpheli"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:2398
-#, fuzzy, c-format
-#| msgid "WARNING: This key is not certified with a trusted signature!\n"
+#: g10/mainproc.c:2442 sm/verify.c:532
+#, c-format
 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"
+msgstr "UYARI: Bu anahtar %s kipinde imzalama için uygun değil\n"
 
-#: g10/mainproc.c:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
-msgstr "Bu imzanın geçerliliği %s de bitti.\n"
+msgstr "Bu imzanın geçerliliği %s tarihinde bitti.\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
-msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
+msgstr "Bu imzanın geçerliliği %s tarihinde bitecek.\n"
 
-#: g10/mainproc.c:2430
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
+#: g10/mainproc.c:2474
+#, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "%s imzası, %s özet algoritması\n"
+msgstr "%s imzası, %s%s%s özet algoritması\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
-msgstr "metinkipi"
+msgstr "metin kipi"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:2434
-#, fuzzy
-#| msgid "algorithm: %s"
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
-msgstr "algoritma: %s"
+msgstr ", anahtar algoritması "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
-msgstr ""
+msgstr "UYARI: Ayrık bir imza değil; '%s' dosyası DOĞRULANMADI!\n"
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "İmza kontrol edilemedi: %s\n"
+msgstr "İmza denetlenemedi: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
-msgstr "bir bağımsız imza değil\n"
+msgstr "bir ayrık imza değil\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
-msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
+msgstr "UYARI: Çoklu imzalar saptandı. Yalnızca ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
 #: g10/misc.c:107 g10/misc.c:137 g10/misc.c:213
-#, fuzzy, c-format
-#| msgid "fstat of `%s' failed in %s: %s\n"
+#, c-format
 msgid "fstat of '%s' failed in %s: %s\n"
-msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
+msgstr "'%s' için %s içinde durum bilgisi alınamıyor: %s\n"
 
 #: g10/misc.c:176
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "fstat(%d) %s de başarısız: %s\n"
+msgstr "fstat(%d) %s içinde başarısız: %s\n"
 
 #: g10/misc.c:304
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
+msgstr "UYARI: Deneysel %s genel anahtar algoritması kullanılıyor\n"
 
 #: g10/misc.c:311
 #, c-format
@@ -6603,12 +6263,12 @@
 #: g10/misc.c:325
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
+msgstr "UYARI: Deneysel %s şifreleme algoritması kullanılıyor\n"
 
 #: g10/misc.c:343
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "UYARI: deneysel %s özet algoritması kullanılıyor\n"
+msgstr "UYARI: Deneysel %s özet algoritması kullanılıyor\n"
 
 #: g10/misc.c:351
 #, c-format
@@ -6616,33 +6276,30 @@
 msgstr "UYARI: %s özet algoritması artık önerilmiyor.\n"
 
 #: g10/misc.c:380
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
+#, c-format
 msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s imzası, %s özet algoritması\n"
+msgstr "Not: %s algoritmasını kullanan imzalar reddediliyor\n"
 
 #: g10/misc.c:396
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
+#, c-format
 msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
-msgstr "%s imzası, %s özet algoritması\n"
+msgstr ""
+"Not: %s algoritmasını kullanan üçüncü parti anahtar imzaları reddediliyor\n"
 
 #: g10/misc.c:421
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
+#, c-format
 msgid "(reported error: %s)\n"
-msgstr "`%s' için okuma hatası: %s\n"
+msgstr "(bildirilen hata: %s)\n"
 
 #: g10/misc.c:424
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
+#, c-format
 msgid "(reported error: %s <%s>)\n"
-msgstr "`%s' için okuma hatası: %s\n"
+msgstr "(bildirilen hata: %s <%s>)\n"
 
 #: g10/misc.c:443 sm/misc.c:51
 #, c-format
 msgid "(further info: "
-msgstr ""
+msgstr "(ek bilgi: "
 
 #: g10/misc.c:1184
 #, c-format
@@ -6652,25 +6309,23 @@
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "lütfen yerine \"%s%s\" kullanınız\n"
+msgstr "lütfen yerine \"%s%s\" kullanın\n"
 
 #: g10/misc.c:1197
 #, 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"
+msgstr "UYARI: \"%s\" komutu artık önerilmiyor - lütfen kullanmayın\n"
 
 #: g10/misc.c:1207
-#, fuzzy, c-format
-#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+#, c-format
 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"
+msgstr "%s:%u: \"%s\", bu dosyada kullanılmıyor - yalnızca %s içinde etkili\n"
 
 #: g10/misc.c:1211
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+#, c-format
 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"
+msgstr "UYARI: \"%s%s\" eskimiş bir seçenek - %s dışında bir etkisi yok\n"
 
 #: g10/misc.c:1308
 msgid "Uncompressed"
@@ -6679,66 +6334,61 @@
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #: g10/misc.c:1333
 msgid "uncompressed|none"
-msgstr "Sıkıştırılmamış|yok"
+msgstr "sıkıştırılmamış|yok"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1625
-#, fuzzy, c-format
-#| msgid "ambiguous option `%s'\n"
+#: g10/misc.c:1619
+#, c-format
 msgid "ambiguous option '%s'\n"
-msgstr "`%s' seçeneği belirsiz\n"
+msgstr "belirsiz seçenek '%s'\n"
 
-#: g10/misc.c:1650
-#, fuzzy, c-format
-#| msgid "unknown option `%s'\n"
+#: g10/misc.c:1644
+#, c-format
 msgid "unknown option '%s'\n"
-msgstr "`%s' seçeneği bilinmiyor\n"
+msgstr "bilinmeyen seçenek '%s'\n"
 
-#: g10/misc.c:1888
-#, fuzzy, c-format
-#| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
+#: g10/misc.c:1882
+#, c-format
 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"
+msgstr ""
+"ECDSA genel anahtarının SEC kodlamasında 8'in katları olması bekleniyor\n"
 
-#: g10/misc.c:1910
-#, fuzzy, c-format
-#| msgid "Unknown signature type `%s'\n"
+#: g10/misc.c:1904
+#, c-format
 msgid "unknown weak digest '%s'\n"
-msgstr "imza türü `%s' bilinmiyor\n"
+msgstr "bilinmeyen zayıf özet '%s'\n"
 
 #: g10/openfile.c:78
-#, fuzzy, c-format
-#| msgid "File `%s' exists. "
+#, c-format
 msgid "File '%s' exists. "
-msgstr "\"%s\" dosyası var. "
+msgstr "'%s' dosyası var. "
 
 #: g10/openfile.c:82
 msgid "Overwrite? (y/N) "
-msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
+msgstr "Üzerine yazılsın mı? (e/H) "
 
 #: g10/openfile.c:117
 #, c-format
 msgid "%s: unknown suffix\n"
-msgstr "%s: bilinmeyen sonek\n"
+msgstr "%s: Bilinmeyen sonek\n"
 
 #: g10/openfile.c:141
 msgid "Enter new filename"
-msgstr "Yeni dosya ismini giriniz"
+msgstr "Yeni dosya adı girin"
 
 #: g10/openfile.c:214
 #, c-format
 msgid "writing to stdout\n"
-msgstr "standart çıktıya yazıyor\n"
+msgstr "standart çıktıya yazılıyor\n"
 
 #: g10/openfile.c:362
-#, fuzzy, c-format
-#| msgid "assuming signed data in `%s'\n"
+#, c-format
 msgid "assuming signed data in '%s'\n"
-msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
+msgstr "'%s' içindeki veri imzalı kabul ediliyor\n"
 
 #: g10/parse-packet.c:357
 #, c-format
@@ -6748,94 +6398,87 @@
 #: g10/parse-packet.c:1299
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
+msgstr "UYARI: Simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
 #: g10/parse-packet.c:1818
-#, fuzzy, c-format
-#| msgid "Critical signature notation: "
+#, c-format
 msgid "Unknown critical signature notation: "
-msgstr "Kritik imza simgelemi: "
+msgstr "Bilinmeyen kritik imza simgelemi: "
 
 #: g10/parse-packet.c:1946
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
+msgstr "%d türü alt paket kritik bit kümesine iye\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
-#, fuzzy
-#| msgid "Please enter the new passphrase"
+#: g10/passphrase.c:201 sm/decrypt.c:661
 msgid "Please enter the passphrase for decryption."
-msgstr "Lütfen yeni anahtar parolasını girin"
+msgstr "Şifre çözümü için yeni anahtar parolasını girin."
 
 #: g10/passphrase.c:203
 msgid "Enter passphrase\n"
-msgstr "Anahtar parolasını giriniz\n"
+msgstr "Anahtar parolasını girin\n"
 
 #: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
-msgstr "kullanıcı tarafından durduruldu\n"
+msgstr "kullanıcı tarafından iptal edildi\n"
 
 #: g10/passphrase.c:483
 #, c-format
 msgid " (main key ID %s)"
-msgstr " (asıl anahtar kimliği %s)"
+msgstr " (ana anahtar kimliği %s)"
 
 #: g10/passphrase.c:490
-#, 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."
+"OpenPGP gizli anahtarının kilidini açmak için anahtar parolasını girin:"
 
 #: g10/passphrase.c:494
-#, 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."
+msgstr "OpenPGP gizli anahtarını içe aktarmak için anahtar parolasını girin:"
 
 #: g10/passphrase.c:499
-#, 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."
+msgstr ""
+"OpenPGP gizli yardımcı anahtarını dışa aktarmak için anahtar parolasını "
+"girin:"
 
 #: g10/passphrase.c:502
-#, 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."
+msgstr "OpenPGP gizli anahtarını dışa aktarmak için anahtar parolasını girin:"
 
 #: g10/passphrase.c:507
-#, 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) "
+msgstr ""
+"OpenPGP gizli yardımcı anahtarını kalıcı olarak silmek istediğinize emin "
+"misiniz:"
 
 #: g10/passphrase.c:510
-#, 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) "
+msgstr ""
+"OpenPGP gizli anahtarını kalıcı olarak silmek istediğinize emin misiniz:"
 
 #: g10/passphrase.c:515
-#, fuzzy
-#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the secret key with keygrip:"
-msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
+msgstr ""
+"Gizli anahtarı anahtar maşasıyla dışa aktarmak için anahtar parolasını girin:"
 
 #: g10/passphrase.c:529
-#, fuzzy, c-format
-#| msgid "%u-bit %s key, ID %s, created %s"
+#, c-format
 msgid ""
 "%s\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %s,\n"
 "created %s%s.\n"
 "%s"
-msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
+msgstr ""
+"%s\n"
+"\"%.*s\"\n"
+"%u bit %s anahtarı, %s kimliği,\n"
+"%s%s tarihinde oluşturuldu.\n"
+"%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6844,91 +6487,86 @@
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 "\n"
-"Foto kimliği olarak kullanılmak üzere bir resim seçiniz. Resim bir JPEG\n"
+"Fotoğraf kimliği olarak kullanılmak üzere bir resim seçiniz. Resim bir JPEG\n"
 "dosyası olmalıdır. Bu resim genel anahtarınızda saklanacağından, çok büyük\n"
 "bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
 "boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
-msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
+msgstr "Fotoğraf kimliği için JPEG dosya adını girin: "
 
-#: g10/photoid.c:121
-#, fuzzy, c-format
-#| msgid "unable to open JPEG file `%s': %s\n"
+#: g10/photoid.c:227
+#, c-format
 msgid "unable to open JPEG file '%s': %s\n"
-msgstr "JPEG dosyası `%s' açılamıyor: %s\n"
+msgstr "JPEG dosyası '%s' açılamıyor: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Bu JPEG gerçekten büyük (%d bayt)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H ya da y/N) "
+msgstr "Onu kullanmak istediğinize emin misiniz? (e/H) "
 
-#: g10/photoid.c:150
-#, fuzzy, c-format
-#| msgid "`%s' is not a JPEG file\n"
+#: g10/photoid.c:263
+#, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s' bir JPEG dosyası değil\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
-msgstr "Bu foto doğru mu? (e/H/ç veya y/N/ç) "
+msgstr "Bu fotoğraf doğru mu? (e/H/k) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
 
-#: g10/photoid.c:506
-#, fuzzy, c-format
-#| msgid "unable to execute shell `%s': %s\n"
+#: g10/photoid.c:619
+#, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "'%s' kabuğu çalıştırılamıyor: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
-msgstr "Dış uygulamamnın doğal olmayan çıkışı\n"
+msgstr "dış uygulamamnın doğal olmayan çıkışı\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "dış uygulama çalıştırılırken sistem hatası: %s\n"
 
-#: g10/photoid.c:600
-#, fuzzy, c-format
-#| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+#: g10/photoid.c:713
+#, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
-msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
+msgstr "UYARI: Geçici dosya silinemiyor (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
-#, fuzzy, c-format
-#| msgid "WARNING: unable to remove temp directory `%s': %s\n"
+#: g10/photoid.c:717
+#, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
-msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
+msgstr "UYARI: '%s' geçici dizini silinemiyor: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
-"güvensiz options dosyası yetkilerinden dolayı dış program çağrıları iptal\n"
-"edildi\n"
+"dosya izinlerinin güvensiz seçeneklerinden dolayı dış program çağrıları "
+"devre dışı bırakıldı\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
-msgstr "foto kimliği gösterilemiyor!\n"
+msgstr "fotoğraf kimliği görüntülenemiyor!\n"
 
 #. TRANSLATORS: These are the allowed answers in lower and
 #. uppercase. Below you will find the matching strings which
@@ -6942,7 +6580,7 @@
 #.
 #: g10/pkclist.c:219
 msgid "iImMqQsS"
-msgstr "bBmMkKaA"
+msgstr "bBmMaAkK"
 
 #: g10/pkclist.c:227
 msgid "No trust value assigned to:\n"
@@ -6957,34 +6595,34 @@
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
-"%s: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
+"Bu anahtarın adı verilen kullanıcının olduğuna ne kadar inanıyorsunuz?\n"
 
 #: g10/pkclist.c:285
 #, c-format
 msgid " %d = I don't know or won't say\n"
-msgstr " %d = bilmiyorum, kem küm\n"
+msgstr " %d = Bilmiyorum, kem küm\n"
 
 #: g10/pkclist.c:287
 #, c-format
 msgid " %d = I do NOT trust\n"
-msgstr " %d = güvence vermem\n"
+msgstr " %d = Güvence vermem\n"
 
 #: g10/pkclist.c:293
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr " %d = Son derece güveniyorum\n"
+msgstr " %d = Son derece güveniyorum\n"
 
 #: g10/pkclist.c:299
 msgid " m = back to the main menu\n"
-msgstr " m = ana menüye dön\n"
+msgstr " m = Ana menüye dön\n"
 
 #: g10/pkclist.c:302
 msgid " s = skip this key\n"
-msgstr " a = bu anahtarı atla\n"
+msgstr " a = Bu anahtarı atla\n"
 
 #: g10/pkclist.c:303
 msgid " q = quit\n"
-msgstr " k = çık\n"
+msgstr " k = Çık\n"
 
 #: g10/pkclist.c:307
 #, c-format
@@ -6992,7 +6630,7 @@
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
-"Bu anahtar için asgari güvence seviyesi: %s\n"
+"Bu anahtar için en düşük güvence düzeyi: %s\n"
 "\n"
 
 #: g10/pkclist.c:313 g10/revoke.c:804
@@ -7002,276 +6640,256 @@
 #: g10/pkclist.c:334
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
-"Bu anahtarı gerçekten son derece güvenli yapmak istiyor musunuz? (e/H ya da "
-"y/N) "
+"Bu anahtarı gerçekten en üst düzey güvenli yapmak istiyor musunuz? (e/H) "
 
 #: g10/pkclist.c:348
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n"
+msgstr "En üst düzey güvenli bir anahtarla sonuçlanan sertifikalar:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair bir "
-"belirti yok\n"
+"%s: Bu anahtarın gerçekten adı verilen kişinin olduğuna dair bir belirti "
+"yok\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair sınırlı "
-"bir belirti var\n"
+"%s: Bu anahtarın gerçekten adı verilen kişinin olduğuna dair sınırlı bir "
+"belirti var\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
-msgstr "Bu anahtarın ismi belirtilen şahsa ait olduğu umuluyor\n"
+msgstr "Bu anahtar herhalde adı verilen kişinin\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Bu anahtar bizim\n"
 
-#: g10/pkclist.c:459
-#, fuzzy, c-format
-#| msgid "root certificate has now been marked as trusted\n"
+#: g10/pkclist.c:463
+#, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
-msgstr "kök sertifika artık güvenilir olarak imlenmiş oldu\n"
+msgstr "%s: Bu anahtar kötü! Güvenilmez olarak imlenmiş!\n"
 
-#: g10/pkclist.c:487
-#, 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"
+#: g10/pkclist.c:491
 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 ""
-"Bu anahtarın kullanıcı kimliğinde ismi belirtilen şahsa ait\n"
-"olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
-"sonraki soruya da evet cevabı verebilirsiniz.\n"
+"Bu anahtar kötü! Güvenilmez olarak imlenmiş! Eğer gerçekten\n"
+"ne yaptığınızı biliyorsanız bir sonraki soruyu isterseniz\n"
+"evet olarak yanıtlayabilirsiniz.\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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 ""
-"Bu anahtarın kullanıcı kimliğinde ismi belirtilen şahsa ait\n"
-"olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
-"sonraki soruya da evet cevabı verebilirsiniz.\n"
+"Bu anahtarın kullanıcı kimliğinde adı bulunan kişinin olduğu\n"
+"kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız bir\n"
+"sonraki soruyu isterseniz evet olarak yanıtlayabilirsiniz.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
-msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
+msgstr "Bu anahtar yine de kullanılsın mı? (e/H) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
-"UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma "
+"UYARI: Bu anahtar yürürlükten kaldırılmış olabilir (yürürlükten kaldırma "
 "anahtarı mevcut değil)\n"
 
-#: g10/pkclist.c:669
-#, fuzzy, c-format
-#| msgid "user ID: \"%s\"\n"
+#: g10/pkclist.c:673
+#, c-format
 msgid "checking User ID \"%s\"\n"
-msgstr "Kullanıcı kimliği: \"%s\"\n"
+msgstr "kullanıcı kimliği denetleniyor: \"%s\"\n"
 
-#: g10/pkclist.c:681
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#: g10/pkclist.c:685
+#, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "%s seçeneği verildi; ancak \"%s\" vereni eşleşmiyor\n"
 
-#: g10/pkclist.c:684
-#, fuzzy, c-format
-#| msgid "key %s: doesn't match our copy\n"
+#: g10/pkclist.c:688
+#, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
-msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
+msgstr "\"%s\" vereni herhangi bir kullanıcı kimliğiyle eşleşmiyor\n"
 
-#: g10/pkclist.c:687
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#: g10/pkclist.c:691
+#, c-format
 msgid "option %s given but no matching User ID found\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "%s seçeneği verildi; ancak eşleşen bir kullanıcı kimliği bulunamadı\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n"
+msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmış!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
+msgstr "UYARI: Bu anahtar iyesi tarafından yürürlükten kaldırılmış!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
-msgstr " Bu imza sahte anlamına gelebilir.\n"
+msgstr " Bu, imza sahtedir anlamına gelebilir.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr ""
-"UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
+msgstr "UYARI: Bu yardımcı anahtar iyesi tarafından yürürlükten kaldırılmış!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
-msgstr "Bilgi: Bu anahtar iptal edildi.\n"
+msgstr "Not: Bu anahtar devre dışı bırakıldı.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
-msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
+msgstr "Not: Bu anahtarın kullanım süresi dolmuş!\n"
 
-#: g10/pkclist.c:729
-#, fuzzy, c-format
-#| msgid "WARNING: This key is not certified with a trusted signature!\n"
+#: g10/pkclist.c:733
+#, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
-msgstr " Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
+msgstr " Bu imzanın iyesine ait olduğuna dair bir belirti yok.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
+msgstr "UYARI: Bu anahtara GÜVENMİYORUZ!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
-msgstr " Bu imza SAHTE olabilir.\n"
+msgstr " Bu imza büyük olasılıkla SAHTE.\n"
 
-#: g10/pkclist.c:753
-#, fuzzy, c-format
-#| msgid ""
-#| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:757
+#, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
 "signatures!\n"
 msgstr ""
-"UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
+"UYARI: Anahtarın kullanıcı kimliği yeterli güvenilen imzalarla "
 "sertifikalanmamış!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr ""
-"UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
-"sertifikalanmamış!\n"
+msgstr "UYARI: Bu anahtar yeterli güvenilen imzalarla sertifikalanmamış!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
-msgstr " Bu imzanın sahibine ait olduğu kesin değil.\n"
+msgstr " Bu imzanın iyesine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: atlandı: genel anahtar iptal edildi\n"
+msgstr "%s: atlandı: Genel anahtar devre dışı bırakıldı\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: atlandı: genel anahtar zaten var\n"
+msgstr "%s: atlandı: Genel anahtar zaten var\n"
 
-#: g10/pkclist.c:1010
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
+#: g10/pkclist.c:1030
+#, c-format
 msgid "can't encrypt to '%s'\n"
-msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
+msgstr "'%s' ögesine şifrelenemiyor\n"
 
-#: g10/pkclist.c:1025
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#: g10/pkclist.c:1045
+#, c-format
 msgid "option '%s' given, but no valid default keys given\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "'%s' seçeneği verildi; ancak bir öntanımlı anahtar verilmedi\n"
 
-#: g10/pkclist.c:1032
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#: g10/pkclist.c:1052
+#, c-format
 msgid "option '%s' given, but option '%s' not given\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "'%s' seçeneği verildi; ancak '%s' seçeneği verilmedi\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
-msgstr "Şimdiki alıcılar:\n"
+msgstr "Geçerli alıcılar:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
 msgstr ""
 "\n"
-"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
+"Kullanıcı kimliğini girin. Boş bir satırla sonlandırın: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
-msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
+msgstr "atlandı: Genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
-msgstr "Genel anahtar iptal edildi.\n"
+msgstr "Genel anahtar devre dışı bırakıldı.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
-msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
+msgstr "atlandı: Genel anahtar zaten ayarlanmış\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
+msgstr "bilinmeyen öntanımlı alıcı \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
-msgstr "geçerli adresler yok\n"
+msgstr "geçerli adres yok\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
-msgstr "Bilginize: anahtar %s %s özelliğine sahip değil\n"
+msgstr "Not: %s anahtarı, %s özelliğine iye değil\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, 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"
+msgstr "Not: %s anahtarı, %s için bir tercihe iye değil\n"
 
 #: g10/plaintext.c:85
 #, c-format
@@ -7280,16 +6898,16 @@
 
 #: g10/plaintext.c:606
 msgid "Detached signature.\n"
-msgstr "Bağımsız imza.\n"
+msgstr "Ayrık imza.\n"
 
 #: g10/plaintext.c:614
 msgid "Please enter name of data file: "
-msgstr "Lütfen veri dosyasının ismini girin: "
+msgstr "Lütfen veri dosyası adını girin: "
 
 #: g10/plaintext.c:651
 #, c-format
 msgid "reading stdin ...\n"
-msgstr "standart girdiden okuyor ...\n"
+msgstr "standart girdiden okunuyor ...\n"
 
 #: g10/plaintext.c:696
 #, c-format
@@ -7297,21 +6915,19 @@
 msgstr "imzalı veri yok\n"
 
 #: g10/plaintext.c:714
-#, fuzzy, c-format
-#| msgid "can't open signed data `%s'\n"
+#, c-format
 msgid "can't open signed data '%s'\n"
-msgstr "imzalı veri '%s' açılamadı\n"
+msgstr "imzalı veri '%s' açılamıyor\n"
 
 #: g10/plaintext.c:749
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
-msgstr "imzalı veri fd=%d açılamadı: %s\n"
+msgstr "imzalı veri fd=%d açılamıyor: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
-#, fuzzy, c-format
-#| msgid "certificate is not usable for encryption\n"
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
+#, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
-msgstr "sertifika şifreleme için elverişli değil\n"
+msgstr "%s anahtarı %s kipinde şifre çözümü için uygun değil\n"
 
 #: g10/pubkey-enc.c:139
 #, c-format
@@ -7319,15 +6935,14 @@
 msgstr "anonim alıcı: %s gizli anahtarı deneniyor ...\n"
 
 #: g10/pubkey-enc.c:146 g10/pubkey-enc.c:159
-#, fuzzy, c-format
-#| msgid "certificate is not usable for encryption\n"
+#, c-format
 msgid "used key is not marked for encryption use.\n"
-msgstr "sertifika şifreleme için elverişli değil\n"
+msgstr "kullanılan anahtar şifreleme kullanımı için imlenmemiş.\n"
 
 #: g10/pubkey-enc.c:157
 #, c-format
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "tamam, biz anonim alıcıyız.\n"
+msgstr "tamam, anonim alıcı biziz.\n"
 
 #: g10/pubkey-enc.c:327
 #, c-format
@@ -7337,24 +6952,22 @@
 #: g10/pubkey-enc.c:355
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
+msgstr "şifre algoritması %d%s bilinmiyor veya devre dışı bırakılmış\n"
 
 #: g10/pubkey-enc.c:399
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
+msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde bulunamadı\n"
 
 #: g10/pubkey-enc.c:432
-#, fuzzy, c-format
-#| msgid "NOTE: secret key %s expired at %s\n"
+#, c-format
 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"
+msgstr "Not: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
 #: g10/pubkey-enc.c:439
-#, fuzzy, c-format
-#| msgid "NOTE: key has been revoked"
+#, c-format
 msgid "Note: key has been revoked"
-msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
+msgstr "Not: Anahtar yürürlükten kaldırılmış"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
 #: g10/revoke.c:503
@@ -7365,7 +6978,7 @@
 #: g10/revoke.c:143
 #, c-format
 msgid "key %s has no user IDs\n"
-msgstr "anahtar %s: kullanıcı kimliği yok\n"
+msgstr "%s anahtarında bir kullanıcı kimliği yok\n"
 
 #: g10/revoke.c:311
 msgid "To be revoked by:\n"
@@ -7373,19 +6986,15 @@
 
 #: g10/revoke.c:315
 msgid "(This is a sensitive revocation key)\n"
-msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
+msgstr "(Bu duyarlı bir yürürlükten kaldırma anahtarıdır)\n"
 
 #: g10/revoke.c:320
-#, fuzzy
-#| msgid "Secret key is available.\n"
 msgid "Secret key is not available.\n"
-msgstr "Gizli anahtar mevcut.\n"
+msgstr "Gizli anahtar mevcut değil.\n"
 
 #: g10/revoke.c:325
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr ""
-"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
-"da y/N) "
+msgstr "Bu imza için bir yürürlükten kaldırma sertifikası üretilsin mi? (e/H) "
 
 #: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
@@ -7403,15 +7012,11 @@
 #: g10/revoke.c:422
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
+msgstr "\"%s\" için yürürlükten kaldırma anahtarı bulunamadı\n"
 
 #: g10/revoke.c:568
-#, fuzzy
-#| msgid "Create a revocation certificate for this key? (y/N) "
 msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr ""
-"Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
-"ya da y/N) "
+msgstr "Bu, OpenPGP anahtarı için bir yürürlükten kaldırma sertifikasıdır:"
 
 #: g10/revoke.c:584
 msgid ""
@@ -7419,6 +7024,9 @@
 "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 ""
+"Yürürlükten kaldırma sertifikası, bir anahtarın artık kullanılamayacağını\n"
+"belirtmek için kullanılan bir tür \"devre kesici\"dir. Yayımlandıktan sonra\n"
+"bir yürürlükten kaldırma sertifikasını geri almak olanaklı değildir."
 
 #: g10/revoke.c:587
 msgid ""
@@ -7428,6 +7036,11 @@
 "a reason for the revocation. For details see the description of\n"
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
+"Bunu, tehlikeli bir durumda veya gizli anahtarın kaybedilmesi durumunda\n"
+"kullanın. Ancak, eğer gizli anahtar hâlâ erişilebilirse yeni bir\n"
+"yürürlükten kaldırma sertifikası oluşturmak ve kaldırma için bir neden\n"
+"vermek daha iyidir. Ayrıntılar için GnuPG kullanım kılavuzunda\n"
+"\"--generate-revocation\" komutunun açıklamasına bakın."
 
 #: g10/revoke.c:593
 msgid ""
@@ -7435,18 +7048,19 @@
 "before the 5 dashes below. Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
+"Bu dosyanın kazara kullanımını önlemek için aşağıdaki üç tireden önce bir\n"
+"iki nokta eklenmiştir. Bu yürürlükten kaldırma sertifikasını içe aktarmadan\n"
+"ve yayımlamadan önce bu iki noktayı bir metin düzenleyici ile kaldırın."
 
 #: g10/revoke.c:612
-#, fuzzy, c-format
-#| msgid "Revocation certificate created.\n"
+#, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
-msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
+msgstr "yürürlükten kaldırma sertifikası '%s.rev' olarak depolandı\n"
 
 #: g10/revoke.c:656
-#, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
+#, c-format
 msgid "secret key \"%s\" not found\n"
-msgstr "gizli anahtar \"%s\" yok: %s\n"
+msgstr "gizli anahtar \"%s\" bulunamadı\n"
 
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line. Several lines
@@ -7454,19 +7068,17 @@
 #: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
-msgstr ""
+msgstr "'%s', birden çok gizli anahtar ile eşleşiyor:\n"
 
 #: g10/revoke.c:706
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
+#, c-format
 msgid "error searching the keyring: %s\n"
-msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
+msgstr "anahtar zinciri aranırken hata: %s\n"
 
 #: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
-"Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
-"ya da y/N) "
+"Bu anahtar için bir yürürlükten kaldırma sertifikası üretilsin mi? (e/H) "
 
 #: g10/revoke.c:753
 msgid ""
@@ -7483,12 +7095,12 @@
 "Sertifika başkalarının kolayca erişebileceği yerlerde saklanmamalıdır.\n"
 "Aksi takdirde, yürürlükten kaldırma sertifikanız bilginiz dışında\n"
 "yayınlandığında geçerli olan genel anahtarınızın geçersiz hale gelebilir.\n"
-"Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
+"Sertifika kısa olacağından isterseniz bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
 #: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
-msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
+msgstr "Lütfen bir yürürlükten kaldırma nedeni seçiniz:\n"
 
 #: g10/revoke.c:797
 msgid "Cancel"
@@ -7497,25 +7109,25 @@
 #: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
+msgstr "(Büyük olasılıkla burada %d seçmek istersiniz)\n"
 
 #: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
-"İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
+"İsteğe bağlı açıklamayı girebilirsiniz; boş bir satır işlemi sonlandırır:\n"
 
 #: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
-msgstr "Yürürlükten kaldırma sebebi: %s\n"
+msgstr "Yürürlükten kaldırma nedeni: %s\n"
 
 #: g10/revoke.c:873
 msgid "(No description given)\n"
-msgstr "(açıklama verilmedi)\n"
+msgstr "(Açıklama verilmedi)\n"
 
 #: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
-msgstr "Bu tamam mı? (e/H ya da y/N) "
+msgstr "Bu tamam mı? (e/H) "
 
 #: g10/seskey.c:62 sm/encrypt.c:126
 #, c-format
@@ -7526,184 +7138,167 @@
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
+"simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kez "
 "denendi!\n"
 
 #: g10/seskey.c:299
-#, fuzzy, c-format
-#| msgid "%s key uses an unsafe (%u bit) hash\n"
+#, c-format
 msgid "%s key %s uses an unsafe (%zu bit) hash\n"
-msgstr "%s anahtarı, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
+msgstr "%s anahtarı %s, güvensiz bir sağlama (%zu bit) kullanıyor\n"
 
 #: g10/seskey.c:317
-#, fuzzy, c-format
-#| msgid "DSA key %s requires a %u bit or larger hash\n"
+#, c-format
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
-msgstr "DSA anahtarı %s, %u bitlik veya daha geniş bir çittirim gerektiriyor\n"
-
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
-#, 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"
-msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+msgstr ""
+"%s anahtarı %s, bir %zu bit veya daha büyük bir sağlama gerektiriyor "
+"(sağlama %s)\n"
 
-#: g10/sig-check.c:85
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
+msgid "key %s may not be used for signing in %s mode\n"
+msgstr "%s anahtarı %s kipinde imzalama için kullanılamaz\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "UYARI: iletideki imza özeti çelişkili\n"
+msgstr "UYARI: İletideki imza özeti çelişkili\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
+msgstr "UYARI: Yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
-msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
+msgstr "daha fazla bilgi için bakınız: %s\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
+"UYARI: Yardımcı imzalama anahtarı %s, geçersiz çapraz sertifikalamaya iye\n"
 
-#: g10/sig-check.c:379
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
+#: g10/sig-check.c:373
+#, 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"
 msgstr0 "genel anahtar %s imzadan %lu saniye daha yeni\n"
 msgstr1 "genel anahtar %s imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:387
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
+#: g10/sig-check.c:381
+#, 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"
 msgstr0 "genel anahtar %s imzadan %lu saniye daha yeni\n"
 msgstr1 "genel anahtar %s imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
+#: g10/sig-check.c:395 g10/sign.c:420
+#, 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"
 msgstr0 ""
-"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+"%s anahtarı %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 msgstr1 ""
-"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+"%s anahtarı %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/sig-check.c:410
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
+#: g10/sig-check.c:404
+#, 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"
 msgstr0 ""
-"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+"%s anahtarı %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 msgstr1 ""
-"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+"%s anahtarı %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/sig-check.c:428
-#, fuzzy, c-format
-#| msgid "NOTE: signature key %s expired %s\n"
+#: g10/sig-check.c:422
+#, c-format
 msgid "Note: signature key %s expired %s\n"
-msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
+msgstr "Not: %s imza anahtarının %s tarihinde süresi dolmuş\n"
 
-#: g10/sig-check.c:439
-#, fuzzy, c-format
-#| msgid "NOTE: signature key %s has been revoked\n"
+#: g10/sig-check.c:433
+#, c-format
 msgid "Note: signature key %s has been revoked\n"
-msgstr "BİLGİ: imza anahtarı %s yürürlükten kaldırılmıştı\n"
+msgstr "Not: %s imza anahtarı yürürlükten kaldırılmış\n"
 
-#: g10/sig-check.c:531
-#, fuzzy, c-format
-#| msgid "standalone signature of class 0x%02x\n"
+#: g10/sig-check.c:525
+#, c-format
 msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n"
-msgstr "0x%02x sınıfı tek başına imza\n"
+msgstr "%s anahtarından kötü anahtar imzası: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:543
-#, fuzzy, c-format
-#| msgid "standalone signature of class 0x%02x\n"
+#: g10/sig-check.c:537
+#, c-format
 msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n"
-msgstr "0x%02x sınıfı tek başına imza\n"
+msgstr "%s anahtarından kötü veri imzası: %s (0x%02x, 0x%x)\n"
 
-#: g10/sig-check.c:646
+#: g10/sig-check.c:640
 #, 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"
+"kötü imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
+"kaynaklandığı varsayılıyor\n"
 
-#: g10/sig-check.c:1241
+#: g10/sig-check.c:1235
 #, 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"
+"%s anahtarı: Anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
-"anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
+"%s anahtarı: Yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
-"UYARI: %% genişletmeli simgelem imkansız (çok büyük). Genişletilmeden "
+"UYARI: %% genişletmeli simgelem olanaksız (çok büyük). Genişletilmeden "
 "kullanılıyor.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr ""
-"UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
-"Uzatılmadan kullanılıyor.\n"
+"UYARI: Güvence URL'si için %%'lik uzatma olanaksız (çok büyük). Uzatılmadan "
+"kullanılıyor.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 msgstr ""
-"UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
-"(çok büyük). Uzatılmadan kullanılıyor.\n"
+"UYARI: Tercih edilen anahtar sunucu URL'si için %%'lik uzatma olanaksız (çok "
+"büyük). Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s/%s imza: \"%s\" den\n"
+msgstr "%s/%s imza \"%s\" konumundan\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"UYARI: alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
+"UYARI: Alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
 "isteniyor\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1631
-#, fuzzy, c-format
-#| msgid "%s encryption will be used\n"
+#: g10/sign.c:1645
+#, c-format
 msgid "%s.%s encryption will be used\n"
-msgstr "%s şifrelemesi kullanılmayacak\n"
+msgstr "%s.%s şifrelemesi kullanılacak\n"
 
 #: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
@@ -7713,12 +7308,12 @@
 #: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "\"%s\" atlandı: tekrarlanmış\n"
+msgstr "\"%s\" atlandı: Yinelenmiş\n"
 
 #: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
-msgstr "atlandı: gizli anahtar zaten var\n"
+msgstr "atlandı: Gizli anahtar zaten var\n"
 
 #: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
@@ -7727,7 +7322,7 @@
 #: g10/tdbdump.c:57 g10/trustdb.c:494
 #, 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"
+msgstr "güvence veritabanının %lu. kaydı, %d türünde: Yazma başarısız: %s\n"
 
 #: g10/tdbdump.c:105
 #, c-format
@@ -7735,14 +7330,13 @@
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# Atanan güvencedeğerlerinin listesi %s oluşturuldu\n"
+"# Atanan güvence değerlerinin listesi %s oluşturuldu\n"
 "# (Eski haline getirmek için \"gpg --import-ownertrust\" kullanın\n"
 
 #: g10/tdbdump.c:164 g10/tdbdump.c:172 g10/tdbdump.c:177 g10/tdbdump.c:182
-#, fuzzy, c-format
-#| msgid "error in `%s': %s\n"
+#, c-format
 msgid "error in '%s': %s\n"
-msgstr "'%s' de hata: %s\n"
+msgstr "'%s' içinde hata: %s\n"
 
 #: g10/tdbdump.c:164
 msgid "line too long"
@@ -7750,167 +7344,161 @@
 
 #: g10/tdbdump.c:172
 msgid "colon missing"
-msgstr ": imi eksik"
+msgstr ": eksik"
 
 #: g10/tdbdump.c:178
 msgid "invalid fingerprint"
-msgstr "parmakizi geçersiz"
+msgstr "parmak izi geçersiz"
 
 #: g10/tdbdump.c:183
 msgid "ownertrust value missing"
-msgstr "sahibiningüvencesi değeri kayıp"
+msgstr "iye güvencesi değeri kayıp"
 
 #: g10/tdbdump.c:226
-#, fuzzy, c-format
-#| msgid "error finding trust record in `%s': %s\n"
+#, c-format
 msgid "error finding trust record in '%s': %s\n"
-msgstr "`%s' deki güvence kaydını ararken hata: %s\n"
+msgstr "'%s' içindeki güvence kaydını bulurken hata: %s\n"
 
 #: g10/tdbdump.c:230
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
+#, c-format
 msgid "read error in '%s': %s\n"
-msgstr "`%s' için okuma hatası: %s\n"
+msgstr "'%s' içinde okuma hatası: %s\n"
 
 #: g10/tdbdump.c:239 g10/trustdb.c:509
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
+msgstr "trustdb: Eşitleme başarısız: %s\n"
 
-#: g10/tdbio.c:144
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
+#: g10/tdbio.c:137
+#, c-format
 msgid "can't create lock for '%s'\n"
-msgstr "`%s' için kilit oluşturulamıyor\n"
+msgstr "'%s' için kilit oluşturulamıyor\n"
 
-#: g10/tdbio.c:149
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
+#: g10/tdbio.c:142
+#, c-format
 msgid "can't lock '%s'\n"
-msgstr "`%s' kiltlenemedi\n"
+msgstr "'%s' kiltlenemiyor\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
+msgstr "trustdb %lu kaydı: lseek başarısız: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, 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"
+msgstr "trustdb kaydı %lu: yazma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
-msgstr "güvence veritabanı işlemi çok uzun\n"
+msgstr "trustdb işlemi çok uzun\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
-msgstr "%s: dizin yok!\n"
+msgstr "%s: Dizin yok!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
-#, fuzzy, c-format
-#| msgid "can't access `%s': %s\n"
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
+#, c-format
 msgid "can't access '%s': %s\n"
 msgstr "'%s' erişilemiyor: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
+msgstr "%s: Sürüm kaydı oluşturma başarısız: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
+msgstr "%s: Geçersiz trustdb oluşturuldu\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: güvence veritabanı oluşturuldu\n"
+msgstr "%s: trustdb oluşturuldu\n"
 
-#: g10/tdbio.c:826
-#, fuzzy, c-format
-#| msgid "NOTE: trustdb not writable\n"
+#: g10/tdbio.c:796
+#, c-format
 msgid "Note: trustdb not writable\n"
-msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
+msgstr "Not: trustdb yazılabilir değil\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: güvence veritabanı geçersiz\n"
+msgstr "%s: Geçersiz trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: çittirim tablosu oluşturulamadı: %s\n"
+msgstr "%s: Sağlama tablosu oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
+msgstr "%s: Sürüm kaydı güncellenirken hata: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
+msgstr "%s: Sürüm kaydı okunurken hata: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
+msgstr "%s: Sürüm kaydı yazılırken hata: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "güvence veritabanı: erişim başarısız: %s\n"
+msgstr "trustdb: lseek başarısız: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
+msgstr "trustdb: Okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: bir güvence veritabanı dosyası değil\n"
+msgstr "%s: Bir trustdb dosyası değil\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, 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:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "%s: dosya sürümü %d geçersiz\n"
+msgstr "%s: Geçersiz dosya sürümü %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: serbest kaydı okuma hatası: %s\n"
+msgstr "%s: Serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: dizin kaydını yazma hatası: %s\n"
+msgstr "%s: Dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: kayıt sıfırlama başarısız: %s\n"
+msgstr "%s: Kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s: kayıt ekleme başarısız: %s\n"
+msgstr "%s: Kayıt iliştirme başarısız: %s\n"
 
-#: g10/tdbio.c:1930
-#, fuzzy, c-format
+#: g10/tdbio.c:1900
+#, c-format
 msgid "Error: The trustdb is corrupted.\n"
-msgstr "%s: güvence veritabanı oluşturuldu\n"
+msgstr "Hata: trustdb hasarlı.\n"
 
 #: g10/textfilter.c:146
 #, c-format
@@ -7923,81 +7511,74 @@
 msgstr "girdi satırı %d karakterden daha uzun\n"
 
 #: g10/tofu.c:231 g10/tofu.c:255 g10/tofu.c:674
-#, fuzzy, c-format
-#| msgid "error sending standard options: %s\n"
+#, c-format
 msgid "error beginning transaction on TOFU database: %s\n"
-msgstr "standart seçenekler gönderilirken hata: %s\n"
+msgstr "TOFU veritabanında işlem başlatılırken hata: %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 "TOFU veritabanında işlem yaparken hata: %s\n"
 
 #: g10/tofu.c:354 g10/tofu.c:887
 #, c-format
 msgid "error rolling back transaction on TOFU database: %s\n"
-msgstr ""
+msgstr "TOFU veritabanında işlem geri alırken hata: %s\n"
 
 #: g10/tofu.c:504
-#, fuzzy, c-format
-#| msgid "unsupported algorithm: %s"
+#, c-format
 msgid "unsupported TOFU database version: %s\n"
-msgstr "desteklenmeyen algoritma: %s"
+msgstr "Desteklenmeyen TOFU veritabanı sürümü: %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 "TOFU veritabanı hatası"
 
 #: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
 #: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
 #: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
 #: g10/tofu.c:3408
-#, fuzzy, c-format
-#| msgid "error sending %s command: %s\n"
+#, c-format
 msgid "error reading TOFU database: %s\n"
-msgstr "%s komutu gönderilirken hata: %s\n"
+msgstr "TOFU veritabanı okunurken hata: %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 "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
+msgstr "TOFU veritabanı sürümü belirlenirken hata: %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: dizin kaydını yazma hatası: %s\n"
+msgstr "TOFU veritabanı ilklendirilirken hata: %s\n"
 
 #: g10/tofu.c:955
-#, fuzzy, c-format
-#| msgid "error opening `%s': %s\n"
+#, c-format
 msgid "error opening TOFU database '%s': %s\n"
-msgstr "'%s' açılırken hata: %s\n"
+msgstr "TOFU veritabanı '%s' açılırken hata: %s\n"
 
 #: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
-#, fuzzy, c-format
-#| msgid "error sending %s command: %s\n"
+#, c-format
 msgid "error updating TOFU database: %s\n"
-msgstr "%s komutu gönderilirken hata: %s\n"
+msgstr "TOFU veritabanı güncellenirken hata: %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 ""
+msgstr "Bu, \"%s\" e-posta adresinin %s anahtarıyla ilk kez kullanımı."
 
 #: 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!"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "\"%s\" e-posta adresi %d anahtarla ilişkilendirilmiş!"
+msgstr1 "\"%s\" e-posta adresi %d anahtarla ilişkilendirilmiş1"
 
 #: g10/tofu.c:1342
 msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
-msgstr ""
+msgstr " Bu garantinin poliçesi 'auto' olduğundan 'ask' olarak değiştirildi."
 
 #: g10/tofu.c:1348
 #, c-format
@@ -8005,133 +7586,126 @@
 "Please indicate whether this email address should be associated with key %s "
 "or whether you think someone is impersonating \"%s\"."
 msgstr ""
+"Lütfen bu e-posta adresinin %s anahtarıyla ilişkilendirilmesi gerekip "
+"gerekmediğini veya başka birisinin \"%s\" kişisinin yerine geçip geçmediği "
+"konusunda ne düşündüğünüzü belirtin."
 
 #: g10/tofu.c:1608
-#, fuzzy, c-format
-#| msgid "error getting new PIN: %s\n"
+#, c-format
 msgid "error gathering other user IDs: %s\n"
-msgstr "yeni PIN alınırken hata: %s\n"
+msgstr "diğer kullanıcı kimliği toplanırken hata: %s\n"
 
+#
 #: g10/tofu.c:1618
-#, fuzzy
-#| msgid "list key and user IDs"
 msgid "This key's user IDs:\n"
-msgstr "anahtarı ve kullanıcı kimliğini gösterir"
+msgstr "Bu anahtarın kullanıcı kimliği:\n"
 
 #: g10/tofu.c:1634 g10/tofu.c:1801
-#, fuzzy, c-format
-#| msgid "validity: %s"
+#, c-format
 msgid "policy: %s"
-msgstr "geçerliliği: %s"
+msgstr "poliçe: %s"
 
 #: g10/tofu.c:1727
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
+#, c-format
 msgid "error gathering signature stats: %s\n"
-msgstr "saklanmış bayraklar alınırken hata: %s\n"
+msgstr "imza istatistikleri toplanırken hata:%s\n"
 
 #: g10/tofu.c:1731
 #, 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"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "\"%s\" e-posta adresi %d anahtarla ilişkilendirilmiş:\n"
+msgstr1 "\"%s\" e-posta adresi %d anahtarla ilişkilendirilmiş:\n"
 
 #: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
-msgstr ""
+msgstr "\"%s\" e-posta adresinin kullanan anahtarların istatistikleri:\n"
 
+#
 #: g10/tofu.c:1799
-#, fuzzy
-#| msgid "list keys"
 msgid "this key"
-msgstr "anahtarları listeler"
+msgstr "bu anahtar"
 
 #: g10/tofu.c:1825
-#, fuzzy, c-format
-#| msgid "print message digests"
+#, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
-msgstr0 "ileti özetlerini gösterir"
-msgstr1 "ileti özetlerini gösterir"
+msgstr0 "%d ileti doğrulandı."
+msgstr1 "%d ileti doğrulandı."
 
 #: g10/tofu.c:1829
-#, fuzzy, c-format
-#| msgid "encrypted with %lu passphrases\n"
+#, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
-msgstr0 "%lu anahtar parolası ile şifrelenmiş\n"
-msgstr1 "%lu anahtar parolası ile şifrelenmiş\n"
+msgstr0 "%d ileti şifrelendi."
+msgstr1 "%d ileti şifrelendi."
 
 #: g10/tofu.c:1836
-#, fuzzy, c-format
-#| msgid "print message digests"
+#, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
-msgstr0 "ileti özetlerini gösterir"
-msgstr1 "ileti özetlerini gösterir"
+msgstr0 "Gelecekte %d ileti doğrulandı."
+msgstr1 "Gelecekte %d ileti doğrulandı."
 
 #: g10/tofu.c:1840
-#, fuzzy, c-format
-#| msgid "print message digests"
+#, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
-msgstr0 "ileti özetlerini gösterir"
-msgstr1 "ileti özetlerini gösterir"
+msgstr0 "Gelecekte %d ileti şifrelendi."
+msgstr1 "Gelecekte %d ileti şifrelendi."
 
 #: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Geçmiş %d günde doğrulanan iletiler: %d."
+msgstr1 "Geçmiş %d günde doğrulanan iletiler: %d."
 
 #: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Geçmiş %d günde şifrelenen iletiler: %d."
+msgstr1 "Geçmiş %d günde şifrelenen iletiler: %d."
 
 #: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Geçmiş %d ayda doğrulanan iletiler: %d."
+msgstr1 "Geçmiş %d ayda doğrulanan iletiler: %d."
 
 #: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Geçmiş %d ayda şifrelenen iletiler: %d."
+msgstr1 "Geçmiş %d ayda şifrelenen iletiler: %d."
 
 #: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Geçmiş %d yılda doğrulanan iletiler: %d."
+msgstr1 "Geçmiş %d yılda doğrulanan iletiler: %d."
 
 #: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
-msgstr0 ""
-msgstr1 ""
+msgstr0 "Geçmiş %d yılda şifrelenen iletiler: %d."
+msgstr1 "Geçmiş %d yılda şifrelenen iletiler: %d."
 
 #: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
-msgstr ""
+msgstr "Geçmişte doğrulanan iletiler: %d."
 
 #: g10/tofu.c:1904
-#, fuzzy, c-format
-#| msgid "print message digests"
+#, c-format
 msgid "Messages encrypted in the past: %d."
-msgstr "ileti özetlerini gösterir"
+msgstr "Geçmişte şifrelenen iletiler: %d."
 
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below. We don't directly internationalize that text so
@@ -8139,126 +7713,130 @@
 #: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
+"Genellikle belirli bir e-posta adresiyle ilişkilendirilmiş yalnızca bir "
+"anahtar vardır. Ancak, örneğin anahtar çok eskiyse veya sahibi anahtarın "
+"güvenliğinin ihlal edilmiş olabileceğini düşünürse bazen yeni bir anahtar "
+"oluşturulur. Aksi takdirde, yeni anahtar iletilere müdahale edildiği "
+"anlamına gelebilir! Bu anahtarı kabul etmeden önce, bu yeni anahtarın "
+"geçerli olduğundan emin olmak için iyesiyle iletişime geçmelisiniz."
 
 #. 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:1963
 msgid "gGaAuUrRbB"
-msgstr ""
+msgstr "yYkKbBrRhH"
 
 #: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
-msgstr ""
+msgstr "İ(y)i, Birini (k)abul et, (B)ilinmeyen, Bir kez (r)eddet, (H)atalı? "
 
 #: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
-msgstr ""
+msgstr "Bilinmeyen varsayılıyor.\n"
 
 #: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
-msgstr ""
+msgstr "TOFU veritabanı hasarı algılandı.\n"
 
 #: g10/tofu.c:2833
-#, fuzzy, c-format
-#| msgid "error creating a pipe: %s\n"
+#, c-format
 msgid "error changing TOFU policy: %s\n"
-msgstr "boru oluşturulurken hata: %s\n"
+msgstr "TOFU poliçesi değiştirilirken hata: %s\n"
 
 #: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%lld yıl"
+msgstr1 "%lld yıl"
 
 #: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%lld ay"
+msgstr1 "%lld ay"
 
 #: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%lld hafta"
+msgstr1 "%lld hafta"
 
 #: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%lld gün"
+msgstr1 "%lld gün"
 
 #: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%lld saat"
+msgstr1 "%lld saat"
 
 #: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%lld dakika"
+msgstr1 "%lld dakika"
 
 #: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%lld saniye"
+msgstr1 "%lld saniye"
 
 #: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
-msgstr ""
+msgstr "%s: 0 imza doğrulandı ve 0 ileti şifrelendi."
 
 #: g10/tofu.c:3155
-#, fuzzy, c-format
-#| msgid "Deleted %d signatures.\n"
+#, c-format
 msgid "%s: Verified 0 signatures."
-msgstr "%d imza silindi.\n"
+msgstr "%s: 0 imza doğrulandı."
 
 #: g10/tofu.c:3169
-#, fuzzy
-#| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
-msgstr "%lu anahtar parolası ile şifrelenmiş\n"
+msgstr "0 ileti şifrelendi."
 
 #: g10/tofu.c:3185
-#, fuzzy, c-format
-#| msgid "validity: %s"
+#, c-format
 msgid "(policy: %s)"
-msgstr "geçerliliği: %s"
+msgstr "(poliçe: %s)"
 
 #: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
+"Uyarı: Bu anahtar/kullanıcı kimliğinin imzaladığı bir ileti henüz görmedik!\n"
 
 #: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
+"Uyarı: Bu anahtar/kullanıcı kimliğinin imzaladığı yalnızca bir ileti "
+"gördük!\n"
 
 #: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
-msgstr ""
+msgstr "Uyarı: Bu anahtara henüz bir ileti şifrelemediniz!\n"
 
 #: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
-msgstr ""
+msgstr "Uyarı: Bu anahtara yalnızca bir ileti şifrelediniz!\n"
 
 #: g10/tofu.c:3258
 #, c-format
@@ -8275,45 +7853,54 @@
 " %s\n"
 "to mark it as being bad.\n"
 msgstr0 ""
+"Uyarı: Bu anahtar/kullanıcı kimliğiyle başka imzalar gördüyseniz büyük "
+"olasılıkla bu anahtar sahte olabilir! Ufak varyasyonlar için e-posta "
+"adreslerini dikkatlice inceleyin. Hâlâ kuşkulanıyorsanız\n"
+" %s\n"
+"kullanarak bunu kötü olarak imleyin.\n"
 msgstr1 ""
+"Uyarı: Bu anahtar ve bu kullanıcı kimlikleriyle başka imzalar gördüyseniz "
+"büyük olasılıkla bu anahtar sahte olabilir! Ufak varyasyonlar için e-posta "
+"adreslerini dikkatlice inceleyin. Hâlâ kuşkulanıyorsanız %s\n"
+"kullanarak bunu kötü olarak imleyin.\n"
 
 #: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
 #: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
-#, fuzzy, c-format
-#| msgid "error sending %s command: %s\n"
+#, c-format
 msgid "error opening TOFU database: %s\n"
-msgstr "%s komutu gönderilirken hata: %s\n"
+msgstr "TOFU veritabanı açılırken hata: %s\n"
 
 #: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
+"UYARI: Yürürlükten kaldırılmamış kullanıcı kimlikleri olan %s ögesine "
+"şifreleniyor\n"
 
 #: g10/trustdb.c:283
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid long keyID\n"
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "`%s' geçerli bir anahtar kimliği değil\n"
+msgstr "'%s' geçerli bir uzun anahtar kimliği değil\n"
 
 #: g10/trustdb.c:306 g10/trustdb.c:335
 #, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
+msgstr "%s anahtarı: Güvenli anahtar olarak kabul edildi\n"
 
 #: g10/trustdb.c:379
 #, 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"
+msgstr "%s anahtarı güvence veritabanında birden fazla görünüyor\n"
 
 #: g10/trustdb.c:418
 #, 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"
+msgstr "%s anahtarı: Güvenli anahtar için genel anahtar yok - atlandı\n"
 
 #: g10/trustdb.c:429
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
+msgstr "%s anahtarı son derece güvenli olarak imlendi.\n"
 
 #: g10/trustdb.c:473
 #, c-format
@@ -8329,11 +7916,13 @@
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
+"trustdb'yi aşağıdaki komutları kullanarak yeniden oluşturmayı "
+"deneyebilirsiniz:\n"
 
 #: g10/trustdb.c:563
 #, c-format
 msgid "If that does not work, please consult the manual\n"
-msgstr ""
+msgstr "Eğer bu işe yaramazsa kullanım kılavuzuna bakın\n"
 
 #: g10/trustdb.c:613
 #, c-format
@@ -8350,29 +7939,27 @@
 #: g10/trustdb.c:668
 #, c-format
 msgid "no need for a trustdb check\n"
-msgstr "bir güvence veritabanı denetimi gereksiz\n"
+msgstr "bir güvence veritabanı denetimi gerekmiyor\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "sonraki güvence veritabanı denetimi %s de\n"
+msgstr "sonraki güvence veritabanı denetimi %s tarihinde\n"
 
 #: g10/trustdb.c:683
-#, fuzzy, c-format
-#| msgid "no need for a trustdb check with `%s' trust model\n"
+#, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
-msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
+msgstr "'%s' güvence modeliyle bir trustdb denetimi gerekmiyor\n"
 
 #: g10/trustdb.c:699
-#, fuzzy, c-format
-#| msgid "no need for a trustdb update with `%s' trust model\n"
+#, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
-msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
+msgstr "'%s' güvence modeliyle bir trustdb güncellemesi gerekmiyor\n"
 
 #: g10/trustdb.c:939 g10/trustdb.c:1522
 #, c-format
 msgid "public key %s not found: %s\n"
-msgstr "genel anahtar %s yok: %s\n"
+msgstr "genel anahtar %s bulunamadı: %s\n"
 
 #: g10/trustdb.c:1155
 #, c-format
@@ -8384,33 +7971,31 @@
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2085
-#, fuzzy, c-format
-#| msgid "%lu keys processed so far\n"
+#: g10/trustdb.c:2097
+#, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
-msgstr0 "şu ana kadar %lu anahtar işlendi\n"
-msgstr1 "şu ana kadar %lu anahtar işlendi\n"
+msgstr0 "%d anahtar işlendi"
+msgstr1 "%d anahtar işlendi"
 
-#: g10/trustdb.c:2088
-#, fuzzy, c-format
-#| msgid "%d keys processed (%d validity counts cleared)\n"
+#: g10/trustdb.c:2100
+#, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
-msgstr0 "%d anahtar işlendi (%d doğrulama temizlendi)\n"
-msgstr1 "%d anahtar işlendi (%d doğrulama temizlendi)\n"
+msgstr0 " (%d doğrulama sayımı temizlendi)\n"
+msgstr1 " (%d doğrulama sayımı temizlendi)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
-msgstr "son derece güvenli bir anahtar yok\n"
+msgstr "son derece güvenli bir anahtar bulunamadı\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, 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"
+msgstr "son derece güvenli %s için genel anahtar bulunamadı\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8418,11 +8003,10 @@
 "derinlik: %d geçerli: %3d imzalı: %3d güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr ""
-"güvence veritabanının sürüm kaydı güncellenemedi: yazma başarısız: %s\n"
+msgstr "trustdb sürüm kaydı güncellenemedi: Yazma başarısız: %s\n"
 
 #: g10/trust.c:114
 msgid "undefined"
@@ -8430,7 +8014,7 @@
 
 #: g10/trust.c:115
 msgid "never"
-msgstr "asla "
+msgstr "asla"
 
 #: g10/trust.c:116
 msgid "marginal"
@@ -8453,10 +8037,8 @@
 #. essentially a comment and need not be translated. Either key and
 #. uid are both NULL, or neither are NULL.
 #: g10/trust.c:155
-#, fuzzy
-#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgid "10 translator see trust.c:uid_trust_string_fixed"
-msgstr "20 translator seen trustdb.c:uid_trust_string_fixed"
+msgstr "20 translator see trustdb.c:uid_trust_string_fixed"
 
 #: g10/trust.c:158
 msgid " revoked"
@@ -8464,320 +8046,295 @@
 
 #: g10/trust.c:160 g10/trust.c:166
 msgid " expired"
-msgstr " süresi doldu "
+msgstr " süresi doldu "
 
 #: g10/trust.c:165
 msgid " unknown"
-msgstr " bilinmeyen "
+msgstr " bilinmeyen "
 
 #: g10/trust.c:167
 msgid " undef "
-msgstr " tanımsız "
+msgstr " tanımsız "
 
 #: g10/trust.c:168
-#, fuzzy
-#| msgid "never"
 msgid " never "
-msgstr "asla "
+msgstr " hiçbir zaman "
 
 #: g10/trust.c:169
 msgid "marginal"
-msgstr " şöyle böyle "
+msgstr " şöyle böyle "
 
 #: g10/trust.c:170
 msgid " full "
-msgstr " tamamen "
+msgstr " tamamen "
 
 #: g10/trust.c:171
 msgid "ultimate"
-msgstr " son derece "
+msgstr " son derece "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"imza doğrulanamadı.\n"
+"İmza doğrulanamadı.\n"
 "İmza dosyasının (.sig veya .asc) komut satırında verilecek\n"
-"ilk dosya olması gerektiğini lütfen hatırlayın.\n"
+"ilk dosya olması gerektiğine dikkat edin.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "fd %d açılamıyor: %s\n"
 
 #: g10/cipher-cfb.c:70
-#, fuzzy, c-format
-#| msgid "WARNING: message was not integrity protected\n"
+#, c-format
 msgid "WARNING: encrypting without integrity protection is dangerous\n"
-msgstr "UYARI: ileti bütünlük korumalı değildi\n"
+msgstr "UYARI: Bütünlük koruması olmadan şifreleme tehlikelidir\n"
 
 #: g10/cipher-cfb.c:72
-#, fuzzy, c-format
-#| msgid "ambiguous option `%s'\n"
+#, c-format
 msgid "Hint: Do not use option %s\n"
-msgstr "`%s' seçeneği belirsiz\n"
+msgstr "İpucu: %s seçeneğini kullanmayın\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
-msgstr "hata ayıklama bayrakları ayarlanır"
+msgstr "hata ayıklama bayraklarını ayarla"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
-msgstr "tam hata ayıklama etkin olur"
+msgstr "tam hata ayıklamayı etkinleştir"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
-msgstr "Kullanımı: kbxutil seçenekler dosyalar (yardım için -h)"
+msgstr "Kullanım: kbxutil seçenekler dosyalar (yardım için -h)"
 
-#: kbx/kbxutil.c:125
-#, fuzzy
-#| msgid ""
-#| "Syntax: kbxutil options files\n"
-#| "list, export, import Keybox data\n"
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
 msgstr ""
-"Sözdizimi: kbxutil seçenekler dosyalar\n"
-"Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
+"Sözdizim: kbxutil seçenekler dosyalar\n"
+"Anahtar kutusu verisini listele, içe ve dışa aktar\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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
-msgstr ""
+msgstr "%sSayı&#x1f;: %s%%0Aİyesi&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
-msgstr ""
+msgstr "Kalan deneme sayısı: %d"
 
 #: scd/app-piv.c:1845
-#, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "|N|Please enter the new Global-PIN"
-msgstr "||Lütfen PIN'i giriniz"
+msgstr "|N|Lütfen yeni Global PIN'i giriniz"
 
 #: scd/app-piv.c:1846
-#, fuzzy
-#| msgid "||Please enter the Reset Code for the card"
 msgid "||Please enter the Global-PIN of your PIV card"
-msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
+msgstr "||Lütfen PIV kartınızın Global PIN'ini girin"
 
 #: scd/app-piv.c:1853
-#, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "|N|Please enter the new PIN"
-msgstr "||Lütfen PIN'i giriniz"
+msgstr "|N|Lütfen yeni PIN'i girin"
 
 #: scd/app-piv.c:1854
-#, fuzzy
-#| msgid "||Please enter the Reset Code for the card"
 msgid "||Please enter the PIN of your PIV card"
-msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
+msgstr "||Lütfen PIV kartınızın PIN'ini girin"
 
 #: scd/app-piv.c:1861
-#, fuzzy
 msgid "|N|Please enter the new Unblocking Key"
-msgstr "||Lütfen PIN'i giriniz"
+msgstr "|N|Lütfen yeni blok açma anahtarını girin"
 
 #: scd/app-piv.c:1862
-#, fuzzy
 msgid "||Please enter the Unblocking Key of your PIV card"
-msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
+msgstr "||Lütfen PIV kartınızın blok açma anahtarını girin"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr "PIN eylemcisi hata döndürdü: %s\n"
+msgstr "PIN geri çağrımı hata döndürdü: %s\n"
 
 #: scd/app-piv.c:1895
-#, fuzzy, c-format
-#| msgid "PIN for CHV%d is too short; minimum length is %d\n"
+#, c-format
 msgid "PIN is too short; minimum length is %d\n"
-msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
+msgstr "PIN pek kısa; en kısa uzunluk %d\n"
 
 #: scd/app-piv.c:1903
-#, fuzzy, c-format
-#| msgid "PIN for CHV%d is too short; minimum length is %d\n"
+#, c-format
 msgid "PIN is too long; maximum length is %d\n"
-msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
+msgstr "PIN pek kısa; en büyük uzunluk %d\n"
 
 #: scd/app-piv.c:1910
 #, c-format
 msgid "PIN has invalid characters; only digits are allowed\n"
-msgstr ""
+msgstr "PIN'de geçersiz karakterler var; yalnızca satırlara izin verilir\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
-msgstr "mevcut anahtar konulacak\n"
+msgstr "mevcut anahtar başkasıyla değiştirilecek\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
-#, fuzzy, c-format
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
+#, c-format
 msgid "writing new key\n"
-msgstr "yeni anahtar üretiliyor\n"
+msgstr "yeni anahtar yazılıyor\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
-msgstr "anahtarın saklanması başarısız: %s\n"
+msgstr "anahtarın depolanması başarısız: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
-msgstr "yanıt RSA modülü içermiyor\n"
+msgstr "yanıt RSA modülünü içermiyor\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
-#, fuzzy, c-format
-#| msgid "response does not contain the RSA public exponent\n"
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
+#, c-format
 msgid "response does not contain the EC public key\n"
-msgstr "yanıt RSA genel bileşenini içermiyor\n"
+msgstr "yanıt EC genel anahtarını içermiyor\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
-msgstr "anahtar üretimi başarısızlığa uğradı\n"
+msgstr "anahtar üretimi başarısız\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
-#, fuzzy, c-format
-#| msgid "key generation completed (%d seconds)\n"
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
+#, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "anahtar üretimi tamamlandı (%d saniye)\n"
 msgstr1 "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
-msgstr "yanıt genel anahtar verisi içermiyor\n"
+msgstr "yanıt genel anahtar verisini içermiyor\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
-msgstr ""
+msgstr "||Nitelikli imzalar üretmek için lütfen PIN'i girin."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
-#, fuzzy
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
-msgstr "||Lütfen PIN'i giriniz"
+msgstr "|A|Lütfen yönetici PIN'ini girin"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
-#, fuzzy
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
-msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
+msgstr "|P|Lütfen standart anahtarlar için PIN blok açma kilidini (PUK) girin."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
-#, fuzzy
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
-msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
+msgstr "||Lütfen standart anahtarlar için PIN'i girin."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, 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:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, 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:1649
-#, fuzzy
-#| msgid "the NullPIN has not yet been changed\n"
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
-msgstr "BoşPIN henüz değişmedi\n"
+msgstr "Not: PIN henüz etkinleştirilmedi."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
-msgstr "BoşPIN henüz değişmedi\n"
+msgstr "Boş PIN henüz değiştirilmedi\n"
 
-#: scd/app-nks.c:2018
-#, fuzzy
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
-msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
+msgstr "|N|Lütfen standart anahtarlar için yeni bir PIN girin."
 
-#: scd/app-nks.c:2026
-#, fuzzy
+#: scd/app-nks.c:2096
 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"
+msgstr ""
+"|NP|Lütfen standart anahtarlar için yeni bir PIN blok açma (PUK) kodu girin."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
-msgstr ""
+msgstr "|N|Nitelikli imzalar üretmek için lütfen yeni bir PIN girin."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
+"|NP|Nitelikli imzalar üretmek için lütfen yeni bir PIN blok açma kodu (PUK) "
+"girin."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
+"|P|Nitelikli imzalar üretmek için lütfen PIN blok açma kodunu (PUK) girin."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "parmakizinin saklanması başarısız oldu: %s\n"
+msgstr "parmak izinin depolanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
+msgstr "oluşturma tarihinin depolanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
@@ -8785,162 +8342,153 @@
 #. 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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
-msgstr ""
+msgstr "%sSayı&#x1f;: %s%%0Aİyesi&#x1f;: %s%%0ASayaç&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
-msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
+msgstr "öntanımlı PIN olarak %s kullanılıyor\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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"
+"öntanımlı PIN olarak %s kullanılamadı: %s - sonrası için öntanımlı kullanım "
+"devre dışı bırakılıyor\n"
 
-#: scd/app-openpgp.c:2643
-#, fuzzy
-#| msgid "||Please enter the PIN"
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
-msgstr "||Lütfen PIN'i giriniz"
+msgstr "||Lütfen kart kilidini açın"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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"
+msgstr "CHV%d için PIN çok kısa; gereken en kısa uzunluk %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, 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:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:2810
-#, fuzzy, c-format
-#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+#: scd/app-openpgp.c:2865
+#, 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"
 msgstr0 ""
-"kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
+"kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN denemesi kaldı\n"
 msgstr1 ""
-"kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
+"kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN denemesi kaldı\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, 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:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, 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"
+msgstr "Sıfırlama Kodu çok kısa; gereken en kısa uzunluk %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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
-msgstr "|YSK|Yeni Sıfırlama Kodu"
+msgstr "|RN|Yeni Sıfırlama Kodu"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
-msgstr "|YYP|Yeni Yönetici PIN'i"
+msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:3544
-#, fuzzy
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
-msgstr "||Lütfen PIN'i giriniz"
+msgstr "||Lütfen Yönetici PIN'ini ve yeni Yönetici PIN'ini girin"
 
-#: scd/app-openpgp.c:3545
-#, fuzzy
-#| msgid "||Please enter the PIN"
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
-msgstr "||Lütfen PIN'i giriniz"
+msgstr "||Lütfen PIN'i ve yeni PIN'i girin"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
-msgstr "parmakizi DO okunurken hata\n"
+msgstr "parmak izi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
-msgstr "oluşturum zaman damgası kayıp\n"
+msgstr "üretim zaman damgası eksik\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, 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"
+msgstr "RSA asal sayısı %s ya eksik ya da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:4648
-#, fuzzy, c-format
-#| msgid "unsupported algorithm: %s"
+#: scd/app-openpgp.c:4717
+#, c-format
 msgid "unsupported curve\n"
-msgstr "desteklenmeyen algoritma: %s"
+msgstr "desteklenmeyen eğri\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, 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:5036
+#: scd/app-openpgp.c:5137
 #, 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:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, 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"
+msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasak\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 
 #: scd/app-dinsig.c:298
-#, fuzzy
-#| msgid "||Please enter your PIN at the reader's keypad"
 msgid "||Please enter your PIN at the reader's pinpad"
-msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
+msgstr "||Lütfen PIN'inizi okuyucunun düğme takımından giriniz"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string. We need this elsewhere
@@ -8951,389 +8499,373 @@
 
 #: scd/scdaemon.c:119
 msgid "run in multi server mode (foreground)"
-msgstr "çoklu sunucu kipinde çalışır (önalanda)"
+msgstr "çoklu sunucu kipinde çalış (ön planda)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
+msgstr "|LEVEL|hata ayıklama düzeyini LEVEL yap"
 
 #: scd/scdaemon.c:142
 msgid "|FILE|write a log to FILE"
-msgstr "|DOSYA|DOSYAya bir günce yazar"
+msgstr "|FILE|FILE'a bir günlük yaz"
 
 #: scd/scdaemon.c:149
 msgid "|N|connect to reader at port N"
-msgstr "|N|N. porttaki okuyucuya bağlanır"
+msgstr "|N|N. kapıdaki okuyucuya bağlan"
 
 #: scd/scdaemon.c:151
 msgid "|NAME|use NAME as ct-API driver"
-msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
+msgstr "|NAME|ct-API sürücüsü olarak NAME kullan"
 
 #: scd/scdaemon.c:153
 msgid "|NAME|use NAME as PC/SC driver"
-msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
+msgstr "|NAME|PC/SC sürücüsü olarak NAME kullan"
 
 #: scd/scdaemon.c:157
 msgid "do not use the internal CCID driver"
-msgstr "dahili CCID sürücüsü kullanılmaz"
+msgstr "dahili CCID sürücüsüna kullanma"
 
 #: scd/scdaemon.c:163
 msgid "|N|disconnect the card after N seconds of inactivity"
-msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
+msgstr "|N|N saniyelik durgunluktan sonra kart bağlantısını kes"
 
 #: scd/scdaemon.c:166
-#, 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"
+msgstr "bir okuyucu düğme takımı kullanma"
 
 #: scd/scdaemon.c:169
 msgid "use variable length input for pinpad"
-msgstr ""
+msgstr "düğme takımı için değişken uzunluk girdisi kullan"
 
 #: scd/scdaemon.c:172
 msgid "|LIST|change the application priority to LIST"
-msgstr ""
+msgstr "|LIST|uygulama önceliğini LIST olarak değiştir"
 
 #: scd/scdaemon.c:180
-#, fuzzy
 msgid "deny the use of admin card commands"
-msgstr "yönetici kartı komutları kullanımına izin verir"
+msgstr "yönetici kart komutları kullanımını reddet"
 
-#: scd/scdaemon.c:325
-#, fuzzy
-#| msgid "Usage: gpgconf options (-h for help)"
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
-msgstr "Kullanımı: gpgconf seçenekler (yardım için -h)"
+msgstr "Kullanım: @SCDAEMON@ seçenekler (yardım için -h)"
 
-#: scd/scdaemon.c:327
-#, fuzzy
-#| msgid ""
-#| "Syntax: scdaemon options command args\n"
-#| "Smartcard daemon for GnuPG\n"
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
-"Sözdizimi: scdaemon seçenekler komut arg ...\n"
-"GnuPG için akıllı kart artalan süreci\n"
+"Sözdizim: scdaemon seçenekler komut arg ...\n"
+"@GNUPG@ için akıllı kart ardalan süreci\n"
 
-#: scd/scdaemon.c:819
-#, fuzzy, c-format
-#| msgid ""
-#| "please use the option `--daemon' to run the program in the background\n"
+#: scd/scdaemon.c:820
+#, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
-msgstr ""
-"Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
-"kullanın\n"
+msgstr "programı ardalanda çalıştırmak için '--daemon' seçeneğini kullanın\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
-msgstr ""
+msgstr "Tor kullanımda olabilir - ağ erişimi sınırlı"
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "sertifika tarafından istenen geçerlilik modeli: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "zincir"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "kabuk"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritik sertifika eklentisi %s desteklenmiyor"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
-msgstr "sertifikacı onu bir CA gibi imlememiş"
+msgstr "veren onu bir CA olarak imlememiş"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "yapılandırılmış poliçeler olmaksızın kritik imli poliçe"
 
-#: sm/certchain.c:347
-#, fuzzy, c-format
-#| msgid "failed to open `%s': %s\n"
+#: sm/certchain.c:357
+#, c-format
 msgid "failed to open '%s': %s\n"
-msgstr "`%s' açılamadı: %s\n"
+msgstr "'%s' açılamadı: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
-#, fuzzy, c-format
-#| msgid "note: non-critical certificate policy not allowed"
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
+#, c-format
 msgid "Note: non-critical certificate policy not allowed"
-msgstr "bilgi: kritik olmayan sertifika poliçesine izin verilmez"
+msgstr "Not: Kritik olmayan sertifika poliçesine izin verilmez"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "sertifika poliçesine izin verilmiyor"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
-msgstr "parmakizinin alınması başarısız oldu\n"
+msgstr "parmak izinin alınması başarısız oldu\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
-msgstr "harici bir sertifikacı arar\n"
+msgstr "vereni dış bir konumda arar\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
-msgstr "eşleşen sertifikacı sayısı: %d\n"
+msgstr "eşleşen veren sayısı: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
-#, fuzzy, c-format
-#| msgid "can't access `%s': %s\n"
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
+#, c-format
 msgid "can't get authorityInfoAccess: %s\n"
-msgstr "'%s' erişilemiyor: %s\n"
+msgstr "authorityInfoAccess alınamıyor: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
-msgstr "Dirmngr önbelleğinde sertifikacıyı arar\n"
+msgstr "Dirmngr önbelleğinde vereni arar\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eşleşen sertifika sayısı: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "dirmngr sadece-önbellek anahtar araması başarısızi: %s\n"
+msgstr "dirmngr önbelleğe özel anahtar araması başarısızi: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, 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:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
-msgstr "sertifika yürürlükten kaldırılmıştı"
+msgstr "sertifika yürürlükten kaldırılmış"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "sertifika durumu bilinmiyor"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, 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"
+msgstr "\"dirmngr\"'ın düzgün olarak kurulu olduğundan lütfen emin olun\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRL sınaması başarısız: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "geçersiz doğrulukla sertifika: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "sertifika henüz geçersiz"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "kök sertifika henüz geçersiz"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "ara sertifika henüz geçersiz"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "sertifika kullanım süresi dolmuş"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "kök sertifikanın kullanım süresi dolmuş"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "ara sertifikanın kullanım süresi dolmuş"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "gerekli sertifika özellikleri eksik: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "geçersiz doğrulukla sertifika"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "sertifika yaşam süresi boyunca imza oluşturulmadı"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
-msgstr "sertifikacının yaşam süresi boyunca sertifika oluşturulmadı"
+msgstr "verenin yaşam süresi boyunca sertifika oluşturulmadı"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
-msgstr "sertifikacının yaşam süresi boyunca ara sertifika oluşturulmadı"
+msgstr "verenin yaşam süresi boyunca ara sertifika oluşturulmadı"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
-msgstr " ( imzanın oluşturuluşu: "
+msgstr " ( imzanın oluşturuluşu: "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
-msgstr " ( sertifikanın oluşturuluşu: "
+msgstr " ( sertifikanın oluşturuluşu: "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (sertifika geçerlilik başlangıcı: "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
-msgstr " (sertifikacı geçerlilik başlangıcı: "
+msgstr " ( veren geçerlilik başlangıcı: "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
-msgstr "parmakizi=%s\n"
+msgstr "parmak izi=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, 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:1474
+#: sm/certchain.c:1522
 #, 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:1480
+#: sm/certchain.c:1528
 #, 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:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
-"UYARI: imzanın oluşturulma zamanı bilinmiyor - şimdiki zaman varsayılıyor"
+"UYARI: İmzanın oluşturulma zamanı bilinmiyor - geçerli zaman varsayılıyor"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
-msgstr "sertifikacı kim belli değil"
+msgstr "sertifikada veren bilgisi bulunamadı"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
-msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
+msgstr "öz imzalı sertifika KÖTÜ bir imzaya iye"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, 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:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
-msgstr "sertifikacı belli değil"
+msgstr "veren sertifikası bulunamadı"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
-msgstr "sertifika KÖTÜ bir imzaya sahip"
+msgstr "sertifika KÖTÜ bir imzaya iye"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 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:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "sertifika iyi durumda\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "ara sertifika iyi durumda\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "kök sertifika iyi durumda\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
-msgstr "zincir modeline geçiş"
+msgstr "zincir modeline geçiliyor"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "kullanılan geçerlilik modeli: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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"
+msgstr "%u bitlik sağlama %u bitlik %s anahtarı için geçersiz\n"
 
-#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
-msgstr "nüve dışında\n"
+msgstr "çekirdek dışında\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "yok"
 
@@ -9343,7 +8875,7 @@
 
 #: sm/certdump.c:650
 msgid "Error - out of core"
-msgstr "Hata - nüve dışında"
+msgstr "Hata - çekirdek dışında"
 
 #: sm/certdump.c:686
 msgid "Error - No name"
@@ -9353,7 +8885,7 @@
 msgid "Error - invalid DN"
 msgstr "Hata - DN geçersiz"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9362,159 +8894,141 @@
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 msgstr ""
-"X.509 sertifikası için gizli anahtarı açacak anahtar parolasını lütfen "
-"giriniz:\n"
+"X.509 sertifikası için gizli anahtarı açacak anahtar parolasını girin:\n"
 "\"%s\"\n"
 "S/N: %s, Kimlik: 0x%08lX,\n"
-"oluşturuluşu: %s, süre bitimi: %s.\n"
+"oluşturulma: %s, süre bitimi: %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, 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"
+msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar varsayılıyor\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
-#, fuzzy, c-format
-#| msgid "certificate should have not been used for certification\n"
+#: sm/certlist.c:154 dirmngr/validate.c:1304
+#, c-format
 msgid "certificate should not have been used for certification\n"
-msgstr "sertifika onaylama için kullanılmamalıydı\n"
+msgstr "sertifika, sertifikasyon için kullanılmamalıydı\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
-#, fuzzy, c-format
-#| msgid "certificate should have not been used for OCSP response signing\n"
+#: sm/certlist.c:167 dirmngr/validate.c:1314
+#, c-format
 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"
+msgstr "sertifika, OCSP yanıt imzalaması için kullanılmamalıydı\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
-#, fuzzy, c-format
-#| msgid "certificate should have not been used for encryption\n"
+#: sm/certlist.c:184 dirmngr/validate.c:1297
+#, c-format
 msgid "certificate should not have been used for encryption\n"
-msgstr "sertifika şifreleme için kullanılmamalıydı\n"
+msgstr "sertifika, şifreleme için kullanılmamalıydı\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
-#, fuzzy, c-format
-#| msgid "certificate should have not been used for signing\n"
+#: sm/certlist.c:186 dirmngr/validate.c:1287
+#, c-format
 msgid "certificate should not have been used for signing\n"
-msgstr "sertifika imzalama için kullanılmamalıydı\n"
+msgstr "sertifika, imzalama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
-msgstr "sertifika şifreleme için elverişli değil\n"
+msgstr "sertifika şifreleme için kullanılabilir değil\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
-msgstr "sertifika imzalama için elverişli değil\n"
+msgstr "sertifika imzalama için kullanılabilir değil\n"
 
-#: sm/certlist.c:361
-#, fuzzy, c-format
-#| msgid "Included certificates"
+#: sm/certlist.c:379
+#, c-format
 msgid "looking for another certificate\n"
-msgstr "İçerilen sertifikalar"
+msgstr "başka bir sertifika aranıyor\n"
 
 #: sm/certreqgen.c:468 sm/certreqgen.c:753
 #, c-format
 msgid "line %d: invalid algorithm\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "`%d. satır: Algoritma geçersiz\n"
 
 #: sm/certreqgen.c:484
 #, 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"
+msgstr "%d. satır: Anahtar uzunluğu %u geçersiz (%d .. %d geçerli)\n"
 
 #: sm/certreqgen.c:502
 #, c-format
 msgid "line %d: no subject name given\n"
-msgstr "%d. satır: konu ismi belirtilmemiş\n"
+msgstr "%d. satır: Konu adı verilmemiş\n"
 
 #: sm/certreqgen.c:511
-#, fuzzy, c-format
-#| msgid "line %d: invalid subject name label `%.*s'\n"
+#, c-format
 msgid "line %d: invalid subject name label '%.*s'\n"
-msgstr "%d. satır: konu ismi yaftası `%.*s' geçersiz\n"
+msgstr "%d. satır: Konu adı yaftası '%.*s', geçersiz\n"
 
 #: sm/certreqgen.c:514
-#, fuzzy, c-format
-#| msgid "line %d: invalid subject name `%s' at pos %d\n"
+#, c-format
 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"
+msgstr "%d. satır: Geçersiz konu adı '%s', konum %d\n"
 
 #: sm/certreqgen.c:531
 #, c-format
 msgid "line %d: not a valid email address\n"
-msgstr "%d. satır: geçerli bir eposta adresi değil\n"
+msgstr "%d. satır: Geçerli bir e-posta adresi değil\n"
 
 #: sm/certreqgen.c:550
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#, c-format
 msgid "line %d: invalid serial number\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "`%d. satır: Geçersiz seri numarası\n"
 
 #: sm/certreqgen.c:566
-#, fuzzy, c-format
-#| msgid "line %d: invalid subject name label `%.*s'\n"
+#, c-format
 msgid "line %d: invalid issuer name label '%.*s'\n"
-msgstr "%d. satır: konu ismi yaftası `%.*s' geçersiz\n"
+msgstr "%d. satır: Veren adı yaftası '%.*s', geçersiz\n"
 
 #: sm/certreqgen.c:569
-#, fuzzy, c-format
-#| msgid "line %d: invalid subject name `%s' at pos %d\n"
+#, c-format
 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"
+msgstr "%d. satır: Geçersiz veren adı '%s', konum %d\n"
 
 #: sm/certreqgen.c:581 sm/certreqgen.c:592
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#, c-format
 msgid "line %d: invalid date given\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "`%d. satır: Geçersiz tarih verildi\n"
 
 #: sm/certreqgen.c:605
-#, fuzzy, c-format
-#| msgid "line %d: error getting key by keygrip `%s': %s\n"
+#, c-format
 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"
+msgstr ""
+"%d. satır: '%s' anahtar maşası ile imzalama anahtarı alınırken hata: %s\n"
 
 #: sm/certreqgen.c:624
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#, c-format
 msgid "line %d: invalid hash algorithm given\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "`%d. satır: Geçersiz sağlama algoritması verildi\n"
 
 #: sm/certreqgen.c:639
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#, c-format
 msgid "line %d: invalid authority-key-id\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "`%d. satır: Geçersiz authority-key-id\n"
 
 #: sm/certreqgen.c:654
-#, fuzzy, c-format
-#| msgid "line %d: invalid subject name `%s' at pos %d\n"
+#, c-format
 msgid "line %d: invalid subject-key-id\n"
-msgstr "%1$d. satır: %3$d konumundaki konu ismi %2$s' geçersiz\n"
+msgstr "%d. satır: Geçersiz subject-key-id\n"
 
 #: sm/certreqgen.c:692
-#, fuzzy, c-format
-#| msgid "line %d: invalid algorithm\n"
+#, c-format
 msgid "line %d: invalid extension syntax\n"
-msgstr "`%d. satır: algoritma geçersiz\n"
+msgstr "`%d. satır: Geçersiz genişletme sözdizimi\n"
 
 #: sm/certreqgen.c:705
-#, fuzzy, c-format
-#| msgid "line %d: error reading key `%s' from card: %s\n"
+#, c-format
 msgid "line %d: error reading key '%s' from card: %s\n"
-msgstr "%d. satır: `%s' anahtarı karttan okunurken hata: %s\n"
+msgstr "%d. satır: '%s' anahtarı karttan okunurken hata: %s\n"
 
 #: sm/certreqgen.c:718
-#, fuzzy, c-format
-#| msgid "line %d: error getting key by keygrip `%s': %s\n"
+#, c-format
 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"
+msgstr "%d. satır: '%s' anahtar maşası tarafından alınırken hata: %s\n"
 
 #: sm/certreqgen.c:762
 #, 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"
+msgstr "%d. satır: Anahtar üretimi başarısız: %s <%s>\n"
 
 #: sm/certreqgen.c:1498
 msgid ""
@@ -9522,7 +9036,7 @@
 "you just created once more.\n"
 msgstr ""
 "Bu sertifika isteğini tamamlamak için lütfen anahtar parolanızı girip "
-"anahtarınızı bir kere daha oluşturun.\n"
+"anahtarınızı bir kez daha oluşturun.\n"
 
 #: sm/certreqgen-ui.c:160
 #, c-format
@@ -9537,7 +9051,7 @@
 #: sm/certreqgen-ui.c:319
 #, c-format
 msgid "Possible actions for a %s key:\n"
-msgstr "bir %s anahtarı için olası eylemler:\n"
+msgstr "Bir %s anahtarı için olası eylemler:\n"
 
 #: sm/certreqgen-ui.c:320
 #, c-format
@@ -9556,17 +9070,16 @@
 
 #: sm/certreqgen-ui.c:346
 msgid "Enter the X.509 subject name: "
-msgstr "X.509 konu ismini girin: "
+msgstr "X.509 konu adını girin: "
 
 #: sm/certreqgen-ui.c:350
 msgid "No subject name given\n"
-msgstr "Konu ismi belirtilmemiş\n"
+msgstr "Konu adı verilmedi\n"
 
 #: sm/certreqgen-ui.c:354
-#, fuzzy, c-format
-#| msgid "Invalid subject name label `%.*s'\n"
+#, c-format
 msgid "Invalid subject name label '%.*s'\n"
-msgstr "Geçersiz konu ismi yaftası `%.*s'\n"
+msgstr "Geçersiz konu adı yaftası '%.*s'\n"
 
 #. TRANSLATORS: The 22 in the second string is the
 #. length of the first string up to the "%s". Please
@@ -9574,14 +9087,13 @@
 #. second string is merely passed to atoi so you can
 #. drop everything after the number.
 #: sm/certreqgen-ui.c:363
-#, fuzzy, c-format
-#| msgid "Invalid subject name `%s'\n"
+#, c-format
 msgid "Invalid subject name '%s'\n"
-msgstr "Geçersiz konu ismi`%s'\n"
+msgstr "Geçersiz konu adı '%s'\n"
 
 #: sm/certreqgen-ui.c:365
 msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
-msgstr "22 çevirmen: bakınız certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr "19"
 
 #: sm/certreqgen-ui.c:377
 msgid "Enter email addresses"
@@ -9589,31 +9101,27 @@
 
 #: sm/certreqgen-ui.c:378
 msgid " (end with an empty line):\n"
-msgstr " (ve boş bir satır ile bitirin):\n"
+msgstr " (boş bir satır ile sonlandır):\n"
 
 #: sm/certreqgen-ui.c:382
 msgid "Enter DNS names"
-msgstr "DNS isimlerini giriniz"
+msgstr "DNS adlarını girin"
 
 #: sm/certreqgen-ui.c:383 sm/certreqgen-ui.c:388
 msgid " (optional; end with an empty line):\n"
-msgstr " (seçimlik; boş bir satır işlemi sonlandırır):\n"
+msgstr " (isteğe bağlı; boş bir satır ile sonlandır):\n"
 
 #: sm/certreqgen-ui.c:387
 msgid "Enter URIs"
 msgstr "URI'leri girin"
 
 #: sm/certreqgen-ui.c:394
-#, fuzzy
-#| msgid "Create a designated revocation certificate for this key? (y/N) "
 msgid "Create self-signed certificate? (y/N) "
-msgstr ""
-"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
-"da y/N) "
+msgstr "Öz imzalı bir sertifika üretilsin mi? (e/H) "
 
 #: sm/certreqgen-ui.c:421
 msgid "These parameters are used:\n"
-msgstr ""
+msgstr "Bu parametreler kullanılıyor:\n"
 
 #: sm/certreqgen-ui.c:433
 #, c-format
@@ -9621,72 +9129,64 @@
 msgstr "geçici dosya oluşturulurken hata: %s\n"
 
 #: sm/certreqgen-ui.c:439
-#, fuzzy
-#| msgid "self-signed certificate has a BAD signature"
 msgid "Now creating self-signed certificate. "
-msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
+msgstr "Öz imzalı sertifika oluşturuluyor. "
 
 #: sm/certreqgen-ui.c:441
-#, fuzzy
-#| msgid "Now creating certificate request. This may take a while ...\n"
 msgid "Now creating certificate request. "
-msgstr "Sertifika isteği oluşturuluyor. Bu biraz vakit alabilir...\n"
+msgstr "Şimdi sertifika isteği oluşturuluyor. "
 
 #: sm/certreqgen-ui.c:442
 msgid "This may take a while ...\n"
-msgstr ""
+msgstr "Bu, biraz zaman alabilir ...\n"
 
 #: sm/certreqgen-ui.c:453
 msgid "Ready.\n"
-msgstr ""
+msgstr "Hazır.\n"
 
 #: sm/certreqgen-ui.c:456
 msgid "Ready. You should now send this request to your CA.\n"
-msgstr "Hazır. Bu isteği şimdi Sertifika Yetkilinize (CA) göndermelisiniz.\n"
+msgstr "Hazır. Bu isteği şimdi sertifika yetkilinize (CA) göndermelisiniz.\n"
 
 #: sm/certreqgen-ui.c:462
 #, c-format
 msgid "resource problem: out of core\n"
-msgstr "özkaynak sorunu: nüve dışı\n"
+msgstr "özkaynak sorunu: Çekirdek dışı\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(bu, RC2 algoritmasıdır)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
 
-#: sm/decrypt.c:1318
-#, fuzzy, c-format
-#| msgid "encrypted with %s key, ID %s\n"
+#: sm/decrypt.c:1314
+#, c-format
 msgid "encrypted to %s key %s\n"
-msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
+msgstr "şifrelendi: %s anahtarı, %s\n"
 
 #: sm/delete.c:50 sm/delete.c:109
-#, fuzzy, c-format
-#| msgid "certificate `%s' not found: %s\n"
+#, c-format
 msgid "certificate '%s' not found: %s\n"
-msgstr "sertifika \"%s\" yok: %s\n"
+msgstr "'%s' sertifikası bulunamadı: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
-msgstr "anahtar bloğu kilitlenirken hata: %s\n"
+msgstr "anahtar bloku kilitlenirken hata: %s\n"
 
 #: sm/delete.c:141
-#, fuzzy, c-format
-#| msgid "duplicated certificate `%s' deleted\n"
+#, c-format
 msgid "duplicated certificate '%s' deleted\n"
-msgstr "yinelenmiş sertifika `%s' silindi\n"
+msgstr "yinelenmiş sertifika '%s' silindi\n"
 
 #: sm/delete.c:143
-#, fuzzy, c-format
-#| msgid "certificate `%s' deleted\n"
+#, c-format
 msgid "certificate '%s' deleted\n"
-msgstr "sertifika `%s' silindi\n"
+msgstr "'%s' sertifikası silindi\n"
 
 #: sm/delete.c:173
 #, c-format
@@ -9696,168 +9196,155 @@
 #: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
-msgstr "geçerli alıcılar verilmedi\n"
+msgstr "geçerli bir alıcı verilmedi\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
-msgstr "harici anahtarları listeler"
+msgstr "harici anahtarları listele"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
-msgstr "sertifika zincirini listeler"
+msgstr "sertifika zincirini listele"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
-msgstr "sertifikaları ithal eder"
+msgstr "sertifikaları içe aktar"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
-msgstr "sertifikaları ihraç eder"
+msgstr "sertifikaları dışa aktar"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
-msgstr "bir akıllı kartı kayda alır"
+msgstr "bir akıllı kartı kayda al"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
-msgstr "dirmngr'a bir komut aktarır"
+msgstr "dirmngr'a bir komut aktar"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
-msgstr "gpg-protect-tool'u çalıştırır"
+msgstr "gpg-protect-tool'u çalıştır"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
-msgstr "terminali hiç kullanma"
+msgstr "uçbirimi hiç kullanma"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|içerilecek sertifika sayısı"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
-msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
+msgstr "|FILE|poliçe bilgisi FILE'dan al"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
-msgstr "girdinin PEM biçiminde olduğu kabul edilir"
+msgstr "girdinin PEM biçiminde olduğunu kabul et"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
-msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
+msgstr "girdinin base-64 biçiminde olduğunu kabul et"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
-msgstr "girdinin ikilik biçimde olduğu kabul edilir"
+msgstr "girdinin ikili biçimde olduğunu kabul et"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
-msgstr "base-64 kodlu çıktı oluşturur"
+msgstr "base-64 kodlu çıktı oluştur"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 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"
+msgstr "|USER-ID|öntanımlı gizli anahtar olarak USER-ID kullan"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
+msgstr "|FILE|anahtar zincirini anahtar zincirleri listesine ekle"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
-msgstr "kayıp sertifikacı sertifikalarını alır"
+msgstr "kayıp veren sertifikalarını al"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|İSİM|PKCS#12 anahtar parolaları için kodlama olarak İSİM kullanılır"
+msgstr "|NAME|PKCS#12 anahtar parolaları için kodlama olarak NAME kullan"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
-msgstr "asla bir CRL sormaz"
+msgstr "asla bir CRL sorma"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
-msgstr "kök sertifikalar için CRLler sınanmaz"
+msgstr "kök sertifikalar için CRL'ler denetleme"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
-msgstr "doğruluğu OCSP kullarak sınar"
+msgstr "doğruluğu OCSP kullarak sına"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
-msgstr "sertifika poliçeleri sınanmaz"
+msgstr "sertifika poliçeleri sınama"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
-msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
+msgstr "|NAME|şifre algoritması olarak NAME kullan"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
-msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
+msgstr "|NAME|özet algoritması olarak NAME kullan"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
-msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
+msgstr "toplu iş kipi: Hiçbir zaman sorma"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
-msgstr "soruların çoğunda cevap evet farzedilir"
+msgstr "soruların çoğunda yanıtı evet varsay"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
-msgstr "soruların çoğunda cevap hayır farzedilir"
+msgstr "soruların çoğunda yanıtı hayır varsay"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
-msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
+msgstr "|FILE|bir denetim günlüğünü FILE'a yaz"
 
-#: sm/gpgsm.c:620
-#, fuzzy
-#| msgid "Usage: gpg options files (-h for help)"
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
-msgstr "Kullanımı: gpg seçenekler dosyalar (yardım için -h)"
+msgstr "Kullanım: @GPGSM@ seçenekler dosyalar (yardım için -h)"
 
-#: sm/gpgsm.c:623
-#, fuzzy
-#| 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"
+#: sm/gpgsm.c:643
 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 ""
-"Sözdizimi: gpgsm seçenekler dosyalar\n"
-"imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
-"öntanımlı işlem girilen veriye bağımlıdır\n"
+"Sözdizim: @GPGSM@ seçenekler dosyalar\n"
+"S/MIME protokolünü kullanarak imzala, denetle, şifrele veya şifre çöz\n"
+"Öntanımlı işlem girdi verisine dayalıdır\n"
 
-#: sm/gpgsm.c:831
-#, fuzzy, c-format
-#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
+#: sm/gpgsm.c:851
+#, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
-msgstr "BİLGİ:`%s'e şifrelenemez: %s\n"
+msgstr "Not: '%s' ögesine şifreleme yapılamayacak: %s\n"
 
-#: sm/gpgsm.c:842
-#, fuzzy, c-format
-#| msgid "unknown validation model `%s'\n"
+#: sm/gpgsm.c:862
+#, c-format
 msgid "unknown validation model '%s'\n"
-msgstr "`%s' geçerlilik modeli bilinmiyor\n"
+msgstr "bilinmeyen geçerlilik modeli '%s'\n"
 
-#: sm/gpgsm.c:1728
-#, fuzzy, c-format
-#| msgid "importing common certificates `%s'\n"
+#: sm/gpgsm.c:1779
+#, c-format
 msgid "importing common certificates '%s'\n"
-msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
+msgstr "'%s' ortak sertifikaları içe aktarılıyor\n"
 
-#: sm/gpgsm.c:1774
-#, fuzzy, c-format
-#| msgid "can't sign using `%s': %s\n"
+#: sm/gpgsm.c:1825
+#, c-format
 msgid "can't sign using '%s': %s\n"
-msgstr "`%s' kullanarak imzalanamıyor: %s\n"
+msgstr "'%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@ -9865,90 +9352,86 @@
 #: sm/import.c:126
 #, c-format
 msgid "total number processed: %lu\n"
-msgstr "işlenmiş toplam miktar: %lu\n"
+msgstr "toplam işlenmiş sayı: %lu\n"
 
 #: sm/import.c:246
 #, c-format
 msgid "error storing certificate\n"
-msgstr "sertifika saklanırken hata\n"
+msgstr "sertifika depolanırken hata\n"
 
 #: sm/import.c:254
 #, c-format
 msgid "basic certificate checks failed - not imported\n"
-msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
+msgstr "temel sertifika denetlemeleri başarısız oldu - içe aktarılmadı\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
-msgstr "saklanmış bayraklar alınırken hata: %s\n"
+msgstr "depolanmış bayraklar alınırken hata: %s\n"
 
 #: sm/import.c:532 sm/import.c:564
 #, c-format
 msgid "error importing certificate: %s\n"
-msgstr "sertifika ithal edilirken hata: %s\n"
+msgstr "sertifika içe aktarılırken hata: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
 
-#: sm/keydb.c:508
-#, fuzzy, c-format
-#| msgid "no gpg-agent running in this session\n"
+#: sm/keydb.c:528
+#, c-format
 msgid "no keyboxd running in this session\n"
-msgstr "bu oturumda çalışan gpg-agent yok\n"
+msgstr "bu oturumda çalışan keyboxd yok\n"
 
-#: sm/keydb.c:600
-#, fuzzy, c-format
-#| msgid "error opening `%s': %s\n"
+#: sm/keydb.c:620
+#, c-format
 msgid "error opening key DB: %s\n"
-msgstr "'%s' açılırken hata: %s\n"
+msgstr "anahtar veritabanı açılırken hata: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "mevcut sertifika aranırken sorun çıktı: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "yazılabilir anahtar veritabanı bulunurken hata: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "bayraklar saklanırken hata: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Hata - "
 
 #: sm/misc.c:79
 #, c-format
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
-msgstr "GPG_TTY atanmamıştı - kullanımı sorunlara yolaçabilir\n"
+msgstr "GPG_TTY atanmamış - kullanımı sorunlara yol açabilir\n"
 
 #: sm/qualified.c:104
-#, fuzzy, c-format
-#| msgid "invalid formatted fingerprint in `%s', line %d\n"
+#, c-format
 msgid "invalid formatted fingerprint in '%s', line %d\n"
-msgstr "`%s', %d. satırındaki biçimli parmakizi geçersiz\n"
+msgstr "'%s', %d. satırındaki biçimli parmak izi geçersiz\n"
 
 #: sm/qualified.c:122
-#, fuzzy, c-format
-#| msgid "invalid country code in `%s', line %d\n"
+#, c-format
 msgid "invalid country code in '%s', line %d\n"
-msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
+msgstr "'%s', %d. satırındaki ülke kodu geçersiz\n"
 
 #: sm/qualified.c:205
 #, c-format
@@ -9964,9 +9447,9 @@
 "\"%s\"\n"
 "Bu, kanunen elyazısı imzaya eşdeğer nitelikte bir imza oluşturacak.\n"
 "\n"
-"%s%sBunu yapmak istediğinizden emin misiniz?"
+"%s%sBunu yapmak istediğinize emin misiniz?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9984,837 +9467,741 @@
 msgstr ""
 "Sertifikanızı kullanarak bir imza oluşturmaya hazırsınız:\n"
 "\"%s\"\n"
-"Bu sertifkanın nitelikli bir imza üretmeyeceğine dikkat ediniz!"
+"Bu sertifkanın nitelikli bir imza ÜRETMEYECEĞİNE dikkat edin!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
-"çittirim algoritması %d (%s) imzacı %d için desteklenmiyor; %s kullanılıyor\n"
+"sağlama algoritması %d (%s), %d imzalayıcısı için desteklenmiyor; %s "
+"kullanılıyor\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
-msgstr "%d imzacı için kullanılan çittirim algoritması: %s (%s)\n"
+msgstr "%d imzalayıcısı için kullanılan sağlama algoritması: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
-msgstr "nitelikli sertifika için sınama başarısız: %s\n"
+msgstr "nitelikli sertifika için denetleme başarısız: %s\n"
 
-#: sm/sign.c:913
-#, fuzzy, c-format
-#| msgid "Signature made %s using %s key ID %s\n"
+#: sm/sign.c:1147
+#, c-format
 msgid "%s/%s signature using %s key %s\n"
-msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
+msgstr "%s/%s imza %s anahtarı kullanılarak %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
-msgstr "İmza "
+msgstr "Yapılan imza "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
-msgstr "belirtilmeyen tarihte"
+msgstr "tarih belirtilmedi"
 
-#: sm/verify.c:483
-#, fuzzy, c-format
-#| msgid "algorithm: %s"
+#: sm/verify.c:494
+#, c-format
 msgid "algorithm:"
-msgstr "algoritma: %s"
+msgstr "algoritma:"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, 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"
+msgstr "geçersiz imza: İleti özeti özelliği hesaplananla uyuşmuyor\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
-msgstr "Buradaki imzeler iyi:"
+msgstr "Buradaki imzalar iyi:"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " nam-ı diğer"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Bu bir nitelikli imzadır.\n"
 
 #: dirmngr/certcache.c:124
-#, fuzzy, c-format
-#| msgid "checking for qualified certificate failed: %s\n"
+#, c-format
 msgid "can't initialize certificate cache lock: %s\n"
-msgstr "nitelikli sertifika için sınama başarısız: %s\n"
+msgstr "sertifika önbellek kilidi başlatılamıyor: %s\n"
 
 #: dirmngr/certcache.c:135
 #, c-format
 msgid "can't acquire read lock on the certificate cache: %s\n"
-msgstr ""
+msgstr "sertifika önbelleğinde okuma kilidi alınamıyor: %s\n"
 
 #: dirmngr/certcache.c:146
 #, c-format
 msgid "can't acquire write lock on the certificate cache: %s\n"
-msgstr ""
+msgstr "sertifika önbelleğinde yazma kilidi alınamıyor: %s\n"
 
 #: dirmngr/certcache.c:157
-#, fuzzy, c-format
-#| msgid "problem looking for existing certificate: %s\n"
+#, c-format
 msgid "can't release lock on the certificate cache: %s\n"
-msgstr "mevcut sertifika aranırken sorun çıktı: %s\n"
+msgstr "sertifika önbelleğindeki kilit açılamıyor: %s\n"
 
-#: dirmngr/certcache.c:298
-#, fuzzy, c-format
-#| msgid "looking up issuer from the Dirmngr cache\n"
+#: dirmngr/certcache.c:313
+#, c-format
 msgid "dropping %u certificates from the cache\n"
-msgstr "Dirmngr önbelleğinde sertifikacıyı arar\n"
+msgstr "önbellekten %u sertifika bırakılıyor\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
-#, fuzzy, c-format
-#| msgid "can't create `%s': %s\n"
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
+#, c-format
 msgid "can't parse certificate '%s': %s\n"
-msgstr "\"%s\" oluşturulamıyor: %s\n"
+msgstr "'%s' sertifikası ayrıştırılamıyor: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
-#, fuzzy, c-format
-#| msgid "certificate `%s' deleted\n"
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
+#, c-format
 msgid "certificate '%s' already cached\n"
-msgstr "sertifika `%s' silindi\n"
+msgstr "'%s' sertifikası halihazırda önbelleklenmiş\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
-#, fuzzy, c-format
-#| msgid "duplicated certificate `%s' deleted\n"
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
+#, c-format
 msgid "trusted certificate '%s' loaded\n"
-msgstr "yinelenmiş sertifika `%s' silindi\n"
+msgstr "güvenilen sertifika '%s' yüklendi\n"
 
-#: dirmngr/certcache.c:441
-#, fuzzy, c-format
-#| msgid "certificate `%s' deleted\n"
+#: dirmngr/certcache.c:456
+#, c-format
 msgid "certificate '%s' loaded\n"
-msgstr "sertifika `%s' silindi\n"
+msgstr "'%s' sertifikası yüklendi\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
-#, fuzzy, c-format
-#| msgid "fingerprint=%s\n"
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
+#, c-format
 msgid " SHA1 fingerprint = %s\n"
-msgstr "parmakizi=%s\n"
+msgstr " SHA1 parmak izi = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
-msgstr ""
+msgstr " veren ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
-msgstr ""
+msgstr " konu ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
-#, fuzzy, c-format
-#| msgid "error storing certificate: %s\n"
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
+#, c-format
 msgid "error loading certificate '%s': %s\n"
-msgstr "serifika saklanırken hata: %s\n"
+msgstr "'%s' sertifikası yüklenirken hata: %s\n"
 
-#: dirmngr/certcache.c:836
-#, fuzzy, c-format
-#| msgid "Included certificates"
+#: dirmngr/certcache.c:852
+#, c-format
 msgid "permanently loaded certificates: %u\n"
-msgstr "İçerilen sertifikalar"
+msgstr "kalıcı olarak yüklenen sertifikalar: %u\n"
 
-#: dirmngr/certcache.c:838
-#, fuzzy, c-format
-#| msgid "number of matching certificates: %d\n"
+#: dirmngr/certcache.c:855
+#, c-format
 msgid " runtime cached certificates: %u\n"
-msgstr "eşleşen sertifika sayısı: %d\n"
+msgstr " açıkken önbelleklenen sertifikalar: %u\n"
 
-#: dirmngr/certcache.c:840
-#, fuzzy, c-format
-#| msgid "number of matching certificates: %d\n"
+#: dirmngr/certcache.c:858
+#, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
-msgstr "eşleşen sertifika sayısı: %d\n"
+msgstr " güvenilen sertifikalar: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
-#, fuzzy, c-format
-#| msgid " (certificate created at "
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
+#, c-format
 msgid "certificate already cached\n"
-msgstr " ( sertifikanın oluşturuluşu: "
+msgstr "sertifika halihazırda önbelleklenmiş\n"
 
-#: dirmngr/certcache.c:870
-#, fuzzy, c-format
-#| msgid "certificate is good\n"
+#: dirmngr/certcache.c:888
+#, c-format
 msgid "certificate cached\n"
-msgstr "sertifika iyi durumda\n"
+msgstr "sertifika önbelleklenmiş\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
-#, fuzzy, c-format
-#| msgid "error storing certificate: %s\n"
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
+#, c-format
 msgid "error caching certificate: %s\n"
-msgstr "serifika saklanırken hata: %s\n"
+msgstr "sertifika önbelleklenirken hata: %s\n"
 
-#: dirmngr/certcache.c:960
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
+#: dirmngr/certcache.c:978
+#, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
-msgstr "parmakizi geçersiz"
+msgstr "geçersiz SHA1 parmak izi dizisi '%s'\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
-#, fuzzy, c-format
-#| msgid "error storing certificate: %s\n"
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
+#, c-format
 msgid "error fetching certificate by S/N: %s\n"
-msgstr "serifika saklanırken hata: %s\n"
+msgstr "S/N'ye göre sertifika getirilirken hata: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
-#, fuzzy, c-format
-#| msgid "error storing certificate: %s\n"
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
+#, c-format
 msgid "error fetching certificate by subject: %s\n"
-msgstr "serifika saklanırken hata: %s\n"
+msgstr "konuya göre sertifika getirilirken hata: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
-#, fuzzy, c-format
-#| msgid "no issuer found in certificate"
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
+#, c-format
 msgid "no issuer found in certificate\n"
-msgstr "sertifikacı kim belli değil"
+msgstr "sertifikada veren kişi bilgisi bulunamadı\n"
 
-#: dirmngr/certcache.c:1749
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
+#: dirmngr/certcache.c:1767
+#, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
-msgstr "saklanmış bayraklar alınırken hata: %s\n"
+msgstr "authorityKeyIdentifier alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:212
-#, fuzzy, c-format
-#| msgid "can't create directory `%s': %s\n"
+#: dirmngr/crlcache.c:219
+#, c-format
 msgid "creating directory '%s'\n"
-msgstr "`%s' dizini oluşturulamıyor: %s\n"
+msgstr "'%s' dizini oluşturuluyor\n"
 
-#: dirmngr/crlcache.c:216
-#, fuzzy, c-format
-#| msgid "error creating keybox `%s': %s\n"
+#: dirmngr/crlcache.c:223
+#, c-format
 msgid "error creating directory '%s': %s\n"
-msgstr "anahtar bloku `%s' oluşturulurken hata: %s\n"
+msgstr "'%s' dizini oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:244
-#, fuzzy, c-format
-#| msgid "ignoring garbage line"
+#: dirmngr/crlcache.c:251
+#, c-format
 msgid "ignoring database dir '%s'\n"
-msgstr "bozuk satır yok sayılıyor"
+msgstr "veritabanı dizini '%s' yok sayılıyor\n"
 
-#: dirmngr/crlcache.c:253
-#, fuzzy, c-format
-#| msgid "error reading from %s: %s\n"
+#: dirmngr/crlcache.c:260
+#, c-format
 msgid "error reading directory '%s': %s\n"
-msgstr "%s okunurken hata: %s\n"
+msgstr "'%s' dizini okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:274
-#, fuzzy, c-format
-#| msgid "receiving line failed: %s\n"
+#: dirmngr/crlcache.c:281
+#, c-format
 msgid "removing cache file '%s'\n"
-msgstr "satır alımı başarısız: %s\n"
+msgstr "'%s' önbellek dosyası kaldırılıyor\n"
 
-#: dirmngr/crlcache.c:283
-#, fuzzy, c-format
-#| msgid "enarmoring failed: %s\n"
+#: dirmngr/crlcache.c:290
+#, c-format
 msgid "not removing file '%s'\n"
-msgstr "zırhlama başarısız: %s\n"
+msgstr "'%s' dosyası kaldırılmıyor\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
-#, fuzzy, c-format
-#| msgid "error closing %s: %s\n"
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
+#, c-format
 msgid "error closing cache file: %s\n"
-msgstr "%s kapanırken hata: %s\n"
+msgstr "önbellek dosyası kapatılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
-#, fuzzy, c-format
-#| msgid "failed to open `%s': %s\n"
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
+#, c-format
 msgid "failed to open cache dir file '%s': %s\n"
-msgstr "`%s' açılamadı: %s\n"
+msgstr "önbellek dizin dosyası '%s' açılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:420
-#, fuzzy, c-format
-#| msgid "error creating temporary file: %s\n"
+#: dirmngr/crlcache.c:427
+#, c-format
 msgid "error creating new cache dir file '%s': %s\n"
-msgstr "geçici dosya oluşturulurken hata: %s\n"
+msgstr "yeni önbellek dizin dosyası '%s' oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:427
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
+#: dirmngr/crlcache.c:434
+#, c-format
 msgid "error writing new cache dir file '%s': %s\n"
-msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
+msgstr "yeni önbellek dizin dosyası '%s' oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:434
-#, fuzzy, c-format
-#| msgid "error closing %s: %s\n"
+#: dirmngr/crlcache.c:441
+#, c-format
 msgid "error closing new cache dir file '%s': %s\n"
-msgstr "%s kapanırken hata: %s\n"
+msgstr "yeni önbellek dizin dosyası '%s' kapatılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:439
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
+#: dirmngr/crlcache.c:446
+#, c-format
 msgid "new cache dir file '%s' created\n"
-msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
+msgstr "yeni önbellek dizin dosyası '%s' oluşturuldu\n"
 
-#: dirmngr/crlcache.c:444
-#, fuzzy, c-format
-#| msgid "failed to create temporary file `%s': %s\n"
+#: dirmngr/crlcache.c:451
+#, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
-msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
+msgstr "önbellek dizin dosyası '%s' yeniden açılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
-msgstr ""
+msgstr "'%s' ögesinin ilk kaydı bu sürüm değil\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
-msgstr ""
+msgstr "önbellek dizininin eski sürümü - temizleniyor\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
-msgstr ""
+msgstr "önbellek dizininin eski sürümü - vazgeçiliyor\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
-msgstr ""
+msgstr "'%s' ögesinin crl kaydında ek alan algılandı, %u. satır\n"
 
-#: dirmngr/crlcache.c:622
-#, fuzzy, c-format
-#| msgid "invalid country code in `%s', line %d\n"
+#: dirmngr/crlcache.c:629
+#, c-format
 msgid "invalid line detected in '%s' line %u\n"
-msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
+msgstr "'%s' ögesinde geçersiz satır algılandı, %u. satır\n"
 
-#: dirmngr/crlcache.c:631
-#, fuzzy, c-format
-#| msgid "invalid country code in `%s', line %d\n"
+#: dirmngr/crlcache.c:638
+#, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
-msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
+msgstr "'%s' ögesinde yinelenmiş girdi algılandı, %u. satır\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
-msgstr ""
+msgstr "'%s' ögesinde desteklenmeyen kayıt türü, %u. satır atlandı\n"
 
-#: dirmngr/crlcache.c:672
-#, fuzzy, c-format
-#| msgid "invalid keyflag in `%s', line %d\n"
+#: dirmngr/crlcache.c:679
+#, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
-msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
+msgstr "'%s' ögesinde geçersiz veren sağlaması, %u. satır\n"
 
-#: dirmngr/crlcache.c:678
-#, fuzzy, c-format
-#| msgid "bad fingerprint in `%s', line %d\n"
+#: dirmngr/crlcache.c:685
+#, c-format
 msgid "no issuer DN in '%s' line %u\n"
-msgstr "`%s', %d. satırda parmakizi hatalı\n"
+msgstr "'%s' ögesinde veren DN'si yok, %u. satır\n"
 
-#: dirmngr/crlcache.c:685
-#, fuzzy, c-format
-#| msgid "invalid keyflag in `%s', line %d\n"
+#: dirmngr/crlcache.c:692
+#, c-format
 msgid "invalid timestamp in '%s' line %u\n"
-msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
+msgstr "'%s' ögesinde geçersiz zaman damgası, %u. satır\n"
 
-#: dirmngr/crlcache.c:691
-#, fuzzy, c-format
-#| msgid "invalid keyflag in `%s', line %d\n"
+#: dirmngr/crlcache.c:698
+#, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
-msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
+msgstr "UYARI: '%s' ögesinde geçersiz önbellek dosyası sağlaması, %u. satır\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
-msgstr ""
+msgstr "önbellek dizin dosyasında hatalar algılandı\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
-msgstr ""
+msgstr "lütfen nedenini denetleyin ve o dosyayı el ile silin\n"
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
-#, fuzzy, c-format
-#| msgid "failed to create temporary file `%s': %s\n"
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
+#, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
-msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
-
-#: 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"
+msgstr "geçici önbellek dizin dosyası '%s' oluşturulamadı: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
+#: dirmngr/crlcache.c:955
+#, c-format
 msgid "error renaming '%s' to '%s': %s\n"
-msgstr "\"%s\" okunurken hata: %s\n"
+msgstr "'%s > '%s' olarak yeniden adlandırırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1002
-#, fuzzy, c-format
-#| msgid "can't access `%s': %s\n"
+#: dirmngr/crlcache.c:1009
+#, c-format
 msgid "can't hash '%s': %s\n"
-msgstr "'%s' erişilemiyor: %s\n"
+msgstr "'%s' sağlaması yapılamıyor: %s\n"
 
-#: dirmngr/crlcache.c:1010
-#, fuzzy, c-format
-#| msgid "error sending %s command: %s\n"
+#: dirmngr/crlcache.c:1017
+#, c-format
 msgid "error setting up MD5 hash context: %s\n"
-msgstr "%s komutu gönderilirken hata: %s\n"
+msgstr "MD5 sağlama içeriği ayarlanırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1026
-#, fuzzy, c-format
-#| msgid "error in `%s': %s\n"
+#: dirmngr/crlcache.c:1033
+#, c-format
 msgid "error hashing '%s': %s\n"
-msgstr "'%s' de hata: %s\n"
+msgstr "'%s' sağlaması yapılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1054
-#, fuzzy, c-format
-#| msgid "invalid formatted fingerprint in `%s', line %d\n"
+#: dirmngr/crlcache.c:1061
+#, c-format
 msgid "invalid formatted checksum for '%s'\n"
-msgstr "`%s', %d. satırındaki biçimli parmakizi geçersiz\n"
+msgstr "'%s' için geçersiz biçimli sağlama toplamı\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
-msgstr ""
+msgstr "pek fazla açık önbellek dosyası; daha fazlası açılamıyor\n"
 
-#: dirmngr/crlcache.c:1125
-#, fuzzy, c-format
-#| msgid "sending line failed: %s\n"
+#: dirmngr/crlcache.c:1132
+#, c-format
 msgid "opening cache file '%s'\n"
-msgstr "satır göndirimi başarısız: %s\n"
+msgstr "'%s' önbellek dosyası açılıyor\n"
 
-#: dirmngr/crlcache.c:1144
-#, fuzzy, c-format
-#| msgid "error opening `%s': %s\n"
+#: dirmngr/crlcache.c:1151
+#, c-format
 msgid "error opening cache file '%s': %s\n"
-msgstr "'%s' açılırken hata: %s\n"
+msgstr "'%s' önbellek dosyası açılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
-msgstr ""
+msgstr "okuma için '%s' önbellek dosyası ilklendirilirken hata: %s\n"
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
-msgstr ""
+msgstr "kapalı bir dosya üzerinde unlock_db_file çağrılıyor\n"
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
-msgstr ""
+msgstr "kilidi açılmış bir dosya üzerinde unlock_db_file çağrılıyor\n"
 
-#: dirmngr/crlcache.c:1230
-#, fuzzy, c-format
-#| msgid "failed to create stream from socket: %s\n"
+#: dirmngr/crlcache.c:1237
+#, c-format
 msgid "failed to create a new cache object: %s\n"
-msgstr "sokette akım oluşturulamadı: %s\n"
+msgstr "yeni bir önbellek nesnesi oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:1287
-#, fuzzy, c-format
-#| msgid "No help available for `%s'"
+#: dirmngr/crlcache.c:1294
+#, c-format
 msgid "no CRL available for issuer id %s\n"
-msgstr "\"%s\" için yardım mevcut değil"
+msgstr "veren kimliği %s için bir CRL kullanılabilir değil\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
-msgstr ""
+msgstr "veren kimliği %s için önbelleklenen CRL pek eski; güncelleme gerekli\n"
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
 "required\n"
 msgstr ""
+"force-crl-refresh etkin ve %d dakika %s veren kimliği için geçti; güncelleme "
+"gerekiyor\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
-msgstr ""
+msgstr "force-crl-refresh %s veren kimliği için etkin; güncelleme gerekiyor\n"
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
-msgstr ""
+msgstr "%s veren kimliği için mevcut CRL kullanılamıyor\n"
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
+"%s veren kimliği için önbelleklenmiş CRL kurcalanmış; güncellememiz "
+"gerekiyor\n"
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
-msgstr ""
+msgstr "UYARI: S/N için geçersiz önbellek kayıt uzunluğu "
 
-#: dirmngr/crlcache.c:1358
-#, fuzzy, c-format
-#| msgid "Error reading backup key from `%s': %s\n"
+#: dirmngr/crlcache.c:1365
+#, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
-msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
+msgstr "S/N %s için önbellek kaydı okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
-msgstr ""
+msgstr "S/N %s geçerli değil; neden=%02X tarih=%.15s\n"
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
-msgstr ""
+msgstr "S/N %s geçerli, CRL içinde listelenmiyor\n"
 
-#: dirmngr/crlcache.c:1380
-#, fuzzy, c-format
-#| msgid "error getting stored flags: %s\n"
+#: dirmngr/crlcache.c:1387
+#, c-format
 msgid "error getting data from cache file: %s\n"
-msgstr "saklanmış bayraklar alınırken hata: %s\n"
+msgstr "önbellek dosyasından veri alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
-msgstr ""
+msgstr "libksba'dan geçersiz bir sembolik ifade alındı\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
-#, fuzzy, c-format
-#| msgid "iconv_open failed: %s\n"
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
+#, c-format
 msgid "converting S-expression failed: %s\n"
-msgstr "iconv_open başarısız: %s\n"
+msgstr "sembolik ifade dönüştürmesi başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
+#, c-format
 msgid "unknown hash algorithm '%s'\n"
-msgstr "`%s' çittirim algoritması geçersiz\n"
+msgstr "bilinmeyen sağlama algoritması '%s'\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
-msgstr ""
+msgstr "%d algoritması için gcry_md_open başarısız:%s\n"
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
-#, fuzzy, c-format
-#| msgid "receiving line failed: %s\n"
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
+#, c-format
 msgid "creating S-expression failed: %s\n"
-msgstr "satır alımı başarısız: %s\n"
+msgstr "sembolik ifade oluşturma başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1922
-#, fuzzy, c-format
-#| msgid "build_packet failed: %s\n"
+#: dirmngr/crlcache.c:1933
+#, c-format
 msgid "ksba_crl_parse failed: %s\n"
-msgstr "build_packet başarısız: %s\n"
+msgstr "ksba_crl_parse başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1937
-#, fuzzy, c-format
-#| msgid "error getting serial number of card: %s\n"
+#: dirmngr/crlcache.c:1948
+#, c-format
 msgid "error getting update times of CRL: %s\n"
-msgstr "kartın seri numarası alınırken hata: %s\n"
+msgstr "CRL güncelleme zamanları alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
-msgstr ""
+msgstr "bu CRL'nin güncelleme zamanları: bu=%s sonraki=%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
-msgstr ""
+msgstr "nextUpdate verilmedi; bir günlük geçerlilik süresi varsayılıyor\n"
 
-#: dirmngr/crlcache.c:1968
-#, fuzzy, c-format
-#| msgid "error getting new PIN: %s\n"
+#: dirmngr/crlcache.c:1979
+#, c-format
 msgid "error getting CRL item: %s\n"
-msgstr "yeni PIN alınırken hata: %s\n"
+msgstr "CRL ögesi alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1983
-#, fuzzy, c-format
-#| msgid "error writing to temporary file: %s\n"
+#: dirmngr/crlcache.c:1994
+#, c-format
 msgid "error inserting item into temporary cache file: %s\n"
-msgstr "geçeci dosyaya yazma hatası: %s\n"
+msgstr "geçici önbellek dosyasına öge eklenirken hata: %s\n"
 
-#: dirmngr/crlcache.c:2010
-#, fuzzy, c-format
-#| msgid "no issuer found in certificate"
+#: dirmngr/crlcache.c:2021
+#, c-format
 msgid "no CRL issuer found in CRL: %s\n"
-msgstr "sertifikacı kim belli değil"
+msgstr "CRL içinde bir CRL vereni bulunamadı: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
-msgstr ""
+msgstr "CRL vereni sertifikası authorityKeyIdentifier ile bulunuyor\n"
 
-#: dirmngr/crlcache.c:2071
-#, fuzzy, c-format
-#| msgid "signature verification suppressed\n"
+#: dirmngr/crlcache.c:2082
+#, c-format
 msgid "CRL signature verification failed: %s\n"
-msgstr "imza doğrulama engellendi\n"
+msgstr "CRL imza doğrulaması başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2083
-#, fuzzy, c-format
-#| msgid "error reading list of trusted root certificates\n"
+#: dirmngr/crlcache.c:2094
+#, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
-msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
+msgstr "CRL vereni sertifikasının geçerliliği denetlenirken hata: %s\n"
 
-#: dirmngr/crlcache.c:2225
-#, fuzzy, c-format
-#| msgid "select failed: %s\n"
+#: dirmngr/crlcache.c:2236
+#, c-format
 msgid "ksba_crl_new failed: %s\n"
-msgstr "select başarısız: %s\n"
+msgstr "ksba_crl_new başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2232
-#, fuzzy, c-format
-#| msgid "read failed: %s\n"
+#: dirmngr/crlcache.c:2243
+#, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
-msgstr "read başarısız: %s\n"
+msgstr "ksba_crl_set_reader başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2266
-#, fuzzy, c-format
-#| msgid "failed to create temporary file `%s': %s\n"
+#: dirmngr/crlcache.c:2277
+#, c-format
 msgid "removed stale temporary cache file '%s'\n"
-msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
+msgstr "eskimiş geçici önbellek dosyası '%s' kaldırıldı\n"
 
-#: dirmngr/crlcache.c:2270
-#, fuzzy, c-format
-#| msgid "failed to create temporary file `%s': %s\n"
+#: dirmngr/crlcache.c:2281
+#, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
-msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
+msgstr "eskimiş geçici önbellek dosyası '%s' kaldırılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:2280
-#, fuzzy, c-format
-#| msgid "error creating temporary file: %s\n"
+#: dirmngr/crlcache.c:2291
+#, c-format
 msgid "error creating temporary cache file '%s': %s\n"
-msgstr "geçici dosya oluşturulurken hata: %s\n"
+msgstr "geçici önbellek dosyası '%s' oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2290
-#, fuzzy, c-format
-#| msgid "update secret failed: %s\n"
+#: dirmngr/crlcache.c:2301
+#, c-format
 msgid "crl_parse_insert failed: %s\n"
-msgstr "gizliyi güncelleme başarısız: %s\n"
+msgstr "crl_parse_insert başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2300
-#, fuzzy, c-format
-#| msgid "error writing to temporary file: %s\n"
+#: dirmngr/crlcache.c:2311
+#, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
-msgstr "geçeci dosyaya yazma hatası: %s\n"
+msgstr "geçici önbellek dosyası '%s' bitirilirken hata: %s\n"
 
-#: dirmngr/crlcache.c:2307
-#, fuzzy, c-format
-#| msgid "error creating temporary file: %s\n"
+#: dirmngr/crlcache.c:2318
+#, c-format
 msgid "error closing temporary cache file '%s': %s\n"
-msgstr "geçici dosya oluşturulurken hata: %s\n"
+msgstr "geçici önbellek dosyası '%s' kapatılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
+"UYARI: Yeni CRL hâlâ pek eski; %s tarihinde süresi dolmuş - yine de "
+"yükleniyor\n"
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
-msgstr ""
+msgstr "yeni CRL hâlâ pek eski; %s tarihinde süresi dolmuş\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
-msgstr ""
+msgstr "bilinmeyen kritik CRL uzantısı %s\n"
 
-#: dirmngr/crlcache.c:2362
-#, fuzzy, c-format
-#| msgid "error reading input: %s\n"
+#: dirmngr/crlcache.c:2383
+#, c-format
 msgid "error reading CRL extensions: %s\n"
-msgstr "girdi okunurken hata: %s\n"
+msgstr "CRL uzantısı okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2413
-#, fuzzy, c-format
-#| msgid "error creating a pipe: %s\n"
+#: dirmngr/crlcache.c:2434
+#, c-format
 msgid "creating cache file '%s'\n"
-msgstr "boru oluşturulurken hata: %s\n"
+msgstr "'%s' önbellek dosyası oluşturuluyor\n"
 
-#: dirmngr/crlcache.c:2445
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
+#: dirmngr/crlcache.c:2466
+#, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
-msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+msgstr "'%s' > '%s' olarak yeniden adlandırırken sorun: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
+"yeni DIR dosyasını güncelleme başarısız - önbellek girdisi bir sonraki "
+"program başlangıcında kaybolacak\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
-msgstr ""
+msgstr "CRL boşaltımını başlat (%s ile alındı)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
+" HATA: CRL kullanılmayacak; çünkü bir güncelleme sonrasında bile hâlâ pek "
+"eski!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
-msgstr ""
+msgstr " HATA: CRL bilinmeyen bir kritik uzantıdan dolayı kullanılmayacak!\n"
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
-msgstr ""
+msgstr " HATA: CRL kullanılmayacak\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
-msgstr ""
+msgstr " HATA: Bu önbelleklenmiş CRL kurcalanmış olabilir!\n"
 
-#: dirmngr/crlcache.c:2550
-#, fuzzy, c-format
-#| msgid "WARNING: invalid notation data found\n"
+#: dirmngr/crlcache.c:2579
+#, c-format
 msgid " WARNING: invalid cache record length\n"
-msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
+msgstr " UYARI: Geçersiz önbellek kayıt uzunluğu\n"
 
-#: dirmngr/crlcache.c:2557
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:2586
+#, c-format
 msgid "problem reading cache record: %s\n"
-msgstr "%s: serbest kaydı okuma hatası: %s\n"
+msgstr "önbellek kaydı okunurken sorun: %s\n"
 
-#: dirmngr/crlcache.c:2568
-#, fuzzy, c-format
-#| msgid "problem re-searching certificate: %s\n"
+#: dirmngr/crlcache.c:2597
+#, c-format
 msgid "problem reading cache key: %s\n"
-msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
+msgstr "önbellek anahtarı okunurken sorun: %s\n"
 
-#: dirmngr/crlcache.c:2599
-#, fuzzy, c-format
-#| msgid "error reading nonce on fd %d: %s\n"
+#: dirmngr/crlcache.c:2628
+#, c-format
 msgid "error reading cache entry from db: %s\n"
-msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
+msgstr "veritabanından önbellek girdisi okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
-msgstr ""
+msgstr "CRL boşaltımını bitir\n"
 
-#: dirmngr/crlcache.c:2723
-#, fuzzy, c-format
-#| msgid "read failed: %s\n"
+#: dirmngr/crlcache.c:2749
+#, c-format
 msgid "crl_fetch via DP failed: %s\n"
-msgstr "read başarısız: %s\n"
+msgstr "DP aracılığıyla crl_fetch başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2734
-#, fuzzy, c-format
-#| msgid "checking the trust list failed: %s\n"
+#: dirmngr/crlcache.c:2760
+#, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
-msgstr "güvence listesinin sınanması başarısız: %s\n"
+msgstr "DP aracılığıyla crl_cache_insert başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2794
-#, fuzzy, c-format
-#| msgid "receiving line failed: %s\n"
+#: dirmngr/crlcache.c:2806
+#, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
-msgstr "satır alımı başarısız: %s\n"
+msgstr "veren aracılığıyla crl_cache_insert başarısız: %s\n"
 
 #: dirmngr/crlfetch.c:75
 #, c-format
 msgid "reader to file mapping table full - waiting\n"
-msgstr ""
+msgstr "okuyucudan dosya eşlemleme tablosu dolu - bekleniyor\n"
 
 #: dirmngr/crlfetch.c:155
-#, fuzzy
-#| msgid "certificate `%s' not found: %s\n"
 msgid "CRL access not possible due to Tor mode"
-msgstr "sertifika \"%s\" yok: %s\n"
+msgstr "CRL erişimi, Tor kipinden dolayı olanaklı değil"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
-msgstr ""
+msgstr "CRL erişimi, devre dışı %s ögesinden dolayı olanaklı değil\n"
 
-#: dirmngr/crlfetch.c:203
-#, fuzzy, c-format
-#| msgid "error retrieving `%s' via %s: %s\n"
+#: dirmngr/crlfetch.c:206
+#, c-format
 msgid "error retrieving '%s': %s\n"
-msgstr "`%s' %s üzerinden alınırken hata: %s\n"
+msgstr "'%s' alınırken hata: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
-#, fuzzy, c-format
-#| msgid "%s: error writing dir record: %s\n"
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#, c-format
 msgid "error initializing reader object: %s\n"
-msgstr "%s: dizin kaydını yazma hatası: %s\n"
+msgstr "okuyucu nesnesi ilklendirilirken hata: %s\n"
 
-#: dirmngr/crlfetch.c:332
-#, fuzzy, c-format
-#| msgid "certificate `%s' not found: %s\n"
+#: dirmngr/crlfetch.c:335
+#, c-format
 msgid "certificate search not possible due to disabled %s\n"
-msgstr "sertifika \"%s\" yok: %s\n"
+msgstr "sertifika araması, devre dışı %s ögesinden dolayı olanaklı değil\n"
 
 #: dirmngr/dirmngr-client.c:71
 msgid "use OCSP instead of CRLs"
-msgstr ""
+msgstr "CRL'ler yerine OCSP kullan"
 
 #: dirmngr/dirmngr-client.c:72
 msgid "check whether a dirmngr is running"
-msgstr ""
+msgstr "bir dirmngr'nin çalışıp çalışmadığını denetle"
 
 #: dirmngr/dirmngr-client.c:73
-#, fuzzy
-#| msgid " (certificate created at "
 msgid "add a certificate to the cache"
-msgstr " ( sertifikanın oluşturuluşu: "
+msgstr "önbelleğe bir sertifika ekle"
 
 #: dirmngr/dirmngr-client.c:74
-#, fuzzy
-#| msgid "Included certificates"
 msgid "validate a certificate"
-msgstr "İçerilen sertifikalar"
+msgstr "bir sertifika doğrula"
 
 #: dirmngr/dirmngr-client.c:75
-#, fuzzy
-#| msgid "Included certificates"
 msgid "lookup a certificate"
-msgstr "İçerilen sertifikalar"
+msgstr "bir sertifika ara"
 
 #: dirmngr/dirmngr-client.c:76
-#, fuzzy
-#| msgid "Included certificates"
 msgid "lookup only locally stored certificates"
-msgstr "İçerilen sertifikalar"
+msgstr "yalnızca yerel olarak depolanan sertifikaları ara"
 
 #: dirmngr/dirmngr-client.c:77
 msgid "expect an URL for --lookup"
-msgstr ""
+msgstr "--lookup için bir URL bekle"
 
 #: dirmngr/dirmngr-client.c:78
-#, fuzzy
-#| msgid "pass a command to the dirmngr"
 msgid "load a CRL into the dirmngr"
-msgstr "dirmngr'a bir komut aktarır"
+msgstr "dirmngr'ye bir CRL yükle"
 
 #: dirmngr/dirmngr-client.c:79
 msgid "special mode for use by Squid"
-msgstr ""
+msgstr "Squid kullanımı için özel kip"
 
 #: dirmngr/dirmngr-client.c:80
-#, fuzzy
-#| msgid "export certificates"
 msgid "expect certificates in PEM format"
-msgstr "sertifikaları ihraç eder"
+msgstr "sertifikaları PEM biçiminde bekle"
 
 #: dirmngr/dirmngr-client.c:82
-#, 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: "
+msgstr "öntanımlı OCSP yanıtlayıcısının kullanımını zorla"
 
 #: dirmngr/dirmngr-client.c:171
-#, 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)"
+msgstr ""
+"Kullanım: dirmngr-client seçenekler sertdosya|dizgi (yardım için -h)\n"
 
 #: dirmngr/dirmngr-client.c:175
 msgid ""
@@ -10823,2324 +10210,1039 @@
 "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 ""
+"Sözdizim: dirmngr-client seçenekler sertifika|dizgi\n"
+"Bir X.509 sertifikasını bir CRL'ye karşın sına veya bir OCSP\n"
+"denetimi yap. Sertifika geçerliyle süreç 0, değilse 1, ve\n"
+"genel başarısızlıklar için diğer hata kodlarını döndürür.\n"
 
 #: dirmngr/dirmngr-client.c:281 dirmngr/dirmngr-client.c:915
-#, fuzzy, c-format
-#| msgid "error storing certificate: %s\n"
+#, c-format
 msgid "error reading certificate from stdin: %s\n"
-msgstr "serifika saklanırken hata: %s\n"
+msgstr "standart girdi'den sertifika okunurken hata: %s\n"
 
 #: dirmngr/dirmngr-client.c:288
-#, fuzzy, c-format
-#| msgid "error reading from %s: %s\n"
+#, c-format
 msgid "error reading certificate from '%s': %s\n"
-msgstr "%s okunurken hata: %s\n"
+msgstr "'%s' konumundan sertifika okunurken hata: %s\n"
 
 #: dirmngr/dirmngr-client.c:302
 #, c-format
 msgid "certificate too large to make any sense\n"
-msgstr ""
+msgstr "sertifika bir şeyler anlamak için pek büyük\n"
 
 #: dirmngr/dirmngr-client.c:317
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
+#, c-format
 msgid "can't connect to the dirmngr: %s\n"
-msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
+msgstr "dirmngr'ye bağlanamıyor: %s\n"
 
 #: dirmngr/dirmngr-client.c:339
-#, fuzzy, c-format
-#| msgid "update failed: %s\n"
+#, c-format
 msgid "lookup failed: %s\n"
-msgstr "güncelleme başarısız: %s\n"
+msgstr "arama başarısız: %s\n"
 
 #: dirmngr/dirmngr-client.c:354
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
+#, c-format
 msgid "loading CRL '%s' failed: %s\n"
-msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+msgstr "CRL '%s' yüklenirken hata: %s\n"
 
 #: dirmngr/dirmngr-client.c:382
 #, c-format
 msgid "a dirmngr daemon is up and running\n"
-msgstr ""
+msgstr "bir dirmngr ardalan süreci çalışıyor\n"
 
 #: dirmngr/dirmngr-client.c:404
-#, fuzzy, c-format
-#| msgid "deleting certificate \"%s\" failed: %s\n"
+#, c-format
 msgid "validation of certificate failed: %s\n"
-msgstr "\"%s\" sertifikası silinemedi: %s\n"
+msgstr "sertifika doğrulaması başarısız: %s\n"
 
 #: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:926
-#, fuzzy, c-format
-#| msgid "certificate is good\n"
+#, c-format
 msgid "certificate is valid\n"
-msgstr "sertifika iyi durumda\n"
+msgstr "sertifika geçerli\n"
 
 #: dirmngr/dirmngr-client.c:417 dirmngr/dirmngr-client.c:934
-#, fuzzy, c-format
-#| msgid "certificate has been revoked"
+#, c-format
 msgid "certificate has been revoked\n"
-msgstr "sertifika yürürlükten kaldırılmıştı"
+msgstr "sertifika yürürlükten kaldırılmış\n"
 
 #: dirmngr/dirmngr-client.c:422 dirmngr/dirmngr-client.c:936
-#, fuzzy, c-format
-#| msgid "deleting certificate \"%s\" failed: %s\n"
+#, c-format
 msgid "certificate check failed: %s\n"
-msgstr "\"%s\" sertifikası silinemedi: %s\n"
+msgstr "sertifika denetimi başarısız: %s\n"
 
 #: dirmngr/dirmngr-client.c:435
 #, c-format
 msgid "got status: '%s'\n"
-msgstr ""
+msgstr "alınan durum: '%s'\n"
 
 #: dirmngr/dirmngr-client.c:450
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
+#, c-format
 msgid "error writing base64 encoding: %s\n"
-msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
+msgstr "base64 kodlaması yazılırken hata: %s\n"
 
 #: dirmngr/dirmngr-client.c:712
-#, fuzzy, c-format
-#| msgid "unsupported algorithm: %s"
+#, c-format
 msgid "unsupported inquiry '%s'\n"
-msgstr "desteklenmeyen algoritma: %s"
+msgstr "desteklenmeyen sorgu '%s'\n"
 
 #: dirmngr/dirmngr-client.c:814
 #, c-format
 msgid "absolute file name expected\n"
-msgstr ""
+msgstr "mutlak dosya adı bekleniyordu\n"
 
 #: dirmngr/dirmngr-client.c:859
 #, c-format
 msgid "looking up '%s'\n"
-msgstr ""
+msgstr "'%s' aranıyor\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
-msgstr ""
+msgstr "CRl önbelleği içeriğini listele"
 
-#: dirmngr/dirmngr.c:179
-#, fuzzy
-#| msgid "|FILE|run commands from FILE on startup"
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
-msgstr "|DOSYA|DOSYAdaki komutlar başlangıçta çalıştırılır"
+msgstr "|FILE|CRL'yi FILE'dan önbelleğe yükle"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
-msgstr ""
+msgstr "|URL|URL'den bir CRL getir"
 
-#: dirmngr/dirmngr.c:181
-#, fuzzy
-#| msgid "pass a command to the dirmngr"
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
-msgstr "dirmngr'a bir komut aktarır"
+msgstr "dirmngr'yi kapat"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
-msgstr ""
+msgstr "önbelleği boşalt"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
-msgstr ""
+msgstr "çevrimiçi yazılım sürüm denetimine izin ver"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
-msgstr ""
+msgstr "|N|bir sorguda N ögeden daha fazlasını döndürme"
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
-msgstr ""
+msgstr "Ağ ile ilgili seçenekler"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
-msgstr ""
+msgstr "tüm ağ trafiğini Tor üzerinden geçir"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "HTTP sunucuları için yapılandırma"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
-msgstr ""
+msgstr "HTTP kullanımını engelle"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
-msgstr ""
+msgstr "HTTP CRL dağıtım noktalarını yok say"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
-msgstr ""
+msgstr "|URL|tüm HTTP isteklerini URL'ye yeniden yönlendir"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
-msgstr "sistemin HTTP vekil ayarları kullanılır"
+msgstr "sistemin HTTP vekil ayarlarını kullan"
 
-#: dirmngr/dirmngr.c:251
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
-msgstr "HTTP sunucuları için yapılandırma"
+msgstr "OpenPGP sunucuları için yapılandırma"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
-msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
+msgstr "|URL|URL'de anahtar sunucusu kullan"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr ""
+msgstr "|FILE|HKP üzerinden TLS için FILE'da CA sertifikalarını kullan"
 
-#: dirmngr/dirmngr.c:258
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
-msgstr "HTTP sunucuları için yapılandırma"
+msgstr "X.509 sunucuları için yapılandırma"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
-msgstr ""
+msgstr "LDAP kullanımını engelle"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
-msgstr ""
+msgstr "LDAP CRL dağıtım noktalarını yok say"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
-msgstr ""
+msgstr "|HOST|LDAP sorguları için HOST kullan"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
-msgstr ""
+msgstr "--ldap-proxy ile geri çekiliş makineleri kullanma"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
+msgstr "|SPEC|anahtarları aramak için bu anahtar sunucusunu kullan"
 
-#: dirmngr/dirmngr.c:270
-#, fuzzy
-#| msgid "|FILE|read options from FILE"
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
-msgstr "|DOSYA|seçenekler DOSYAdan okunur"
+msgstr "|FILE|LDAP sunucu listesini FILE'dan oku"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
+"CRL dağıtım noktalarında keşfedilen yeni sunucuları sunucu listesine ekle"
 
-#: dirmngr/dirmngr.c:275
-#, fuzzy
-#| msgid "|N|set maximum PIN cache lifetime to N seconds"
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
-msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
+msgstr "|N|LDAp zaman aşımını N saniye olarak engelle"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
-msgstr "OCSP için yapılandırma"
+msgstr "OCSP yapılandırması"
 
-#: dirmngr/dirmngr.c:280
-#, fuzzy
-#| msgid "allow PKA lookups (DNS requests)"
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
-msgstr "PKA aramalarına izin verilir (DNS istekleri)"
+msgstr "OCSP istekleri göndermeye izin ver"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
-msgstr ""
+msgstr "sertifika içeren OCSP hizmet URL'lerini yok say"
 
-#: dirmngr/dirmngr.c:284
-#, fuzzy
-#| msgid "|URL|use keyserver at URL"
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
-msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
+msgstr "|URL|URL'de OCSP yanıtlayıcısını kullan"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
-msgstr ""
+msgstr "|FPR|FPR tarafından imzalanan OCSP yanıtı"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
-msgstr ""
+msgstr "tarihi geçmiş CRL'lerin yüklenmesini zorla"
 
-#: dirmngr/dirmngr.c:305
-#, fuzzy
-#| msgid ""
-#| "@\n"
-#| "(See the man page for a complete listing of all commands and options)\n"
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
 "options)\n"
 msgstr ""
 "@\n"
-"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
+"(Tüm komutlar ve seçeneklerin bir listesi için \"info\" kılavuzuna bakın)\n"
 
-#: dirmngr/dirmngr.c:458
-#, fuzzy
-#| msgid "Usage: gpgconf options (-h for help)"
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
-msgstr "Kullanımı: gpgconf seçenekler (yardım için -h)"
+msgstr "Kullanım: @DIRMNGR@ seçenekler (yardım için -h)"
 
-#: dirmngr/dirmngr.c:460
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg-agent options command args\n"
-#| "Secret key management for GnuPG\n"
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
-"Sözdizimi: gpg-agent seçenekler komut arg ...\n"
-"GnuPG için gizli anahtar yönetimi\n"
+"Sözdizim: @DIRMNGR@ seçenekler komut argümanlar\n"
+"@GNUPG@ için anahtar sunucusu, CRL ve OCSP erişimi\n"
 
-#: dirmngr/dirmngr.c:540
-#, fuzzy, c-format
-#| msgid "invalid debug-level `%s' given\n"
+#: dirmngr/dirmngr.c:556
+#, c-format
 msgid "valid debug levels are: %s\n"
-msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
+msgstr "geçerli hata ayıklama düzeyleri: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
-#, fuzzy, c-format
-#| msgid "usage: gpgsm options "
+#, c-format
 msgid "usage: %s options "
-msgstr "kullanımı: gpgsm seçenekler "
+msgstr "kullanım: %s seçenekler "
 
-#: dirmngr/dirmngr.c:1346
-#, fuzzy, c-format
-#| msgid "%s not allowed with %s!\n"
+#: dirmngr/dirmngr.c:1397
+#, c-format
 msgid "colons are not allowed in the socket name\n"
-msgstr "%s ile %s birlikte kullanılmaz!\n"
+msgstr "soket adında iki noktaya izin verilmiyor\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
+#, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
-msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+msgstr "'%s' konumundan CRL getirilemedi: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
-#, fuzzy, c-format
-#| msgid "conversion from `%s' to `%s' failed: %s\n"
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
+#, c-format
 msgid "processing CRL from '%s' failed: %s\n"
-msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
+msgstr "'%s' konumundan CRL işlemesi başarısız: %s\n"
 
-#: dirmngr/dirmngr.c:1733
-#, fuzzy, c-format
-#| msgid "line too long - skipped\n"
+#: dirmngr/dirmngr.c:1786
+#, c-format
 msgid "%s:%u: line too long - skipped\n"
-msgstr "satır çok uzun - atlandı\n"
+msgstr "%s:%u: Satır pek uzun - atlandı\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
+#, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
-msgstr "parmakizi geçersiz"
+msgstr "%s:%u: Geçersiz parmak izi algılandı\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
+#, c-format
 msgid "%s:%u: read error: %s\n"
-msgstr "`%s' için okuma hatası: %s\n"
+msgstr "%s:%u: Okuma hatası: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
-msgstr ""
+msgstr "%s:%u: Satır sonundaki anlamsız veri yok sayıldı\n"
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
+"SIGHUP alındı - yapılandırma yeniden okunuyor ve önbellekler boşaltılıyor\n"
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
-msgstr ""
+msgstr "SIGUSR2 alındı - bir eylem tanımlanmamış\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
-msgstr ""
+msgstr "SIGTERM alındı - kapatılıyor ...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
-msgstr ""
+msgstr "SIGTERM alındı - hâlâ %d bağlantı etkin\n"
 
-#: dirmngr/dirmngr.c:2035
-#, fuzzy, c-format
-#| msgid "not forced"
+#: dirmngr/dirmngr.c:2089
+#, c-format
 msgid "shutdown forced\n"
-msgstr "zorlanmadı"
+msgstr "kapatma zorlandı\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
-msgstr ""
+msgstr "SIGINT alındı - anında kapatma\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
-msgstr ""
+msgstr "%d sinyali alındı - bir eylem tanımlanmamış\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
-#, fuzzy, c-format
-#| msgid "error running `%s': exit status %d\n"
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
+#, c-format
 msgid "error accessing '%s': http status %u\n"
-msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
+msgstr "'%s' ögesine erişilirken hata: %u http durumu\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
+msgstr "'%s' URL'si '%s' konumuna yeniden yönlendirildi (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
-#, fuzzy, c-format
-#| msgid "too many cipher preferences\n"
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
+#, c-format
 msgid "too many redirections\n"
-msgstr "çok fazla şifreleme tercihi\n"
+msgstr "pek fazla yeniden yönlendirme\n"
 
-#: dirmngr/http.c:3768
-#, fuzzy, c-format
-#| msgid "writing to `%s'\n"
+#: dirmngr/http.c:3803
+#, c-format
 msgid "redirection changed to '%s'\n"
-msgstr "\"%s\"e yazıyor\n"
+msgstr "yeniden yönlendirme '%s' olarak değiştirildi\n"
 
 #: dirmngr/ldap-wrapper.c:232
-#, fuzzy, c-format
-#| msgid "error writing to %s: %s\n"
+#, c-format
 msgid "error printing log line: %s\n"
-msgstr "%s yazılırken hata: %s\n"
+msgstr "günlük satırı yazılırken hata: %s\n"
 
 #: dirmngr/ldap-wrapper.c:262
-#, fuzzy, c-format
-#| msgid "error reading from %s: %s\n"
+#, c-format
 msgid "error reading log from ldap wrapper %d: %s\n"
-msgstr "%s okunurken hata: %s\n"
+msgstr "%d ldap sarıcısından günlük okunurken hata: %s\n"
 
 #: dirmngr/ldap-wrapper.c:450
 #, c-format
 msgid "ldap wrapper %d ready"
-msgstr ""
+msgstr "ldap sarıcısı %d hazır"
 
 #: dirmngr/ldap-wrapper.c:459
 #, c-format
 msgid "ldap wrapper %d ready: timeout\n"
-msgstr ""
+msgstr "ldap sarıcısı %d hazır: Zaman aşımı\n"
 
 #: dirmngr/ldap-wrapper.c:462
 #, c-format
 msgid "ldap wrapper %d ready: exitcode=%d\n"
-msgstr ""
+msgstr "ldap sarıcısı %d hazır: Çıkış kodu=%d\n"
 
 #: dirmngr/ldap-wrapper.c:471
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
+#, c-format
 msgid "waiting for ldap wrapper %d failed: %s\n"
-msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+msgstr "%d ldap sarıcısını bekleme başarısız: %s\n"
 
 #: dirmngr/ldap-wrapper.c:483
 #, c-format
 msgid "ldap wrapper %d stalled - killing\n"
-msgstr ""
+msgstr "ldap sarıcısı %d oyalandı - sonlandırılıyor\n"
 
 #: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
-msgstr ""
+msgstr "makine adında geçersiz karakter 0x%02x - eklenmedi\n"
 
 #: dirmngr/ldap.c:96
-#, fuzzy, c-format
-#| msgid "sending key %s to %s server %s\n"
+#, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
-msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
+msgstr "'%s:%d' ldap sunucu listesine ekleniyor\n"
 
 #: dirmngr/ldap.c:99 dirmngr/misc.c:512
-#, fuzzy, c-format
-#| msgid "select failed: %s\n"
+#, c-format
 msgid "malloc failed: %s\n"
-msgstr "select başarısız: %s\n"
+msgstr "malloc başarısız: %s\n"
 
-#: dirmngr/ldap.c:221
-#, fuzzy, c-format
-#| msgid "`%s' is not a JPEG file\n"
+#: dirmngr/ldap.c:225
+#, c-format
 msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' bir JPEG dosyası değil\n"
+msgstr "'%s' bir LDAP URL'si değil\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
+msgstr "'%s' geçersiz bir LDAP URL'si\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
-msgstr ""
+msgstr "ldap_search, sunucunun boyut limitine takıldı\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: kullanıcısız parola verilmiş\n"
+msgstr "%s:%u: Parola, kullanıcı olmadan verilmiş\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
+msgstr "%s:%u: Bilinmeyen bayrak '%s' yok sayılıyor\n"
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: bu satır atlanıyor\n"
+msgstr "%s:%u: Bu satır atlanıyor\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: dosya sürümü %d geçersiz\n"
+msgstr "geçersiz kurallara uygun sembolik ifade bulundu\n"
 
 #: dirmngr/misc.c:196 dirmngr/misc.c:230
-#, fuzzy, c-format
-#| msgid "iconv_open failed: %s\n"
+#, c-format
 msgid "gcry_md_open failed: %s\n"
-msgstr "iconv_open başarısız: %s\n"
+msgstr "gcry_md_open başarısız: %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 "gizliyi güncelleme başarısız: %s\n"
+msgstr "ups: ksba_cert_hash başarısız: %s\n"
 
 #: dirmngr/misc.c:528
 #, c-format
 msgid "bad URL encoding detected\n"
-msgstr ""
+msgstr "kötü URL kodlaması algılandı\n"
 
 #: dirmngr/ocsp.c:80
-#, fuzzy, c-format
-#| msgid "error reading from %s: %s\n"
+#, c-format
 msgid "error reading from responder: %s\n"
-msgstr "%s okunurken hata: %s\n"
+msgstr "yanıtlayıcıdan okunurken hata: %s\n"
 
 #: dirmngr/ocsp.c:98
-#, fuzzy, c-format
-#| msgid "Error: Private DO too long (limit is %d characters).\n"
+#, c-format
 msgid "response from server too large; limit is %d bytes\n"
-msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
+msgstr "sunucudan gelen yanıt pek büyük; limit %d bayt\n"
 
 #: dirmngr/ocsp.c:148
-#, fuzzy
-#| msgid "certificate `%s' not found: %s\n"
 msgid "OCSP request not possible due to Tor mode"
-msgstr "sertifika \"%s\" yok: %s\n"
+msgstr "OCSP isteği, Tor kipinden dolayı olanaklı değil"
 
 #: dirmngr/ocsp.c:157
 #, c-format
 msgid "OCSP request not possible due to disabled HTTP\n"
-msgstr ""
+msgstr "OCSP isteği, HTTP'nin devre dışı olmasından dolayı olanaklı değil\n"
 
 #: dirmngr/ocsp.c:164
-#, fuzzy, c-format
-#| msgid "error storing flags: %s\n"
+#, c-format
 msgid "error setting OCSP target: %s\n"
-msgstr "bayraklar saklanırken hata: %s\n"
+msgstr "OCSP hedefi ayarlanırken hata: %s\n"
 
 #: dirmngr/ocsp.c:182
-#, fuzzy, c-format
-#| msgid "error loading `%s': %s\n"
+#, c-format
 msgid "error building OCSP request: %s\n"
-msgstr "`%s' yüklenirken hata: %s\n"
+msgstr "OCSP isteği yapılırken hata: %s\n"
 
 #: dirmngr/ocsp.c:195
-#, fuzzy, c-format
-#| msgid "error writing to `%s': %s\n"
+#, c-format
 msgid "error connecting to '%s': %s\n"
-msgstr "`%s' yazılırken hata: %s\n"
+msgstr "'%s' bağlantısı yapılırken hata: %s\n"
 
 #: dirmngr/ocsp.c:221 dirmngr/ocsp.c:273
-#, fuzzy, c-format
-#| msgid "error reading from %s: %s\n"
+#, c-format
 msgid "error reading HTTP response for '%s': %s\n"
-msgstr "%s okunurken hata: %s\n"
+msgstr "'%s' için HTTP yanıtı okunurken hata: %s\n"
 
 #: dirmngr/ocsp.c:284
-#, fuzzy, c-format
-#| msgid "error binding socket to `%s': %s\n"
+#, c-format
 msgid "error parsing OCSP response for '%s': %s\n"
-msgstr "soket `%s'e bağlanırken hata: %s\n"
+msgstr "'%s' için OCSP yanıtı ayrıştırılırken hata: %s\n"
 
 #: dirmngr/ocsp.c:309 dirmngr/ocsp.c:340
 #, c-format
 msgid "OCSP responder at '%s' status: %s\n"
-msgstr ""
+msgstr "'%s' konumundaki OCSP yanıtlayıcısı durumu: %s\n"
 
 #: dirmngr/ocsp.c:325
 #, c-format
 msgid "failed to establish a hashing context for OCSP: %s\n"
-msgstr ""
+msgstr "OCSP için bir sağlama bağlamı oluşturulamadı: %s\n"
 
 #: dirmngr/ocsp.c:335
-#, fuzzy, c-format
-#| msgid "checking the trust list failed: %s\n"
+#, c-format
 msgid "hashing the OCSP response for '%s' failed: %s\n"
-msgstr "güvence listesinin sınanması başarısız: %s\n"
+msgstr "'%s' için OCSP yanıtı sağlaması başarısız: %s\n"
 
 #: dirmngr/ocsp.c:379
 #, c-format
 msgid "not signed by a default OCSP signer's certificate"
-msgstr ""
+msgstr "bir öntanımlı OCSP imzalayıcısının sertifikasi ile imzalanmamış"
 
-#: dirmngr/ocsp.c:580
-#, fuzzy, c-format
-#| msgid "receiving line failed: %s\n"
+#: dirmngr/ocsp.c:585
+#, c-format
 msgid "allocating list item failed: %s\n"
-msgstr "satır alımı başarısız: %s\n"
+msgstr "list ögesinin ayrılması başarısız: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
-#, fuzzy, c-format
-#| msgid "error getting new PIN: %s\n"
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
+#, c-format
 msgid "error getting responder ID: %s\n"
-msgstr "yeni PIN alınırken hata: %s\n"
+msgstr "yanıtlayıcı kimliği alınırken hata: %s\n"
 
-#: dirmngr/ocsp.c:639
-#, fuzzy, c-format
-#| msgid "certificate should have not been used for OCSP response signing\n"
+#: dirmngr/ocsp.c:645
+#, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
-msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
+msgstr "OCSP yanıtını doğrulamak için uygun bir sertifika bulunamadı\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
-#, fuzzy, c-format
-#| msgid "issuer certificate not found"
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
+#, c-format
 msgid "issuer certificate not found: %s\n"
-msgstr "sertifikacı belli değil"
+msgstr "veren sertifikası bulunamadı: %s\n"
 
-#: dirmngr/ocsp.c:688
-#, fuzzy, c-format
-#| msgid "error reading list of trusted root certificates\n"
+#: dirmngr/ocsp.c:703
+#, c-format
 msgid "caller did not return the target certificate\n"
-msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
+msgstr "çağrıcı hedef sertifikayı döndürmedi\n"
 
-#: dirmngr/ocsp.c:695
-#, fuzzy, c-format
-#| msgid "error storing certificate\n"
+#: dirmngr/ocsp.c:710
+#, c-format
 msgid "caller did not return the issuing certificate\n"
-msgstr "sertifika saklanırken hata\n"
+msgstr "çağrıcı veren sertifikayı döndürmedi\n"
 
-#: dirmngr/ocsp.c:705
-#, fuzzy, c-format
-#| msgid "failed to allocate keyDB handle\n"
+#: dirmngr/ocsp.c:720
+#, c-format
 msgid "failed to allocate OCSP context: %s\n"
-msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
+msgstr "OCSP bağlamı ayrılması başarısız: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
-msgstr ""
+msgstr "öntanımlı bir OCSP yanıtlayıcısı tanımlanmadı\n"
 
-#: dirmngr/ocsp.c:750
-#, fuzzy, c-format
-#| msgid "no default secret keyring: %s\n"
+#: dirmngr/ocsp.c:765
+#, c-format
 msgid "no default OCSP signer defined\n"
-msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
+msgstr "öntanımlı bir OCSP imzalayıcısı tanımlanmadı\n"
 
-#: dirmngr/ocsp.c:757
-#, fuzzy, c-format
-#| msgid "using default PIN as %s\n"
+#: dirmngr/ocsp.c:772
+#, c-format
 msgid "using default OCSP responder '%s'\n"
-msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
+msgstr "öntanımlı OCSP yanıtlayıcısı '%s' kullanılıyor\n"
 
-#: dirmngr/ocsp.c:762
-#, fuzzy, c-format
-#| msgid "using cipher %s\n"
+#: dirmngr/ocsp.c:777
+#, c-format
 msgid "using OCSP responder '%s'\n"
-msgstr "%s şifrelemesi kullanılıyor\n"
+msgstr "OCSP yanıtlayıcısı '%s' kullanılıyor\n"
 
-#: dirmngr/ocsp.c:819
-#, fuzzy, c-format
-#| msgid "error storing certificate: %s\n"
+#: dirmngr/ocsp.c:834
+#, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
-msgstr "serifika saklanırken hata: %s\n"
+msgstr "hedef sertifika için OCSP durumu alınırken hata: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
-msgstr ""
+msgstr "sertifika durumu: %s (bu=%s sonraki=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
-msgstr ""
+msgstr "iyi"
 
-#: dirmngr/ocsp.c:851
-#, fuzzy, c-format
-#| msgid "certificate has been revoked"
+#: dirmngr/ocsp.c:894
+#, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
-msgstr "sertifika yürürlükten kaldırılmıştı"
+msgstr "sertifika şurada yürürlükten kaldırıldı: %s nedeni: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
-msgstr ""
+msgstr "OCSP yanıtlayıcısı gelecekte olan bir durum döndürdü\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
-msgstr ""
+msgstr "OCSP yanıtlayıcısı geçerli olmayan bir durum döndürdü\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
-msgstr ""
+msgstr "OCSP yanıtlayıcısı pek eski bir durum döndürdü\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
-#, fuzzy, c-format
-#| msgid "sending line failed: %s\n"
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
+#, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
-msgstr "satır göndirimi başarısız: %s\n"
+msgstr "assuan_inquire(%s) başarısız: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
-msgstr ""
+msgstr "sertifika kimliğinde seri numarası eksik"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
-#, fuzzy, c-format
-#| msgid "sending line failed: %s\n"
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
+#, c-format
 msgid "assuan_inquire failed: %s\n"
-msgstr "satır göndirimi başarısız: %s\n"
+msgstr "assuan_inquire başarısız: %s\n"
 
-#: dirmngr/server.c:1576
-#, fuzzy, c-format
-#| msgid "select failed: %s\n"
+#: dirmngr/server.c:1606
+#, c-format
 msgid "fetch_cert_by_url failed: %s\n"
-msgstr "select başarısız: %s\n"
+msgstr "fetch_cert_by_url başarısız: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
-#, fuzzy, c-format
-#| msgid "error sending %s command: %s\n"
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
+#, c-format
 msgid "error sending data: %s\n"
-msgstr "%s komutu gönderilirken hata: %s\n"
+msgstr "veri gönderilirken hata: %s\n"
 
-#: dirmngr/server.c:1727
-#, fuzzy, c-format
-#| msgid "select failed: %s\n"
+#: dirmngr/server.c:1757
+#, c-format
 msgid "start_cert_fetch failed: %s\n"
-msgstr "select başarısız: %s\n"
+msgstr "start_cert_fetch başarısız: %s\n"
 
-#: dirmngr/server.c:1760
-#, fuzzy, c-format
-#| msgid "select failed: %s\n"
+#: dirmngr/server.c:1790
+#, c-format
 msgid "fetch_next_cert failed: %s\n"
-msgstr "select başarısız: %s\n"
+msgstr "fetch_next_cert başarısız: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
-msgstr ""
+msgstr "max_replies %d aşıldı\n"
 
-#: dirmngr/server.c:2973
-#, fuzzy, c-format
-#| msgid "cannot allocate outfile string: %s\n"
+#: dirmngr/server.c:3124
+#, c-format
 msgid "can't allocate control structure: %s\n"
-msgstr "dosya dışı dizge ayrılamıyor: %s\n"
+msgstr "denetim yapısı ayrılamıyor: %s\n"
 
-#: dirmngr/server.c:2984
-#, fuzzy, c-format
-#| msgid "failed to create stream from socket: %s\n"
+#: dirmngr/server.c:3135
+#, c-format
 msgid "failed to allocate assuan context: %s\n"
-msgstr "sokette akım oluşturulamadı: %s\n"
+msgstr "assuan bağlamı ayrılamadı: %s\n"
 
-#: dirmngr/server.c:3005
-#, fuzzy, c-format
-#| msgid "failed to initialize the TrustDB: %s\n"
+#: dirmngr/server.c:3156
+#, c-format
 msgid "failed to initialize the server: %s\n"
-msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
+msgstr "sunucu başlatılamadı: %s\n"
 
-#: dirmngr/server.c:3013
-#, fuzzy, c-format
-#| msgid "failed to store the creation date: %s\n"
+#: dirmngr/server.c:3164
+#, c-format
 msgid "failed to the register commands with Assuan: %s\n"
-msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
+msgstr "komutlar Assuan ile kayıt yapılamadı: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
-msgstr ""
+msgstr "Assuan kabul sorunu: %s\n"
 
-#: dirmngr/server.c:3065
-#, fuzzy, c-format
-#| msgid "signing failed: %s\n"
+#: dirmngr/server.c:3216
+#, c-format
 msgid "Assuan processing failed: %s\n"
-msgstr "imzalama başarısız: %s\n"
+msgstr "Assuan işlemesi başarısız: %s\n"
 
 #: dirmngr/validate.c:239
-#, fuzzy, c-format
-#| msgid "issuer certificate is not marked as a CA"
+#, c-format
 msgid "accepting root CA not marked as a CA"
-msgstr "sertifikacı onu bir CA gibi imlememiş"
+msgstr "kök CA kabulu bir CA olarak imlenmemiş"
 
-#: dirmngr/validate.c:265
-#, fuzzy, c-format
-#| msgid "checking the trustdb\n"
+#: dirmngr/validate.c:266
+#, c-format
 msgid "CRL checking too deeply nested\n"
-msgstr "güvence veritabanı denetleniyor\n"
+msgstr "CRL denetimi çok iç içe geçmiş\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
-msgstr ""
+msgstr "CRL şunun için denetlenmiyor:"
 
-#: dirmngr/validate.c:288
-#, fuzzy
-#| msgid "checking the CRL failed: %s"
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
-msgstr "CRL sınaması başarısız: %s"
+msgstr "CRL şunun için denetleniyor:"
 
-#: dirmngr/validate.c:591
-#, fuzzy, c-format
-#| msgid "checking for qualified certificate failed: %s\n"
+#: dirmngr/validate.c:601
+#, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
-msgstr "nitelikli sertifika için sınama başarısız: %s\n"
+msgstr "kök sertifikanın güvenilirliğini denetleme başarısız: %s\n"
 
-#: dirmngr/validate.c:770
-#, fuzzy, c-format
-#| msgid "certificate is good\n"
+#: dirmngr/validate.c:780
+#, c-format
 msgid "certificate chain is good\n"
-msgstr "sertifika iyi durumda\n"
+msgstr "sertifika zinciri iyi\n"
 
-#: dirmngr/validate.c:1310
-#, fuzzy, c-format
-#| msgid "certificate should have not been used for signing\n"
+#: dirmngr/validate.c:1321
+#, c-format
 msgid "certificate should not have been used for CRL signing\n"
-msgstr "sertifika imzalama için kullanılmamalıydı\n"
+msgstr "sertifika CRL imzalaması için kullanılmamalıydı\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "sessiz"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
-msgstr "veri çıktısını onaltılık kodlamayla basar"
+msgstr "veri çıktısını onaltılık kodlamayla yazdır"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
-msgstr "alınan veri satırlarının kodunu açar"
+msgstr "alınan veri satırlarının kodunu çöz"
 
-#: tools/gpg-connect-agent.c:89
-#, fuzzy
-#| msgid "pass a command to the dirmngr"
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
-msgstr "dirmngr'a bir komut aktarır"
+msgstr "dirmngr'ye bağlan"
 
-#: tools/gpg-connect-agent.c:90
-#, fuzzy
-#| msgid "pass a command to the dirmngr"
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
-msgstr "dirmngr'a bir komut aktarır"
+msgstr "keyboxd'ye bağlan"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
-msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
+msgstr "|NAME|Assuan soket NAME'ine bağlan"
 
-#: tools/gpg-connect-agent.c:95
-#, fuzzy
-#| msgid "|NAME|connect to Assuan socket NAME"
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
-msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
+msgstr "|ADDR|Assuan sunucusuna ADDR'de bağlan"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
-msgstr "komut satırında verilen Assuan sunucu çalıştırılır"
+msgstr "komut satırında verilen Assuan sunucusunu çalıştır"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
-msgstr "ek bağlantı kipi kullanılmaz"
+msgstr "genişletilmiş bağlantı kipini kullanma"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
-msgstr "|DOSYA|DOSYAdaki komutlar başlangıçta çalıştırılır"
+msgstr "|FILE|başlangıçta FILE'dan komutlar çalıştır"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
-msgstr "/subst başlangıçta çalıştırılır"
+msgstr "başlangıçta /subst'ı çalıştır"
 
-#: tools/gpg-connect-agent.c:223
-#, fuzzy
-#| msgid "Usage: gpg-connect-agent options (-h for help)"
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
-msgstr "Kullanımı: gpg-connect-agent seçenekler (yardım için -h)"
+msgstr "Kullanım: @GPG@-connect-agent seçenekler (yardım için -h)"
 
-#: tools/gpg-connect-agent.c:226
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg-connect-agent options\n"
-#| "Connect to a running agent and send commands\n"
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
-"Sözdizimi: gpg-connect-agent seçenekler\n"
-"Çalışan bir aracıya bağlanıp komutları gönderir\n"
+"Sözdizim: @GPG@-connect-agent seçenekler\n"
+"Çalışan bir aracıya bağlan ve komutlar gönder\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, 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"
+msgstr "\"%s\" seçeneği bir program ve isteğe bağlı argümanlar gerektirir\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
-msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
+msgstr "\"%s\" seçeneği yok sayıldı, nedeni: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, 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:1890
-#, fuzzy, c-format
-#| msgid "unknown command `%s'\n"
+#: tools/gpg-connect-agent.c:1907
+#, c-format
 msgid "unknown command '%s'\n"
-msgstr "komut `%s' bilinmiyor\n"
+msgstr "bilinmeyen komut '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
-msgstr "satır göndirimi başarısız: %s\n"
+msgstr "satır gönderimi başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
-#, fuzzy, c-format
-#| msgid "no gpg-agent running in this session\n"
+#: tools/gpg-connect-agent.c:2332
+#, c-format
 msgid "no keybox daemon running in this session\n"
-msgstr "bu oturumda çalışan gpg-agent yok\n"
+msgstr "bu oturumda bir keybox ardalan süreci çalışmıyor\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
 #: tools/gpgconf-comp.c:658
 msgid "OpenPGP"
-msgstr ""
+msgstr "OpenPGP"
 
 #: tools/gpgconf-comp.c:662
 msgid "S/MIME"
-msgstr ""
+msgstr "S/MIME"
 
 #: tools/gpgconf-comp.c:666
-#, fuzzy
-#| msgid "public key is %s\n"
 msgid "Public Keys"
-msgstr "genel anahtar: %s\n"
+msgstr "Genel Anahtarlar"
 
 #: tools/gpgconf-comp.c:670
 msgid "Private Keys"
-msgstr ""
+msgstr "Özel Anahtarlar"
 
 #: tools/gpgconf-comp.c:674
 msgid "Smartcards"
-msgstr ""
+msgstr "Akıllı Kartlar"
 
 #: tools/gpgconf-comp.c:679
 msgid "TPM"
-msgstr ""
+msgstr "TPM"
 
 #: tools/gpgconf-comp.c:686
 msgid "Network"
-msgstr ""
+msgstr "Ağ"
 
 #: tools/gpgconf-comp.c:690
-#, fuzzy
-#| msgid "Bad Passphrase"
 msgid "Passphrase Entry"
-msgstr "Anahtar Parolası hatalı"
+msgstr "Anahtar Parolası Girişi"
 
 #: tools/gpgconf-comp.c:956
-#, fuzzy
-#| msgid "Component not found"
 msgid "Component not suitable for launching"
-msgstr "Bileşen yok"
+msgstr "Bileşen çalıştırma için uygun değil"
 
 #: tools/gpgconf-comp.c:962
-#, fuzzy, c-format
-#| msgid "External verification of component %s failed"
+#, c-format
 msgid "Configuration file of component %s is broken\n"
-msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
+msgstr "%s bileşeninin yapılandırma dosyası bozulmuş\n"
 
 #: tools/gpgconf-comp.c:965
-#, 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 "lütfen önce \"seçmece\" komutunu kullanın.\n"
+msgstr "Not: Ayrıntıları almak için \"%s%s\" komutunu kullanın.\n"
 
 #: tools/gpgconf-comp.c:2846
 #, c-format
 msgid "External verification of component %s failed"
-msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
+msgstr "%s bileşeninin dış doğrulaması başarısız oldu"
 
 #: tools/gpgconf-comp.c:2976
 msgid "Note that group specifications are ignored\n"
-msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
+msgstr "Grup belirtimlerinin yok sayıldığına dikkat edin\n"
 
-#: tools/gpgconf-comp.c:3573
-#, fuzzy, c-format
-#| msgid "error closing %s: %s\n"
+#: tools/gpgconf-comp.c:3576
+#, c-format
 msgid "error closing '%s'\n"
-msgstr "%s kapanırken hata: %s\n"
+msgstr "'%s' kapatılırken hata\n"
 
-#: tools/gpgconf-comp.c:3575
-#, fuzzy, c-format
-#| msgid "error in `%s': %s\n"
+#: tools/gpgconf-comp.c:3578
+#, c-format
 msgid "error parsing '%s'\n"
-msgstr "'%s' de hata: %s\n"
+msgstr "'%s' ayrıştırılırken hata\n"
 
 #: tools/gpgconf.c:88
 msgid "list all components"
-msgstr "tüm bileşenleri listeler"
+msgstr "tüm bileşenleri listele"
 
 #: tools/gpgconf.c:89
 msgid "check all programs"
-msgstr "tüm programları sınar"
+msgstr "tüm programları denetle"
 
 #: tools/gpgconf.c:90
 msgid "|COMPONENT|list options"
-msgstr "|BİLEŞEN|seçenekleri listeler"
+msgstr "|COMPONENT|seçenekleri listeler"
 
 #: tools/gpgconf.c:91
 msgid "|COMPONENT|change options"
-msgstr "|BİLEŞEN|seçenekleri değiştirir"
+msgstr "|COMPONENT|seçenekleri değiştir"
 
 #: tools/gpgconf.c:92
 msgid "|COMPONENT|check options"
-msgstr "|BİLEŞEN|seçenekleri sınar"
+msgstr "|COMPONENT|seçenekleri denetle"
 
 #: tools/gpgconf.c:94
 msgid "apply global default values"
-msgstr "öntanımlı küresel değerleri uygular"
+msgstr "öntanımlı global değerleri uygula"
 
 #: tools/gpgconf.c:96
-#, fuzzy
-#| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
-msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
+msgstr "|FILE|yapılandırma dosyalarını FILE kullanarak güncelle"
 
 #: tools/gpgconf.c:98
-#, fuzzy
-#| msgid "get the configuration directories for gpgconf"
 msgid "get the configuration directories for @GPGCONF@"
-msgstr "gpgconf için yapılandırma dizinlerini getirir"
+msgstr "@GPGCONF@ için yapılandırma dizinlerini getir"
 
 #: tools/gpgconf.c:100
 msgid "list global configuration file"
-msgstr "küresel yapılandırma dosyasını listeler"
+msgstr "global yapılandırma dosyasını listele"
 
 #: tools/gpgconf.c:102
 msgid "check global configuration file"
-msgstr "küresel yapılandırma dosayasını sınar"
+msgstr "global yapılandırma dosyasını denetle"
 
 #: tools/gpgconf.c:104
-#, fuzzy
-#| msgid "update the trust database"
 msgid "query the software version database"
-msgstr "güvence veritabanını günceller"
+msgstr "yazılım sürüm veritabanını sorgula"
 
 #: tools/gpgconf.c:105
-#, fuzzy
-#| msgid "list all components"
 msgid "reload all or a given component"
-msgstr "tüm bileşenleri listeler"
+msgstr "tüm veya yalnızca verilen bileşeni yeniden yükle"
 
 #: tools/gpgconf.c:106
-#, fuzzy
-#| msgid "list all components"
 msgid "launch a given component"
-msgstr "tüm bileşenleri listeler"
+msgstr "verilen bir bileşeni çalıştır"
 
 #: tools/gpgconf.c:107
-#, fuzzy
-#| msgid "list all components"
 msgid "kill a given component"
-msgstr "tüm bileşenleri listeler"
+msgstr "verilen bir bileşeni sonlandır"
 
 #: tools/gpgconf.c:116
 msgid "use as output file"
-msgstr "çıktı dosyası olarak kullanılır"
+msgstr "çıktı dosyası olarak kullan"
 
 #: tools/gpgconf.c:120
 msgid "activate changes at runtime, if possible"
-msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
+msgstr "olanaklıysa değişiklikleri çalışma sırasında etkin kıl"
 
 #: tools/gpgconf.c:166
-#, 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)"
+msgstr "Kullanım: @GPGCONF@ seçenekler (yardım için -h)"
 
 #: tools/gpgconf.c:169
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpgconf options\n"
-#| "Manage configuration options for tools of the GnuPG system\n"
 msgid ""
 "Syntax: @GPGCONF@ options\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
-"Sözdizimi: gpgconf seçenekler\n"
-"GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
+"Sözdizim: @GPGCONF@ seçenekler\n"
+"@GNUPG@ sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
 
 #: tools/gpgconf.c:726 tools/gpgconf.c:761
 msgid "Need one component argument"
-msgstr "Tek bileşenlik değiştirge gerekli"
+msgstr "Tek bileşenlik argüman gerekli"
 
 #: tools/gpgconf.c:735 tools/gpgconf.c:785 tools/gpgconf.c:835
 msgid "Component not found"
-msgstr "Bileşen yok"
+msgstr "Bileşen bulunamadı"
 
 #: tools/gpgconf.c:861
 msgid "No argument allowed"
-msgstr "Değiştirgeye izin verilmez"
+msgstr "Argümana izin verilmiyor"
 
 #: 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"
+"Kullanım: gpg-check-pattern seçenekler dizgidosyası (yardım için -h)\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 ""
-"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"
+"Sözdizim: gpg-check-pattern seçenekler dizgi dosyası\n"
+"Standart girdiden verilen anahtar parolasını dizgi ile karşılaştırır\n"
 
-#: tools/gpg-card.c:2407
-#, fuzzy, c-format
+#: tools/gpg-card.c:2425
+#, c-format
 msgid "Note: key %s is already stored on the card!\n"
-msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
+msgstr "Not: %s anahtarı halihazırda kart üzerinde depolanıyor!\n"
 
-#: tools/gpg-card.c:2410
-#, fuzzy, c-format
+#: tools/gpg-card.c:2428
+#, c-format
 msgid "Note: Keys are already stored on the card!\n"
-msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
+msgstr "Not: Anahtarlar halihazırda kart üzerinde depolanıyor!\n"
 
-#: tools/gpg-card.c:2413
-#, fuzzy, c-format
-#| msgid "Replace existing keys? (y/N) "
+#: tools/gpg-card.c:2431
+#, c-format
 msgid "Replace existing key %s ? (y/N) "
-msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
+msgstr "Mevcut %s anahtarı başkasıyla değiştirilsin mi? (e/H) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
-#, fuzzy, c-format
-#| msgid "OpenPGP card no. %s detected\n"
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
+#, c-format
 msgid "%s card no. %s detected\n"
-msgstr "%s numaralı OpenPGP kartı saptandı\n"
+msgstr "%s kart numarası %s algılandı\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
-msgstr ""
+msgstr "Kullanıcı etkileşim bayrağı \"%s\" olarak ayarlı - değiştirilemez\n"
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
+"Uyarı: Kullanıcı etkileşim bayrağını \"%s\" olarak\n"
+" ayarlamak yalnızca fabrika ayarlarına dönerek geri alınabilir!\n"
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
-msgstr ""
+msgstr "Lütfen \"uif --yes %d %s\" kullanın\n"
 
-#: tools/gpg-card.c:3686
-#, fuzzy
-#| msgid " (certificate created at "
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
-msgstr " ( sertifikanın oluşturuluşu: "
+msgstr "karta kimlik doğrula"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
-msgstr ""
+msgstr "kart ardalan sürecine sıfırlama gönder"
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
-msgstr ""
+msgstr "PIN kimlik doğrulaması için KDF ayarla"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
-msgstr ""
+msgstr "bir gizli veri nesnesi değiştir"
 
-#: tools/gpg-card.c:3693
-#, fuzzy
-#| msgid " (certificate created at "
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
-msgstr " ( sertifikanın oluşturuluşu: "
+msgstr "bir veri nesnesinden bir sertifika oku"
 
-#: tools/gpg-card.c:3694
-#, fuzzy
-#| msgid " (certificate created at "
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
-msgstr " ( sertifikanın oluşturuluşu: "
+msgstr "bir veri nesnesine bir sertifika depola"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
-msgstr ""
+msgstr "bir veri nesnesine bir özel anahtar depola"
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
-msgstr ""
+msgstr "Yubikey yönetim konsolu"
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
-msgstr ""
-
-#~ msgid "error writing to temporary file: %s\n"
-#~ msgstr "geçeci dosyaya yazma hatası: %s\n"
-
-#, fuzzy
-#~| msgid "run in server mode"
-#~ msgid "run in supervised mode"
-#~ msgstr "sunucu kipinde çalışır"
-
-#~ msgid "Name may not start with a digit\n"
-#~ msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
-
-#~ msgid "Name must be at least 5 characters long\n"
-#~ msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
-
-#~ msgid "Configuration for Keyservers"
-#~ msgstr "Anahtar sunucular için yapılandırma"
-
-#~ msgid "Configuration of LDAP servers to use"
-#~ msgstr "Kullanılacak LDAP sunucularının yapılandırması"
-
-#, fuzzy
-#~| msgid "self-signed certificate has a BAD signature"
-#~ msgid "selfsigned certificate has a BAD signature"
-#~ msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
-
-#~ msgid "requesting key %s from %s server %s\n"
-#~ msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
-
-#~ msgid "%s:%u: no hostname given\n"
-#~ msgstr "%s:%u: konak adı belirtilmemiş\n"
-
-#~ msgid "could not parse keyserver\n"
-#~ msgstr "anahtar sunucusu çözümlenemedi\n"
-
-#, fuzzy
-#~| msgid "|NAME|connect to Assuan socket NAME"
-#~ msgid "|NAME|connect to host NAME"
-#~ msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
-
-#, fuzzy
-#~| msgid "|N|connect to reader at port N"
-#~ msgid "|N|connect to port N"
-#~ msgstr "|N|N. porttaki okuyucuya bağlanır"
-
-#, 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)"
-
-#, fuzzy
-#~| msgid "invalid import options\n"
-#~ msgid "invalid port number %d\n"
-#~ msgstr "içselleştirme seçenekleri geçersiz\n"
-
-#, fuzzy
-#~| msgid "error writing to %s: %s\n"
-#~ msgid "error writing to stdout: %s\n"
-#~ msgstr "%s yazılırken hata: %s\n"
-
-#, fuzzy
-#~| msgid "certificate `%s' not found: %s\n"
-#~ msgid "attribute '%s' not found\n"
-#~ msgstr "sertifika \"%s\" yok: %s\n"
-
-#, fuzzy
-#~| msgid "reading from `%s'\n"
-#~ msgid "processing url '%s'\n"
-#~ msgstr "`%s'den okunuyor\n"
-
-#, fuzzy
-#~| msgid " w/o user IDs: %lu\n"
-#~ msgid " user '%s'\n"
-#~ msgstr " kullanıcı kimliksiz: %lu\n"
-
-#, fuzzy
-#~| msgid " aka \"%s\""
-#~ msgid " pass '%s'\n"
-#~ msgstr " nam-ı diğer \"%s\""
-
-#, fuzzy
-#~| msgid " w/o user IDs: %lu\n"
-#~ msgid " host '%s'\n"
-#~ msgstr " kullanıcı kimliksiz: %lu\n"
-
-#, fuzzy
-#~| msgid " not imported: %lu\n"
-#~ msgid " port %d\n"
-#~ msgstr " alınamadı: %lu\n"
-
-#, fuzzy
-#~| msgid " aka \"%s\""
-#~ msgid " DN '%s'\n"
-#~ msgstr " nam-ı diğer \"%s\""
-
-#, fuzzy
-#~| msgid " aka \"%s\""
-#~ msgid " attr '%s'\n"
-#~ msgstr " nam-ı diğer \"%s\""
-
-#, fuzzy
-#~| msgid "%s:%u: no hostname given\n"
-#~ msgid "no host name in '%s'\n"
-#~ msgstr "%s:%u: konak adı belirtilmemiş\n"
-
-#, fuzzy
-#~| msgid "WARNING: Using untrusted key!\n"
-#~ msgid "WARNING: using first attribute only\n"
-#~ msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
-
-#, fuzzy
-#~| 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"
-
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "LDAP init to '%s' failed: %s\n"
-#~ msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
-
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "LDAP init to '%s' done\n"
-#~ msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
-
-#, fuzzy
-#~| 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"
-
-#, fuzzy
-#~| msgid "dearmoring failed: %s\n"
-#~ msgid "searching '%s' failed: %s\n"
-#~ msgstr "zırhın kaldırılması başarısız: %s\n"
-
-#, fuzzy
-#~| msgid "change a passphrase"
-#~ msgid "Suggest a random passphrase."
-#~ msgstr "anahtar parolası değiştirir"
-
-#~ msgid "detected card with S/N: %s\n"
-#~ msgstr "Algılanan kartın seri nr: %s\n"
-
-#, fuzzy
-#~| msgid "error getting default authentication keyID of card: %s\n"
-#~ msgid "no authentication key for ssh on card: %s\n"
-#~ msgstr ""
-#~ "kartın öntanımlı kimlik doğrulama anahtar kimliği alınırken hata: %s\n"
-
-#~ msgid "use a log file for the server"
-#~ msgstr "sunucu için bir günlük dosyası kullanılır"
-
-#, fuzzy
-#~| msgid "no running gpg-agent - starting one\n"
-#~ msgid "no running gpg-agent - starting '%s'\n"
-#~ msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
-
-#~ msgid "argument not expected"
-#~ msgstr "değiştirge beklenmiyordu"
-
-#~ msgid "read error"
-#~ msgstr "okuma hatası"
-
-#~ msgid "keyword too long"
-#~ msgstr "anahtar sözcük çok uzun"
-
-#~ msgid "missing argument"
-#~ msgstr "eksik değiştirge"
-
-#, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid argument"
-#~ msgstr "değer hatalı\n"
-
-#~ msgid "invalid command"
-#~ msgstr "geçersiz komut"
-
-#~ msgid "invalid alias definition"
-#~ msgstr "geçersiz rumuz tanımı"
-
-#~ msgid "out of core"
-#~ msgstr "nüve dışı"
-
-#, fuzzy
-#~| msgid "invalid command"
-#~ msgid "invalid meta command"
-#~ msgstr "geçersiz komut"
-
-#, fuzzy
-#~| msgid "unknown command `%s'\n"
-#~ msgid "unknown meta command"
-#~ msgstr "komut `%s' bilinmiyor\n"
-
-#, fuzzy
-#~| msgid "unexpected armor: "
-#~ msgid "unexpected meta command"
-#~ msgstr "beklenmeyen zırh: "
-
-#~ msgid "invalid option"
-#~ msgstr "geçersiz seçenek"
-
-#~ msgid "missing argument for option \"%.50s\"\n"
-#~ msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
-
-#~ msgid "option \"%.50s\" does not expect an argument\n"
-#~ msgstr "\"%.50s\" seçeneğinin değiştirge ihtiyacı yok\n"
-
-#~ msgid "invalid command \"%.50s\"\n"
-#~ msgstr "geçersiz komut \"%.50s\"\n"
-
-#~ msgid "option \"%.50s\" is ambiguous\n"
-#~ msgstr "\"%.50s\" seçeneği belirsiz\n"
-
-#~ msgid "command \"%.50s\" is ambiguous\n"
-#~ msgstr "\"%.50s\" komutu belirsiz\n"
-
-#~ msgid "invalid option \"%.50s\"\n"
-#~ msgstr "geçersiz seçenekler \"%.50s\"\n"
-
-#, fuzzy
-#~| 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"
-
-#, fuzzy
-#~| msgid "option file `%s': %s\n"
-#~ msgid "option file '%s': %s\n"
-#~ msgstr "seçenek dosyası \"%s\": %s\n"
-
-#, fuzzy
-#~| msgid "you may not use %s while in %s mode\n"
-#~ msgid "keyserver option \"%s\" may not be used in %s mode\n"
-#~ msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
-
-#, fuzzy
-#~| msgid "unable to execute program `%s': %s\n"
-#~ msgid "unable to execute program '%s': %s\n"
-#~ msgstr " '%s' çalıştırılamıyor: %s\n"
-
-#~ msgid "unable to execute external program\n"
-#~ msgstr "dış uygulama çalıştırılamıyor\n"
-
-#~ msgid "unable to read external program response: %s\n"
-#~ msgstr "dış uygulamanın yanıtı okunamıyor: %s\n"
-
-#~ msgid "validate signatures with PKA data"
-#~ msgstr "imzaları PKA verisi ile doğrular"
-
-#~ msgid "elevate the trust of signatures with valid PKA data"
-#~ msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
-
-#, fuzzy
-#~ msgid " (%d) ECC and ECC\n"
-#~ msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
-
-#~ msgid "honor the PKA record set on a key when retrieving keys"
-#~ msgstr "anahtarları alırken PKA kaydını bir anahtara atar"
-
-#, fuzzy
-#~| msgid "Note: Verified signer's address is `%s'\n"
-#~ msgid "Note: Verified signer's address is '%s'\n"
-#~ msgstr "Bilgi: Doğrulanmış imzacının adresi: `%s'\n"
-
-#, fuzzy
-#~| msgid "Note: Signer's address `%s' does not match DNS entry\n"
-#~ msgid "Note: Signer's address '%s' does not match DNS entry\n"
-#~ msgstr "Bilgi: İmzacının adresi `%s', DNS girdisiyle eşleşmiyor\n"
-
-#~ msgid "trustlevel adjusted to FULL due to valid PKA info\n"
-#~ msgstr ""
-#~ "geçerli PKA bilgisinden dolayı güvence seviyesi TAM olarak ayarlandı\n"
-
-#~ msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
-#~ msgstr ""
-#~ "kötü PKA bilgisinden dolayı güvence seviyesi ASLA olarak ayarlandı\n"
-
-#~ msgid "|FILE|write a server mode log to FILE"
-#~ msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
-
-#, 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) "
-
-#~ msgid "allow PKA lookups (DNS requests)"
-#~ msgstr "PKA aramalarına izin verilir (DNS istekleri)"
-
-#~ msgid "Options controlling the format of the output"
-#~ msgstr "Çıktı biçimini denetleyen seçenekler"
-
-#, fuzzy
-#~| msgid "Options controlling the security"
-#~ msgid "Options controlling the use of Tor"
-#~ msgstr "Güvenliği denetleyen seçenekler"
-
-#~ msgid "LDAP server list"
-#~ msgstr "LDAP sunucu listesi"
-
-#, 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"
-
-#~ msgid ""
-#~ "@\n"
-#~ "Commands:\n"
-#~ " "
-#~ msgstr ""
-#~ "@\n"
-#~ "Komutlar:\n"
-#~ " "
-
-#~ msgid "decryption modus"
-#~ msgstr "şifre çözme kipi"
-
-#~ msgid "encryption modus"
-#~ msgstr "şifreleme kipi"
-
-#~ msgid "tool class (confucius)"
-#~ msgstr "araç sınıfı (Konfüçyüs)"
-
-#~ msgid "program filename"
-#~ msgstr "program dosyaismi"
-
-#~ msgid "secret key file (required)"
-#~ msgstr "gizli anahtar dosyası (gerekli)"
-
-#~ msgid "input file name (default stdin)"
-#~ msgstr "girdi dosyası ismi (std girdi öntanımlı)"
-
-#~ msgid "Usage: symcryptrun options (-h for help)"
-#~ msgstr "Kullanımı: symcryptrun seçenekler (yardım için -h)"
-
-#~ 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 "%s on %s aborted with status %i\n"
-#~ msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\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"
-
-#, 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"
-
-#~ msgid "could not open %s for writing: %s\n"
-#~ msgstr "%s yazmak için açılamadı: %s\n"
-
-#~ msgid "error closing %s: %s\n"
-#~ msgstr "%s kapanırken hata: %s\n"
-
-#~ msgid "no --program option provided\n"
-#~ msgstr "--program diye bir seçenek yok\n"
-
-#~ msgid "only --decrypt and --encrypt are supported\n"
-#~ msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
-
-#~ msgid "no --keyfile option provided\n"
-#~ msgstr "--keyfile diye bir seçenek yok\n"
-
-#~ msgid "cannot allocate args vector\n"
-#~ msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
-
-#~ msgid "could not create pipe: %s\n"
-#~ msgstr "boru oluşturulamadı: %s\n"
-
-#~ msgid "could not create pty: %s\n"
-#~ msgstr "pty oluşturulamadı: %s\n"
-
-#~ msgid "could not fork: %s\n"
-#~ msgstr "çatallanamadı: %s\n"
-
-#~ msgid "execv failed: %s\n"
-#~ msgstr "execv başarısız: %s\n"
-
-#~ msgid "select failed: %s\n"
-#~ msgstr "select başarısız: %s\n"
-
-#~ msgid "read failed: %s\n"
-#~ msgstr "read başarısız: %s\n"
-
-#~ msgid "pty read failed: %s\n"
-#~ msgstr "pty okuması başarısız: %s\n"
-
-#~ msgid "waitpid failed: %s\n"
-#~ msgstr "waitpid başarısız: %s\n"
-
-#~ msgid "child aborted with status %i\n"
-#~ msgstr "alt süreç %i durumu ile çıktı\n"
-
-#~ msgid "cannot allocate infile string: %s\n"
-#~ msgstr "dosya içi dizge ayrılamıyor: %s\n"
-
-#~ msgid "cannot allocate outfile string: %s\n"
-#~ msgstr "dosya dışı dizge ayrılamıyor: %s\n"
-
-#~ msgid "either %s or %s must be given\n"
-#~ msgstr "ya %s verilmeli ya da %s\n"
-
-#~ msgid "no class provided\n"
-#~ msgstr "hiç sınıf sağlanmamış\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"
-
-#~ msgid "male"
-#~ msgstr "erkek"
-
-#~ msgid "female"
-#~ msgstr "dişi"
-
-#~ msgid "unspecified"
-#~ msgstr "belirtilmemiş"
-
-#~ msgid "Sex ((M)ale, (F)emale or space): "
-#~ msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
-
-#~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr ""
-#~ "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
-
-#, fuzzy
-#~| msgid "error creating temporary file: %s\n"
-#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
-#~ msgstr "geçici dosya oluşturulurken hata: %s\n"
-
-#, fuzzy
-#~| msgid "error sending %s command: %s\n"
-#~ msgid "error creating 'encryptions' TOFU table: %s\n"
-#~ msgstr "%s komutu gönderilirken hata: %s\n"
-
-#, fuzzy
-#~| msgid "error writing key: %s\n"
-#~ msgid "resetting keydb: %s\n"
-#~ msgstr "anahtarı yazarken hata: %s\n"
-
-#, fuzzy
-#~| msgid "error storing flags: %s\n"
-#~ msgid "error setting TOFU binding's policy to %s\n"
-#~ msgstr "bayraklar saklanırken hata: %s\n"
-
-#, fuzzy
-#~| msgid "print message digests"
-#~ msgid "%s: Verified %ld~signature in the past %s."
-#~ msgid_plural "%s: Verified %ld~signatures in the past %s."
-#~ msgstr0 "ileti özetlerini gösterir"
-#~ msgstr1 "ileti özetlerini gösterir"
-
-#, fuzzy
-#~| msgid "print message digests"
-#~ msgid "Encrypted %ld~message in the past %s."
-#~ msgid_plural "Encrypted %ld~messages in the past %s."
-#~ msgstr0 "ileti özetlerini gösterir"
-#~ msgstr1 "ileti özetlerini gösterir"
-
-#, fuzzy
-#~| msgid "error writing public keyring `%s': %s\n"
-#~ msgid "error setting policy for key %s, user id \"%s\": %s"
-#~ msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
-
-#, fuzzy
-#~| msgid "error closing %s: %s\n"
-#~ msgid "error looking up: %s\n"
-#~ msgstr "%s kapanırken hata: %s\n"
-
-#, fuzzy
-#~| msgid "error creating keyring `%s': %s\n"
-#~ msgid "Warning: %s appears in the keyring %d times\n"
-#~ msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
-
-#, fuzzy
-#~| msgid "error running `%s': exit status %d\n"
-#~ msgid "error retrieving '%s': http status %u\n"
-#~ msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
-
-#, fuzzy
-#~| msgid "pth_select failed: %s - waiting 1s\n"
-#~ msgid "npth_select failed: %s - waiting 1s\n"
-#~ msgstr "pth_select başarısız: %s - 1s bekliyor\n"
-
-#, fuzzy
-#~| msgid "reading public key failed: %s\n"
-#~ msgid "reading from ldap wrapper %d failed: %s\n"
-#~ msgstr "genel anahtar okuması başarısız: %s\n"
-
-#, fuzzy
-#~ msgid "What keysize do you want for the Signature key? (%u) "
-#~ msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
-
-#, fuzzy
-#~ msgid "What keysize do you want for the Encryption key? (%u) "
-#~ msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
-
-#, fuzzy
-#~ msgid "What keysize do you want for the Authentication key? (%u) "
-#~ msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
-
-#~ msgid "listen() failed: %s\n"
-#~ msgstr "soket dinleme başarısız: %s\n"
-
-#~ msgid "Error: URL too long (limit is %d characters).\n"
-#~ msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
-
-#~ msgid "Error: Login data too long (limit is %d characters).\n"
-#~ msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
-
-#~ msgid "Error: Private DO too long (limit is %d characters).\n"
-#~ msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
-
-#, 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"
-
-#, 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 ""
-#~ "UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
-
-#, fuzzy
-#~| msgid "Key generation failed: %s\n"
-#~ msgid "User ID revocation failed: %s\n"
-#~ msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
-
-#~ msgid "||Please enter the PIN%%0Asigs done: %lu"
-#~ msgstr "||Lütfen PIN'i giriniz%%0Ayapılan imza: %lu"
-
-#, fuzzy
-#~ msgid "|A|Please enter the Admin PIN%%0Aremaining attempts: %d"
-#~ msgstr ""
-#~ "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz%%0Akalan "
-#~ "deneme: %d"
-
-#~ msgid "--store filename"
-#~ msgstr "--store dosyaismi"
-
-#~ msgid "--symmetric filename"
-#~ msgstr "--symmetric dosyaismi"
-
-#~ msgid "--encrypt filename"
-#~ msgstr "--encrypt dosyaismi"
-
-#~ msgid "--symmetric --encrypt filename"
-#~ msgstr "--symmetric --encrypt dosyaismi"
-
-#~ msgid "--sign filename"
-#~ msgstr "--sign dosyaismi"
-
-#~ msgid "--sign --encrypt filename"
-#~ msgstr "--sign --encrypt dosyaismi"
-
-#~ msgid "--symmetric --sign --encrypt filename"
-#~ msgstr "--symmetric --sign --encrypt dosyaismi"
-
-#~ msgid "--sign --symmetric filename"
-#~ msgstr "--sign --symmetric DOSYA"
-
-#~ msgid "--clear-sign filename"
-#~ msgstr "--clear-sign dosyaismi"
-
-#~ msgid "--decrypt filename"
-#~ msgstr "--decrypt dosyaismi"
-
-#~ msgid "--sign-key user-id"
-#~ msgstr "--sign-key kullanıcı-kimliği"
-
-#~ msgid "--lsign-key user-id"
-#~ msgstr "--lsign-key kullanıcı-kimliği"
-
-#~ msgid "--edit-key user-id commands"
-#~ msgstr "--edit-key kullanıcı-kimliği komutlar"
-
-#, fuzzy
-#~ msgid "--passwd <user-id>"
-#~ msgstr "--sign-key kullanıcı-kimliği"
-
-#~ msgid "filename"
-#~ msgstr "dosyaismi"
-
-#~ msgid "shadowing the key failed: %s\n"
-#~ msgstr "anahtar gölgelenemedi: %s\n"
-
-#, fuzzy
-#~ msgid "available TOFU policies:\n"
-#~ msgstr "anahtarı iptal eder"
-
-#, fuzzy
-#~| msgid "print message digests"
-#~ msgid "%ld message signed"
-#~ msgid_plural "%ld messages signed"
-#~ msgstr0 "ileti özetlerini gösterir"
-#~ msgstr1 "ileti özetlerini gösterir"
-
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "gpg-agent ile haberleşme problemi\n"
-
-#~ msgid "canceled by user\n"
-#~ msgstr "kullanıcı tarafından iptal edildi\n"
-
-#~ msgid "problem with the agent\n"
-#~ msgstr "aracı ile sorun var\n"
-
-#, fuzzy
-#~| msgid "problem with the agent: %s\n"
-#~ msgid "problem with the agent (unexpected response \"%s\")\n"
-#~ msgstr "aracı ile sorun var: %s\n"
-
-#, fuzzy
-#~| msgid "unknown command `%s'\n"
-#~ msgid "unknown TOFU DB format '%s'\n"
-#~ msgstr "komut `%s' bilinmiyor\n"
-
-#~ msgid "libgcrypt is too old (need %s, have %s)\n"
-#~ msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
-
-#~ 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"
-#~ msgstr ""
-#~ "OpenPGP sertifikası için gizli anahtarı açacak anahtar parolasını "
-#~ "giriniz:\n"
-#~ "\"%.*s\"\n"
-#~ "%u bitlik %s anahtarı, kimlik %s,\n"
-#~ "oluşturma tarihi %s%s.\n"
-
-#~ msgid ""
-#~ "You need a passphrase to unlock the secret key for\n"
-#~ "user: \"%s\"\n"
-#~ msgstr ""
-#~ "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız "
-#~ "var.\n"
-#~ "Anahtarın sahibi: \"%s\"\n"
-
-#~ msgid "%u-bit %s key, ID %s, created %s"
-#~ msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
-
-#~ msgid " (subkey on main key ID %s)"
-#~ msgstr " (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
-
-#, fuzzy
-#~| msgid "can't create directory `%s': %s\n"
-#~ msgid "can't access directory '%s': %s\n"
-#~ msgstr "`%s' dizini oluşturulamıyor: %s\n"
-
-#, fuzzy
-#~| msgid "run in daemon mode (background)"
-#~ msgid "run as windows service (background)"
-#~ msgstr "artalan süreci olarak çalışır"
-
-#~ msgid "you found a bug ... (%s:%d)\n"
-#~ msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
-
-#, 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"
-#~ msgstr0 "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
-#~ msgstr1 "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
-
-#~ msgid "moving a key signature to the correct place\n"
-#~ msgstr "bir anahtar imzası doğru yere taşınıyor\n"
-
-#, fuzzy
-#~| msgid "option \"%.50s\" is ambiguous\n"
-#~ msgid "key specification '%s' is ambiguous\n"
-#~ msgstr "\"%.50s\" seçeneği belirsiz\n"
-
-#~ msgid "%d signatures not checked due to missing keys\n"
-#~ msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
-
-#~ msgid "%d signatures not checked due to errors\n"
-#~ msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
-
-#~ msgid "1 user ID without valid self-signature detected\n"
-#~ msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
-
-#~ msgid "User ID \"%s\": %d signatures removed\n"
-#~ msgstr "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
-
-#~ msgid ""
-#~ "You need a Passphrase to protect your secret key.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a passphrase to protect the off-card backup of the new "
-#~ "encryption key."
-#~ msgstr ""
-#~ "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
-#~ "giriniz."
-
-#~ msgid "passphrase not correctly repeated; try again"
-#~ msgstr ""
-#~ "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
-#~ "tekrarlanacak"
-
-#~ msgid "%s.\n"
-#~ msgstr "%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 ""
-#~ "Bir anahtar parolası istemediniz - bu *kötü* bir fikir!\n"
-#~ "Nasıl isterseniz. Anahtar parolanızı bu programı \"--edit-key\"\n"
-#~ "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
-#~ "\n"
-
-#~ msgid "storing key onto card failed: %s\n"
-#~ msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
-
-#, fuzzy
-#~| msgid "1 bad signature\n"
-#~ msgid "1 good signature\n"
-#~ msgstr "1 kötü imza\n"
-
-#~ msgid "%lu keys cached (%lu signatures)\n"
-#~ msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
-
-#~ msgid "refreshing 1 key from %s\n"
-#~ msgstr "1 anahtar %s adresinden tazeleniyor\n"
-
-#~ msgid "sending key %s to %s server %s\n"
-#~ msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
-
-#~ msgid "public key %s is %lu seconds newer than the signature\n"
-#~ msgstr "genel anahtar %s imzadan %lu saniye daha yeni.\n"
-
-#~ msgid ""
-#~ "key %s was created %lu seconds in the future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "anahtar %s bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
-#~ "problemi)\n"
-
-#~ msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
-#~ msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
-
-#, fuzzy
-#~| msgid "failed to store the key: %s\n"
-#~ msgid "Failed to open the keyring DB.\n"
-#~ msgstr "anahtarın saklanması başarısız: %s\n"
-
-#, fuzzy
-#~| msgid "failed to open `%s': %s\n"
-#~ msgid "Failed to parse '%s'.\n"
-#~ msgstr "`%s' açılamadı: %s\n"
-
-#, fuzzy
-#~| msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgid "error looking up secret key \"%s\": %s\n"
-#~ msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
-
-#~ msgid "Please select at most one subkey.\n"
-#~ msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
-
-#, fuzzy
-#~| msgid "no running dirmngr - starting `%s'\n"
-#~ msgid "no running dirmngr - starting one\n"
-#~ msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
-
-#, fuzzy
-#~| msgid "malformed DIRMNGR_INFO environment variable\n"
-#~ msgid "malformed %s environment variable\n"
-#~ msgstr "DIRMNGR_INFO ortam değişkeni hatalı\n"
-
-#~ msgid "dirmngr protocol version %d is not supported\n"
-#~ msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
-
-#~ msgid "can't connect to the dirmngr - trying fall back\n"
-#~ msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
-
-#~ msgid "export keys in an S-expression based format"
-#~ msgstr "anahtarları bir S ifadesine dayalı biçimde ihraceder"
-
-#~ msgid "toggle between the secret and public key listings"
-#~ msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
-
-#~ msgid "Passphrase"
-#~ msgstr "Anahtar Parolası"
-
-#~ msgid "use temporary files to pass data to keyserver helpers"
-#~ msgstr ""
-#~ "anahtar sunucusu yardımcılarına veri aktaracak geçici dosyalar kullanılır"
-
-#~ msgid "do not delete temporary files after using them"
-#~ msgstr "geçici dosyaları kullandıktan sonra silmez"
-
-#, fuzzy
-#~| msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-#~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
-#~ msgstr ""
-#~ "UYARI: anahtar sunucusu seçeneği `%s' bu platformda kullanımda değil\n"
-
-#~ msgid "name of socket too long\n"
-#~ msgstr "soketin ismi çok uzun\n"
-
-#~ msgid "gpg-agent is not available in this session\n"
-#~ msgstr "gpg-agent bu oturumda kullanılamaz\n"
-
-#~ msgid "use a standard location for the socket"
-#~ msgstr "soket için standart bir yer kullanılır"
-
-#~ msgid "|FILE|write environment settings also to FILE"
-#~ msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
-
-#~ msgid "Usage: gpg-agent options (-h for help)"
-#~ msgstr "Kullanımı: gpg seçenekler (yardım için -h)"
-
-#~ msgid "malformed GPG_AGENT_INFO environment variable\n"
-#~ msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
-
-#~ msgid "gpg-agent protocol version %d is not supported\n"
-#~ msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
-
-#~ msgid "can't fdopen pipe for reading: %s\n"
-#~ msgstr "okumak için boruya fdopen yapılamadı: %s\n"
-
-#~ msgid "error creating socket: %s\n"
-#~ msgstr "soket oluşturulurken hata: %s\n"
-
-#~ msgid "host not found"
-#~ msgstr "konak yok"
-
-#~ msgid "can't connect to the agent - trying fall back\n"
-#~ msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
-
-#~ msgid "unknown key protection algorithm\n"
-#~ msgstr "bilinmeyen anahtar koruma algoritması\n"
-
-#~ msgid "secret parts of key are not available\n"
-#~ msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
-
-#~ msgid "secret key already stored on a card\n"
-#~ msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
-
-#, fuzzy
-#~ msgid "error writing key to card: %s\n"
-#~ msgstr "anahtarı yazarken hata: %s\n"
-
-#~ msgid ""
-#~ "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-#~ msgstr ""
-#~ "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
-#~ "yapabilirsiniz\n"
-
-#~ msgid ""
-#~ "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-#~ msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
-
-#~ msgid "remove the passphrase from exported subkeys"
-#~ msgstr "ihracedilen yardımcı anahtarlardan anahtar parolasını kaldırır"
-
-#~ msgid "key %s: not protected - skipped\n"
-#~ msgstr "anahtar %s: korunmamış - atlandı\n"
-
-#~ msgid "about to export an unprotected subkey\n"
-#~ msgstr "korunmamış bir yardımcı anahtar ihraca hazır\n"
-
-#~ msgid "failed to unprotect the subkey: %s\n"
-#~ msgstr "yardımcı anahtarın koruması kaldırılamadı: %s\n"
-
-#~ msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-#~ msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
-
-#~ msgid "too many entries in pk cache - disabled\n"
-#~ msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
-
-#~ msgid "no secret subkey for public subkey %s - ignoring\n"
-#~ msgstr ""
-#~ "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
-
-#~ msgid "key %s: secret key without public key - skipped\n"
-#~ msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
-
-#~ msgid "usage: gpg options "
-#~ msgstr "kullanımı: gpg seçenekler "
-
-#~ msgid ""
-#~ "you can only make detached or clear signatures while in --pgp2 mode\n"
-#~ msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
-
-#~ msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-#~ msgstr ""
-#~ "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
-
-#~ msgid ""
-#~ "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-#~ msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
-
-#~ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-#~ msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
-
-#~ msgid "create a public key when importing a secret key"
-#~ msgstr "bir gizli anahtar ithal ederken bir genel anahtar oluşturur"
-
-#~ msgid "key %s: already in secret keyring\n"
-#~ msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
-
-#~ msgid "key %s: secret key not found: %s\n"
-#~ msgstr "anahtar %s: gizli anahtar yok: %s\n"
-
-#~ msgid "NOTE: a key's S/N does not match the card's one\n"
-#~ msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
-
-#~ msgid "NOTE: primary key is online and stored on card\n"
-#~ msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
-
-#~ msgid "NOTE: secondary key is online and stored on card\n"
-#~ msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
-
-#~ msgid ""
-#~ "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-#~ "mode.\n"
-#~ msgstr ""
-#~ "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
-#~ "uygulanamayabilir.\n"
-
-#~ msgid "This would make the key unusable in PGP 2.x.\n"
-#~ msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
-
-#~ msgid "This key is not protected.\n"
-#~ msgstr "Bu anahtar korunmamış.\n"
-
-#~ msgid "Key is protected.\n"
-#~ msgstr "Anahtar korunmuş.\n"
-
-#~ msgid "Can't edit this key: %s\n"
-#~ msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
-
-#~ msgid ""
-#~ "Enter the new passphrase for this secret key.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "You don't want a passphrase - this is probably a *bad* idea!\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
-#~ "\n"
-
-#~ msgid "Do you really want to do this? (y/N) "
-#~ msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
-
-#~ msgid "Please remove selections from the secret keys.\n"
-#~ msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
-
-#~ msgid "No corresponding signature in secret ring\n"
-#~ msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
-
-#~ msgid "writing secret key stub to `%s'\n"
-#~ msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
-
-#~ msgid "writing secret key to `%s'\n"
-#~ msgstr "gizli anahtarı `%s'e yazıyor\n"
-
-#~ msgid "no writable secret keyring found: %s\n"
-#~ msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
-
-#~ msgid "WARNING: 2 files with confidential information exists.\n"
-#~ msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
-
-#~ msgid "%s is the unchanged one\n"
-#~ msgstr "%s değişmeyenlerden\n"
-
-#~ msgid "%s is the new one\n"
-#~ msgstr "%s yenilerden\n"
-
-#~ msgid "Please fix this possible security flaw\n"
-#~ msgstr "Lütfen bu güvenlik çatlağını giderin\n"
-
-#~ msgid "searching for names from %s server %s\n"
-#~ msgstr "%2$s sunucusunda %1$s içindeki isimler aranıyor\n"
-
-#~ msgid "searching for names from %s\n"
-#~ msgstr "%s içindeki isimler aranıyor\n"
-
-#~ msgid "searching for \"%s\" from %s server %s\n"
-#~ msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
-
-#~ msgid "searching for \"%s\" from %s\n"
-#~ msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
-
-#~ msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-#~ msgstr ""
-#~ "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
-
-#~ msgid "keyserver did not send VERSION\n"
-#~ msgstr "anahtar sunucusu VERSION göndermiyor\n"
-
-#~ msgid "external keyserver calls are not supported in this build\n"
-#~ msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
-
-#~ msgid "no handler for keyserver scheme `%s'\n"
-#~ msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
-
-#~ msgid "action `%s' not supported with keyserver scheme `%s'\n"
-#~ msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
-
-#~ msgid "%s does not support handler version %d\n"
-#~ msgstr "%s %d sürümü eylemciyi desteklemiyor\n"
-
-#~ msgid "keyserver timed out\n"
-#~ msgstr "anahtar sunucusu zamanaşımına uğradı\n"
-
-#~ msgid "keyserver internal error\n"
-#~ msgstr "anahtar sunucusu iç hatası\n"
-
-#~ msgid "keyserver communications error: %s\n"
-#~ msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
-
-#~ msgid "WARNING: unable to parse URI %s\n"
-#~ msgstr "UYARI: Betimleyici %s çözümlenemiyor\n"
-
-#~ msgid "invalid root packet detected in proc_tree()\n"
-#~ msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
-
-#~ msgid "the IDEA cipher plugin is not present\n"
-#~ msgstr "IDEA şifre eklentisi yok\n"
-
-#~ msgid "no corresponding public key: %s\n"
-#~ msgstr "karşılığı olan genel anahtar yok: `%s\n"
-
-#~ msgid "public key does not match secret key!\n"
-#~ msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
-
-#~ msgid "unknown protection algorithm\n"
-#~ msgstr "bilinmeyen sıkıştırma algoritması\n"
-
-#~ msgid "NOTE: This key is not protected!\n"
-#~ msgstr "BİLGİ: Bu anahtar korunmamış!\n"
-
-#~ msgid "protection digest %d is not supported\n"
-#~ msgstr "koruma özeti %d desteklenmiyor\n"
-
-#~ msgid "Invalid passphrase; please try again"
-#~ msgstr "Anahtar parolası geçersiz; lütfen tekrar deneyin"
-
-#~ msgid "%s ...\n"
-#~ msgstr "%s ...\n"
-
-#~ msgid "WARNING: Weak key detected - please change passphrase again.\n"
-#~ msgstr ""
-#~ "UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
-#~ "değiştirin.\n"
-
-#~ msgid ""
-#~ "generating the deprecated 16-bit checksum for secret key protection\n"
-#~ msgstr ""
-#~ "gizli anahtarın güvenliği için eski tarz 16 bitlik sağlama toplamı "
-#~ "üretiliyor\n"
-
-#~ msgid "DSA key %s uses an unsafe (%u bit) hash\n"
-#~ msgstr "DSA anahtarı %s, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
-
-#~ msgid ""
-#~ "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-#~ msgstr ""
-#~ "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza "
-#~ "yapabilirsiniz\n"
-
-#~ msgid ""
-#~ "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-#~ msgstr ""
-#~ "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
-#~ "yapabilirsiniz\n"
-
-#~ msgid " - probably dead - removing lock"
-#~ msgstr " - muhtemelen ölü - kilit siliniyor"
-
-#~ msgid "Usage: scdaemon options (-h for help)"
-#~ msgstr "Kullanımı: scdaemon seçenekler (yardım için -h)"
-
-#~ msgid "Parameters to be used for the certificate request:\n"
-#~ msgstr "Sertifika isteği için kullanılacak değiştirgeler:\n"
-
-#~ msgid "use system's dirmngr if available"
-#~ msgstr "elverişliyse sistemin dirmngr'ı kullanılır"
-
-#~ msgid "Usage: gpgsm options files (-h for help)"
-#~ msgstr "Kullanımı: gpgsm seçenekler dosyalar (yardım için -h)"
-
-#~ msgid "usage: gpgconf options "
-#~ msgstr "kullanımı: gpgconf seçenekler "
-
-#~ msgid "you may want to start the gpg-agent first\n"
-#~ msgstr "gpg-agent'ı önce başlatmak isteyebilirsiniz\n"
-
-#~ msgid "failed to allocated keyDB handle\n"
-#~ msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
-
-#~ msgid "Command> "
-#~ msgstr "Komut> "
-
-#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-#~ msgstr ""
-#~ "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
-
-#~ msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
-#~ msgstr ""
-#~ "Yazılım hatalarını lütfen <gnupg-bugs@gnu.org> adresine,\n"
-#~ "çeviri hatalarını ise <gnu-tr@belgeler.org> adresine bildiriniz.\n"
-
-#~ msgid "Please report bugs to "
-#~ msgstr "Yazılım hatalarını lütfen "
-
-#~ msgid "DSA keypair will have %u bits.\n"
-#~ msgstr "DSA anahtar çifti %u bit olacak.\n"
-
-#~ msgid "this command has not yet been implemented\n"
-#~ msgstr "bu komut henüz gerçeklenmedi\n"
-
-#~ msgid "Repeat passphrase\n"
-#~ msgstr "Parolayı tekrar yazınız\n"
-
-#~ msgid "||Please enter your PIN at the reader's keypad%%0Asigs done: %lu"
-#~ msgstr ""
-#~ "||Lütfen PIN'inizi okuyucu tuştakımından giriniz%%0Ayapılan imza: %lu"
-
-#~ msgid "|A|Admin PIN"
-#~ msgstr "|A|Yönetici PIN'i"
+msgstr "komut geçmişini yönet"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/uk.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/uk.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/uk.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/uk.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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"
@@ -19,7 +19,7 @@
 "%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
 "X-Generator: Lokalize 20.11.70\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "не вдалося встановити блокування запису пінкоду: %s\n"
@@ -30,49 +30,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "_Гаразд"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "_Скасувати"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "_Так"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "_Ні"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "Пінкод:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Зберегти у засобі керування паролями"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Справді хочете зробити пароль видимим на екрані?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "Зробити пароль видимим"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Приховати пароль"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -83,7 +83,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -94,14 +94,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -109,7 +109,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Якість:"
 
@@ -119,13 +119,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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Якість введеного вище тексту.\n"
 "Дані щодо критеріїв якості можна отримати у вашого адміністратора."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -133,7 +133,7 @@
 "Будь ласка, вкажіть ваш пінкод, щоб ключ можна було розблокувати для цього "
 "сеансу"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -141,76 +141,82 @@
 "Будь ласка, вкажіть ваш пароль, щоб ключ можна було розблокувати для цього "
 "сеансу"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "Пінкод:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "Пароль:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "паролі не збігаються, повторіть спробу"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase"
+msgid "Passphrases match."
+msgstr "Пароль"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (спроба %d з %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "Повторіть:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "Занадто довгий пінкод"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "Занадто довгий пароль"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "Некоректні символи у пінкоді"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "Занадто короткий пінкод"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "Помилковий пінкод"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "Помилковий пароль"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "помилка під час спроби отримання серійного номера картки: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "Будь ласка, повторіть введення пароля"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -221,52 +227,52 @@
 msgstr ""
 "Будь ласка, введіть пароль для захисту імпортованого об’єкта у системі GnuPG."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 "підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "не вдалося створити «%s»: %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не вдалося відкрити «%s»: %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "не виявлено відповідних ключів картки: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "помилка під час спроби отримання списку карток: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -275,20 +281,20 @@
 "Процесом ssh надіслано запит щодо використання ключа%%0A %s%%0A "
 "(%s)%%0AНадати доступ до цього ключа?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "Надати"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "Заборонити"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "Будь ласка, вкажіть пароль до ключа ssh%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -297,85 +303,81 @@
 "Будь ласка, вкажіть пароль для захисту отриманого закритого ключа%%0A %s"
 "%%0A %s%%0Aу сховищі ключів gpg-agent"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "не вдалося створити потік даних з сокета: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Будь ласка, вставте картку з серійним номером"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Адміністративний пінкод"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Код скидання"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AСкористайтеся додатковою клавіатурою зчитувача для введення."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Повторіть введення цього коду скидання"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Повторіть введення цього PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Повторіть введення цього пінкоду"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Помилка під час повторного введення коду скидання, повторіть спробу"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "Помилка під час повторного введення PUK, повторіть спробу"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "Помилка під час повторного введення пінкоду, повторіть спробу"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Будь ласка, введіть пінкод%s%s%s для розблокування картки"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "помилка під час запису до %s: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Вами не вказано пароля!%0AВикористання порожніх паролів заборонено."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -384,11 +386,11 @@
 "Вами не вказано пароля. Цього не варто робити!%0AБудь ласка, підтвердіть, що "
 "ваш ключ не слід захищати взагалі."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "Так, у захисті немає потреби"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -396,7 +398,7 @@
 msgstr1 "Пароль має складатися принаймні з %u символів."
 msgstr2 "Пароль має складатися принаймні з %u символів."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -405,237 +407,243 @@
 msgstr1 "У паролі має бути принаймні %u цифри або%%0Aспеціальних символи."
 msgstr2 "У паролі має бути принаймні %u цифр або%%0Aспеціальних символів."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Паролем не повинно бути слово зі словника або слово%%0A, що відповідає "
 "певному зразку."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Попередження: вами вказано нескладний пароль."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "Скористатися цим"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Вкажіть пароль до%0Aз метою захисту вашого нового ключа"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Параметри діагностики"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "запустити у режимі фонової служби (фоновий)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "запустити у режимі сервера (основному)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "не від’єднувати від консолі"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "виведення команд у форматі sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "виведення команд у форматі csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|прочитати параметри з вказаного файла"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "Параметри керування діагностичним виводом"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "докладний режим"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "дещо зменшити кількість повідомлень"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|записувати журнал режиму сервера до файла"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "Параметри керування налаштуваннями"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "не використовувати SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|використовувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|використовувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|приймати певні команди через NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ігнорувати запити щодо зміни TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ігнорувати запити щодо зміни графічного дисплея"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "увімкнути підтримку ssh"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|АЛГО|використати алгоритм АЛГО для показу відбитків ssh"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "увімкнути підтримку putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "увімкнути підтримку putty"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "Параметри керування захистом"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|вважати кешовані пінкоди за вказану кількість секунд"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|завершувати строк дії ключів SSH за N секунд"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|встановити максимальний строк дії кешу пінкодів у секундах"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|встановити максимальний строк дії ключа SSH у секундах"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "не використовувати кеш пін-кодів для підписування"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "заборонити використання зовнішнього кешу паролів"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "заборонити клієнтам позначати ключі як надійні"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "дозволити попереднє встановлення пароля"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "Параметри примусового використання правил паролів"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "не дозволяти обхід правил паролів"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|встановити вказану мінімальну довжину нових паролів"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|вимагати у нових паролях не менше вказаної кількості нелітер"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|перевіряти нові паролі за зразком з вказаного файла"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|завершувати строк дії паролів за вказану кількість днів"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "не дозволяти повторне використання старих паролів"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Параметри керування захистом"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "заборонити функції виклику перевизначати pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "не захоплювати керування клавіатурою і мишею"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|використовувати вказану програму пінзаписів"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|встановити вказаний час очікування Pinentry у секундах"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "дозволити запит пароля з Emacs"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "Використання: @GPG_AGENT@ параметри (-h — довідка)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -643,143 +651,143 @@
 "Синтаксис: @GPG_AGENT@ параметри команда аргументи\n"
 "Керування закритими ключами у @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "вказано некоректне значення рівня діагностики «%s»\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "прочитати параметри з «%s»\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "УВАГА: «%s» вважається застарілим параметром\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не вдалося створити сокет: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "назва сокета «%s» є надто довгою\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
 
-#: agent/gpg-agent.c:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "помилка під час спроби отримання поточного стану сокета\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не вдалося встановити права доступу до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "очікування даних на сокеті «%s»\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не вдалося створити каталог «%s»: %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "створено каталог «%s»\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "помилка stat() щодо «%s»: %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "не можна використовувати як домашній каталог «%s»\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 "помилка під час спроби читання поточного стану на файловому дескрипторі %d: "
 "%s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "запущено обробки 0x%lx для файлового дескриптора %d\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "помилка pth_select: %s — очікування у 1 с\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s зупинено\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "у цьому сеансі не запущено gpg-agent\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -787,12 +795,12 @@
 "@Параметри:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr ""
 "Використання: gpg-preset-passphrase параметри KEYGRIP (-h — довідка)\n"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -800,8 +808,8 @@
 "Синтаксис: gpg-preset-passphrase параметри KEYGRIP\n"
 "Керування кешем паролів\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -809,8 +817,8 @@
 "@Команди:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -820,11 +828,11 @@
 "Параметри:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "Використання: gpg-protect-tool параметри (-h — довідка)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -832,22 +840,22 @@
 "Синтаксис: gpg-protect-tool параметри аргументи\n"
 "Інструмент керування закритими ключами\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Будь ласка, вкажіть пароль для зняття захисту з об’єкта PKCS#12."
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Будь ласка, вкажіть пароль для захисту нового об’єкта PKCS#12."
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Будь ласка, введіть пароль для захисту імпортованого об’єкта у системі GnuPG."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -855,52 +863,54 @@
 "Будь ласка, вкажіть пароль або пінкод,\n"
 "потрібні для завершення цієї дії."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "скасовано\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "помилка під час спроби запиту пароля: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "помилка під час відкриття «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "файл «%s», рядок %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "проігноровано інструкцію «%s» у «%s», рядок %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "список довіри системи «%s» недоступний\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "помилковий відбиток у «%s», рядок %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "некоректна позначка ключа у «%s», рядок %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "помилка під час читання «%s», рядок %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "помилка під час читання списку надійних кореневих сертифікатів\n"
@@ -913,7 +923,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -922,11 +932,11 @@
 "Бажаєте встановити абсолютний рівень довіри до%%0A «%s»%%0Aз метою належної "
 "сертифікації сертифікатів користувача?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Так"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "Ні"
@@ -939,7 +949,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -951,21 +961,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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "Підтверджую"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "Не підтверджую"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Зауваження: цей пароль ще не змінювався.%0AБудь ласка, змініть його зараз."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -974,15 +984,29 @@
 "Цей пароль не змінювався%%0Aз %.4s-%.2s-%.2s. Будь ласка, змініть його "
 "зараз."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "Змінити пароль"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "Я зміню його пізніше"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "Будь ласка, вставте картку з серійним номером"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"Процесом ssh надіслано запит щодо використання ключа%%0A %s%%0A "
+"(%s)%%0AНадати доступ до цього ключа?"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -990,11 +1014,11 @@
 msgstr ""
 "Справді хочете вилучити ключ, що визначається keygrip%%0A %s%%0A %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "Вилучити ключ"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1008,8 +1032,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "Для DSA довжина хешу має бути кратною до 8 бітів\n"
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "Ключ %s використовує недостатньо міцний (%u-бітовий) хеш\n"
@@ -1019,7 +1043,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu-бітовий хеш не є коректним для %u-бітового ключа %s\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "невдала спроба перевірити створений підпис: %s\n"
@@ -1029,7 +1053,7 @@
 msgid "secret key parts are not available\n"
 msgstr "закриті частини ключа недоступні\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -1045,53 +1069,53 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "підтримки алгоритму захисту хешуванням %d (%s) не передбачено\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "помилка під час спроби створення каналу: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "помилка під час спроби створення потоку для каналу: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "помилка під час спроби розгалужування процесу: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr ""
 "помилка під час спроби виконання «%s»: ймовірно, програму не встановлено\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "помилка під час спроби виконання «%s»: стан виходу %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "помилка під час спроби виконання «%s»: виконання перервано\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "не вдалося дочекатися переривання процесу: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "помилка під час спроби отримання коду виходу процесу %d: %s\n"
@@ -1111,28 +1135,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "не вдалося вимкнути створення дампів образів у пам’яті: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Увага: визначення власника не є безпечним для %s — «%s»\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Увага: визначення прав доступу не є безпечним для %s — «%s»\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "очікуємо на отримання доступу до файла «%s»…\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "спроба перейменування «%s» на «%s» зазнала невдачі: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes|так"
 
@@ -1187,8 +1211,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "вихід за межі області під час спроби отримання %lu байтів"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "помилка під час спроби розподілу пам’яті: %s\n"
@@ -1203,80 +1227,80 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "невідомий прапорець діагностики «%s» проігноровано\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "очікування на працездатність dirmngr… (%d с)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "очікування на працездатність агента… (%d с)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "очікування на працездатність агента… (%d с)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "встановлено з’єднання з dirmngr\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the keyboxd established\n"
 msgstr "встановлено з’єднання з dirmngr\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the agent established\n"
 msgstr "встановлено з’єднання з dirmngr\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running Dirmngr - starting '%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "Dirmngr не запущено — запускаємо «%s»\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "connection to agent is in restricted mode\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "з’єднання з агентом відбувається у обмеженому режимі\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "помилка під час спроби отримання даних щодо версії з «%s»: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "сервер «%s» має версію, старішу за нашу (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "УВАГА: %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 "Зауваження: на застарілих серверах може не бути важливих виправлено "
 "захисту.\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Зауваження: скористайтеся командою «%s» для їхнього перезапуску.\n"
@@ -1349,7 +1373,7 @@
 msgstr "алгоритм: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "непідтримуваний алгоритм: %s"
@@ -1424,39 +1448,39 @@
 msgid "Root certificate trustworthy"
 msgstr "Кореневий сертифікат є гідним довіри"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "не знайдено списку відкликання для сертифіката"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "доступний список відкликання є занадто старим"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "перевірка сертифікатів за допомогою CRL/OCSP"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "Включені сертифікати"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "Немає записів журналу перевірки."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "Невідома дія"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent придатний до використання"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr придатна до використання"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "Довідки щодо «%s» не виявлено."
@@ -1465,11 +1489,11 @@
 msgid "ignoring garbage line"
 msgstr "ігноруємо беззмістовний рядок"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "немає"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "пропущено некоректний символ radix64 %02x\n"
@@ -1504,136 +1528,148 @@
 msgid "iconv_open failed: %s\n"
 msgstr "помилка iconv_open: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "помилка перетворення з «%s» у «%s»: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "не вдалося створити тимчасовий файл «%s»: %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "помилка під час спроби запису до «%s»: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "вилучення застарілого файла блокування (створено %d)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "очікування на блокування (зайнято %d%s) %s...\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(застаріле блокування?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "блокування «%s» не виконано: %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "очікування на блокування %s…\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "помилка створення «%s»: %s.\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "помилка під час спроби закрити «%s»: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "некоректний заголовок ASCII: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "заголовок ASCII: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "некоректний заголовок прозорого підпису\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "некоректний заголовок ASCII: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "вкладені підписи нешифрованим текстом\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "неочікуваний формат ASCII: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "некоректний екранований дефісами рядок: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "пропущено некоректний символ radix64 %02X\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "завчасний кінець файла (немає CRC)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "завчасний кінець файла (у CRC)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "помилкове форматування CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "помилка CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "завчасний кінець файла (у додатку)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "помилка у рядку доповнення\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "не виявлено коректних даних OpenPGP.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "некоректний формат ASCII: рядок є довшим за %d символів\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1641,12 +1677,12 @@
 "символи quoted printable у кодуванні ASCII — ймовірно, використано "
 "помилковий MTA\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " незручне для читання (%zu байтів: %s%s) "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1655,32 +1691,32 @@
 "назва примітки має складатися з друкованих символів або пробілів і "
 "завершуватися символом «=»\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "назва примітки користувача має містити символ «@»\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "назва примітки не повинна містити більше за один символ «@»\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "у значенні примітки не повинно міститися керівних символів\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "назва позначення не може містити символів «=»\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "назва примітки має складатися з друкованих символів або пробілів\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "УВАГА: виявлено некоректні дані примітки\n"
@@ -1694,8 +1730,8 @@
 msgid "Enter passphrase: "
 msgstr "Введіть пароль: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s не є сумісним із режимом %s\n"
@@ -1706,13 +1742,13 @@
 msgid "error from TPM: %s\n"
 msgstr "помилка читання з %s: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема з агентом: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "у цьому сеансі не запущено dirmngr\n"
@@ -1723,205 +1759,210 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "не можна використовувати %s у режимі %s\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "«%s» не є відбитком\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "«%s» не є відбитком\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "створити сертифікат відкликання"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Не вдалося отримати доступ до картки OpenPGP: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Виявлено картку OpenPGP з номером %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "це не можна робити у пакетному режимі\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Цією командою можна користуватися лише для карток версії 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Немає коду скидання або код скидання вже недоступний\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Ваш вибір? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "не встановлено"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "не увімкнено"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "увімкнено"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 "Помилка: у поточній версії можна використовувати лише звичайний ASCII.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Помилка: символ «<» не можна використовувати.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Помилка: не можна використовувати подвійні пробіли.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Прізвище власника картки: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Ім’я власника картки: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Помилка: складена назва є занадто довгою (максимум — %d символів).\n"
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "Адреса для отримання відкритого ключа: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "помилка під час спроби читання «%s»: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "помилка під час спроби читання «%s»: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Дані користувача (назва запису): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Особисті дані DO: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Основна мова: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Помилка: некоректна довжина рядка основної мови.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Помилка: некоректні символи у рядку основної мови.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Помилка: некоректна відповідь.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Відбиток CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Помилка: некоректне форматування відбитка.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "дія над ключем неможлива: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "не є карткою OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "помилка під час отримання даних поточного ключа: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "Замінити вже створений ключ? (y/N або т/Н) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1938,100 +1979,100 @@
 " ознайомтеся з документацією до вашої картки, щоб\n"
 " визначити дозволені розміри.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Якою має бути довжина ключа? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлено до %u бітів\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "Зміна атрибута ключа картки для: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "Ключ підписування\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "Ключ шифрування\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "Ключ розпізнавання\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Вкажіть потрібний вам тип ключа:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Некоректний вибір.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "помилка під час спроби змінити атрибут ключа %d: %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "помилка під час спроби отримання даних щодо картки: %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Цією карткою не передбачено підтримки вказаної команди\n"
 
-#: g10/card-util.c:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Створити резервну копію ключа шифрування поза карткою? (Y/n або Т/н) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Замірити вже створені ключі? (y/N або т/Н) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2042,186 +2083,191 @@
 " PIN = «%s» Адміністративний PIN = «%s»\n"
 "Вам слід змінити параметри за допомогою команди --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "Виберіть тип ключа, який слід створити:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) Ключ підписування\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) Ключ шифрування\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) Ключ розпізнавання\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "Виберіть сховище для зберігання ключа:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Помилка KEYTOCARD: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Зауваження: у результаті виконання цієї команди усі ключі на картці буде "
 "знищено!\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Продовжити? (y (так)/N (ні)) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 "Справді хочете скинути усе до типових налаштувань? (введіть «yes» («так»)) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "помилка налаштування KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "помилка налаштування KDF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "вийти з цього меню"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "показати керівні команди"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "показати цю довідкову інформацію"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "показати всі доступні дані"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "змінити ім’я власника картки"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "змінити адресу для отримання ключа"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "отримати ключ, вказаний у полі адреси картки"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "змінити ім’я користувача"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "змінити основну мову"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "змінити поле статі власника картки"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "змінити відбиток CA"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "увімкнути або вимкнути позначку примусового пінкоду підпису"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "створити ключі"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "меню зміни або розблокування пінкоду"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "перевірити пінкод і показати список всіх даних"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "розблокувати під коду за допомогою коду скидання"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "знищити усі ключі і дані"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "налаштування KDF для розпізнавання за PIN"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "змінити атрибут ключа"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "змінити рівень довіри до власника"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/картка> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "Команда адміністратора\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "Команди адміністрування дозволено\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "Команди адміністрування заборонено\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "Некоректна команда (скористайтеся командою «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output не працює з цією командою\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "не вдалося відкрити «%s»\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ «%s» не знайдено: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2279,9 +2325,9 @@
 msgid "subkey"
 msgstr "підключ"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "помилка оновлення: %s\n"
@@ -2307,82 +2353,77 @@
 msgstr ""
 "спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
+"параметрам отримувача\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "алгоритм шифрування «%s» не можна використовувати у режимі %s\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "алгоритм шифрування «%s» не можна використовувати у режимі %s\n"
+
+#: g10/encrypt.c:181 sm/encrypt.c:771
+#, c-format
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "УВАГА: ключ %s не можна використовувати для шифрування у режимі %s\n"
+
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "помилка під час спроби створення пароля: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "не можна використовувати симетричний пакет ESK через режим S2K\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "використано шифр %s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "«%s» вже стиснено\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "УВАГА: файл «%s» є порожнім\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "алгоритм шифрування «%s» не можна використовувати у режимі %s\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "алгоритм шифрування «%s» не можна використовувати у режимі %s\n"
-
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "алгоритм створення контрольних сум «%s» не можна використовувати у режимі "
 "%s\n"
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "читання з «%s»\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
-"параметрам отримувача\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, c-format
-msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "УВАГА: ключ %s не можна використовувати для шифрування у режимі %s\n"
-
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2391,20 +2432,13 @@
 "УВАГА: примусове використання алгоритму стиснення %s (%d) не відповідає "
 "параметрам отримувача\n"
 
-#: g10/encrypt.c:1071
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-"примусове використання симетричного шифру %s (%d) не відповідає параметрам "
-"отримувача\n"
-
-#: g10/encrypt.c:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для «%s»\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр «%s» не можна використовувати у режимі %s\n"
@@ -2420,7 +2454,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2432,410 +2466,416 @@
 msgid "problem handling encrypted packet\n"
 msgstr "проблема з обробкою зашифрованого пакета\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "експортувати підписи, які позначено як придатні лише для локального "
 "використання"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 "експортувати ідентифікатори користувача атрибута (типово фотоідентифікатори)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "експортувати ключі відкликання, позначені як «важливі»"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "вилучити невикористовувані частини ключа під час експортування"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "вилучити максимум частин з ключа під час експортування"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "створити сертифікат відкликання"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "використовувати формат резервних копій ключів GnuPG"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "експортування закритих ключів заборонено\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - пропущено"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "записуємо до «%s»\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "експортування закритих ключів заборонено\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: ключ у стилі PGP 2.x — пропущено\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "УВАГА: нічого не експортовано\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "помилка створення «%s»: %s.\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "Ідентифікатор не знайдено"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "автоматично отримано «%s» за допомогою %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "помилка під час спроби отримання «%s» за допомогою %s: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "Без відбитка"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "закритий ключ «%s» не знайдено: %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(перевірте аргумент параметра «%s»)\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Попередження: «%s» не використовується як типовий ключ: %s\n"
 
-#: g10/getkey.c:2098
+#: g10/getkey.c:2107
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "використовуємо «%s» як типовий закритий ключ для підписування\n"
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "усі значення, передані «%s», проігноровано\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
 "uid\n"
 
-#: g10/getkey.c:3830
+#: g10/getkey.c:3868
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "використовуємо підключ %s замість основного ключа %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "коректні значення параметра «%s»:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "створити підпис"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "створити текстовий підпис"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "створити від’єднаний підпис"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "зашифрувати дані"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "шифрувати лише за допомогою симетричного шифру"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "розшифрувати дані (типова дія)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "перевірити підпис"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "показати список ключів"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "показати список ключів і підписів"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "показати список і перевірити підписи ключів"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "показати список ключів і відбитків"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "показати список закритих ключів"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "створити пару ключів"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "швидке створення пари ключів"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "швидке додавання нового ідентифікатора користувача"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "швидке відкликання ідентифікатора користувача"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "швидке встановлення нової дати завершення строку дії"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "повноцінне створення пари ключів"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "створити сертифікат відкликання"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "вилучити ключі з відкритого сховища ключів"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "вилучити ключів з закритого сховища ключів"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "швидко підписати ключ"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "швидко підписати ключ локально"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "швидке відкликання ідентифікатора користувача"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "підписати ключ"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "підписати ключ локально"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "підписати або редагувати ключ"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "змінити пароль"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "експортувати ключі"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "експортувати ключі на сервер ключів"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "імпортувати ключі з сервера ключів"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "шукати ключі на сервері ключів"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "оновити всі ключів з сервера ключів"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "імпортувати/об’єднати ключі"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "показати дані про стан картки"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "змінити дані на картці"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "змінити пінкод картки"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "оновити базу даних довіри"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "показати контрольні суми повідомлень"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "запустити у режимі сервера"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|встановити вказане правило TOFU для ключа"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|використовувати вказаний типовий закритий ключ"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|шифрувати також до вказаного ідентифікатора користувача"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|встановити замінники адреси електронної пошти"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "строго використовувати стандарт OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "не вносити змін"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "запитувати перед перезаписом"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Параметри керування захистом"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Параметри керування діагностичним виводом"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "створити дані у форматі ASCII"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|записати дані до вказаного файла"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "використовувати канонічний текстовий режим"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Параметри керування інтерактивністю та примусом"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMS|використовувати вказаний механізм для пошуку ключів за адресою"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "імпортувати ключі з сервера ключів"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "показати список і перевірити підписи ключів"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "заборонити доступ до dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Параметри керування налаштуваннями"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "показати список закритих ключів"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|USER-ID|використовувати для створення підписів або розшифрування вказаний "
 "ідентифікатор"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2844,7 +2884,7 @@
 "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
 "довідника (man))\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2865,11 +2905,11 @@
 " --list-keys назви показати ключі\n"
 " --fingerprint назви показати відбитки\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "Використання: @GPG@ параметри файли (-h — довідка)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2879,7 +2919,7 @@
 "Підписування, перевірка підписів, шифрування або розшифрування\n"
 "Типова дія залежатиме від вхідних даних\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2887,77 +2927,77 @@
 "\n"
 "Підтримувані алгоритми:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "Відкритий ключ: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Шифр: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "Хеш: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Стиснення: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "користування: %s параметри %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "несумісні команди\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "у визначенні групи «%s» немає знаку «=»\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2965,21 +3005,21 @@
 "УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
 "«%s» не є безпечним\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2987,490 +3027,484 @@
 "УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "невідомий пункт налаштувань «%s»\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "показувати фотоідентифікатори у списках ключів"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "показувати дані щодо використання ключа у списках ключів"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "показувати адреси правил у списках підписів"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "показувати всі примітки у списках підписів"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "показувати стандартні примітки IETF у списках підписів"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "показувати примітки користувача у списках підписів"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показувати адреси основних серверів ключів у списках підписів"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показувати відкликані та застарілі ідентифікатори користувачів у списках "
 "ключів"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показувати відкликані та застарілі підключі у списках ключів"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "показувати дати завершення строків дії у списку підписів"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "показувати назву сховища ключів у списках ключів"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершення строків дії у списку підписів"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "список переваг (експертний)"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "невідомі правила TOFU «%s»\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(команда «help» виводить список можливих варіантів)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Цією командою не можна користуватися у режимі %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» не є коректною адресою електронної пошти\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "некоректний режим pinentry, «%s»\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "некоректне походження запиту «%s»\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» не є коректним набором символів\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не вдалося обробити адресу сервера ключів\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: некоректні параметри сервера ключів\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "некоректні параметри сервера ключів\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: некоректні параметри імпортування\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "некоректні параметри імпортування\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "некоректний параметр фільтрування: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: некоректні параметри експортування\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "некоректні параметри експортування\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: некоректні параметри побудови списку\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "некоректні параметри побудови списку\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "показувати фотоідентифікатори під час перевірки підписів"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "показувати адреси правил під час перевірки підписів"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "показувати всі примітки під час перевірки підписів"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "показувати стандартні примітки IETF під час перевірки підписів"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "показувати вказані користувачем примітки під час перевірки підписів"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "показувати адреси основних серверів ключів у списках перевірки підписів"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показувати чинність ідентифікаторів користувача під час перевірки підписів"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показувати відкликані та застарілі ідентифікатори користувачів у списках "
 "перевірки підписів"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показувати лише основний ідентифікатор користувача під час перевірки підписів"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не вдалося встановити шлях для запуску у значення %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: некоректний список auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "некоректний список auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "некоректний аргумент параметра «%.50s»\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "УВАГА: %s перевизначає %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не можна використовувати разом з %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s є зайвим, якщо використано %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "УВАГА: запущено з фіктивним системним часом: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "вибраний алгоритм шифрування є некоректним\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "вибраний алгоритм стискання є некоректним\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "значення completes-needed має бути більшим за 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "значення marginals-needed має перевищувати 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
 "S2K (0)\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:4016
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "некоректні типові параметри\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "некоректні особисті параметри шифрування\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "некоректні особисті параметри шифрування\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "некоректні особисті параметри контрольної суми\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "некоректні особисті параметри стискання\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ще не може працювати разом з %s\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "алгоритм шифрування «%s» не можна використовувати у режимі %s\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм стискання «%s» не можна використовувати у режимі %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
 "ключем\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
 "mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "помилка під час спроби експортування ключа: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "помилка пошуку на сервері ключів: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "помилка оновлення з сервера ключів: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "помилка перетворення з формату ASCII: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "помилка перетворення у формат ASCII: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "некоректний алгоритм хешування «%s»\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr "УВАГА: команд не надано. Намагаємося вгадати, що вам потрібно...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Почніть вводити ваше повідомлення...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "вказана адреса правил сертифікації є некоректною\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "вказана адреса правил підписування є некоректною\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "вказана адреса основного сервера ключів є некоректною\n"
@@ -3483,7 +3517,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|записувати до дескриптора файла дані щодо стану"
 
@@ -3512,157 +3546,157 @@
 msgid "No help available for '%s'"
 msgstr "Довідки щодо %s не виявлено"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "імпортувати підписи, позначені як лише локальні"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "відновлювати пошкодження сервером ключів pks під час імпортування"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "не вилучати значень власної довіри під час імпортування"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "не оновлювати базу даних довіри після імпортування"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "enable putty support"
 msgid "enable bulk import mode"
 msgstr "увімкнути підтримку putty"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "показувати ключ під час імпортування"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key during import"
 msgid "show key but do not actually import"
 msgstr "показувати ключ під час імпортування"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "приймати оновлення лише вже створених ключів"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "вилучити невикористані частини ключа після імпортування"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "вилучити максимум частин з ключа після імпортування"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "запустити фільтри імпортування та експортувати ключ негайно"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "припускати формат резервних копій ключів GnuPG"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "відновлювати ключі при імпортуванні"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропускаємо блок типу %d\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "оброблено %lu ключів\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Загалом оброблено: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " пропущено ключів PGP-2: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr "пропущено нових ключів: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " без ід. користувача: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " імпортовано: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " без змін: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr "нових ід. користувачів: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " нових підключів: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " нових підписів: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr "відкликань нових ключів: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr "прочитано закритих ключів: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr "імпортовано закр. ключів: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " закр. ключів без змін: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " не імпортовано: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " вилучених підписів: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " вилучених ід. корист.: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3671,179 +3705,184 @@
 "УВАГА: у ключі %s містяться записи надання переваги\n"
 "недоступним алгоритмам для таких ід. користувачів:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " «%s»: перевага алгоритму шифрування %s\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " «%s»: перевага алгоритму шифрування %s\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " «%s»: перевага алгоритму контрольних сум %s\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " «%s»: перевага алгоритму стискання %s\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "наполегливо рекомендуємо вам оновити записи переваг і\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "повторно поширити цей ключ, щоб уникнути потенційних проблем з алгоритмами\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: немає ідентифікатор користувача\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "ключ %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "відкинуто екранувальником імпорту"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: прийнято несамопідписаний ідентифікатор користувача «%s»\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: немає чинних ідентифікаторів користувача\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиною цього може бути те, що немає самопідпису\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новий ключ — пропущено\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "не виявлено придатного до запису сховища ключів: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не відповідає нашій копії\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: «%s» %d нових ідентифікаторів користувачів\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: «%s» 1 новий підпис\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: «%s» %d нових підписів\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: «%s» 1 новий підключ\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: «%s» %d нових підключів\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: «%s» вилучено %d підпис\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: «%s» вилучено %d підписів\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: «%s» спорожнено %d ідентифікатор користувача\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: «%s» спорожнено %d ідентифікаторів користувачів\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: «%s» не змінено\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: імпортовано закритий ключ\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "ключ %s: закритий ключ вже існує\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3852,204 +3891,204 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 "Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: "
 "%s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "закритий ключ %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "імпортування закритих ключів заборонено\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Причину не вказано"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Ключ замінено"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Ключ скомпрометовано"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Ключ більше не використовується"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Ідентифікатор користувача втратив чинність"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "причина відкликання: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "коментар щодо відкликання: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
 "відкликання\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
 "ідентифікатора користувача «%s»\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: немає підключа для зв’язування ключів\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: некоректне зв’язування підключів\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: немає підключа для відкликання ключа\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: некоректне відкликання підключа\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: вилучено кратне відкликання підключа\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущено підключ\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: додано безпосередній підпис ключа\n"
@@ -4059,14 +4098,14 @@
 msgid "error allocating memory: %s\n"
 msgstr "помилка під час спроби отримання області пам’яті: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr ""
 "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
 "відкритого ключа (%d): %s.\n"
 
-#: g10/key-check.c:405
+#: g10/key-check.c:406
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@ -4074,16 +4113,16 @@
 "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
 "контрольної суми %d: %s.\n"
 
-#: g10/key-check.c:571
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr " (нижче наведено перевпорядковані підписи)"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "ключ %s:\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
@@ -4091,7 +4130,7 @@
 msgstr1 "вилучено %d дублікати підписів\n"
 msgstr2 "вилучено %d дублікатів підписів\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
@@ -4099,7 +4138,7 @@
 msgstr1 "%d підписи не перевірено через те, що немає ключа\n"
 msgstr2 "%d підписів не перевірено через те, що немає ключа\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
@@ -4107,7 +4146,7 @@
 msgstr1 "%d помилкових підписи\n"
 msgstr2 "%d помилкових підписів\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
@@ -4115,7 +4154,7 @@
 msgstr1 "перевпорядковано %d підписи\n"
 msgstr2 "перевпорядковано %d підписів\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
@@ -4124,45 +4163,45 @@
 "Попередження: виявлено помилки, перевірка виконувалася лише для "
 "самопідписування, віддайте команду «%s», щоб перевірити усі підписи.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "створено сховище ключів «%s»\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "створено сховище ключів «%s»\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "ресурс блоку ключів «%s»: %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "відкликання"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "самопідпис"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4173,17 +4212,17 @@
 "ключів інших\n"
 "користувачів (за паспортами, відбитками з інших джерел тощо)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Я довіряю не повністю\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Я довіряю повністю\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4193,52 +4232,52 @@
 "Глибина, більша за 1, дозволяє ключу, який ви підписуєте, створювати\n"
 "надійні підписи від вашого імені.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Будь ласка, вкажіть домен обмеження цього підпису або натисніть Enter, якщо "
 "такого домену немає.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Пропускаємо ідентифікатор користувача «%s», який не є текстовим.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Ідентифікатор користувача «%s» відкликано."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ви певні, що все ще бажаєте підписати його? (y/N або т/Н) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " Неможливо підписати.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Строк дії ідентифікатор користувача «%s» сплив."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Ідентифікатор користувача «%s» не є самопідписаним."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "Ідентифікатор користувача «%s» можна підписувати. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "Підписати його? (y/N або т/Н) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4247,12 +4286,12 @@
 "Самопідпис «%s»\n"
 "є підписом у форматі PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Бажаєте розширити сферу використання до самопідпису OpenPGP? (y/N або т/Н) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4261,11 +4300,11 @@
 "Строк дії вашого поточного підпису «%s»\n"
 "завершено.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Бажаєте видати новий підпис для заміни застарілого? (y/N або т/Н) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4274,45 +4313,45 @@
 "Ваш поточний підпис «%s»\n"
 "є локальним підписом.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Бажаєте розширити сферу використання до повністю експортованого підпису? (y/"
 "N або т/Н) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» вже було локально підписано ключем %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» вже було підписано ключем %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Бажаєте підписати його попри все? (y/N або т/Н) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нічого підписувати ключем %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "Строк дії цього ключа вичерпано!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Строк дії цього ключа завершиться %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Бажаєте, щоб строк дії вашого підпису був таким самим? (Y/n або Т/н) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4323,269 +4362,280 @@
 "справді належить особі, ім’я якої вказано вище? Якщо ви не знаєте відповіді, "
 "введіть «0».\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) Не буду відповідати.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) Мною не виконувалося ніяких перевірок.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) Мною виконано часткову перевірку.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) Мною виконано ретельну перевірку.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Ваш вибір? (введіть «?», щоб дізнатися більше): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Ви справді бажаєте підписати цей ключ вашим ключем «%s» (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "Це буде самопідпис.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "УВАГА: підпис не буде позначено як непридатний до експортування.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "УВАГА: підпис не буде позначено як непридатний до відкликання.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Підпис буде позначено як непридатний до експортування.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Підпис буде позначено як непридатний до відкликання.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "Цей ключ не перевірявся мною.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "Цей ключ перевірено мною частково.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "Цей ключ ретельно перевірено мною.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "Підписати? (y/N або т/Н) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "помилка під час спроби підписування: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "До ключа включено лише типовий заповнювач або записи ключа з картки — ніяких "
 "паролів не потрібно змінювати.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "ключ %s: помилка під час спроби зміни пароля: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "зберегти і вийти"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "показати відбиток ключа"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "показати keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "показати список ключів та ідентифікаторів користувача"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "вибрати вказаний ідентифікатор користувача"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "вибрати вказаний підключ"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "перевірити підписи"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr ""
 "підписати вибрані ідентифікатори користувачів * нижче наведено відповідні "
 "команди"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "підписати вибрані ідентифікатори користувача локально"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "підписати вибрані ідентифікатори користувача підписом надійності"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "підписати вибрані ідентифікатори користувача підписом, який не можна "
 "відкликати"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "додати ідентифікатор користувача"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "додати фотоідентифікатор"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "вилучити вибрані ідентифікатори користувача"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "додати підключ"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "додати ключ на картку пам’яті"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "пересунути ключ на картку пам’яті"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "пересунути резервний ключ на картку пам’яті"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "вилучити вибрані підключі"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "додати ключ відкликання"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "Дані розшифровано"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "вилучити підписи з вибраних ідентифікаторів користувача"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "змінити дату завершення строку дії ключа або вибраних ключів"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "позначити вибраний ідентифікатор користувача як основний"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "список переваг (експертний)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "список переваг (докладний)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "встановити список параметрів для вибраних ідентифікаторів користувачів"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "встановити адресу основного сервера ключів для вибраних ідентифікаторів "
 "користувачів"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "встановити примітку для вибраного ідентифікатора користувача"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "змінити пароль"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "змінити рівень довіри до власника"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "відкликати підписи для вибраних ідентифікаторів користувачів"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "відкликати вибрані ідентифікатори користувачів"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "відкликати ключ або вибрані підключі"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "увімкнути ключ"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "вимкнути ключ"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "показати вибрані фотоідентифікатори"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
 "невикористані підписи з ключа"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
 "всі підписи з ключа"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "Доступний закритий ключ.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "Доступні закриті підключі.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "Для цього потрібен закритий ключ.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4596,291 +4646,282 @@
 " «t» для надійних підписів (tsign), «nr» для підписів без відкликання\n"
 " (nrsign) або будь-яку комбінацію (ltsign, tnrsign тощо).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "Ключ відкликано."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Підписати всі текстові ідентифікатори користувача? (y/N або т/Н) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Підказка: виберіть ідентифікатори користувача для підписування\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Невідомий тип підпису «%s»\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "Вам слід вибрати принаймні один ідентифікатор користувача.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Скористайтеся командою «%s».)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вилучити всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вилучити цей ідентифікатор користувача? (y/N або т/Н) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "Вилучити основний ключ? (y/N або т/Н) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "Вам слід вибрати лише один ключ.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "Для команди слід вказати аргумент з назвою файла\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Не вдалося відкрити «%s»: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Помилка читання резервного ключа з «%s»: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "Вам слід вибрати принаймні один ключ.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Справді бажаєте вилучити цей ключ? (y/N або т/Н) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Відкликати всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Відкликати цей ідентифікатор користувача? (y/N або т/Н) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Ви справді бажаєте відкликати весь ключ? (y/N або т/Н) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Ви справді бажаєте відкликати позначені підключі? (y/N або т/Н) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Ви справді бажаєте відкликати цей підключ? (y/N або т/Н) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Не можна встановлювати довіру до власника, якщо використовується вказана "
 "користувачем база даних довіри\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "Встановити список переваг:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Оновити переваги для вибраних ідентифікаторів користувачів? (y/N або т/Н) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "Оновити параметри? (y/N або т/Н) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "Зберегти зміни? (y/N або т/Н) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "Вийти без збереження? (y/N або т/Н) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "помилка під час спроби вилучення закритого %s: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "помилка перевірки списку довіри: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "помилка перевірки списку довіри: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» не є відбитком\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» не є основним відбитком\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Некоректний ідентифікатор користувача «%s»: %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "Немає відповідних ідентифікаторів користувачів."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "Нічого підписувати.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Не підписано вами.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "невдала спроба перевірити створений підпис: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» не є коректним записом завершення строку дії\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» не є належним відбитком\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "не знайдено підключ «%s»\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "Контрольна сума: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "Можливості: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "Сервер ключів без можливості зміни"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Основний сервер ключів: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "Примітки: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Переваг для ідентифікаторів користувачів у форматі PGP 2.x не передбачено.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3849
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Цей ключ може бути відкликано %s ключем %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(важливий)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "створено: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "відкликано: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "не діє з: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "діє до: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "використання: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "номер картки: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "надійність: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "чинність: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "Цей ключ було вимкнено"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4888,17 +4929,17 @@
 "Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
 "до перезапуску програми.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "відкликано"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "збіг строк дії"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4909,17 +4950,23 @@
 " цієї команди можна зробити основним інший ідентифікатор "
 "користувача.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4929,37 +4976,37 @@
 "до відмови\n"
 " у використанні цього ключа деякими версіями PGP.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ви справді бажаєте додати його? (y/N або т/Н) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
 
-#: g10/keyedit.c:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Вилучити цей дійсний підпис? (y/N/q або т/Н/в)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Вилучити цей некоректний підпис? (y/N/q або т/Н/в)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Вилучити цей невідомий підпис? (y/N/q або т/Н/в)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4967,20 +5014,20 @@
 msgstr1 "Вилучено %d підписи.\n"
 msgstr2 "Вилучено %d підписів.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "Нічого не вилучено.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "некоректний"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4988,17 +5035,17 @@
 msgstr1 "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
 msgstr2 "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Ідентифікатор користувача «%s»: вже мінімізовано\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Ідентифікатор користувача «%s»: вже очищено\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -5008,42 +5055,58 @@
 "призвести до відмови\n"
 " у використанні цього ключа деякими версіями PGP.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Не можна додавати підписане відкликання до ключа у форматі PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Вкажіть ідентифікатор користувача підписаного відкликання: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "не можна призначати ключ у форматі PGP 2.x підписаним відкликанням\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4713
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "не можна призначати ключ власним підписаним відкликанням\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4735
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "цей ключ вже було позначено як призначений для відкликання\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "УВАГА: призначення ключа як підписаного відкликання не можна скасовувати!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
 "Н) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(якщо ключ не задано відбитком)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "Підключ %s вже відкликано.\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5051,243 +5114,243 @@
 "Ви справді хочете змінити час вичерпання строку дії для декількох підключів? "
 "(y/N або т/Н) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Зміна часу завершення строку дії для підключа.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Зміна часу завершення строку дії для основного ключа.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "Змінюємо використання підключа.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "Змінюємо використання основного підключа.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "підписування підключа %s вже перехресно сертифіковано\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "підключ %s не призначено для підписування, отже його не потрібно перехресно "
 "сертифікувати\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "Будь ласка, виберіть лише один ідентифікатор користувача.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропускаємо самопідпис v3 для ідентифікатора користувача «%s»\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "Вкажіть адресу вашого основного сервера ключів: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ви справді бажаєте замінити його? (y/N або т/Н) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ви справді бажаєте вилучити його? (y/N або т/Н) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "Вкажіть примітку: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "Продовжувати? (y/N або т/Н) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ідентифікатора користувача з індексом %d не існує\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ідентифікатора користувача з хешем %s не існує\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Піключа із ідентифікатором ключа «%s» не існує.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Підключа з індексом %d не існує\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Ідентифікатор користувача: «%s»\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "підписано вашим ключем %s %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (неекспортовний)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Строк дії цього підпису завершується %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ви справді бажаєте відкликати його? (y/N або т/Н) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Створити сертифікат відкликання для цього підпису? (y/N або т/Н) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вами підписано ці ідентифікатори користувачів у ключі %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (невідкликуваний)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "відкликано вашим ключем %s у %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "Ви маєте намір відкликати ці підписи:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Справді створити сертифікати відкликання? (y/N або т/Н) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "немає закритого ключа\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "спроба відкликати ідентифікатор, який не належить користувачеві: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ідентифікатор користувача «%s» вже відкликано\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "УВАГА: підпис ідентифікатора користувача позначено датою на %d секунд у "
 "майбутньому\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Підключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "некоректне значення параметра «%s»\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "запис переваги «%s» продубльовано\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "занадто багато записів переваг шифрів\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "занадто багато записів переваг контрольних сум\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "занадто багато записів переваг стискання\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "занадто багато записів переваг шифрів\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "некоректний запис «%s» у рядку переваг\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "записування безпосереднього підпису\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "записування самопідпису\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "записування підпису прив’язування ключа\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "розмір ключа округлено до %u-бітового\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5295,19 +5358,19 @@
 "УВАГА: деякі з програм OpenPGP не можуть працювати з ключем DSA з таким "
 "розміром контрольної суми\n"
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "Підписати"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "Сертифікувати"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "Зашифрувати"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "Пройти розпізнавання"
 
@@ -5321,181 +5384,181 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Можливі дії з ключем %s: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "Поточні дозволені дії: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) увімкнути або вимкнути можливість підписування\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) увімкнути або вимкнути можливість шифрування\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr ""
 " (%c) увімкнути або вимкнути можливість використання для розпізнавання\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) вийти\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA і RSA (типовий)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA і Elgamal\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (лише підписування)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (лише підписування)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (лише шифрування)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (лише шифрування)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (із визначенням можливостей власноруч)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (із визначенням можливостей власноруч)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) sign, encrypt\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) підписування, шифрування\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (лише підписування)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) ECC (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (із визначенням можливостей власноруч)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) ECC (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (лише шифрування)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) Вже записаний ключ\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) Вже записаний ключ з картки\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Вкажіть keygrip: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Некоректний keygrip (мало бути вказано 40 шістнадцяткових цифр)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Немає ключів з таким значенням keygrip\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "помилка читання картки: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Серійний номер картки: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Доступні ключі:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "округлено до %u бітів\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Якою має бути довжина підключа? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запитана довжина ключа — %u бітів\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Вкажіть потрібну вам еліптичну криву:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5511,7 +5574,7 @@
 " <n>m = строк чинності у n місяців\n"
 " <n>y = строк чинності у n років\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5527,38 +5590,38 @@
 " <n>m = строк чинності підпису у n місяців\n"
 " <n>y = строк чинності підпису у n років\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "Яким є строк чинності ключа? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Яким є строк чинності підпису? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "некоректне значення\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "Ключ не має обмеження строку дії\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "Підпис не має обмеження строку дії\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ діє до %s\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Підпис діє до %s\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5566,11 +5629,11 @@
 "У вашій системі неможливий показ дат після 2038 року.\n"
 "Але програма коректно оброблятиме ці дати до 2106 року.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "Все правильно? (y/N або т/Н) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5585,7 +5648,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5602,41 +5665,41 @@
 " \"Ivan Ivanenko (farmer) <iivanenko@moyahata.ua>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "Справжнє ім’я: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "Некоректний символ у імені\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Не можна використовувати символи «%s» і «%s» у назві\n"
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "Адреса ел. пошти: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "Некоректна адреса електронної пошти\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "Коментар: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "Некоректний символ у коментарі\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Вами використано таблицю символів «%s».\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5647,13 +5710,13 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
 "імені або коментаря\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
 
@@ -5668,32 +5731,32 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
 
-#: g10/keygen.c:3130
+#: g10/keygen.c:3114
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
 
-#: g10/keygen.c:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "Спочатку виправте помилку\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5705,18 +5768,18 @@
 "під час створення простого числа. Це надасть змогу генератору\n"
 "псевдовипадкових чисел створити краще випадкове число.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Помилка під час спроби створення ключа: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5727,66 +5790,66 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "Продовжити? (Y (так)/n (ні)) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ключ для «%s» вже існує\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "Створити попри це? (y (так)/N (ні)) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "створюємо попри усе\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
 "створення ключа.\n"
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Створення ключа скасовано.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "записуємо відкритий ключ до «%s»\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "відкритий і закритий ключі створено і підписано.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5794,7 +5857,7 @@
 "Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
 "скористатися командою «--edit-key» для створення підключа з цією метою.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5802,7 +5865,7 @@
 "ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
 "проблема з годинником)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5810,22 +5873,22 @@
 "ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
 "або проблема з годинником)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Закриті частини основного ключа недоступні.\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Закриті частини основного ключа зберігаються на картці.\n"
 
-#: g10/keygen.c:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "Створити? (y/N або т/Н) "
 
@@ -5833,27 +5896,43 @@
 msgid "never "
 msgstr "ніколи "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "Контрольна сума: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "Можливості: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "Сервер ключів без можливості зміни"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "Критичні правила підпису: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "Правила підпису: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "Критичний основний сервер ключів: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "Критична примітка підпису: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "Примітка підпису: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
@@ -5861,7 +5940,7 @@
 msgstr1 "%d добрих підписи\n"
 msgstr2 "%d добрих підписів\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
@@ -5869,7 +5948,7 @@
 msgstr1 "%d підписи не перевірено через помилку\n"
 msgstr2 "%d підписів не перевірено через помилку\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
@@ -5879,33 +5958,33 @@
 msgstr2 ""
 "Попередження: %lu ключів пропущено через їхній надто великий розмір\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Сховище ключів"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "Основний відбиток ключа:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr "Відбиток основного ключа:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " Відбиток підключа:"
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " Відбиток ключа ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr "Серійний номер картки ="
 
@@ -5985,7 +6064,7 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» не є ідентифікатором ключа: пропускаємо\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5993,87 +6072,87 @@
 msgstr1 "оновлюємо %d ключі з %s\n"
 msgstr2 "оновлюємо %d ключів з %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "УВАГА: не вдалося оновити ключ %s за допомогою %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ «%s» не знайдено на сервері ключів\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "ключ не знайдено на сервері ключів\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "надсилаємо запит щодо ключа %s з %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "немає відомих серверів ключів\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено «%s»: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "надсилаємо ключ %s на %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "надсилаємо запит щодо ключа з «%s»\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "УВАГА: не вдалося отримати адресу %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "дивний розмір для зашифрованого ключа сеансу (%d)\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "зашифрований %s ключ сеансу\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "Дані, зашифровані за алгоритмом %s\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr ""
 "пароль створено за допомогою невідомого алгоритму створення контрольних сум "
 "%d\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "відкритий ключ — %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
@@ -6081,238 +6160,244 @@
 "зашифровано за допомогою %u-бітового %s ключа, ідентифікатор %s, створено "
 "%s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " «%s»\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключем %s, ідентифікатор %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "УВАГА: виявлено декілька фрагментів нешифрованого тексту\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано за допомогою %lu паролів\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано за допомогою 1 пароля\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "невдала спроба розшифровування відкритим ключем: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "зашифровані відкритим ключем дані: належний DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "припускаємо, що дані зашифровано %s\n"
 
-#: g10/mainproc.c:660
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Шифр IDEA недоступний, спробуємо скористатися замість нього %s\n"
 
-#: g10/mainproc.c:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "УВАГА: цілісність повідомлення не захищено\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "невдала спроба розшифрування: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "розшифровано\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "УВАГА: зашифроване повідомлення було змінено!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "невдала спроба розшифрування: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАУВАЖЕННЯ: вимога відправника: «лише для Вас»\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "початкова назва файла=«%.*s»\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "окреме відкликання — скористайтеся командою «gpg --import» для застосування\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "підпису не знайдено\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПОМИЛКОВИЙ підпис від «%s»"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Прострочений підпис від «%s»"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Належний підпис від «%s»"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "перевірку підписів придушено\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Підпис створено %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " за допомогою %s ключа %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " видавець «%s»\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ доступний на: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "непевний"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " або «%s»"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "УВАГА: цей ключ не можна використовувати для підписування у режимі %s\n"
 
-#: g10/mainproc.c:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Строк дії підпису вичерпано %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Підпис діє до %s\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "двійковий"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "текстовий"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "невідомо"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не вдалося перевірити підпис: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не є від’єднаним підписом\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
 msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "окремий підпис класу 0x%02x\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "підпис у застарілому форматі (PGP 2.x)\n"
@@ -6419,28 +6504,28 @@
 msgid "uncompressed|none"
 msgstr "uncompressed|немає"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "використання цього повідомлення щодо %s може бути неможливим\n"
 
-#: g10/misc.c:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "неоднозначний параметр «%s»\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "невідомий параметр «%s»\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "невідома слабка контрольна сума «%s»\n"
@@ -6496,7 +6581,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "підпакет типу %d містить критичний набір бітів\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6561,7 +6646,7 @@
 "створено %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6576,71 +6661,71 @@
 "дуже велике зображення, ваш ключ також стане дуже великим!\n"
 "Варто дотримуватися розмірів, близьких до 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Вкажіть назву файла JPEG для фотоідентифікатора: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "не вдалося відкрити файл JPEG «%s»: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Цей файл JPEG є дуже великим (%d байтів)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Вам справді хочеться ним скористатися? (y/N або т/Н) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "«%s» не є файлом JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Це потрібна вам фотографія (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "виконання віддалених програм не передбачено\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "на цій платформі слід використовувати тимчасові файли під час виклику "
 "зовнішніх програм\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "не вдалося виконати оболонку «%s»: %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "неприродний вихід з зовнішньої програми\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "системна помилка під час спроби виклику зовнішньої програми: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "УВАГА: не вдалося вилучити тимчасовий файл (%s) «%s»: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "УВАГА: не вдалося вилучити тимчасовий каталог «%s»: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6648,7 +6733,7 @@
 "виклик зовнішніх програм вимкнено через невідповідність прав доступу до "
 "файла параметрами безпеки\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "показ фотоідентифікатора неможливий!\n"
@@ -6732,36 +6817,36 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Сертифікати, що призводять до необмеженої довіри до ключа:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: немає певності щодо належності цього ключа користувачеві з вказаним "
 "іменем\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: є певні свідчення належності цього ключа користувачеві з вказаним "
 "іменем\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "Ймовірно, цей ключ належить користувачеві з вказаним іменем\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "Цей ключ належить нам\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s: цей ключ є помилковим! Його позначено як не вартий довіри!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6771,7 +6856,7 @@
 "ви попри це впевнені у наслідках своїх дій, вам слід відповісти\n"
 "на наступне питання «так».\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6782,102 +6867,102 @@
 "відомі наслідки ваших дій, можете ствердно відповісти\n"
 "на наступне питання.\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "Попри все використовувати цей ключ? (y/N або т/Н) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "УВАГА: використовуємо ненадійний ключ!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "УВАГА: цей ключ могло бути відкликано (немає ключа відкликання)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "Ідентифікатор користувача: «%s»\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "вказано параметр «%s», але не вказано параметр «%s»\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "ключ %s: не відповідає нашій копії\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "option '%s' given, but option '%s' not given\n"
 msgid "option %s given but no matching User ID found\n"
 msgstr "вказано параметр «%s», але не вказано параметр «%s»\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "УВАГА: цей ключ було відкликано відповідною особою!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "УВАГА: цей ключ було відкликано власником!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " Це може означати, що підпис було підроблено.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "УВАГА: цей підключ було відкликано його власником!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "Зауваження: цей ключ було вимкнено.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "Зауваження: строк дії цього ключа вичерпано!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "УВАГА: цей ключ не сертифіковано за допомогою надійного підпису!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "УВАГА: цей ключ не сертифіковано за допомогою надійного підпису!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " Немає підтверджень належності підпису його власнику.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "УВАГА: ми НЕ довіряємо цьому ключу!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " Підпис, ймовірно, є ПІДРОБКОЮ.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6886,57 +6971,57 @@
 "signatures!\n"
 msgstr "УВАГА: цей ключ не сертифіковано достатньо надійними підписами!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "УВАГА: цей ключ не сертифіковано достатньо надійними підписами!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " Певності у належності підпису його власнику немає.\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущено: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: пропущено: відкритий ключ вимкнено\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: відкритий ключ вже існує\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "не вдалося зашифрувати до «%s»\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "вказано параметр «%s», але не вказано коректних типових ключів\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "вказано параметр «%s», але не вказано параметр «%s»\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Вами не вказано ідентифікатора користувача. (можете скористатися «-r»)\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "Поточні отримувачі:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6944,40 +7029,40 @@
 "\n"
 "Вкажіть ідентифікатор користувача. Дані слід завершити порожнім рядком: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "Немає такого ідентифікатора користувача.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "пропущено: відкритий ключ вже встановлено для типового отримувача\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "Відкритий ключ вимкнено.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "пропущено: відкритий ключ вже встановлено\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "невідомий типовий отримувач «%s»\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "немає коректних адрес\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
@@ -7017,7 +7102,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "не вдалося відкрити підписані дані fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "ключ %s не можна використовувати для розшифровування у режимі %s\n"
@@ -7251,38 +7336,33 @@
 "Для використання %s ключа %s потрібен хеш з %zu або більше бітів (маємо хеш "
 "%s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "ключ %s не можна використовувати для підписування у режимі %s\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "УВАГА: конфлікт контрольних сум підписів у повідомленні\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "УВАГА: підписування підключа %s не є перехресно сертифікованим\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "будь ласка, ознайомтеся з %s, щоб дізнатися більше\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "УВАГА: підписування підключа %s містить некоректну перехресну сертифікацію\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
@@ -7290,7 +7370,7 @@
 msgstr1 "відкритий ключ %s є на %lu секунди новішим за підпис\n"
 msgstr2 "відкритий ключ %s є на %lu секунд новішим за підпис\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
@@ -7298,7 +7378,7 @@
 msgstr1 "відкритий ключ %s є на %lu дні новішим за підпис\n"
 msgstr2 "відкритий ключ %s є на %lu днів новішим за підпис\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7314,7 +7394,7 @@
 "ключ %s було створено з позначкою на %lu секунду у майбутньому (часова петля "
 "або проблема з годинником)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -7329,51 +7409,51 @@
 "ключ %s було створено з позначкою на %lu днів у майбутньому (часова петля "
 "або проблема з годинником)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "ЗАУВАЖЕННЯ: строк дії ключа підпису %s завершився %s\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "ЗАУВАЖЕННЯ: ключ підпису %s було відкликано\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "припускаємо помилковий підпису від ключа %s через невідомий критичний біт\n"
 
-#: g10/sig-check.c:1241
+#: g10/sig-check.c:1235
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: немає підключа для підпису відкликання підключа\n"
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: немає підключа для підпису прив’язування підключа\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr ""
 "УВАГА: не вдалося виконати %%-розгортання примітки (занадто велика). "
 "Використовуємо нерозгорнутою.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@ -7381,7 +7461,7 @@
 "УВАГА: не вдалося виконати %%-розгортання адреси правил (занадто велика). "
 "Використовуємо нерозгорнутою.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@ -7390,12 +7470,12 @@
 "УВАГА: не вдалося виконати %%-розгортання адреси основного сервера ключів "
 "(занадто велика). Використовуємо нерозгорнутою.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s підпис від: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -7403,12 +7483,12 @@
 "УВАГА: примусове використання алгоритму контрольних сум %s (%d) не "
 "відповідає параметрам отримувача\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "підписування:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7487,133 +7567,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: помилка синхронізації: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "не вдалося створити блокування для «%s»\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "не вдалося заблокувати «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "запис trustdb %lu: помилка lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "запис trustdb %lu: помилка запису (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "занадто велика операція trustdb\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталогу не існує!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "немає доступу до «%s»: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: не вдалося створити запис щодо версії: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: створено некоректну trustdb\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: створено trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "ЗАУВАЖЕННЯ: запис до trustdb заборонено\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: некоректна trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: не вдалося створити таблицю хешів: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: помилка оновлення запису версії: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: помилка читання запису версії: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: помилка записування запису версії: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: помилка lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: помилка читання (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не є файлом trustdb\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запис версії з номером запису %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: некоректна версія файла %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: помилка під час спроби читання вільного запису: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: помилка записування запису каталогу (dir): %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: не вдалося обнулити запис: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: не вдалося додати запис: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Помилка: trustdb пошкоджено.\n"
@@ -8092,7 +8172,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "потреби у перевірці trustdb немає\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "наступну перевірку trustdb призначено на %s\n"
@@ -8122,7 +8202,7 @@
 msgid "checking the trustdb\n"
 msgstr "перевірка trustdb\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8130,7 +8210,7 @@
 msgstr1 "оброблено %d ключі"
 msgstr2 "оброблено %d ключів"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8138,17 +8218,17 @@
 msgstr1 " (очищено %d значення чинності)\n"
 msgstr2 " (очищено %d значень чинності)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "не знайдено ключів з необмеженою довірою\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, c-format
 msgid ""
 "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8156,7 +8236,7 @@
 "глибина: %d чинність: %3d підписано: %3d надійність: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
@@ -8225,7 +8305,7 @@
 msgid "ultimate"
 msgstr "безмежна"
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8236,12 +8316,12 @@
 "Будь ласка, пам’ятайте, що файл підпису (.sig або .asc)\n"
 "має бути першим файлом, вказаним у командному рядку.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "у рядку вхідних даних %u занадто багато символів або не вказано LF\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "не вдалося відкрити fd %d: %s\n"
@@ -8258,19 +8338,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "неоднозначний параметр «%s»\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "встановити прапорці діагностики"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "увімкнути повну діагностику"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "Використання: kbxutil параметри файли (-h — довідка)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8281,16 +8361,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8333,10 +8413,10 @@
 "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для стандартних "
 "ключів."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Зворотний виклик пінкоду повернув повідомлення про помилку: %s\n"
@@ -8358,57 +8438,57 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "ключ вже існує\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "вже створений ключ буде замінено\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "створення нового ключа\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "записування нового ключа\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "не вдалося зберегти ключ: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "відповідь не містить основи числення RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "відповідь не містить відкритого показника RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "відповідь не містить відкритого ключа еліптичної кривої\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "зачекайте на завершення створення ключа...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "помилка під час створення ключа\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8416,12 +8496,12 @@
 msgstr1 "створення ключа завершено (за %d секунди)\n"
 msgstr2 "створення ключа завершено (за %d секунд)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "відповідь не містить даних відкритого ключа\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Будь ласка, вкажіть пінкод для ключа, призначеного для створення якісних "
@@ -8429,62 +8509,62 @@
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Вкажіть адміністративний пінкод"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для стандартних "
 "ключів."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Вкажіть пінкод для стандартних ключів."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 "Не знайдено основи числення RSA або основа числення не належить до %d-"
 "бітових\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 "Не вистачає відкритого показника RSA або розмірність показника перевищує %d "
 "бітів\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN ще не було змінено\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN ще не було змінено\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Вкажіть новий пінкод для стандартних ключів."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Будь ласка, вкажіть новий код розблокування пінкоду (PUK) для "
 "стандартних ключів."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Будь ласка, вкажіть новий пінкод для ключа, призначеного для створення "
 "якісних підписів."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8492,7 +8572,7 @@
 "|NP|Будь ласка, вкажіть новий код розблокування пінкоду (PUK) для створення "
 "якісних підписів."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8500,27 +8580,27 @@
 "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для створення якісних "
 "підписів."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "помилка під час отримання нового пінкоду: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "не вдалося зберегти відбиток: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "не вдалося зберегти дату створення: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "помилка отримання стану CHV з картки\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "помилка читання відкритого ключа: %s\n"
@@ -8528,44 +8608,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "використовуємо типовий пінкод як %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "не вдалося використати типовий пінкод як %s: %s — вимикаємо подальше типове "
 "використання\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||Будь ласка, розблокуйте картку"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "Пінкод для CHV%d занадто короткий; мінімальна довжина — %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "помилка перевірки CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "картку заблоковано!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8580,20 +8660,20 @@
 "залишилося %d спроб визначення адміністративного пінкоду перед тим, як "
 "картку буде остаточно заблоковано\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "доступ до адміністративних команд не налаштовано\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||Вкажіть пінкод"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Вкажіть код скидання коду картки"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Занадто короткий код скидання; мінімальна довжина — %d\n"
@@ -8601,79 +8681,79 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|Новий код скидання"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новий адміністративний пінкод"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|Новий пінкод"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Вкажіть адміністративний пінкод та новий адміністративний пінкод"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Вкажіть пінкод та новий пінкод"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "помилка читання даних програми\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "помилка читання відбитка DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "не вказано часової позначки створення\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "Не знайдено простого числа RSA %s або число не належить до %d-бітових\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "непідтримувана крива\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "некоректна структура картки OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "відбиток на картці не відповідає запитаному\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карткою не підтримується алгоритм контрольних сум %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "вже створено підписів: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "перевірку адміністративного пінкоду заборонено цією командою\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
@@ -8693,7 +8773,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "запустити у режимі декількох серверів (основному режимі)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|встановити вказаний рівень діагностики"
 
@@ -8737,11 +8817,11 @@
 msgid "deny the use of admin card commands"
 msgstr "заборонити використання команд з адміністрування картки"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "Використання: @SCDAEMON@ параметри (-h — довідка)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8749,318 +8829,318 @@
 "Синтаксис: scdaemon параметри команди аргументи\n"
 "Фонова служба карток пам’яті для @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
 "фоновому режимі\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "запущено запуск обробки для дескриптора %d\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "роботу обробника для дескриптора %d перервано\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "помилка під час спроби отримання даних щодо використання ключа: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "модель перевірки, запитана сертифікатом: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "ланцюжок"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "оболонка"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "не підтримується критичне розширення сертифікації %s"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "сертифікат видавця не позначено як сертифікат служби сертифікації (CA)"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "правила, позначені як критичні, без налаштування"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "не вдалося відкрити «%s»: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Зауваження: заборонено некритичні правила сертифікації"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "заборонено правила сертифікації"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "не вдалося отримати відбиток\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "пошук видавця за зовнішньою адресою\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "кількість відповідних видавців: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "не вдалося отримати authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "пошук видавця у кеші dirmngr\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "кількість відповідних сертифікатів: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "помилка пошуку ключів лише з dirmngr: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "не вдалося розмістити дескриптор keyDB\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "сертифікат відкликано"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "стан сертифікату є невідомим"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "будь ласка, переконайтеся, що «dirmngr» встановлено належним чином\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "помилка під час перевірки CRL: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "сертифікат з некоректною чинністю: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "сертифікат ще не набув чинності"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "кореневий сертифікат ще не набув чинності"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "проміжний сертифікат ще не набув чинності"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "строк дії сертифіката завершився"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "строк дії кореневого сертифіката завершився"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "строк дії проміжного сертифіката завершився"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "не вистачає обов’язкових атрибутів сертифіката: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "сертифікат з некоректною чинністю"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "підпис не було створено під час строку дії сертифіката"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "сертифікат не було створено під час строку чинності видавця"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "проміжний сертифікат не було створено під час строку чинності видавця"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( підпис створено "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " ( сертифікат створено "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " ( сертифікат чинний з "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( видавець чинний з "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "відбиток=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "кореневий сертифікат було позначено як надійний\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "не увімкнено інтерактивне позначення надійності у gpg-agent\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "інтерактивне позначення надійності вимкнено для цього сеансу\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "УВАГА: невідомий час створення підпису — припускаємо поточний час"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "у сертифікаті не було знайдено даних щодо видавця"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "самопідписаний сертифікат має ПОМИЛКОВИЙ підпис"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "кореневий сертифікат не позначено як надійний"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "помилка перевірки списку довіри: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "занадто довгий ланцюжок сертифікації\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "не знайдено видавця сертифіката"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "сертифікат має ПОМИЛКОВИЙ підпис"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "виявлено інший можливий відповідний сертифікат служби сертифікації (CA) — "
 "повторюємо спробу"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "ланцюжок сертифікації є довшим за дозволений CA (%d)"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "сертифікат є належним\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "належний проміжний сертифікат\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "належний кореневий сертифікат\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "перемикаємося на ланцюгову модель"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "використана модель перевірки: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "вихід за межі області пам’яті\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(це алгоритм MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "немає"
 
@@ -9080,7 +9160,7 @@
 msgid "Error - invalid DN"
 msgstr "Помилка — некоректний DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -9095,42 +9175,42 @@
 "С/Н %s, ідентифікатор 0x%08lX,\n"
 "створено %s, застаріває %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не вказано використання ключа — припускаємо всі можливі використання\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "сертифікат не мав використовуватися для сертифікації\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "сертифікат не мав використовуватися для підписування відповідей OCSP\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "сертифікат не мав використовуватися для шифрування\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "сертифікат не мав використовуватися для підписування\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "сертифікат непридатний для шифрування\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "сертифікат непридатний для підписування\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9355,17 +9435,17 @@
 msgid "resource problem: out of core\n"
 msgstr "проблема з ресурсами: вихід за межі пам’яті\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(це алгоритм RC2)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(здається, це не зашифроване повідомлення)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9376,7 +9456,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "сертифіката «%s» не знайдено: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "помилка під час блокування сховища ключів: %s\n"
@@ -9401,126 +9481,126 @@
 msgid "no valid recipients given\n"
 msgstr "не вказано коректних отримувачів\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "показати ключ зовнішніх ключів"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "показати ланцюжок сертифікації"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "імпортувати сертифікати"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "експортувати сертифікати"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "зареєструвати картку пам’яті"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "передати команду dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "виклик gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "взагалі не використовувати термінал"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "кількість сертифікатів, які слід включити"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взяти дані щодо правил з вказаного файла"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "вважати вхідні дані даними у форматі PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "вважати вхідні дані даними у форматі BASE64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "вважати вхідні дані даними у двійковому форматі"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "створити дані, закодовані у BASE64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 "|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|додати сховище ключів до списку сховищ ключів"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "Надіслати запит щодо незнайдених сертифікатів видавця"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "використовувати вказане кодування для паролів PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "не використовувати САС"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "не шукати у списках відкликаних сертифікатів кореневі сертифікати"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "перевіряти чинність за допомогою OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "не перевіряти правила сертифікатів"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|використовувати вказаний алгоритм шифрування"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|NAME|використовувати вказаний алгоритм обчислення контрольної суми "
 "повідомлення"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "пакетний режим: нічого не запитувати"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "вважати відповіддю на більшість питань «так»"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "вважати відповіддю на більшість питань «ні»"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|записувати журнал перевірки до файла"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "Використання: @GPGSM@ параметри файли (-h — довідка)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9531,27 +9611,27 @@
 "протоколу S/MIME\n"
 "Типова дія залежатиме від вхідних даних\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "ЗАУВАЖЕННЯ: не вдасться зашифрувати до «%s»: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "невідома модель перевірки «%s»\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "імпортуємо загальні сертифікати «%s»\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "підписування за допомогою «%s» неможливе: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "некоректна команда (немає неявної команди)\n"
@@ -9571,7 +9651,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "помилка під час основних перевірок сертифіката — не імпортовано\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "помилка під час спроби отримання збережених прапорців: %s\n"
@@ -9581,48 +9661,48 @@
 msgid "error importing certificate: %s\n"
 msgstr "помилка під час спроби імпортування сертифіката: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "помилка під час спроби читання вхідних даних: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "у цьому сеансі не запущено dirmngr\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "помилка під час спроби відкрити базу даних ключів: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "проблем з пошуком вже створеного сертифіката: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "помилка під час спроби знайти придатну до запису keyDB: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "помилка під час спроби збереження сертифіката: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "проблема з повторним пошуком сертифіката: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "помилка під час спроби збереження позначок: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Помилка - "
 
@@ -9658,7 +9738,7 @@
 "\n"
 "%s%sВи справді хочете це зробити?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9678,46 +9758,46 @@
 "«%s»\n"
 "Зауважте, що цей сертифікат НЕ створюватиме якісного підпису!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "підтримки алгоритму хешування %d (%s) для підписувальника %d не передбачено; "
 "використовуємо %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "алгоритм хешування, використаний для підписувача %d: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "помилка перевірки якості сертифікатів: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "Підпис створено "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "дату не вказано"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 #| msgid "algorithm: %s"
 msgid "algorithm:"
 msgstr "алгоритм: %s"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9725,17 +9805,17 @@
 "некоректний підпис: атрибут контрольної суми повідомлення не збігається з "
 "обчисленою сумою\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "Правильний підпис від"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " або"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Це якісний підпис\n"
@@ -9760,317 +9840,312 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "не вдалося зняти блокування з кешу сертифікатів: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "викидання %u сертифікатів з кешу\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "не вдалося обробити сертифікат «%s»: %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "сертифікат «%s» вже кешовано\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "надійний сертифікат «%s» завантажено\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "сертифікат «%s» завантажено\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " відбиток SHA1 = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " видавець ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " призначення ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "помилка під час спроби завантаження сертифіката «%s»: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "остаточно завантажені сертифікати: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " динамічно кешовані сертифікати: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " довірені сертифікати: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "сертифікат вже кешовано\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "сертифікат кешовано\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "помилка під час спроби кешування сертифіката: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "некоректний рядок відбитка SHA1 «%s»\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "помилка під час спроби отримання сертифіката за серійним номером: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "помилка під час спроби отримання сертифіката за призначенням: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "у сертифікаті не виявлено запису видавця\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "помилка під час спроби отримання authorityKeyIdentifier: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "створення каталогу «%s»\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "помилка під час спроби створення каталогу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "ігноруємо каталог бази даних «%s»\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "помилка під час спроби читання каталогу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "вилучаємо файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "не вилучаємо файл «%s»\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "помилка під час спроби закриття файла кешу: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "не вдалося відкрити файл каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "помилка під час спроби створення нового файла каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "помилка під час спроби запису нового файла каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:434
+#: dirmngr/crlcache.c:441
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "помилка під час спроби закриття нового файла каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "створено новий файл каталогу кешу «%s»\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "не вдалося повторно відкрити файл каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "першим записом «%s» не є версія\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "застаріла версія каталогу кешу — спорожнюємо\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "застаріла версія каталогу кешу — пропускаємо\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "виявлено зайве поле у записі CRL «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "виявлено некоректний рядок у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "виявлено дублікат запису у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "непідтримуваний тип запису у «%s», рядок %u пропущено\n"
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "некоректний хеш видавця у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "немає DN видавця «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "некоректна позначка часу у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "УВАГА: некоректний хеш файла кешу у «%s», рядок %u\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "виявлено помилки у файлі каталогу кешу\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "будь ласка, перевірте причину і вилучіть цей файл вручну\n"
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "не вдалося створити тимчасовий файл каталогу кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "помилка під час спроби закрити «%s»: %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "помилка під час спроби перейменування «%s» на «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "не вдалося хешувати «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "помилка під час спроби встановлення контексту хешування MD5: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "помилка під час спроби хешування «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "некоректне форматування контрольної суми для «%s»\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "забагато відкритих файлів кешу; більше файлів відкрити не можна\n"
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "відкриваємо файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "помилка під час спроби відкриття файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "помилка під час спроби ініціалізації файла кешу «%s» для читання: %s\n"
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "виклик unlock_db_file для закритого файла\n"
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "виклик unlock_db_file для розблокованого файла\n"
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "не вдалося створити об’єкт кешування: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "немає CRL для ідентифікатора видавця %s\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr ""
 "кешований CRL для ідентифікатора видавця %s є занадто старим; потрібне "
 "оновлення\n"
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -10079,205 +10154,205 @@
 "задіяно force-crl-refresh і %d хвилин тому передано для ідентифікатора "
 "видавця %s; потрібне оновлення\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr ""
 "задіяно force-crl-refresh для ідентифікатора видавця %s; потрібне оновлення\n"
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "доступний CRL для ідентифікатора видавця %s не може бути використано\n"
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr ""
 "кешований CRL для ідентифікатора видавця %s підроблено; потрібне оновлення\n"
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "УВАГА: некоректна довжина запису кешу для серійного номера "
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr ""
 "проблема під час спроби читання запису кешування для серійного номера %s: "
 "%s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr "серійний номер %s не є коректним; причина=%02X дата=%.15s\n"
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, c-format
 msgid "S/N %s is valid, it is not listed in the CRL\n"
 msgstr "серійний номер %s є коректним, його немає у CRL\n"
 
-#: dirmngr/crlcache.c:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "помилка під час спроби отримання даних з файла кешу: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "отримано некоректний вираз S з libksba\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "спроба перетворення виразу S зазнала невдачі: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "невідомий алгоритм хешування «%s»\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "помилка використання gcry_md_open для алгоритму %d: %s\n"
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "спроба створення виразу S зазнала невдачі: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "помилка ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "помилка під час спроби отримання даних щодо часу оновлення з CRL: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "часи оновлення цього CRL: поточне=%s наступне=%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "не вказано nextUpdate; вважаємо періодом чинності один день\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "помилка під час спроби отримання запису CRL: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "помилка під час спроби додавання пункту до файла тимчасового кешу: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "не виявлено видавця CRL у CRL: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "пошук видавця CRL сертифіката за authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "помилка перевірки підпису CRL: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "помилка під час спроби перевірки чинності сертифіката видавця CRL: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "помилка ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "помилка ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "вилучено застарілий тимчасовий файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "помилка під час спроби вилучення застарілого тимчасового файла кешу «%s»: "
 "%s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "помилка під час спроби створення тимчасового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "помилка crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 "помилка під час спроби завершення запису тимчасового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "помилка під час спроби закриття тимчасового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "УВАГА: новий CRL все ще занадто старий; його строк дії завершується %s — "
 "попри це завантажуємо\n"
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "новий CRL все ще занадто старий; його строк дії завершується %s\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "невідомий критичний додаток CRL %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "помилка під час читання додатків CRL: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "створюємо файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "проблема під час перейменування «%s» на «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10286,12 +10361,12 @@
 "помилка під час спроби оновлення файла каталогу — запис кешу буде втрачено "
 "під час наступного запуску програми\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Початок дампу CRL (отримано за допомогою %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10299,54 +10374,54 @@
 " ПОМИЛКА: CRL не буде використано, оскільки він все ще застарілий після "
 "оновлення!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " ПОМИЛКА: CRL не буде використано через невідомий критичний додаток!\n"
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ПОМИЛКА: CRL не буде використано\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ПОМИЛКА: цей кешований CRL можливо було підроблено!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " УВАГА: некоректна довжина запису кешу\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "проблема під час читання запису кешу: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "проблема під час спроби читання ключа кешу: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "помилка під час спроби читання запису кешу з бази даних: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "Кінець дампу CRL\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "помилка crl_fetch за DP: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "помилка crl_cache_insert за DP: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "помилка crl_cache_insert за видавцем: %s\n"
@@ -10362,23 +10437,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "Доступ до CRL неможливий через увімкнений режим Tor\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "Доступ до CRL неможливий через вимкнений %s\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "помилка отримання «%s»: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "помилка під час спроби ініціалізації об’єкта читання: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "пошук сертифікатів неможливий через вимкнений %s\n"
@@ -10525,139 +10600,139 @@
 msgid "looking up '%s'\n"
 msgstr "пошук «%s»\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "показати вміст кешу CRL"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|отримати CRL з вказаної адреси"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "завершити роботу dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "спорожнити кеш"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "дозволити інтерактивну перевірку версії програмного забезпечення"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|повертати не більше за вказану кількість записів на запит"
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "Налаштування для серверів HTTP"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "заборонити використання HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "ігнорувати точки поширення САС протоколу HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "використовувати загальносистемний проксі-сервер HTTP"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "Налаштування для серверів HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|використовувати сервер ключів за адресою"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "Налаштування для серверів HTTP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "заборонити використання LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "ігнорувати точки поширення САС протоколу LDAP"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "не використовувати резервні вузли з --ldap-proxy"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "використовувати цей сервер ключів для пошуку"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|встановити вказаний час очікування даних від LDAP"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "Налаштування OCSP"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "дозволити надсилання запитів OCSP"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ігнорувати адреси служб OCSP з сертифікатами"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|відповідь OCSP підписано FPR"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "примусове завантаження застарілих САС"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10667,11 +10742,11 @@
 "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
 "довідника (man) «info»)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "Використання: @DIRMNGR@ параметри (-h — довідка)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10679,104 +10754,104 @@
 "Синтаксис: @DIRMNGR@ параметри команда аргументи\n"
 "Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "коректними рівнями зневаджування є: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "використання: %s параметри"
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "не можна використовувати двокрапки у назві сокета\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "помилка під час обробки CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: занадто довгий рядок — пропущено\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: виявлено некоректний відбиток\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: помилка під час читання: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "примусове завершення роботи\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "отримано сигнал %d — дій не визначено\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "помилка під час спроби доступу до «%s»: стан http %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "Адресу «%s» переспрямовано до «%s» (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "занадто багато переспрямувань\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10832,32 +10907,32 @@
 msgid "malloc failed: %s\n"
 msgstr "помилка malloc: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "«%s» не є адресою LDAP\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "«%s» є некоректною адресою LDAP\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search перевищив обмеження розміру сервера\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: вказано пароль, але не вказано користувача\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: пропускаємо цей рядок\n"
@@ -10948,161 +11023,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "не підписано типовим сертифікатом підписувальника OCSP"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "спроба розміщення пункту списку у пам’яті зазнала невдачі: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "помилка під час спроби отримання ідентифікатора відповідача: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "не виявлено придатного сертифіката для перевірки відповіді за OCSP\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "не виявлено сертифіката видавця: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "викликаною підпрограмою не повернуто сертифіката призначення\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "викликаною підпрограмою не повернуто сертифіката видавця\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "не вдалося розмістити контекст OCSP: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "не визначено типового відповідача за OCSP\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "не визначено типового підписувача за OCSP\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "використовуємо типовий відповідач за OCSP «%s»\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "використовуємо відповідач за OCSP «%s»\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "помилка під час отримання стану OCSP для сертифіката призначення: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "стан сертифіката: %s (цей=%s наступний=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "придатний"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "сертифікат було відкликано: %s причина: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "Відповідачем OCSP повернуто стан у майбутньому\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "Відповідачем OCSP повернуто не поточний стан\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "помилка assuan_inquire(%s): %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "у ідентифікаторі сертифіката немає серійного номера"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "помилка assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "помилка fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "помилка під час спроби надсилання даних: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "помилка start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "помилка fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "перевищено max_replies у %d\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "не вдалося розмістити структуру керування: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "не вдалося розмістити контекст assuan: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "не вдалося ініціалізувати сервер: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема з прийняттям Assuan: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "помилка обробки за допомогою Assuan: %s\n"
@@ -11112,86 +11187,86 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "приймаємо кореневий сертифікат CA не позначений як CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "занадто високий рівень вкладеності перевірки CRL\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "не перевіряємо CRL щодо"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "перевіряємо CRL щодо"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr ""
 "спроба перевірки надійності кореневого сертифіката зазнала невдачі: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "коректний ланцюжок сертифікації\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "сертифікат не мав використовуватися для підписування CRL\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "без повідомлень"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "вивести дані у шістнадцятковому форматі"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "декодувати отримані рядки даних"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "з’єднатися з dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "з’єднатися з dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|встановити з’єднання з вказаним сокетом Assuan"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|встановити з’єднання з сервером Assuan за вказаною адресою"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "запустити сервер Assuan, вказаний у командному рядку"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "не використовувати розширений режим з’єднання"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|виконати команди з вказаного файла під час запуску"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "виконати /subst під час запуску"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "Використання: @GPG@-connect-agent параметри (-h — довідка)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -11199,51 +11274,51 @@
 "Синтаксис: @GPG@-connect-agent параметри\n"
 "Встановити з’єднання з запущеним агентом і надіслати команди\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 "щоб скористатися параметром «%s», слід вказати програму та додаткові "
 "аргументи\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр «%s» проігноровано через «%s»\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "помилка під час спроби отримання рядка: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "рядок є надто довгим, його пропущено\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "рядок скорочено через вбудований символ Nul\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "невідома команда «%s»\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "помилка надсилання рядка: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "у цьому сеансі не запущено dirmngr\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "помилка під час спроби надсилання стандартних параметрів: %s\n"
@@ -11307,12 +11382,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "Зауважте, що специфікації груп буде проігноровано\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "помилка під час спроби закрити «%s»\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "помилка під час спроби обробити «%s»'\n"
@@ -11418,90 +11493,110 @@
 "Синтаксис: gpg-check-pattern параметри файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Замірити вже створені ключі? (y/N або т/Н) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Виявлено картку OpenPGP з номером %s\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "додати сертифікат до кешу"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "налаштування KDF для розпізнавання за PIN"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "додати сертифікат до кешу"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "додати сертифікат до кешу"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "некоректні особисті параметри шифрування\n"
+
+#, fuzzy
+#~| msgid "cipher algorithm '%s' may not be used in %s mode\n"
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "алгоритм шифрування «%s» не можна використовувати у режимі %s\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr ""
+#~ "примусове використання симетричного шифру %s (%d) не відповідає "
+#~ "параметрам отримувача\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "помилка під час спроби запису до тимчасового файла: %s\n"
 
@@ -12353,9 +12448,6 @@
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "перемкнутися між списками закритих і відкритих ключів"
 
-#~ msgid "Passphrase"
-#~ msgstr "Пароль"
-
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "використовувати тимчасові файли для передавання даних до допоміжних "

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/zh_CN.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/zh_CN.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/zh_CN.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/zh_CN.po Changed

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the GnuPG package.
 # Meng Jie <zuxyhere@eastday.com>, 2004.
 # Chuhao Li <lchopn@gmail.com>, 2018.
-# bobwxc <bobwxc@yeah.net>, 2021.
+# bobwxc <bobwxc@yeah.net>, 2021, 2022.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.27\n"
+"Project-Id-Version: GNU gnupg 2.3.8\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-25 15:55+0200\n"
-"PO-Revision-Date: 2022-04-14 13:13+0800\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\n"
+"PO-Revision-Date: 2022-10-22 19:41+0800\n"
 "Last-Translator: bobwxc <bobwxc@yeah.net>\n"
 "Language-Team: None\n"
 "Language: zh_CN\n"
@@ -22,7 +22,7 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "获取 pinentry 锁失败: %s\n"
@@ -33,49 +33,49 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|确认(_O)"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|取消(_C)"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|是(_Y)"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|否(_N)"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN："
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|在密码管理器中保存(_S)"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "您真的想要使您的密码在屏幕上可见吗？"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|使密码可见"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|隐藏密码"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "大写锁定已开启"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "建议"
 
@@ -86,27 +86,27 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "使用随机生成的密码"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "注意：密码不允许含有空格。"
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "不允许的密码"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "强度："
 
@@ -116,165 +116,171 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "上方输入的文本的质量。\n"
 "请向管理员咨询详细相关准则。"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "请输入您的 PIN，从而为此会话解锁私钥"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入您的密码，从而为此会话解锁私钥"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr "PIN："
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "密码："
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "不匹配 - 请重试"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase Entry"
+msgid "Passphrases match."
+msgstr "密码条目"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s（尝试第%d个，共%d个）"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "重复："
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "PIN 太长"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "密码太长"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "PIN 中含有无效字符"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "PIN 太短"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "错误的 PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "注意：来自网络浏览器的请求。"
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "注意：来自远程站点的请求。"
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "获取卡的序列号时出现错误： %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "请重新输入此密码"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "请输入密码以在 %s 系统内部保护已导入的对象。"
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr "此密钥（或子密钥）未受密码保护。请输入新的密码以将其导出。"
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "尚未支持长度超过 %d 位的 ssh 密钥\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "无法创建 ‘%s’： %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "无法打开 ‘%s’： %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "没有找到合适的卡片密钥：%s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "获取卡片列表时出现错误：%s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
 "allow this?"
 msgstr "一个 ssh 进程请求使用密钥%%0A %s%%0A (%s)%%0A您想要允许这一请求吗？"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "允许"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "拒绝"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "请输入 ssh 密钥 %%0A %F%%0A (%c) 的密码"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -283,83 +289,78 @@
 "请输入一个密码，以便于在 gpg-agent 的密钥存储中保护接收到的私钥 %%0A %s"
 "%%0A %s%%0A"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "从以下套接字创建流时失败： %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "请插入具有以下序列号的卡"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "管理员 PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "重置码"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "按下卡片/令牌上的 ACK 按钮。"
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "使用读卡器小键盘输入。"
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "再次输入此重置码"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "再次输入此 PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "再次输入此 PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "重置码再次输入时与首次输入不符；请重试"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK 再次输入时与首次输入不符；请重试"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请重试"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "请输入 PIN%s%s%s 以解锁这张卡"
 
-#: agent/genkey.c:154
-#, fuzzy, c-format
-#| msgid "error writing to %s: %s\n"
+#: agent/genkey.c:155
+#, c-format
 msgid "error writing to pipe: %s\n"
-msgstr "写入 %s 时出现错误：%s\n"
+msgstr "写入管道时出现错误：%s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "输入新的密码"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "您并没有输入一个密码！%0A不允许密码留空。"
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -368,246 +369,252 @@
 "您并没有输入一个密码 - 这通常不是一个好主意！%0A请确认您不想给您的密钥加上任"
 "何的保护。"
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "是的，保护不是必须的"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "密码长度应至少为 %u 字符。"
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr0 "密码应当包括至少 %u 位或者%%0A特殊字符。"
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "密码不应该是一个已知的用语或者与%%0A特定的模式相匹配。"
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告：您输入了一个不安全的密码。"
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "无论如何都使用这个"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "请输入密码以%0A保护您的新密钥"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "请输入新的密码"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 msgid "Options used for startup"
 msgstr "用于启动的选项"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "以守护进程模式运行 （后台）"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "以服务进程模式运行 （前台）"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "请勿离开控制台"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sh 风格的命令行输出"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "csh 风格的命令行输出"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|从 FILE 中读取选项"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "控制诊断输出的选项"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|将服务器模式的日志写入到 FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "控制配置的选项"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "不使用 SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 作为 SCdaemon 程序"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|使用 PGM 作为 tpm2daemon 程序"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|通过 NAME 接收一些命令"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "忽略改变 TTY 的请求"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "忽略改变 X display 的请求"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "启用 ssh 支持"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|使用 ALGO 显示 ssh 指纹"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "启用 putty 支持"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "启用 putty 支持"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "控制安全的选项"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|使被缓存的 PIN 在 N 秒后过期"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|在 N 秒后使 SSH 密钥过期"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|设置 PIN 缓存的生命周期为 N 秒"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|设置 SSH 缓存的生命周期为 N 秒"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "在签名时不使用 PIN 缓存"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 msgid "disallow the use of an external password cache"
 msgstr "禁止使用外部的密码缓存"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "禁止客户端将密钥标记为“信任”"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "允许预设置的密码"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "选项强制要求一个密码策略"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "不允许绕过密码的策略"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|设置要求新密码的最短长度为 N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|要求新密码至少有 N 个非字母字符"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|按 FILE 中的样式检查新密码"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天后使密码过期"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "不允许再次使用旧的密码"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 msgid "Options controlling the PIN-Entry"
 msgstr "控制 PIN-Entry 的选项"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr "不使用 PIN-entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr "禁止调用者覆盖 pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "允许 PIN-Entry 抓取键盘与鼠标"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 作为 PIN-Entry 程序"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|设置 Pinentry 的超时时间为 N 秒"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "运行密码通过 Emacs 回显"
 
 #. 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: 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:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "用法： @GPG_AGENT@ 选项 （-h 获取帮助）"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -615,141 +622,141 @@
 "语法： @GPG_AGENT@ 选项 命令 参数\n"
 "@GNUPG@ 私钥管理器\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "无效的调试级别‘%s’\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注意：‘%s’不被认为是一个选项\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s” 是一个已被弃用的选项\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法创建套接字： %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "套接字名称‘%s’太长\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "正尝试从运行的 %s 处夺取套接字\n"
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "有一个 gpg-agent 实例正在运行 - 无须启动新的实例\n"
 
-#: agent/gpg-agent.c:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "获取套接字 nonce 时出现错误\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "绑定套接字到 '%s' 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "无法设置‘%s’的权限： %s\n"
 
-#: agent/gpg-agent.c:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在监听套接字‘%s’\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "无法创建目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目录‘%s’已创建\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "‘%s’的 stat() 方法失败：%s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "无法使用‘%s’作为家目录\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "在读取 fd %d 上的 nonce 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "句柄 0x%lx 于文件描述符 %d 启动\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "句柄 0x%lx 于文件描述符 %d 终止\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 句柄 0x%lx 于文件描述符 %d 启动\n"
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 句柄 0x%lx 于文件描述符 %d 终止\n"
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect 方法失败：%s - 等待 1s\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "此会话中没有 gpg-agent 实例运行\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -757,11 +764,11 @@
 "@选项:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr "用法： gpg-preset-passphrase 选项 KEYGRIP (-h 获取帮助)\n"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -769,8 +776,8 @@
 "语法： gpg-preset-passphrase 选项 KEYGRIP\n"
 "密码缓存管理\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -778,8 +785,8 @@
 "@命令：\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -789,11 +796,11 @@
 "选项：\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "用法： gpg-protect-tool 选项 (-h 获取帮助)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -801,21 +808,21 @@
 "语法：gpg-protect-tool 选项 参数\n"
 "私钥管理工具\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码以解密 PKCS#12 对象。"
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码以保护新的 PKCS#12 对象。"
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "请输入密码以在 GnuPG 系统内部保护已导入的对象。"
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -823,52 +830,54 @@
 "请输入所需的密码或者 PIN\n"
 "以完成此操作。"
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "已取消\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "请求密码时出现错误： %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "打开‘%s’时出现错误：%s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "文件‘%s’ 的第 %d 行：%s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "已忽略声明 “%s” ，其位于‘%s’的第 %d 行\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "系统信任列表 ‘%s’ 不可用\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "错误的指纹，其位于 ‘%s’ 的第 %d 行\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "无效的密钥标记，其位于 ‘%s’ 的第 %d 行\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "读取 ‘%s’ 的第 %d 行时出现错误：%s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "读取受信任的根证书列表时出现错误\n"
@@ -881,18 +890,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "您要无限地信任%%0A “%s”%%0A为正确的认证用户证书吗?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "是"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "否"
@@ -905,7 +914,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -915,35 +924,44 @@
 #. 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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "正确"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "错误"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注意：此密码从未被修改过。%0A请立即修改。"
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, 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:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "更改密码"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "稍后修改"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "请插入具有以下序列号的卡"
+
+#: agent/findkey.c:1232
+#, c-format
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr "请求使用密钥%%0A %s%%0A %s%%0A您想要允许这一请求吗？"
+
+#: agent/findkey.c:1766
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@ -951,11 +969,11 @@
 msgstr ""
 "您真的想要删除这个被以下的 keygrip 所标识的密钥吗 %%0A %s%%0A %%C%%0A？"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "删除密钥"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -968,8 +986,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 要求散列值长度为 8 位的倍数\n"
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "%s 密钥使用了一个不安全的（%u 位）散列\n"
@@ -979,7 +997,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu 位的散列对于一个 %u 位的 %s 密钥无效\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
@@ -989,7 +1007,7 @@
 msgid "secret key parts are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "不支持的公钥算法: %d (%s)\n"
@@ -1004,52 +1022,52 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "不支持的保护散列算法: %d (%s)\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "创建管道时发生错误： %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "为管道创建流时出现错误： %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "在 fork 进程时出现错误： %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "等待进程 %d 终止时失败： %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "运行‘%s’时出现错误：可能未安装\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "运行‘%s’时出现错误：退出代码 %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "运行‘%s’时出现错误：被终止\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "等待进程终止时失败： %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "获取进程 %d 的退出代码时出现错误： %s\n"
@@ -1069,28 +1087,28 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告： %s 具有不安全的文件所有权 “%s”\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告：%s 具有不安全的文件权限位 “%s”\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "等待 ‘%s’ 可被访问...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "将 ‘%s’ 重命名为 ‘%s’ 时失败：%s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1147,8 +1165,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "分配 %lu 字节时内存不足"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "在分配足够的内存时出现错误： %s\n"
@@ -1163,72 +1181,72 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "警告： “%s%s” 是一个废弃的选项 - 此选项不会产生作用\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "未知的调试选项 ‘%s’ 已被忽略\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "等待 dirmngr 启动 ... (%ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "正在等待 keyboxd 启动…… ( %d 秒) \n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "正在等待 agent 启动…… ( %d 秒) \n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "与 dirmngr 的连接已建立\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "已建立与 keyboxd 的连接\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr "已建立与代理的连接\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "无运行的 %s ——正在启动‘%s’\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "与代理的连接处于受限模式\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "从 ‘%s’ 获取版本时出现错误: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "服务器 ‘%s’ 比我们的版本更老 （%s < %s）"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "警告：%s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr "注意： 过时的服务器可能缺少重要的安全修复。\n"
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "注意： 使用 “%s” 来重启他们。\n"
@@ -1301,7 +1319,7 @@
 msgstr "算法：%s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "不支持的算法：%s"
@@ -1376,39 +1394,39 @@
 msgid "Root certificate trustworthy"
 msgstr "根证书可靠"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "未找到该证书的证书吊销列表（CRL）"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "可用的证书吊销列表（CRL）太旧"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "针对证书的 CRL/OCSP 检查"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "包括的证书"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "没有审计日志条目。"
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "未知操作"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent 可用"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr 可用"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "没有关于 ‘%s’ 的可用帮助。"
@@ -1417,11 +1435,11 @@
 msgid "ignoring garbage line"
 msgstr "忽略无用行"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr "未有"
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "无效的 radix64 字符 %02x 已被跳过\n"
@@ -1456,180 +1474,192 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open 方法失败： %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "从 ‘%s’ 转换到 ‘%s’ 时失败：%s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "创建临时文件 ‘%s’ 失败： %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "写入 ‘%s’ 时出现错误： %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "移除旧的锁文件 （由 %d 创建）\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "等待锁（由 %d%s 持有） %s...\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "（死锁？） "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "锁 ‘%s’ 未被建立： %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "等待锁 %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太旧 （需要 %s，拥有 %s）\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "创建‘%s’时出现错误：%s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "关闭‘%s’时出现错误：%s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "字符封装：%s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "无效的字符封装头： "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "字符封装头： "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "无效的明文签名头\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "未知的字符封装头： "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "嵌套明文签名\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "与预期不符的字符封装： "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "无效的连字符转义行： "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "无效的 radix64 字符 %02X 已被跳过\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "文件过早结束（没有 CRC 部分）\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "文件过早结束（CRC 部分未结束）\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误；%06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "文件过早结束（于结尾处）\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "结尾行出现错误\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的字符封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "字符封装中出现引号包裹起来的可打印字符 - 可能使用了有缺陷的邮件传输代理\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, c-format
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr " 非人类可读（%zu 字节：%s%s） "
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "一个记号的名称必须只含有可打印字符或者空格，并且以一个‘=’结尾\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "一个用户记号名称必须包含‘@’字符\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "一个记号名称必须不包含多于一个的‘@’字符\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "一个记号的值必须不能使用任何的控制字符\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "一个记号的名称可能不能包含‘=’字符\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "一个记号的名称必须只含有可打印字符或者空格\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告： 找到的记号数据无效\n"
@@ -1643,8 +1673,8 @@
 msgid "Enter passphrase: "
 msgstr "输入密码： "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s 与 %s 模式不兼容\n"
@@ -1654,13 +1684,13 @@
 msgid "error from TPM: %s\n"
 msgstr "来自 TPM 的错误：%s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理人程序出现问题：%s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr ""
@@ -1672,197 +1702,202 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "密钥服务器选项 “honor-keyserver-url” 不应用于 Tor 模式中\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr "WKD 使用了缓存的结果"
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr "Tor 未在运行"
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 msgid "Tor is not properly configured"
 msgstr "Tor 配置错误"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 msgid "DNS is not properly configured"
 msgstr "DNS 配置错误"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr "无法接受来自服务器的 HTTP 重定向"
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "已清除来自服务器的不可接受的 HTTP 重定向"
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 msgid "server uses an invalid certificate"
 msgstr "服务器证书无效"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %s\n"
 msgstr "注意：%s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡，号码为 %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "这一命令只在版本 2 的卡上可用\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "重置码不可用或不再可用\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "您的选择是？ "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "未设定"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "先生"
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "女士"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "非强制"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "强制"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用纯 ASCII 字符。\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符 “<”。\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "卡片持有人的姓： "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "卡片持有人的名： "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成后的姓名太长（至多 %d 个字符）。\n"
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "拉取公钥的 URL： "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "读取 ‘%s’ 时出现错误：%s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "写入 ‘%s’ 时出现错误： %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "登录数据（帐户名）： "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "个人 DO 数据： "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "语言偏好： "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：偏好字符串长度无效。\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：偏好字符串中存在无效字符。\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "称呼（M = 先生，F = 女士，或者留空)： "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA 指纹： "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "密钥操作无法实现：%s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "替换现存的密钥？(y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 " key type or size. If the key generation does not succeed,\n"
@@ -1873,100 +1908,100 @@
 " 如果密钥生成不成功，请检查您的卡片文档，\n"
 " 查看其所支持的密钥类型和大小。\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要使用的密钥长度？(%u) "
 
 # means round up to %u binary bits
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 比特位\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥长度必须在 %u 与 %u 间\n"
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr "正在改变卡片的密钥属性： "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 msgid "Signature key\n"
 msgstr "签名密钥\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 msgid "Encryption key\n"
 msgstr "加密密钥\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 msgid "Authentication key\n"
 msgstr "身份验证密钥\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥类型：\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, c-format
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "改变密钥 %d 的密钥属性时出现错误： %s\n"
 
-#: g10/card-util.c:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "获取卡片信息时出现错： %s\n"
 
-#: g10/card-util.c:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "此命令不被此卡片支持\n"
 
-#: g10/card-util.c:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "创建加密密钥的离卡备份？ (Y/n) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注意： 已有私钥被存储于卡片上！\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "替换现存的密钥？(y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1977,176 +2012,181 @@
 " PIN = ‘%s’ 管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要生成的密钥类型：\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) 签名密钥\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) 加密密钥\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) 身份验证密钥\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失败： %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注意： 这一命令将会销毁所有储存于卡片上的私钥！\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "继续？ (y/N) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "真的要执行恢复出厂设置吗？ (输入“yes”) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "设置 KDF 时出现错误： %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "设置 KDF 时出现错误： %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "退出此菜单"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "显示此帮助"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "更改拉取密钥的 URL"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "更改语言偏好"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "变更卡片持有人的称呼"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "切换签名强制使用 PIN 标志"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "使用重置码解锁 PIN"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "销毁所有密钥和数据"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "针对 PIN 身份验证设置 KDF（开启/单一/关闭）"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 msgid "change the key attribute"
 msgstr "更改密钥属性"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "变更用户交互选项"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "管理员命令可用\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "管理员命令不可用\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "无效的命令 （尝试“help”）\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "无法打开 ‘%s’\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "未找到密钥 ‘%s’：%s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2204,9 +2244,9 @@
 msgid "subkey"
 msgstr "子密钥"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
@@ -2231,109 +2271,98 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "警告： 强制对称密文 %s (%d) 与接收者的偏好设置冲突\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, c-format
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "密文算法 ‘%s’ 可能不能被用于加密\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr "（使用选项 “%s” 来覆盖）\n"
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, c-format
+msgid "cipher algorithm '%s' may not be used in %s mode\n"
+msgstr "密文算法 ‘%s’ 可能不能被用于 %s 模式\n"
+
+#: g10/encrypt.c:181 sm/encrypt.c:771
+#, c-format
+msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
+msgstr "警告： 密钥 %s 在 %s 模式下不适用于加密\n"
+
+#: g10/encrypt.c:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "创建密码时出现错误：%s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "由于在 S2K 模式，不能使用一个对称的 ESK 封包\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "使用加密 %s.%s\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, c-format
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "密文算法 ‘%s’ 可能不能被用于加密\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr "（使用选项 “%s” 来覆盖）\n"
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, c-format
-msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "密文算法 ‘%s’ 可能不能被用于 %s 模式\n"
-
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "摘要算法‘%s’不能在 %s 模式下使用\n"
 
-#: g10/encrypt.c:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "正在从‘%s’读取\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "警告： 强制对称密文 %s (%d) 与接收者的偏好设置冲突\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, c-format
-msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "警告： 密钥 %s 在 %s 模式下不适用于加密\n"
-
-#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告： 强制压缩算法 %s (%d) 与接收者的偏好设置冲突\n"
 
-#: g10/encrypt.c:1071
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "强行对称密文算法 %s (%d) 与接收者的偏好设置冲突\n"
-
-#: g10/encrypt.c:1164
+#: g10/encrypt.c:1179
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s 已经加密给：“%s”\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "选项 ‘%s’ 可能不能用于 %s 模式\n"
 
 #: g10/decrypt-data.c:245
-#, fuzzy, c-format
-#| msgid "%s.%s encrypted data\n"
+#, c-format
 msgid "%s encrypted data\n"
-msgstr "%s.%s 已加密的数据\n"
+msgstr "%s 已加密的数据\n"
 
 #: g10/decrypt-data.c:248
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2344,386 +2373,392 @@
 msgid "problem handling encrypted packet\n"
 msgstr "处理加密封包时出现问题\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "导出被标记为“仅限本地”的签名"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "导出附属用户标识（一般为照片标识）"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "导出被标记为“敏感”的吊销用密钥"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "导出时移除密钥中未使用的部分"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "导出时尽可能移除密钥中的可选部分"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "生成一份吊销证书"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "使用 GnuPG 密钥备份格式"
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "不允许导出私钥\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - 已跳过"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "密钥 %s：密钥在卡片上 - 已跳过\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥 - 已跳过\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "创建‘%s’时出现错误：%s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "用户标识未找到"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "自动拉取‘%s’，通过 %s\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "拉取‘%s’通过 %s 时出现错误： %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "无指纹"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "正在通过 %s 检查一个已过期密钥的新拷贝\n"
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥 “%s”：%s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "（检查选项 ‘%s’ 的参数）\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "警告：未使用‘%s’作为默认密钥：%s\n"
 
-#: g10/getkey.c:2098
+#: g10/getkey.c:2107
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "使用 “%s” 作为默认签名用私钥\n"
 
-#: g10/getkey.c:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "传递给‘%s’的所有值被忽略\n"
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "无效的密钥 %s 通过 --allow-non-selfsigned-uid 生效\n"
 
-#: g10/getkey.c:3830
+#: g10/getkey.c:3868
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子密钥 %s 而非主密钥 %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "选项 ‘%s’ 的有效值:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "生成一份签名"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "生成一份明文签名"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称密文加密"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "解密数据（默认）"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "生成一个新的密钥对"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "快速生成一个新的密钥对"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 msgid "quickly add a new user-id"
 msgstr "快速添加一个新的用户标识"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 msgid "quickly revoke a user-id"
 msgstr "快速吊销一个用户标识"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 msgid "quickly set a new expiration date"
 msgstr "快速设置一个过期日期"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "完整功能的密钥对生成"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "快速签名一个密钥"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "快速本地签名一个密钥"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 msgid "quickly revoke a key signature"
 msgstr "快速吊销一个密钥签名"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "签名一个密钥"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "本地签名一个密钥"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "签名或编辑一个密钥"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "将密钥导出到一个公钥服务器上"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "在公钥服务器上搜索密钥"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有密钥"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "打印卡片状态"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "更改卡片上的数据"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "更改卡片的 PIN"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "更新信任数据库"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "打印消息摘要"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "以服务器模式运行"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|设置一个密钥的 TOFU 政策"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|使用 NAME 作为默认的私钥"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|同时给以 NAME 为名称的用户标识加密"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|设置电子邮件别名"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "使用严格的 OpenPGP 行为"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "不做任何更改"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "覆盖前提示"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 msgid "Options controlling the input"
 msgstr "控制输入的选项"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 msgid "Options controlling the output"
 msgstr "控制输出的选项"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "创建 ASCII 字符封装的输出"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|写输出到 FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "使用规范的文本模式"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设置压缩等级为 N （0 为禁用）"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 msgid "Options controlling key import and export"
 msgstr "控制密钥导入导出的选项"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|通过邮件地址定位密钥时使用机制 MECHANISMS"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 msgid "import missing key from a signature"
 msgstr "从签名中导入缺少的密钥"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 msgid "include the public key in signatures"
 msgstr "在签名中包含公钥"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "禁用对 dirmngr 的所有访问"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 msgid "Options controlling key listings"
 msgstr "控制密钥列表的选项"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 msgid "Options to specify keys"
 msgstr "指定密钥的选项"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|为 USER-ID 加密"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|使用 USER-ID 来签名或者解密"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr "用于无人值守的选项"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr "其他选项"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2731,7 +2766,7 @@
 "@\n"
 "（请参考手册页以获得所有命令和选项的完整列表）\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2751,11 +2786,11 @@
 " --list-keys 名字 列出密钥\n"
 " --fingerprint 名字 显示指纹\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "用法： @GPG@ 选项 文件 (-h 获取帮助)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2765,7 +2800,7 @@
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2773,554 +2808,551 @@
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "公钥： "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "密文： "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "散列： "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "压缩： "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "用法： %s 选项 %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "群组定义 ‘%s’ 中找不到 = 标志\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录权限位不安全\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的上级目录权限不安全\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的上级目录权限位不安全\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示照片标识"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "列出密钥时显示用途信息"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示所有注记"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子密钥"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "列出签名时显示过期日期"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "列出偏好设置（专家模式）"
+
+#: g10/gpg.c:2224
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的 TOFU 政策‘%s’\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "（使用“help”来列出选择）\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "不允许在 %s 模式中使用此命令。\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注意：%s 不适用于一般使用！\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s” 不是一个合适的邮件地址\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "无效的 pinentry 模式‘%s’\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "无效的请求来源‘%s’\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "无效的过滤选项：%s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "在签名验证中只显示主要用户标识"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 无效的验证选项\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "无效的验证选项\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法设置运行路径为 %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s%d: 无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s” 的参数无效\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储文件！\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 覆盖了 %s \n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允许与 %s 并用\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用时不起作用\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告：正在以虚假的系统时间运行： "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的密文算法无效\n"
 
-#: g10/gpg.c:3949
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "所选择的 AEAD 算法无效\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:4016
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "无效的默认偏好设置\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人密文偏好设置\n"
 
-#: g10/gpg.c:4012
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "无效的个人 AEAD 偏好设置\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人摘要算法偏好设置\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "块大小无效 - 使用 %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:4134
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "AEAD 算法‘%s’不能在 %s 模式下使用\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "压缩算法‘%s’不能在 %s 模式下使用\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了接收者（-r）但并未使用公钥加密\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "您不能在使用 --symmetric --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "发送至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "作为 ssh 密钥导出失败：%s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "公钥服务器搜索失败：%s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "公钥服务器刷新失败：%s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开字符封装时失败：%s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行字符封装时失败：%s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "无效的散列算法‘%s’\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "解析密钥指定‘%s’时出现错误：%s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’不像是一个有效的密钥标识、指纹或者 keygrip\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr "警告：没有提供命令。正在尝试猜测您的意图...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始输入您的消息…\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的证书策略 URL 无效\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -3333,7 +3365,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳冲突仅视为警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
@@ -3362,153 +3394,153 @@
 msgid "No help available for '%s'"
 msgstr "没有关于‘%s’的可用帮助"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "导入被标记为仅限本地（local-only）的签名"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "导入时修复源于 PKS 公钥服务器的损坏"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 msgstr "在导入期间不清除信任度"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "导入后不更新信任度数据库"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr "启用批量导入模式"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "在导入时显示密钥"
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "show key but do not actually import"
 msgstr "显示密钥但不导入"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "只接受对现有密钥的更新"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "导入后移除密钥中无用的部分"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "导入后尽可能多地移除密钥中的可选部分"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr "忽略不是自签名的密钥签名"
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr "运行导入过滤器并立即导出密钥"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "假定为 GnuPG 密钥备份格式"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 msgstr "在导入期间修复密钥"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 类型的块\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 个密钥\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "处理的总数：%lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " 已跳过的 PGP-2 密钥：%lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " 已跳过的新密钥：%lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " 缺少用户标识：%lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " 已导入：%lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " 未改变：%lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " 新用户标识：%lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " 新的子密钥：%lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " 新的签名：%lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " 新的密钥吊销：%lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " 读取的私钥：%lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " 导入的私钥：%lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " 未改变的私钥：%lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " 未被导入：%lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " 清理的签名：%lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " 清理的用户标识：%lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3517,175 +3549,180 @@
 "警告：密钥 %s 包含了不可用算法的偏好设置\n"
 "于下列用户标识上：\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " “%s”：密文算法 %s 的首选项\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, c-format
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\"：关于 AEAD 算法 %s 的偏好设置\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的偏好设置并重新分发这个密钥\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "密钥 %s： %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "被导入筛查器拒绝"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥%s：PKS 子密钥破损已修复\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自签名的用户标识 “%s”\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自签名所致\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥 - 已跳过\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "写入钥匙环 ‘%s’ 时出现错误： %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥 “%s” 已导入\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不符合\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s” 1 个新的用户标识\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s” %d 个新的用户标识\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s” 1 个新的签名\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s” %d 个新的签名\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s” 1 个新的子密钥\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s” %d 个新的子密钥\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s” %d 个签名被清理\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s” %d 个签名被清理\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s” %d 个用户标识被清理\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s” %d 个用户标识被清理\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s” 未改变\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "密钥 %s：私钥已存在\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "密钥 %s：发送至代理人程序时出现错误：%s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3694,197 +3731,197 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "要迁移 ‘%s’，对每一张智能卡，执行：%s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "私钥 %s：%s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "私钥导入被禁止\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的密文算法 %d - 已跳过\n"
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "吊销原因： "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "吊销注释： "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥 - 无法应用吊销证书\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块：%s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s - 已拒绝\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s” 吊销证书已被导入\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识 “%s” 使用了不支持的公钥算法\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识 “%s” 自身签名无效\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "密钥 %s：无效的直接密钥签名\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子密钥\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子密钥绑定\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子密钥绑定\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销用的子密钥\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子密钥吊销\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子密钥吊销\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识 “%s”\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子密钥\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3972
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：非可导出签名（验证级别 0x%02X）- 已跳过\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误 - 已跳过\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名级别（0x%02X） - 已跳过\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识 - 已合并\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "密钥 %s：检测到重复的子钥 - 已合并\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销用密钥 %s\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销用密钥 %s 不存在。\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已添加吊销证书 “%s”\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已添加直接密钥签名\n"
@@ -3894,96 +3931,96 @@
 msgid "error allocating memory: %s\n"
 msgstr "分配内存时出现错误：%s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "无法使用不支持的公钥算法（%d）检查签名：%s。\n"
 
-#: g10/key-check.c:405
+#: g10/key-check.c:406
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
 msgstr "无法使用不支持的摘要算法 %d 检查签名：%s。\n"
 
-#: g10/key-check.c:571
+#: g10/key-check.c:572
 msgid " (reordered signatures follow)"
 msgstr "（以下是重排的签名）"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, c-format
 msgid "key %s:\n"
 msgstr "密钥 %s：\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "%d 个重复签名被移除\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr0 "%d 个签名因密钥遗失而未被检查\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, c-format
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d 个损坏签名\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "%d 个签名已重排\n"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr "警告：发现错误并且只检查了自签名，请运行 ‘%s’ 检查所有签名。\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "创建钥匙箱‘%s’时出现错误：%s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "创建钥匙环‘%s’时出现错误：%s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "钥匙箱‘%s’已创建\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "钥匙环‘%s’已创建\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "密钥区块资源‘%s’：%s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "吊销"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "自签名"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3993,17 +4030,17 @@
 "请决定您对这名用户能否正确地验证其他用户密钥\n"
 "（通过查看护照，检查不同来源的的指纹等等）的相信程度\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = 我勉强相信\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = 我完全相信\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4013,50 +4050,50 @@
 "深度若大于 1 您将签名的这个密钥将可以\n"
 "代表您进行信任签名。\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入一个限制此签名的域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "跳过用户标识 “%s”，其不是一个文字标识。\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识 “%s” 已被吊销。"
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签名吗？(y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " 无法添加签名。\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识 “%s” 已过期。"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识 “%s” 不含自签名。"
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "用户标识 “%s” 可被签名。 "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "为其签名吗？(y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4065,65 +4102,65 @@
 "“%s” 上的自签名是\n"
 "PGP 2.x 样式的签名。\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成一个 OpenPGP 自签名？(y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您当前在 “%s” 上的签名已过期。\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您是否想要签发一个新的签名来取代已过期的那个吗？(y/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目前为 “%s” 的签名是一个本地签名。\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把它升级成一个可完整导出的签名？(y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s” 已由密钥 %s 在本地签名\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s” 已由密钥 %s 签名\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您无论如何都要为它再次签名吗？(y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以用密钥 %s 签名\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "这个密钥已过期！"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这个密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签名也在同一时间过期吗？ (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4132,31 +4169,31 @@
 "您有多仔细地检查过您正要签名的密钥确实属于具有以上名字的人呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "您的选择是？（输入‘?’以获得更多的信息）： "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4165,226 +4202,239 @@
 "您真的确定要签名这个密钥，使用您的密钥\n"
 "“%s” (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "这将会是一个自签名。\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签名将不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签名将不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签名将会被标记成不可导出。\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签名将会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这个密钥。\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这个密钥。\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这个密钥。\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "密钥只有存根或者卡上项目 - 没有密码可以更改。\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "密钥 %s：修改密码时出现错误：%s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "保存并退出"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 msgid "show the keygrip"
 msgstr "显示 keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "选择子密钥 N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "检查签名"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "为所选用户标识添加签名 * 参见下面的相关命令"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签名"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签名"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签名"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "增加一个子密钥"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "增加一个密钥到智能卡"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "移动一个密钥到智能卡"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr "使用本地 TPM 将密钥转换为 TPM 形式"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "移动一个备份密钥到智能卡上"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "删除选定的子密钥"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "增加一个吊销用密钥"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "数据解密成功"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "从所选用户标识上删除签名"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子密钥的使用期限"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "标记所选的用户标识为主要"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "列出偏好设置（专家模式）"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "列出偏好设置（详细模式）"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "为所选用户标识设定偏好设置列表"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "为所选用户标识设定首选公钥服务器 URL"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "为所选用户标识的设定注记"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "变更密码"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "变更信任度"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签名"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子密钥"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "压缩不可用的用户标识并从密钥上移除不可用的签名"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "压缩不可用的用户标识并从密钥上移除所有签名"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 msgid "Secret subkeys are available.\n"
 msgstr "私密子密钥可用。\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+#, fuzzy
+#| msgid "Note: Only the secret part of the shown subkey will be deleted.\n"
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr "主要：只有显示的子钥的秘密部分会被删除。\n"
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4395,299 +4445,290 @@
 " 信任签名，‘nr’前缀（nrsign）进行不可吊销签名，\n"
 " 或者上述三种前缀的任意组合（ltsign、tnrsign 等）。\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "真的要签名所有的文本用户标识吗？(y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要签名所有的用户标识吗？(y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择用户标识以签名\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "未知的签名类型‘%s’\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "您必须选择至少一个用户标识。\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "（使用‘%s’ 命令。)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有选定的用户标识吗？(y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除此用户标识吗？(y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移动主密钥吗？(y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "您必须选择一个密钥。\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出现错误：%s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一个密钥。\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除此密钥吗？(y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销此用户标识吗？(y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整个密钥吗？(y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子密钥吗？(y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这个子密钥吗？(y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr "在使用一个用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "设定偏好设置列表为：\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的偏好设置吗？(y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好设置吗？(y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "要保存变更吗？(y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而退出吗？(y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "删除私钥 %s 时失败： %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变更所以不需要更新。\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "不能吊销最后一个有效的用户标识。\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2632
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "吊销用户标识时出现错误：%s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "设置主要用户标识时出现错误：%s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" 不是一个指纹\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s” 不是主要指纹\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "无效的用户标识‘%s’：%s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "没有匹配的用户标识。"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "没有可被签名的东西。\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "并非由您签名。\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "吊销密钥签名失败：%s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’不是一个有效的过期时间\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3407
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s” 不是一个正确的指纹\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "子密钥 “%s” 未找到\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr "AEAD： "
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "摘要： "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "特点： "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "公钥服务器不可修改"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器： "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "注记： "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "没有关于 PGP 2.x 样式用户标识的偏好设置。\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3849
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列密钥在 %s 被 %s 的密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这个密钥可被 %s 的密钥 %s 吊销"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "（敏感的）"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "吊销于：%s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "过期于：%s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "卡号： "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "这个密钥已经被禁用"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，所显示的密钥有效性不一定正确。\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4696,17 +4737,23 @@
 "警告： 没有用户标识被标记为主要。 此命令可能会\n"
 " 导致一个不同的用户标识被假定为主要。\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告： 您的加密用子密钥将在不久后过期。\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "您可能也想要变更它的过期日期。\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "警告： 您的加密用子密钥将在不久后过期。\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4715,72 +4762,70 @@
 "警告：这是一个 PGP2 样式的密钥。增加照片标识可能会导致某些版本的\n"
 " PGP 拒绝这个密钥。\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:4273
-#, fuzzy
-#| msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4379
 msgid "Such a user ID already exists on this key!"
-msgstr "这样的用户标识已经存在于这个密钥上了！\n"
+msgstr "该用户标识已经存在于这个密钥上了！"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自签名吗？(y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识 “%s” 已被压缩：%s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr0 "用户标识 “%s”：%d 个签名被移除\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识 “%s”：已被最小化\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识 “%s”：无用部分已清理\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4789,293 +4834,309 @@
 "警告：这是一个 PGP2 样式的密钥。增加指定吊销者\n"
 " 可能会导致某些版本的 PGP 无法识别这个密钥。\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识： "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4713
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4735
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "这个密钥已被指派为一个吊销者\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥设置为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这个密钥设置为指定吊销者吗？(y/N)： "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "（除非您用指纹指定密钥）\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "子密钥 %s 已被吊销。\n"
+
+#: g10/keyedit.c:5007
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "您确定要改变多个子密钥的过期时间吗？ (y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子密钥的过期时间。\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主密钥的过期时间。\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的过期时间\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:5131
 msgid "Changing usage of a subkey.\n"
 msgstr "变更一个子密钥的用途。\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 msgid "Changing usage of the primary key.\n"
 msgstr "变更主密钥的用途。\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子密钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子密钥 %s 不签名，因此不需要被交叉验证\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "请选定仅一个用户标识。\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识 “%s” 上的 v3 自签名\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选公钥服务器的 URL： "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "输入注记： "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "没有属于密钥标识‘%s’的子密钥。\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子密钥\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "此签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经签名来密钥 %s 上的这些用户标识：\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 吊销于 %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "尝试吊销一个非用户标识：%s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识 “%s” 已经被吊销。\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "不能吊销最后一个有效的用户标识。\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "选项‘%s’有无效的值\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "偏好设置‘%s’重复\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "过多的密文偏好设置\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "过多的散列算法偏好设置\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "过多的压缩算法偏好设置\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "过多的 AEAD 偏好设置\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "正在写入自签名\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效；改用 %u 位\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 比特位\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, 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:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "签名（Sign）"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "认证（Certify）"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "加密（Encrypt）"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "身份验证（Authenticate）"
 
@@ -5089,166 +5150,166 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "%s 密钥的可实现的功能： "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "目前启用的功能： "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) 签名功能开关\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) 加密功能开关\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) 身份验证功能开关\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) 已完成\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, c-format
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA 和 RSA %s\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, c-format
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA 和 Elgamal %s\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, c-format
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA（仅用于签名）%s\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, c-format
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA（仅用于签名）%s\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, c-format
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) ElGamal（仅用于加密）%s\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, c-format
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA（仅用于加密）%s\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, c-format
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA（自定义用途）%s\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, c-format
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA（自定义用途）%s\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, c-format
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) ECC（签名和加密）%s\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr " *默认*"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC（仅用于签名）\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, c-format
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC（自定义用途）%s\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, c-format
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC（仅用于加密）%s\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, c-format
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) 现有密钥 %s\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, c-format
 msgid " (%d) Existing key from card%s\n"
 msgstr " （%d）卡中现有密钥 %s\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "输入 keygrip： "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "不是一个有效的 keygrip （需要 40 位十六进制数）\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "没有此 keygrip 关联的密钥\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "读取卡片时出现错误：%s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "卡片的序列号：%s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "可用的密钥：\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥的长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "您想要为此子密钥使用的密钥长度？(%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "请求的密钥长度是 %u 位\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "请选择您想要使用的椭圆曲线：\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5264,7 +5325,7 @@
 " <n>m = 密钥在 n 月后过期\n"
 " <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5280,38 +5341,38 @@
 " <n>m = 签名在 n 月后过期\n"
 " <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是？(%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "无效的值\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5319,11 +5380,11 @@
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过它可以正确地处理到 2106 年之前的日期。\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "这些内容正确吗？ (y/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5337,7 +5398,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5352,41 +5413,41 @@
 " “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "真实姓名： "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "字符‘%s’和‘%s’不能出现在姓名中\n"
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "电子邮件地址： "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "注释： "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5397,11 +5458,11 @@
 " “%s”\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "这样的用户标识已经存在于这个密钥上了！\n"
 
@@ -5416,31 +5477,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或退出（Q）？ "
 
-#: g10/keygen.c:3130
+#: g10/keygen.c:3114
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或退出（Q）？ "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5451,18 +5512,18 @@
 "、移动鼠标、读写硬盘之类的）将会是一个不错的主意；这会让随机数\n"
 "发生器有更好的机会获得足够的熵。\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "警告：已指定 v4，但被 v5 覆盖。\n"
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "密钥生成失败：%s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5473,64 +5534,64 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "继续吗？ (Y/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "一个 \"%s\" 的密钥已经存在\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "无论如何都要创建吗？(y/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "无论如何都创建\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注意：使用 “%s %s” 以获得一个全功能的密钥生成对话框。\n"
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注意：卡片密钥的备份已保存到‘%s’\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在将公钥写至‘%s’\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "无可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并被签名。\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5538,34 +5599,34 @@
 "请注意这个密钥不能用于加密。您可能想要使用“--edit-key”命令来\n"
 "生成一个用于此用途的子密钥。\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥已经在 %lu 秒后的未来生成（可能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥已经在 %lu 秒后的未来生成（可能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥创建子密钥是不与 OpenPGP 兼容的\n"
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主密钥的私钥部分不可用。\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主密钥的私钥部分存储在卡上。\n"
 
-#: g10/keygen.c:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "真的要创建吗？(y/N) "
 
@@ -5573,71 +5634,87 @@
 msgid "never "
 msgstr "永不 "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD： "
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "摘要： "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "特点： "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "公钥服务器不可修改"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "紧急签名策略： "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "签名策略： "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "紧急首选公钥服务器： "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "紧急签名注记： "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "签名注记： "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d 个良好签名\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, c-format
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 "%d 个签名因错误而未被检查\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, 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"
 msgstr0 "警告：%lu 把密钥因尺寸大而被跳过\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr "主密钥指纹："
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " 主密钥指纹："
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " 子密钥指纹："
 
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " 密钥指纹 ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " 卡片序列号 ="
 
@@ -5711,143 +5788,143 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s” 不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr0 "正在更新 %d 把密钥，从 %s \n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法通过 %s 更新密钥 %s ：%s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥 “%s”\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在请求密钥 %s 从 %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "无已知的公钥服务器\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳过 “%s”： %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "正在发送密钥 %s 到 %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在从 %s 请求密钥\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "奇怪的加密会话密钥长度（%d）\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, c-format
 msgid "%s.%s encrypted session key\n"
 msgstr "%s.%s 已加密的会话密钥\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s 已加密的数据\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "未知的算法加密 %d.%s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "由 %s 密钥加密，标识为 %s，生成于 %s\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " “%s”\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、密钥号为 %s\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告： 检测到多重纯文本\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密数据：完好的数据加密密钥（DEK）\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:660
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 密文算法不可用，尝试使用 %s 代替\n"
 
-#: g10/mainproc.c:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：消息未受到完整性保护\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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"
@@ -5857,178 +5934,184 @@
 "看起来此信息就是合法的。这是因为那个时候完整性\n"
 "保护还没有被广泛地采用。\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "无论如何使用选项‘%s’来解密。\n"
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "解密强制失败！\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "未能满足合规规则，操作已强制取消\n"
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发送者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书 - 请使用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理此有歧义的签名数据\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " 使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，密钥号 %s\n"
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, c-format
 msgid " issuer \"%s\"\n"
 msgstr " 签发者 \"%s\"\n"
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "密钥在以下地方可用： "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注意：使用 “%s” 可使用此信息\n"
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr "不确定"
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " 亦即 “%s”"
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "警告： 此密钥在 %s 模式下不适用于签名\n"
 
-#: g10/mainproc.c:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 签名，摘要算法 %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr "，密钥算法 "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "警告：不是一个分离签名；文件‘%s’没有被验证！\n"
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式（PGP 2.x）签名\n"
@@ -6128,27 +6211,27 @@
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "此消息可能不能被 %s 使用\n"
 
-#: g10/misc.c:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "未知的弱摘要‘%s’\n"
@@ -6201,7 +6284,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类型的子包设定了紧急位\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 msgid "Please enter the passphrase for decryption."
 msgstr "请输入解密密码。"
 
@@ -6262,7 +6345,7 @@
 "创建于 %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6275,75 +6358,75 @@
 "请记住这张图片储存在您的公钥里。如果您挑了过大的图片的话，\n"
 "您的密钥也会变得非常大！请把图片控制到接近理想尺寸 240x288。\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "输入要当作照片标识的 JPEG 文件名： "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "无法打开 JPEG 文件‘%s’：%s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "此 JPEG 文件过大（%d 字节）！\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "您确定要用它吗？(y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "‘%s’不是一个 JPEG 文件\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "这张照片正确吗？(y/N/q) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "不支持远程程序执行\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "此平台上调用外部程序时要求临时文件\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "无法执行外壳程序‘%s’：%s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "外部程序异常退出\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "调用外部程序时出现系统错误：%s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "警告：无法删除临时文件（%s）‘%s’：%s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "由于文件权限位不安全，外部程序调用被禁用\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
@@ -6424,32 +6507,32 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "确定一个绝对信任的密钥的证书：\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s：不保证这个密钥属于其声称的所有者\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s：只有有限的保证这个密钥属于其声称的所有者\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "这个密钥有可能属于其声称的所有者\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "这个密钥是属于我们的\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, c-format
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "%s：此密钥有问题！其已被标记为不受信任！\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 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"
@@ -6459,7 +6542,7 @@
 "*真的* 了解您正在做的事情，您需要在下面的\n"
 "问题中回答 yes。\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6468,153 +6551,153 @@
 "这个密钥并不一定属于其用户标识中声称的那个人。如果您真的\n"
 "知道自己在做什么，您可以在下一个问题回答 yes。\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "无论如何都要使用这个密钥吗？(y/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告：正在使用不受信任的密钥！\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告：此密钥可能已被吊销（吊销用密钥不存在）\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, c-format
 msgid "checking User ID \"%s\"\n"
 msgstr "检查用户标识“%s”\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, c-format
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "选项‘%s’已给定，但发布者“%s”不匹配\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, c-format
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "发布者“%s”未匹配任何用户标识\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, c-format
 msgid "option %s given but no matching User ID found\n"
 msgstr "选项‘%s’已给定，但未发现任何匹配的用户标识\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告：此密钥已经被它的指定吊销者吊销了！\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告：此密钥已经被它的所有者吊销了！\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " 这可能表明此签名是伪造的。\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告：此子密钥已经被它的所有者吊销了！\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "注意：此密钥已被禁用。\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "注意：此密钥已过期！\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, c-format
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "警告：此密钥的用户标识未被受信任签名认证！\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告：此密钥未被受信任签名认证！\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " 没有证据表明此签名属于其声称的所有者。\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告：我们不信任这个密钥！\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " 此签名很有可能是伪造的。\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, c-format
 msgid ""
 "WARNING: The key's User ID is not certified with sufficiently trusted "
 "signatures!\n"
 msgstr "警告：此密钥的用户标识未被足够可信的签名所认证！\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告：此密钥未被足够可信的签名所认证！\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " 此签名并不一定属于其声称的所有者。\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s：已跳过：公钥已被禁用\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, c-format
 msgid "can't encrypt to '%s'\n"
 msgstr "无法加密给‘%s’\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, c-format
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "选项‘%s’已给定，但尚未给定有效的默认密钥\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, c-format
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "选项‘%s’已给定，但是选项‘%s’尚未给定\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "您没有指定用户标识。（您可以在命令行中用“-r”指定）\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "当前接收者：\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6622,40 +6705,40 @@
 "\n"
 "输入用户标识。以空白行结束： "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "没有此用户标识。\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为用于默认接收者\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "公钥被禁用。\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "已跳过：公钥已被设定\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的默认接收者 “%s”\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "注意：密钥 %s 没有 %s 特性\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "注意：密钥 %s 没有关于 %s 的偏好设置\n"
@@ -6693,7 +6776,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "无法打开已签名的数据 fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "密钥 %s 在 %s 模式下不适用于解密\n"
@@ -6915,49 +6998,44 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "%s 密钥 %s 要求一个 %zu 位或更长的散列（散列是 %s）\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "密钥 %s 在 %s 模式中不适用于签名\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr "由于 %s 选项，验证仍在继续中\n"
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告：签名散列值与报文不一致\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告：签名的子密钥 %s 未经交叉验证\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告：签名的子密钥 %s 具有无效的交叉验证\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, 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"
 msgstr0 "公钥 %s 在其签名之后的 %lu 秒生成\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, 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"
 msgstr0 "公钥 %s 在其签名之后的 %lu 天生成\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6966,7 +7044,7 @@
 msgstr0 ""
 "密钥 %s 生成于未来的 %lu 秒后（可能是因为时空扭曲或系统时钟的问题）\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, c-format
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -6974,76 +7052,76 @@
 msgstr0 ""
 "密钥 %s 生成于未来的 %lu 天后（可能是因为时空扭曲或系统时钟的问题）\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "注意：签名密钥 %s 已被吊销\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:1241
+#: g10/sig-check.c:1235
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有用于子密钥吊销签名的子密钥\n"
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有用于子密钥绑定签名的子密钥\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr "警告：注记 %% 无法扩展（过大）。现在使用未扩展的。\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr "警告：策略 URL %% 无法扩展（过大）。现在使用未扩展的。\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 msgstr "警告：首选公钥服务器 URL %% 无法扩展（过大）。现在使用未扩展的。\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强制摘要算法 %s (%d) 与接收者的偏好设置冲突\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, c-format
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s 加密将被采用\n"
@@ -7117,133 +7195,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：sync 失败：%s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "无法为‘%s’创建锁\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "无法锁定‘%s’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "信任度数据库处理量过大\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "无法访问‘%s’：%s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s：建立版本记录失败：%s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s：建立了无效的信任度数据库\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数据库\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "注意：信任度数据库不可写入\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数据库\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出现错误： %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出现错误： %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任度数据库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任度数据库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：不是一个信任度数据库文件\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编号为%lu的版本记录\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读取自由记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "错误：信任度数据库已被破坏。\n"
@@ -7645,7 +7723,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
@@ -7675,36 +7753,36 @@
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "已处理 %d 把密钥"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr0 " （%d 个有效计数已被清除）\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "未找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任密钥 %s 的公钥未找到\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, 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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -7773,7 +7851,7 @@
 msgid "ultimate"
 msgstr " 绝对 "
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -7784,12 +7862,12 @@
 "请记住签名文件（.sig 或 .asc）应该是\n"
 "在命令行中第一个给定的文件。\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的 LF 缺失\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "无法打开 fd %d：%s\n"
@@ -7804,19 +7882,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "提示：不要使用选项 %s\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "设置调试选项"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "启用完整调试"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "用法：kbxutil 选项 文件 (-h 获取帮助)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -7827,16 +7905,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%s"
 msgstr "%s数字&#x1f;: %s%%0A持有者&#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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "剩余尝试：%d"
@@ -7865,10 +7943,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||请为您的 PIV 卡片输入解锁密钥"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
@@ -7888,149 +7966,149 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN 有无效字符；只允许使用数字\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "正在写入新密钥\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存储密钥失败：%s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应不包含 RSA 余数\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应不包含 RSA 公钥指数\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "响应不包含 EC 公钥\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "请等待密钥生成…\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr0 "密钥生成完成（%d 秒）\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "响应不包含公钥数据\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||请为这个密钥输入 PIN 以创建合格的签名。"
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|请输入管理员 PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请输入标准密钥的 PIN 解锁码（PUK）。"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||请输入标准密钥的 PIN。"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "注意：尚未启用 PIN。"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "尚未变更 NullPIN\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|请为标准密钥输入一个新的 PIN。"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请为标准密钥输入一个新的 PIN 解锁码（PUK）。"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|请为这个密钥输入一个新的 PIN 以创建合格的签名。"
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 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:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|请为这个密钥输入 PIN 解锁码（PUK）以创建合格的签名。"
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出现错误：%s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存储指纹失败：%s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存储创建日期失败：%s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡片中拉取 CHV 状态时出现错误\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "读取公钥失败：%s\n"
@@ -8038,62 +8116,62 @@
 #. 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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr "%s数字&#x1f;: %s%%0A持有者&#x1f;: %s%%0A计数&#x1f;: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "使用默认 PIN 作为 %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 msgid "||Please unlock the card"
 msgstr "||请解锁卡片"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "卡片被永久锁定！\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, 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"
 msgstr0 "在卡片被永久锁定之前剩余 %d 次管理员 PIN 尝试\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "未配置到管理员命令的访问\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||请输入 PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||请输入卡片的重置码"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重置码太短；最小长度为 %d\n"
@@ -8101,78 +8179,78 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|新的重置码"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|新的 PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||请输入原管理员 PIN 和新管理员 PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||请输入原 PIN 和新 PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 DO 时出现错误\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, c-format
 msgid "unsupported curve\n"
 msgstr "不支持的曲线\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构（DO 0x93）\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指纹与请求的不匹配\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支持摘要算法 %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能访问 %s - 无效的 OpenPGP 卡？\n"
@@ -8192,7 +8270,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "正在以多服务器模式运行（前台）"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|设置调试级别至 LEVEL"
 
@@ -8236,11 +8314,11 @@
 msgid "deny the use of admin card commands"
 msgstr "拒绝使用卡片的管理员命令"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "用法：@SCDAEMON@ 选项 (-h 获取帮助)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8248,314 +8326,314 @@
 "语法：scdaemon 选项 命令 参数\n"
 "@GNUPG@ 智能卡守护进程\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "请使用‘--daemon’选项以在后台运行此程序\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d 的句柄已启动\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d 的句柄已关闭\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "获取密钥用途信息时出现错误：%s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
-msgstr ""
+msgstr "可能正在使用Tor——网络访问受限"
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "证书所请求的验证模型：%s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "链"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "外壳"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "紧急认证扩展 %s 不被支持"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "签发者证书没有被标记为 CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "未配置关键标记策略"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "注意：非紧急认证策略不被允许"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "证书策略不被允许"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "获取指纹失败\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "在外部位置查找签发者\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "匹配的签发者数目：%d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "无法获取 authorityInfoAccess：%s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "在 Dirmngr 缓存中查找签发者\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "匹配的证书数：%d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr 仅缓存的密钥查找失败：%s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "分配 keyDB 句柄时失败\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "证书已被吊销"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "证书的状态未知"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "请确定“dirmngr”被正确安装\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "检查 CRL 时失败：%s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "证书的有效期无效：%s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "证书尚未验证"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "根证书尚未验证"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "中间证书尚未验证"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "证书已过期"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "根证书已过期"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "中间证书已过期"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "请求的证书属性缺失：%s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "证书有效期无效"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "签名不是在证书的有效期内被创建的"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "签名不是在签发者的有效期内被创建的"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "中间证书不是在签发者的有效期内被创建的"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " （ 签名创建于 "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " （证书创建于 "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " （证书有效期从 "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " （ 签发者有效期从 "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指纹 = %s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根证书现已被标记为信任\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "交互式标记为信任未在 gpg-agent 中开启\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "交互式标记为信任在此会话中被关闭\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告：签名的创建时间未知 - 猜测为当前时间"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "证书中没有找到签发者"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "自签名证书具有损坏的签名"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根证书未被标记为信任"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查信任列表时失败：%s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "证书链过长\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "签发者证书未找到"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "证书具有损坏的签名"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到另一个可能匹配的 CA 证书 - 正在重试"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "证书链长于 CA 允许的长度（%d）"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "证书有效\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中间证书有效\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根证书良好\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "正在切换为链模型"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用的验证模型：%s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "内存不足\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "（这是 MD2 算法）\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "none"
 
@@ -8575,7 +8653,7 @@
 msgid "Error - invalid DN"
 msgstr "错误 - 无效 DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8589,42 +8667,42 @@
 "S/N %s，ID 0x%08lX，\n"
 "创建于 %s，过期于 %s。\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "没有指定密钥用途 - 假设为所有用途\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "证书本不应被用于认证\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "证书本不应被用于认 OCSP 响应签名\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "证书本不应被用于加密\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "证书本不应被用于签名\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "证书不可用于加密\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "证书不可用于签名\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "查找另一个证书\n"
@@ -8840,17 +8918,17 @@
 msgid "resource problem: out of core\n"
 msgstr "资源问题：内存不足\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "（此为 RC2 算法）\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "（这看起来不像是一条被加密的消息）\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "由 %s 密钥 %s 加密\n"
@@ -8860,7 +8938,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "证书‘%s’未找到：%s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "锁定钥匙箱时出现错误：%s\n"
@@ -8885,123 +8963,123 @@
 msgid "no valid recipients given\n"
 msgstr "未指定有效的接收者\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "列出外部密钥"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "列出证书链"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "导入证书"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "导出证书"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "注册一张智能卡"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "传递一条命令给 dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "调用 gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "始终不使用终端"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|要包含的证书数目"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|从 FILE 处获取策略信息"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "假定输入的是 PEM 格式"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "假定输入的是 base-64 格式"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "假定输入的是二进制格式"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "创建 base-64 编码的输出"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|使用 USER-ID 作为默认的私钥"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|添加钥匙环到钥匙环列表"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "获取缺失的签发者证书"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|对 PKCS#12 密码使用名为 NAME 的编码"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "从不查询 CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "不对根证书检查 CRLs"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "使用 OCSP 检查有效性"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "不检查证书策略"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|使用名称为 NAME 的密文算法"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|使用以 NAME 命名的信息摘要算法"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "批处理模式：永不询问"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "在多数问题上假定回答为是"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "在多数问题上假定回答为否"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|将审计日志写入 FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "用法：@GPGSM@ 选项 文件 (-h 获取帮助)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9011,27 +9089,27 @@
 "使用 S/MIME 协议以签名、检查、加密或者解密\n"
 "默认操作取决于输入的数据\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注意：将不加密给‘%s’：%s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的验证模型‘%s’\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在导入通用证书‘%s’\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "无法使用‘%s’签名：%s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "无效的命令（不存在隐式的命令）\n"
@@ -9051,7 +9129,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本证书检查失败 - 未被导入\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "获取存储选项时出现错误：%s\n"
@@ -9061,47 +9139,47 @@
 msgid "error importing certificate: %s\n"
 msgstr "导入证书时出现错误：%s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "读取输入时出现错误：%s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "此会话中没有正在运行的 keyboxd\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "打开密钥数据库时出现错误：%s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "查找现存证书时出现问题：%s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "寻找可写入的 keyDB 时出现错误：%s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "存储证书时出现错误：%s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "重新搜索证书时出现问题：%s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "存储选项时出现错误：%s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "错误 - "
 
@@ -9136,7 +9214,7 @@
 "\n"
 "%s%s您真的确定您要这样做吗？"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9154,58 +9232,58 @@
 "“%s”\n"
 "注意，此证书将不会创建一个合格签名！"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "散列算法 %d (%s) 对于签名者 %d 而言不被支持；使用 %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "为签名者 %d 使用的散列算法：%s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查合格证书失败：%s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s 使用 %s 密钥 %s 创建的签名\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "已签名 "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr "日期未指定"
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, c-format
 msgid "algorithm:"
 msgstr "算法："
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "无效的签名：消息摘要属性与计算得到的不匹配\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "良好签名来自于"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " 亦即"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "这是一个合格的签名\n"
@@ -9230,323 +9308,318 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "无法解除证书缓存上的锁：%s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "从缓存中丢弃 %u 个证书\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "无法解析证书‘%s’：%s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "证书‘%s’已被缓存\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "受信任证书‘%s’已加载\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "证书‘%s’已加载\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " SHA1 指纹 = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " 签发者 ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " 主题 ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "加载证书‘%s’时出现错误：%s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "永久载入的证书： %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " 运行时缓存的证书： %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, c-format
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " 信任的证书： %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "证书已被缓存。\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "证书已缓存\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "缓存证书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "无效的 SHA1 指纹字串 '%s'\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "通过 S/N 获取证书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "通过主题获取证书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "没有找到证书的签发者\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "获取 authorityKeyIdentifier 时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "正在创建目录‘%s’\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "创建目录‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "忽略数据库文件夹‘%s’\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "读取文件夹‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "正在移除缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "未能移除文件‘%s’\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "关闭缓存文件时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "打开缓存目录文件‘%s’失败：%s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "创建新的缓存目录文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "写入新的缓存目录文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:434
+#: dirmngr/crlcache.c:441
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "关闭新的缓存目录文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "新的缓存目录文件‘%s’已创建\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "重新打开缓存目录文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "‘%s’的第一条记录不是版本信息\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "缓存目录的旧版 - 正在清理\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "缓存目录的旧版 - 放弃\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "在‘%s’的 CRL 记录的第 %u 行检测到额外信息\n"
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "在‘%s’的第 %u 行检测到无效的行\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "在‘%s’的第 %u 行检测到重复的条目\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "已跳过‘%s’的第 %u 行的不支持的记录\n"
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr ""
 "在‘%s’的第 %u 行检测到无效的签发者散列\n"
 "\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr ""
 "在‘%s’的第 %u 行没有签发者 DN\n"
 "\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr ""
 "在‘%s’的第 %u 行检测到无效的时间戳\n"
 "\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr ""
 "警告：在‘%s’的第 %u 行检测到无效的缓存文件\n"
 "\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "在缓存目录文件中检测到错误\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "请检查理由并手动删除那个文件\n"
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "创建临时缓存目录文件‘%s’时失败：%s\n"
 
-#: dirmngr/crlcache.c:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "关闭‘%s’时出现错误：%s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "将‘%s’重命名为‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "无法取‘%s’的散列：%s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "设置 MD5 散列上下文时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "计算‘%s’的散列时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "‘%s’具有无效的校验和格式\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "已经打开太多缓存文件；无法打开更多\n"
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "正在打开缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "打开缓存文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "为读取初始化缓存文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "对一个已关闭的文件调用 unlock_db_file 方法\n"
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "对一个已解锁的文件调用 unlock_db_file 方法\n"
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "创建新的缓存对象失败：%s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "签发者标识为 %s 的 CRL 不可用\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "签发者标识 %s 的 CRL 缓存太旧；要求更新\n"
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, c-format
 msgid ""
 "force-crl-refresh active and %d minutes passed for issuer id %s; update "
@@ -9554,259 +9627,259 @@
 msgstr ""
 "force-crl-refresh 选项已启用并且已过去 %d 分钟，签发者标识为 %s ; 要求更新\n"
 
-#: dirmngr/crlcache.c:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "签发者标识 %s 的 force-crl-refresh 选项已启用; 要求更新\n"
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "签发者标识 %s 的可用 CRL 不能被使用\n"
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr "签发者标识 %s 缓存的 CRL 被修改；我们需要更新\n"
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "警告：S/N 具有无效的缓存记录长度 "
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "读取 S/N %s 的缓存记录时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr "S/N %s 无效；原因=%02X 日期=%.15s\n"
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "从缓存文件中获取数据时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "从 libksba 获得了无效的 S 表达式\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "转换 S 表达式时失败：%s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "未知的散列算法‘%s’\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "算法 %d 的 gcry_md_open 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "创建 S 表达式时失败：%s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "从 CRL 获取更新次数时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "此 CRL 的更新时间：本次=%s 下次=%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate 参数未被指定；假设有效期为一天\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "获取 CRL 项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "向临时缓存文件中插入项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "没有在 CRL 中找到 CRL 签发者： %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "正在通过 authorityKeyIdentifier 定位 CRL 签发者\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL 签名验证失败：%s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "检查 CRL 签署者证书的有效性时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "移除过期的缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "移除过期的缓存文件‘%s’时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "创建临时缓存文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "完成临时缓存文件时出现错误‘%s’：%s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "关闭临时缓存文件时出现错误‘%s’：%s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "警告：新的 CRL 仍然太旧；其已在 %s 过期 - 无论如何先加载\n"
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新的 CRL 仍然太旧；其已在 %s 过期\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "未知的紧急 CRL 扩展 %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "读取 CRL 扩展时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "正在创建缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "将‘%s’重命名为‘%s’时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, 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:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "开始 CRL 导出（已通过 %s 取回）\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr " 错误：此 CRL 将不会被使用，因为它在一次更新之后仍然太旧！\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " 错误：此 CRL 将不会被使用，因为一个未知的紧急扩展！\n"
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " 错误：此 CRL 将不会被使用\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " 错误：此缓存的 CRL 可能已经被篡改！\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " 警告： 无效的缓存记录长度\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "读取缓存记录时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "读取缓存的密钥时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "从数据库读取缓存项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "结束 CRL 导出\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "通过 DP 的 crl_fetch 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "通过 DP 进行 crl_cache_insert 失败：%s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "通过发布者进行 crl_cache_insert 失败：%s\n"
@@ -9817,28 +9890,26 @@
 msgstr "读取器的文件映射表已满 - 正在等待\n"
 
 #: dirmngr/crlfetch.c:155
-#, fuzzy
-#| msgid "CRL access not possible due to Tor mode\n"
 msgid "CRL access not possible due to Tor mode"
-msgstr "不能在 Tor 模式下访问 CRL \n"
+msgstr "不能在 Tor 模式下访问 CRL"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "不能进行 CRL 访问，因为 %s 已禁用\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "拉取‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "初始化读取对象时出现错误：%s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "由于 %s 被关闭，无法进行证书搜索\n"
@@ -9983,139 +10054,135 @@
 msgid "looking up '%s'\n"
 msgstr "正在查找‘%s’\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "列出 CRL 缓存的内容"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|从 FILE 中加载 CRL 到缓存"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|从 URL 处获取 CRL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "关闭 dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "刷新缓存"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr "允许在线软件版本检查"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|在一次查询中最多返回 N 个项目"
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr "网络相关选项"
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr "通过 Tor 转发所有网络流量"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "对 HTTP 服务器的配置"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "禁止使用 HTTP 协议"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分发点"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|重定向 HTTP 请求到 URL"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "使用系统的 HTTP 代理设置"
 
-#: dirmngr/dirmngr.c:251
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
+#: dirmngr/dirmngr.c:256
 msgid "Configuration for OpenPGP servers"
-msgstr "对 HTTP 服务器的配置"
+msgstr "对 OpenPGP 服务器的配置"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|使用 URL 处的密钥服务器"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|为承载 HKP 的 TLS 使用 FILE 中的 CA 证书"
 
-#: dirmngr/dirmngr.c:258
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
+#: dirmngr/dirmngr.c:263
 msgid "Configuration for X.509 servers"
-msgstr "对 HTTP 服务器的配置"
+msgstr "对 X.509 服务器的配置"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "禁止 LDAP 的使用"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "忽略 LDAP CRL 分发点"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|使用 HOST 进行 LDAP 查询"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "使用 --ldap-proxy 选项以不使用回退主机"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此公钥服务器来查找密钥"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|从 FILE 中读取 LDAP 服务器列表"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "添加从 CRL 分发点发现的新服务器到服务器列表"
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|设置 LDAP 超时时间为 N 秒"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "对于 OCSP 的配置"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "允许发送 OCSP 请求"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "忽略证书包含的 OCSP 服务 URLs"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|使用 URL 处的 OCSP 响应者"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP 响应由 FPR 签名"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "强制载入过期的 CRLs"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10124,11 +10191,11 @@
 "@\n"
 "(参阅 \"info\" 手册以获取一份所有命令及选项的完整列表)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "用法：@DIRMNGR@ 选项 (-h 获取帮助)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10136,103 +10203,103 @@
 "语法：@DIRMNGR@ 选项 命令 参数\n"
 "@GNUPG@ 的公钥服务器、CRL 和 OCSP 访问\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的调试等级为：%s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "用法：%s 选项 "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "套接字名称中不允许使用冒号\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处获取 CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处处理 CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行太长 - 跳过\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 检测到无效指纹\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 读取错误：%s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 已忽略行尾部的垃圾数据\n"
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "接收到 SIGHUP 信号 -正在重新读取配置文件并刷新缓存\n"
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "接收到 SIGUSR2 信号 - 未定义要进行的操作\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "接收到 SIGTERM 信号 - 正在关闭...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "接收到 SIGTERM 信号 - 仍然有 %d 个活动的连接\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "强制关闭\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT 信号 - 立即关闭\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到 %d 信号 - 未定义要进行的操作\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "访问‘%s’时出现错误：http 状态码 %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' 重定向到 '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "过多重定向\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "重定向更改到 “%s”\n"
@@ -10287,32 +10354,32 @@
 msgid "malloc failed: %s\n"
 msgstr "malloc 方法失败：%s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "‘%s’不是一个 LDAP URL\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "‘%s’是一个无效的 LDAP URL\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search 方法触及服务器的大小限制\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: 给定密码但未给定用户\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr "%s:%u：忽略未知的标志 ‘%s’\n"
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: 正在跳过此行\n"
@@ -10348,10 +10415,8 @@
 msgstr "服务器的响应太长；限制为 %d 字节\n"
 
 #: dirmngr/ocsp.c:148
-#, fuzzy
-#| msgid "OCSP request not possible due to Tor mode\n"
 msgid "OCSP request not possible due to Tor mode"
-msgstr "不能在 Tor 模式下进行 OCSP 请求\n"
+msgstr "不能在 Tor 模式下进行 OCSP 请求"
 
 #: dirmngr/ocsp.c:157
 #, c-format
@@ -10403,161 +10468,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "并非由一个默认的 OCSP 签名者的证书签名"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "分配列表项时失败：%s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "获取响应者 ID 时出现错误：%s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "未找到合适的证书来验证 OCSP 请求\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "未找到签发者证书：%s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "调用者没有返回目标证书\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "调用者没有返回签发的证书\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "分配 OCSP 上下文时失败：%s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "未定义默认的 OCSP 响应者\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "未定义默认的 OCSP 签名者\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "正在使用默认的 OCSP 响应者‘%s’\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "正在使用 OCSP 响应者‘%s’\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "获取目标证书的 OCSP 状态时出现错误：%s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "证书状态：%s (当前=%s 下一个=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "证书已经被吊销于： %s 原因是： %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP 响应者返回了将来的状态\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP 响应者返回了一个非当前的状态\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP 返回了一个太以前的状态\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) 方法失败：%s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "证书 ID 中的序列号缺失"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 方法失败：%s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url 方法失败：%s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "发送数据时出现错误：%s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 方法失败：%s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 方法失败：%s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "超过设置的 max_replies %d\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "无法分配控制结构：%s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "分配 assuan 上下文时失败：%s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "初始化服务器时失败：%s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "向 Assuan 注册命令时失败：%s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接受出现问题：%s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 处理时失败：%s\n"
@@ -10567,83 +10632,83 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "正在接受的根 CA 没有被标记为一个 CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "CRL 检查时出现过深层的嵌套\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "未检查 CRL ，对于"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "正在检查 CRL，对于"
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "检查根证书的信任度时失败：%s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "证书链良好\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "证书本不应被用于 CRL 签名\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "静默"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "以十六进制编码打印数据"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "解码接收到的数据行"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "连接到 dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 msgid "connect to the keyboxd"
 msgstr "连接 keyboxd"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|连接到名称为 NAME 的 Assuan 套接字"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|连接到地址为 ADDR 的 Assuan 服务器"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "运行命令行中指定的 Assuan 服务器"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "不使用扩展连接模式"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|在启动时从 FILE 处执行命令"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "在启动时运行 /subst"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "用法：@GPG@-connect-agent 选项 (-h 获取帮助)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -10651,48 +10716,48 @@
 "语法：@GPG@-connect-agent 选项\n"
 "连接到一个正在运行的代理人程序并发送命令\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "选项 “%s” 要求一个程序和可选参数\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "已忽略选项 “%s”，因为 “%s”\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收行失败：%s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "行太长 - 跳过\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "行已被截断，因为内嵌有 Nul 字符\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "未知命令‘%s’\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "发送行失败：%s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "此会话中没有正在运行的 keybox 守护进程\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "发送标准选项时出现错误：%s\n"
@@ -10752,12 +10817,12 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "注意，群组规范已被忽略\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "关闭‘%s’时出现错误\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "处理‘%s’时出现错误\n"
@@ -10862,33 +10927,33 @@
 "语法：gpg-check-pattern 选项 patternfile\n"
 "按照 patternfile 检查一个由标准输入（stdin）给定的密码\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "注意： 已有私钥 %s 被存储于卡片上！\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "注意： 已有私钥被存储于卡片上！\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "替换现有密钥 %s ？(y/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "检测到 %s 卡片 编号 %s\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr "用户交互标志设置为“%s”——无法更改\n"
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -10897,47 +10962,62 @@
 "警告：正在将用户交互标志设置为“%s”\n"
 " 只能使用出厂重置还原！\n"
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "请使用“uif --yes %d %s”\n"
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "验证卡片"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "向卡片守护进程发送重置"
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "针对 PIN 身份验证设置 KDF"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "更改私有数据对象"
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "从数据对象中读取证书"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "储存一个证书到数据对象"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "储存私钥到数据对象"
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey 管理命令"
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "管理命令历史记录"
 
+#~ msgid "continuing verification anyway due to option %s\n"
+#~ msgstr "由于 %s 选项，验证仍在继续中\n"
+
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "所选择的 AEAD 算法无效\n"
+
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "无效的个人 AEAD 偏好设置\n"
+
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "AEAD 算法‘%s’不能在 %s 模式下使用\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "强行对称密文算法 %s (%d) 与接收者的偏好设置冲突\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "写入临时文件时出现错误： %s\n"

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/zh_TW.gmo -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/zh_TW.gmo Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/po/zh_TW.po -> _service:tar_scm:gnupg-2.4.3.tar.bz2/po/zh_TW.po Changed

@@ -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: 2022-04-25 15:55+0200\n"
+"POT-Creation-Date: 2023-07-04 15:53+0200\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:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
@@ -32,59 +32,59 @@
 #. * text. An underscore indicates that the next letter should be
 #. * used as an accelerator. Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|取消 (_C)"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|個人識別碼 (PIN):"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|取消 (_C)"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, 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:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "請輸入新密語"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -95,7 +95,7 @@
 #. translate this entry, a default English text (see source)
 #. will be used. The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -106,14 +106,14 @@
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled. The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints. Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -121,7 +121,7 @@
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "優劣程度: %s"
 
@@ -131,94 +131,100 @@
 #. 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:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "上列輸入文字的優劣程度.\n"
 "關於此規範的細節, 請洽你的系統管理者."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
-#: agent/protect-tool.c:729
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1732
+#: agent/protect-tool.c:727
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1810 agent/command.c:2118
+#: agent/command.c:2177 agent/command-ssh.c:3278 agent/genkey.c:428
 msgid "does not match - try again"
 msgstr "前後不一致 - 請再試一次"
 
+#: agent/call-pinentry.c:1550 agent/call-pinentry.c:1819
+#, fuzzy
+#| msgid "Passphrase"
+msgid "Passphrases match."
+msgstr "密語"
+
 #. 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:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1848
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (第 %d 次嘗試, 最多 %d 次)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1585 agent/call-pinentry.c:1859
 msgid "Repeat:"
 msgstr "重複:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1597 agent/call-pinentry.c:1609
+#: agent/call-pinentry.c:1871 agent/call-pinentry.c:1883
 msgid "PIN too long"
 msgstr "個人識別碼 (PIN) 太長"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1872
 msgid "Passphrase too long"
 msgstr "密語太長"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1606 agent/call-pinentry.c:1880
 msgid "Invalid characters in PIN"
 msgstr "個人識別碼 (PIN) 含有無效的字符"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1611 agent/call-pinentry.c:1885
 msgid "PIN too short"
 msgstr "個人識別碼 (PIN) 太短"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad PIN"
 msgstr "不良的個人識別碼 (PIN)"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1630 agent/call-pinentry.c:1903
 msgid "Bad Passphrase"
 msgstr "不良的密語"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1332 g10/card-util.c:749 g10/card-util.c:770
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "取得此卡片序號時出錯: %s\n"
 
-#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:362
+#: agent/command.c:1945 agent/command.c:2110 agent/command-ssh.c:3206
+#: agent/genkey.c:363
 msgid "Please re-enter this passphrase"
 msgstr "請再次輸入密語"
 
-#: agent/command.c:2703
+#: agent/command.c:2908
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -228,52 +234,52 @@
 "system."
 msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
 
-#: agent/command.c:2833
+#: agent/command.c:3049
 msgid ""
 "This key (or subkey) is not protected with a passphrase. Please enter a new "
 "passphrase to export it."
 msgstr ""
 
-#: agent/command-ssh.c:677 agent/command-ssh.c:766
+#: agent/command-ssh.c:693 agent/command-ssh.c:782
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
-#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: agent/command-ssh.c:890 common/dotlock.c:851 g10/card-util.c:998
+#: g10/export.c:1554 g10/gpg.c:1463 g10/keygen.c:5458 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:644 g10/photoid.c:662
+#: g10/sign.c:1121 g10/sign.c:1466 g10/tdbio.c:739 tools/gpg-card.c:494
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "無法建立 '%s': %s\n"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:902 common/helpfile.c:57 g10/card-util.c:955
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
+#: g10/decrypt.c:148 g10/encrypt.c:445 g10/encrypt.c:861 g10/gpg.c:1464
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4396
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
-#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
-#: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1820 tools/gpg-card.c:408
+#: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1334 g10/sign.c:1447
+#: g10/sign.c:1619 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:744
+#: g10/tdbio.c:799 g10/verify.c:99 g10/verify.c:163 sm/gpgsm.c:2316
+#: sm/gpgsm.c:2346 sm/gpgsm.c:2384 sm/keylist.c:1827 sm/qualified.c:65
+#: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
+#: dirmngr/crlcache.c:2668 dirmngr/dirmngr.c:1873 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "無法開啟 '%s': %s\n"
 
-#: agent/command-ssh.c:2396
+#: agent/command-ssh.c:2418
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "找不到合適的卡片金鑰: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2499
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "取得已存放的旗標時出錯: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2910
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@ -281,20 +287,20 @@
 msgstr ""
 "有某個 ssh 程序提出使用金鑰 %%0A %s%%0A (%s)%%0A 之請求, 請問是否允許?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Allow"
 msgstr "允許"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2917 agent/findkey.c:1241
 msgid "Deny"
 msgstr "拒絕"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2926
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
 msgstr "請輸入此 ssh 金鑰的密語 %%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3233
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
@@ -302,85 +308,81 @@
 msgstr ""
 "請輸入密語以保護收到的私鑰 %%0A %s%%0A %s%%0A 於 gpg-agent 的金鑰存放處"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3965
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "從 socket 建立串流失敗: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "請插入下列序號的卡片:"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "管理者個人識別碼 (PIN)"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PIN 重設碼 (PUK)"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "重設碼"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0A使用讀卡機的鍵盤來輸入."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "請再次輸入重設碼"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "請再次輸入 PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "請再次輸入個人識別碼 (PIN)"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "前後兩次輸入的重設碼不一致; 請再試一次"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "前後兩次輸入的 PUK 不一致; 請再試一次"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開卡片"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:155
 #, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error writing to pipe: %s\n"
 msgstr "寫入 %s 時出錯: %s\n"
 
-#: agent/genkey.c:176
+#: agent/genkey.c:177
 msgid "Enter new passphrase"
 msgstr "請輸入新密語"
 
-#: agent/genkey.c:212
+#: agent/genkey.c:213
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "你還沒有輸入密語!%0A空密語是不行的."
 
-#: agent/genkey.c:214
+#: agent/genkey.c:215
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -389,259 +391,265 @@
 "你還沒有輸入密語 - 通常這可不是個好主意!%0A請確認你不想要對你的金鑰做任何保"
 "護."
 
-#: agent/genkey.c:226
+#: agent/genkey.c:227
 msgid "Yes, protection is not needed"
 msgstr "是, 不需要任何保護"
 
-#: agent/genkey.c:243
+#: agent/genkey.c:244
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr0 "密語至少要有 %u 個字符長."
 
-#: agent/genkey.c:262
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr0 "密語至少得要含有 %u 個數字或%%0A特別字符."
 
-#: agent/genkey.c:289
+#: agent/genkey.c:290
 #, fuzzy, c-format
 #| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "密語不得含有已知的詞彙, 亦不得與%%0A確知的模式吻合."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:305
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 你輸入了不安全的密語."
 
-#: agent/genkey.c:325
+#: agent/genkey.c:326
 msgid "Take this one anyway"
 msgstr "無論如何還是要用這個"
 
-#: agent/genkey.c:493
+#: agent/genkey.c:494
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "請輸入密語至%0A以保護你的新金鑰"
 
-#: agent/genkey.c:622
+#: agent/genkey.c:623
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:189
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "對除錯有幫助的選項"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:178
 msgid "run in daemon mode (background)"
 msgstr "以服務模式執行 (背景)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:177
 msgid "run in server mode (foreground)"
 msgstr "以伺服器模式執行 (前景)"
 
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:191
 msgid "do not detach from the console"
 msgstr "不要從 console 分離"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:192
 msgid "sh-style command output"
 msgstr "sh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:193
 msgid "csh-style command output"
 msgstr "csh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:605 scd/scdaemon.c:125 sm/gpgsm.c:435
+#: dirmngr/dirmngr.c:196
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從指定檔案中讀取選項"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
-#: dirmngr/dirmngr.c:196
+#: agent/gpg-agent.c:189 g10/gpg.c:590 scd/scdaemon.c:129 sm/gpgsm.c:274
+#: dirmngr/dirmngr.c:200
 msgid "Options controlling the diagnostic output"
 msgstr "控制著診斷性輸出的選項"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:592 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:131 sm/gpgsm.c:276 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:202 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:199
+#: agent/gpg-agent.c:192 g10/gpg.c:594 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:132 sm/gpgsm.c:278 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:203
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:609 sm/gpgsm.c:292 dirmngr/dirmngr.c:213
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
-#: dirmngr/dirmngr.c:213
+#: agent/gpg-agent.c:204 g10/gpg.c:615 scd/scdaemon.c:146 sm/gpgsm.c:300
+#: dirmngr/dirmngr.c:217
 msgid "Options controlling the configuration"
 msgstr "控制著組態的選項"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "不要使用 SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|名稱|連線至位於指定名稱的主機"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的要求"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的要求"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "啟用 ssh 支援"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "啟用 putty 支援"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:234
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "啟用 putty 支援"
+
+#: agent/gpg-agent.c:244 g10/gpg.c:861 scd/scdaemon.c:176 sm/gpgsm.c:395
 msgid "Options controlling the security"
 msgstr "控制著安全性的選項"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:247
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:249
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:251
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:253
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:255
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:257
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "不允許重複使用舊密語"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:259
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "不允許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:264
 msgid "allow presetting passphrase"
 msgstr "允許預先設定密語"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:269
 msgid "Options enforcing a passphrase policy"
 msgstr "強制執行密語原則的選項"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:272
 msgid "do not allow bypassing the passphrase policy"
 msgstr "不允許略過密語原則"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:274
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|把新密語所需的最短長度設成 N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:276
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|新密語至少要有 N 個非字母的字符"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:279
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:283
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天之後讓密語過期"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "do not allow the reuse of old passphrases"
 msgstr "不允許重複使用舊密語"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:288
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "控制著安全性的選項"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:290
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:292
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:294
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "不要奪取鍵盤及滑鼠"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:297
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:301
 #, fuzzy
 #| msgid "|N|set LDAP timeout to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|把 LDAP 逾時設成 N 秒"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:305
 msgid "allow passphrase to be prompted through Emacs"
 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:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:571 agent/preset-passphrase.c:102 agent/protect-tool.c:153
+#: g10/gpg.c:1165 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: sm/gpgsm.c:637 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:471
+#: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:580
 msgid "Usage: @GPG_AGENT@ options (-h for help)"
 msgstr "用法: @GPG_AGENT@ 選項 (或用 -h 求助)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:582
 msgid ""
 "Syntax: @GPG_AGENT@ options command args\n"
 "Secret key management for @GNUPG@\n"
@@ -649,142 +657,142 @@
 "語法: @GPG_AGENT@ 選項 指令 引數\n"
 "@GNUPG@ 私鑰管理\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
-#: dirmngr/dirmngr.c:539
+#: agent/gpg-agent.c:627 g10/gpg.c:1363 scd/scdaemon.c:385 sm/gpgsm.c:785
+#: dirmngr/dirmngr.c:555
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "給定的除錯等級 '%s' 無效\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:994 g10/gpg.c:3973 g10/gpg.c:3997 sm/gpgsm.c:1690
+#: sm/gpgsm.c:1696
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2044 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1946
+#: agent/gpg-agent.c:1223 agent/gpg-agent.c:2072 common/comopt.c:97
+#: g10/gpg.c:2615 scd/scdaemon.c:550 sm/gpgsm.c:1052 dirmngr/dirmngr.c:1127
+#: dirmngr/dirmngr.c:1999
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "從 '%s' 讀取選項中\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1348 g10/gpg.c:3928 scd/scdaemon.c:688 sm/gpgsm.c:1627
+#: dirmngr/dirmngr.c:1244 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "請注意: '%s' 並不當成選項\n"
 
-#: agent/gpg-agent.c:1382 g10/misc.c:1188 dirmngr/dirmngr.c:1279
+#: agent/gpg-agent.c:1399 g10/misc.c:1188 dirmngr/dirmngr.c:1331
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: 已不建議使用 \"%s\" 選項\n"
 
-#: agent/gpg-agent.c:2197 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1353
+#: agent/gpg-agent.c:2225 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1404
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:2214 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1366
+#: agent/gpg-agent.c:2242 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1417
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket 名稱 '%s' 太長\n"
 
-#: agent/gpg-agent.c:2252
+#: agent/gpg-agent.c:2280
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2258
+#: agent/gpg-agent.c:2286
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:2270 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2298 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1453
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:2275 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1405
+#: agent/gpg-agent.c:2303 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1456
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2286 agent/gpg-agent.c:2326 agent/gpg-agent.c:2335
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1414
+#: agent/gpg-agent.c:2314 agent/gpg-agent.c:2354 agent/gpg-agent.c:2363
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1465
 #, 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:2300 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1426
+#: agent/gpg-agent.c:2328 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1477
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在候聽 socket '%s'\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2373 common/homedir.c:762
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2348 agent/gpg-agent.c:2401 common/homedir.c:828
+#: g10/openfile.c:399 g10/photoid.c:492
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "無法建立目錄 '%s': %s\n"
 
-#: agent/gpg-agent.c:2323 agent/gpg-agent.c:2378 common/homedir.c:765
+#: agent/gpg-agent.c:2351 agent/gpg-agent.c:2406 common/homedir.c:833
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目錄 '%s' 已建立\n"
 
-#: agent/gpg-agent.c:2384
+#: agent/gpg-agent.c:2412
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s' 的 stat() 失敗: %s\n"
 
-#: agent/gpg-agent.c:2388
+#: agent/gpg-agent.c:2416
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "無法使用 '%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:2543 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2175
+#: agent/gpg-agent.c:2571 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2229
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2750
+#: agent/gpg-agent.c:2871
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2755
+#: agent/gpg-agent.c:2876
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:2830
+#: agent/gpg-agent.c:2951
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2835
+#: agent/gpg-agent.c:2956
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:3057 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2389
+#: agent/gpg-agent.c:3179 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2443
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:3145 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3267 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:3286 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3408 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2333 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
+#: agent/preset-passphrase.c:76 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -792,11 +800,11 @@
 "@選項:\n"
 " "
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:106
 msgid "Usage: gpg-preset-passphrase options KEYGRIP (-h for help)\n"
 msgstr "用法: gpg-preset-passphrase 選項 金鑰鑰柄 (或用 -h 求助)\n"
 
-#: agent/preset-passphrase.c:106
+#: agent/preset-passphrase.c:109
 msgid ""
 "Syntax: gpg-preset-passphrase options KEYGRIP\n"
 "Password cache maintenance\n"
@@ -804,8 +812,8 @@
 "語法: gpg-preset-passphrase 選項 金鑰鑰柄\n"
 "密碼快取維護\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
-#: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
+#: agent/protect-tool.c:106 g10/gpg.c:461 kbx/kbxutil.c:71 sm/gpgsm.c:224
+#: dirmngr/dirmngr.c:175 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
 " "
@@ -813,8 +821,8 @@
 "@指令:\n"
 " "
 
-#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: agent/protect-tool.c:115 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -824,11 +832,11 @@
 "選項:\n"
 " "
 
-#: agent/protect-tool.c:157
+#: agent/protect-tool.c:156
 msgid "Usage: gpg-protect-tool options (-h for help)\n"
 msgstr "用法: gpg-protect-tool 選項 (或用 -h 求助)\n"
 
-#: agent/protect-tool.c:159
+#: agent/protect-tool.c:158
 msgid ""
 "Syntax: gpg-protect-tool options args\n"
 "Secret key maintenance tool\n"
@@ -836,21 +844,21 @@
 "語法: gpg-protect-tool 選項 引數\n"
 "私鑰維護工具\n"
 
-#: agent/protect-tool.c:708 sm/import.c:776
+#: agent/protect-tool.c:706 sm/import.c:776
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語來取消 PKCS#12 物件的保護."
 
-#: agent/protect-tool.c:713 sm/export.c:727
+#: agent/protect-tool.c:711 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語來保護新的 PKCS#12 物件."
 
-#: agent/protect-tool.c:719
+#: agent/protect-tool.c:717
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
 
-#: agent/protect-tool.c:724
+#: agent/protect-tool.c:722
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -858,52 +866,54 @@
 "請輸入完成這項操作所需的\n"
 "密語或個人識別碼 (PIN)."
 
-#: agent/protect-tool.c:735
+#: agent/protect-tool.c:733
 #, c-format
 msgid "cancelled\n"
 msgstr "已取消\n"
 
-#: agent/protect-tool.c:737
+#: agent/protect-tool.c:735
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢問密語時出錯: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:173 agent/trustlist.c:394 g10/verify.c:348
+#: tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:189 common/helpfile.c:73 common/helpfile.c:89
+#: g10/verify.c:366
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "檔案 '%s', 第 %d 列: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:212 agent/trustlist.c:220
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "陳述句 \"%s\" 忽略於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:226
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "沒有系統信任清單 '%s' 可用\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:270
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "不良的指紋於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:295 agent/trustlist.c:302
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "無效的金鑰旗標於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:340 common/helpfile.c:136 g10/verify.c:399
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "讀取 '%s' 時出錯, 第 %d 列: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:465 agent/trustlist.c:537
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "讀取已信任根憑證清單時出錯\n"
@@ -916,18 +926,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:668
+#: agent/trustlist.c:699
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "請問你是否徹底信任%%0A \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:708 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:708 agent/findkey.c:1790 agent/findkey.c:1804
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -940,7 +950,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:711
+#: agent/trustlist.c:742
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -950,35 +960,48 @@
 #. 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:725
+#: agent/trustlist.c:756
 msgid "Correct"
 msgstr "正確"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:756
 msgid "Wrong"
 msgstr "錯了"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:414
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "請注意: 密語從未變更過.%0A請現在就變更."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:430
 #, 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:397 agent/findkey.c:404
+#: agent/findkey.c:444 agent/findkey.c:451
 msgid "Change passphrase"
 msgstr "更改密語"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:452
 msgid "I'll change it later"
 msgstr "我稍後再變更"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1112
+msgid "Please insert the card with serial number"
+msgstr "請插入下列序號的卡片:"
+
+#: agent/findkey.c:1232
+#, fuzzy, c-format
+#| msgid ""
+#| "An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want "
+#| "to allow this?"
+msgid "Requested the use of key%%0A %s%%0A %s%%0ADo you want to allow this?"
+msgstr ""
+"有某個 ssh 程序提出使用金鑰 %%0A %s%%0A (%s)%%0A 之請求, 請問是否允許?"
+
+#: agent/findkey.c:1766
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -986,11 +1009,11 @@
 "%%0A?"
 msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1790 agent/findkey.c:1804
 msgid "Delete key"
 msgstr "刪除金鑰"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1801
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1003,8 +1026,8 @@
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
 
-#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1809
-#: dirmngr/ocsp.c:458 dirmngr/validate.c:1130
+#: agent/pksign.c:185 sm/certcheck.c:103 dirmngr/crlcache.c:1819
+#: dirmngr/ocsp.c:458 dirmngr/validate.c:1141
 #, c-format
 msgid "%s key uses an unsafe (%u bit) hash\n"
 msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
@@ -1014,7 +1037,7 @@
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:573
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時出錯: %s\n"
@@ -1024,7 +1047,7 @@
 msgid "secret key parts are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1603
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1611
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公鑰演算法 %d (%s) 未支援\n"
@@ -1039,53 +1062,53 @@
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "保護雜湊演算法 %d (%s) 未支援\n"
 
-#: common/exechelp-posix.c:369 common/exechelp-w32.c:462
+#: common/exechelp-posix.c:367 common/exechelp-w32.c:462
 #: common/exechelp-w32.c:486 common/exechelp-w32.c:516
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立管道時出錯: %s\n"
 
-#: common/exechelp-posix.c:382 common/exechelp-w32.c:357
+#: common/exechelp-posix.c:380 common/exechelp-w32.c:357
 #: common/exechelp-w32.c:472 common/exechelp-w32.c:496
 #: common/exechelp-w32.c:526
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "建立管道串流時出錯: %s\n"
 
-#: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1444
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1495
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "衍生執行程序時出錯: %s\n"
 
-#: common/exechelp-posix.c:688 common/exechelp-w32ce.c:768
+#: common/exechelp-posix.c:686
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "等候 %d 處理程序終止時失敗: %s\n"
 
-#: common/exechelp-posix.c:697 common/exechelp-posix.c:818
+#: common/exechelp-posix.c:695 common/exechelp-posix.c:816
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
 
-#: common/exechelp-posix.c:703 common/exechelp-posix.c:825
-#: common/exechelp-w32.c:843 common/exechelp-w32ce.c:782
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
+#: common/exechelp-w32.c:839
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
 
-#: common/exechelp-posix.c:711 common/exechelp-posix.c:833
+#: common/exechelp-posix.c:709 common/exechelp-posix.c:831
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "執行 '%s' 時出錯: 已終止\n"
 
-#: common/exechelp-posix.c:774 common/exechelp-w32.c:824
+#: common/exechelp-posix.c:772 common/exechelp-w32.c:820
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "等候 %d 處理程序終止時失敗: %s\n"
 
-#: common/exechelp-w32.c:836 common/exechelp-w32ce.c:776
+#: common/exechelp-w32.c:832
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
@@ -1105,29 +1128,29 @@
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: common/sysutils.c:416
+#: common/sysutils.c:420
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
 
-#: common/sysutils.c:448
+#: common/sysutils.c:452
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:885
 #, 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:931
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1181,8 +1204,8 @@
 msgid "out of core while allocating %lu bytes"
 msgstr "配置 %lu 位元組時超出核心"
 
-#: common/miscellaneous.c:115 g10/card-util.c:955 tools/no-libgcrypt.c:30
-#: tools/gpg-card.c:416
+#: common/miscellaneous.c:115 g10/card-util.c:962 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "配置足夠的記憶體時出錯: %s\n"
@@ -1197,80 +1220,80 @@
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
 
-#: common/miscellaneous.c:705
+#: common/miscellaneous.c:706
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "正在等候 dirmngr 出現 ... (%d 秒)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "正在等候代理程式出現 ... (%d 秒)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "正在等候代理程式出現 ... (%d 秒)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "連線至 dirmngr 已建立\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the keyboxd established\n"
 msgstr "連線至 dirmngr 已建立\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, fuzzy, c-format
 #| msgid "connection to the dirmngr established\n"
 msgid "connection to the agent established\n"
 msgstr "連線至 dirmngr 已建立\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, fuzzy, c-format
 #| msgid "no running Dirmngr - starting '%s'\n"
 msgid "no running %s - starting '%s'\n"
 msgstr "沒有執行中的 Dirmngr - 正在啟動 '%s'\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, fuzzy, c-format
 #| msgid "connection to agent established\n"
 msgid "connection to the agent is in restricted mode\n"
 msgstr "至代理程式的連線已建立\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, fuzzy, c-format
 #| msgid "error creating keyring '%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 
-#: common/asshelp.c:731
+#: common/asshelp.c:725
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:407 sm/call-dirmngr.c:457
+#: common/asshelp.c:731 g10/call-dirmngr.c:432 sm/call-dirmngr.c:459
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: common/asshelp.c:740
+#: common/asshelp.c:734
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr ""
 
-#: common/asshelp.c:742
+#: common/asshelp.c:736
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s\" to restart them.\n"
@@ -1344,7 +1367,7 @@
 msgstr "演算法: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4270
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "未支援的演算法: %s"
@@ -1419,39 +1442,39 @@
 msgid "Root certificate trustworthy"
 msgstr "根憑證可信賴"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1113 sm/certchain.c:1290
 msgid "no CRL found for certificate"
 msgstr "找不到用於憑證的 CRL"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1116 sm/certchain.c:1300
 msgid "the available CRL is too old"
 msgstr "可用的 CRL 太舊了"
 
-#: common/audit.c:1120
+#: common/audit.c:1121
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP 憑證檢查"
 
-#: common/audit.c:1140
+#: common/audit.c:1141
 msgid "Included certificates"
 msgstr "包含在內的憑證"
 
-#: common/audit.c:1195
+#: common/audit.c:1196
 msgid "No audit log entries."
 msgstr "沒有稽核日誌項目."
 
-#: common/audit.c:1244
+#: common/audit.c:1245
 msgid "Unknown operation"
 msgstr "未知的操作"
 
-#: common/audit.c:1262
+#: common/audit.c:1263
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent 可以使用"
 
-#: common/audit.c:1272
+#: common/audit.c:1273
 msgid "Dirmngr usable"
 msgstr "Dirmngr 可以使用"
 
-#: common/audit.c:1308
+#: common/audit.c:1309
 #, c-format
 msgid "No help available for '%s'."
 msgstr "'%s' 沒有可用的說明."
@@ -1460,11 +1483,11 @@
 msgid "ignoring garbage line"
 msgstr "忽略垃圾列"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "none"
 msgstr " 無 "
 
-#: common/ksba-io-support.c:347
+#: common/ksba-io-support.c:365
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "已跳過無效的 radix64 字符 %02x\n"
@@ -1499,176 +1522,188 @@
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open 失敗: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "從 '%s' 轉換到 '%s' 失敗: %s\n"
 
-#: common/dotlock.c:728
+#: common/dotlock.c:723
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "建立暫存檔失敗 '%s': %s\n"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785 common/homedir.c:178
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "寫入 '%s' 時出錯: %s\n"
 
-#: common/dotlock.c:1165
+#: common/dotlock.c:1160
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "正在移除陳腐的鎖定檔 (由 %d 所建立)\n"
 
-#: common/dotlock.c:1202
+#: common/dotlock.c:1197
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "正在等候鎖定 (被 %d%s 持有) %s...\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(死結嗎?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "未鎖定 '%s': %s\n"
 
-#: common/dotlock.c:1269
+#: common/dotlock.c:1264
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:173 sm/gpgsm.c:933 dirmngr/dirmngr.c:1033
+#: dirmngr/dirmngr.c:1042
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: g10/armor.c:441
+#: common/homedir.c:171 g10/export.c:2910 g10/export.c:3138 g10/plaintext.c:152
+#: g10/plaintext.c:161 g10/plaintext.c:167
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "建立 '%s' 時出錯: %s\n"
+
+#: common/homedir.c:186 dirmngr/crlcache.c:943
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "關閉 '%s' 時出錯: %s\n"
+
+#: g10/armor.c:442
 #, c-format
 msgid "armor: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/armor.c:482
+#: g10/armor.c:483
 #, c-format
 msgid "invalid armor header: "
 msgstr "無效的封裝檔頭: "
 
-#: g10/armor.c:493
+#: g10/armor.c:494
 #, c-format
 msgid "armor header: "
 msgstr "封裝檔頭: "
 
-#: g10/armor.c:508
+#: g10/armor.c:509
 #, c-format
 msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
-#: g10/armor.c:521
+#: g10/armor.c:522
 #, c-format
 msgid "unknown armor header: "
 msgstr "未知的封裝檔頭: "
 
-#: g10/armor.c:581
+#: g10/armor.c:582
 #, c-format
 msgid "nested clear text signatures\n"
 msgstr "多層明文簽章\n"
 
-#: g10/armor.c:719
+#: g10/armor.c:727
 #, c-format
 msgid "unexpected armor: "
 msgstr "未預期的封裝: "
 
-#: g10/armor.c:732
+#: g10/armor.c:740
 #, c-format
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:1025
+#: g10/armor.c:1040
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 已跳過\n"
 
-#: g10/armor.c:1061
+#: g10/armor.c:1076
 #, c-format
 msgid "premature eof (no CRC)\n"
 msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\n"
 msgstr "格式不對的 CRC\n"
 
-#: g10/armor.c:1107
+#: g10/armor.c:1122
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
 
-#: g10/armor.c:1127
+#: g10/armor.c:1142
 #, c-format
 msgid "premature eof (in trailer)\n"
 msgstr "檔案未預期的結束 (於結尾處)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\n"
 msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1537
+#: g10/armor.c:1552
 #, c-format
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1542
+#: g10/armor.c:1562
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/build-packet.c:1459
+#: g10/build-packet.c:1492
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid " not human readable (%zu bytes: %s%s) "
 msgstr "不是人類能讀得懂的"
 
-#: g10/build-packet.c:1511
+#: g10/build-packet.c:1544
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
-#: g10/build-packet.c:1523 g10/build-packet.c:1619
+#: g10/build-packet.c:1556 g10/build-packet.c:1652
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "使用者標記名稱一定要含有 '@' 字符\n"
 
-#: g10/build-packet.c:1529 g10/build-packet.c:1625
+#: g10/build-packet.c:1562 g10/build-packet.c:1658
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 
-#: g10/build-packet.c:1547
+#: g10/build-packet.c:1580
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定不能使用任何的控制字符\n"
 
-#: g10/build-packet.c:1603
+#: g10/build-packet.c:1636
 #, fuzzy, c-format
 #| msgid "a notation name must not contain more than one '@' character\n"
 msgid "a notation name may not contain an '=' character\n"
 msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 
-#: g10/build-packet.c:1609
+#: g10/build-packet.c:1642
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1676,7 +1711,7 @@
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
-#: g10/build-packet.c:1668 g10/build-packet.c:1679
+#: g10/build-packet.c:1701 g10/build-packet.c:1712
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告: 找到無效的標記資料\n"
@@ -1690,8 +1725,8 @@
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:812 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
+#: g10/call-agent.c:318 g10/encrypt.c:159 g10/encrypt.c:419 g10/sign.c:471
+#: sm/call-agent.c:180 sm/encrypt.c:706 sm/sign.c:657
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1703,13 +1738,13 @@
 msgid "error from TPM: %s\n"
 msgstr "讀取 %s 時出錯: %s\n"
 
-#: g10/call-agent.c:2142 g10/passphrase.c:233 g10/passphrase.c:266
+#: g10/call-agent.c:2166 g10/passphrase.c:233 g10/passphrase.c:266
 #: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題: %s\n"
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:240 tools/gpg-connect-agent.c:2330
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1721,204 +1756,209 @@
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "你不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/call-dirmngr.c:385
+#: g10/call-dirmngr.c:410
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:388
+#: g10/call-dirmngr.c:413
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:390
+#: g10/call-dirmngr.c:415
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "\"%s\" 不是指紋\n"
 
-#: g10/call-dirmngr.c:392
+#: g10/call-dirmngr.c:417
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "\"%s\" 不是指紋\n"
 
-#: g10/call-dirmngr.c:394
+#: g10/call-dirmngr.c:419
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:396
+#: g10/call-dirmngr.c:421
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:398
+#: g10/call-dirmngr.c:423
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4658 sm/call-dirmngr.c:457
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1965
-#: tools/gpg-card.c:3056
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1991
+#: tools/gpg-card.c:3074
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1971
+#: g10/card-util.c:91 g10/card-util.c:1997
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2350 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4788 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2377 g10/delkey.c:164 g10/keyedit.c:1435
+#: g10/keygen.c:4865 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2960
+#: g10/card-util.c:105 tools/gpg-card.c:2978
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "祇有第二版卡片纔能用這個指令\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3455 tools/gpg-card.c:2983
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "(再也) 沒有重設碼\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1486 g10/card-util.c:1751
-#: g10/card-util.c:1843 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1990 g10/keygen.c:2164 g10/keygen.c:2384 g10/keygen.c:2684
+#: g10/card-util.c:140 g10/card-util.c:1494 g10/card-util.c:1759
+#: g10/card-util.c:1853 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:432
+#: g10/keygen.c:1974 g10/keygen.c:2148 g10/keygen.c:2368 g10/keygen.c:2668
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:510
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "你要選哪一個? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
-#: tools/gpg-card.c:636
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:611
+#: tools/gpg-card.c:651
 msgid "not set"
 msgstr "未設定"
 
-#: g10/card-util.c:591 tools/gpg-card.c:905
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:906
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:619 tools/gpg-card.c:933
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1484
+#: g10/card-util.c:712
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
+#: g10/card-util.c:809 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1486
+#: g10/card-util.c:811 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:805 tools/gpg-card.c:1488
+#: g10/card-util.c:813 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1521
+#: g10/card-util.c:831 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1522
+#: g10/card-util.c:833 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的名字: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1539
+#: g10/card-util.c:852 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:868 tools/gpg-card.c:1577
+#: g10/card-util.c:875 tools/gpg-card.c:1595
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
-#: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1756
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
+#: g10/card-util.c:971 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:662 dirmngr/crlcache.c:667
+#: dirmngr/crlcache.c:921 dirmngr/crlcache.c:927 dirmngr/dirmngr.c:1809
+#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:441
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "讀取 '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
-#: tools/gpg-card.c:493
+#: g10/card-util.c:1004 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:932 tools/gpg-card.c:501
+#: tools/gpg-card.c:508
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "寫入 '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1666
+#: g10/card-util.c:1031 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號名稱): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1962
+#: g10/card-util.c:1069 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1715
+#: g10/card-util.c:1154 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1726
+#: g10/card-util.c:1162 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的偏好設定字串長度\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1735
+#: g10/card-util.c:1171 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1769
+#: g10/card-util.c:1193 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1786
+#: g10/card-util.c:1207 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1852
+#: g10/card-util.c:1230 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1878
+#: g10/card-util.c:1254 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格式化指紋.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1305
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1306
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:1311 g10/keygen.c:4808 g10/keygen.c:6001
+#: g10/card-util.c:1319 g10/keygen.c:4885 g10/keygen.c:6092
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1404
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3345
+#: g10/card-util.c:1421 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1934,110 +1974,110 @@
 " 如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
 " 看看這張卡片支援哪些尺寸.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2569 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1442 g10/keygen.c:2553 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "你想要用多大的金鑰尺寸? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2492 g10/keygen.c:2524
+#: g10/card-util.c:1452 g10/keygen.c:2476 g10/keygen.c:2508
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/card-util.c:1452 g10/keygen.c:2577 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1460 g10/keygen.c:2561 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1479
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1481
 #, fuzzy
 #| msgid " (1) Signature key\n"
 msgid "Signature key\n"
 msgstr " (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1483
 #, fuzzy
 #| msgid " (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr " (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1485
 #, fuzzy
 #| msgid " (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr " (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2111 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1487 g10/keygen.c:2095 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇你要使用的金鑰種類:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1488 sm/certreqgen-ui.c:159
 #, c-format
 msgid " (%d) RSA\n"
 msgstr " (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1489
 #, fuzzy, c-format
 #| msgid " (%d) ECC and ECC\n"
 msgid " (%d) ECC\n"
 msgstr " (%d) ECC 和 ECC\n"
 
-#: g10/card-util.c:1496 g10/card-util.c:1763 g10/card-util.c:1863
-#: g10/keyedit.c:900 g10/keygen.c:2016 g10/keygen.c:2044 g10/keygen.c:2171
-#: g10/keygen.c:2424 g10/keygen.c:2712 g10/revoke.c:840
+#: g10/card-util.c:1504 g10/card-util.c:1771 g10/card-util.c:1873
+#: g10/keyedit.c:903 g10/keygen.c:2000 g10/keygen.c:2028 g10/keygen.c:2155
+#: g10/keygen.c:2408 g10/keygen.c:2696 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1577
 #, 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:1574
+#: g10/card-util.c:1582
 #, 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:1610
+#: g10/card-util.c:1618
 #, 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:1626 g10/card-util.c:2147 g10/card-util.c:2203
+#: g10/card-util.c:1634 g10/card-util.c:2173 g10/card-util.c:2229
 #, 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:1632 g10/card-util.c:1977 g10/card-util.c:2153
-#: g10/card-util.c:2212 tools/gpg-card.c:3074 tools/gpg-card.c:3313
-#: tools/gpg-card.c:3371
+#: g10/card-util.c:1640 g10/card-util.c:2003 g10/card-util.c:2179
+#: g10/card-util.c:2238 tools/gpg-card.c:3092 tools/gpg-card.c:3331
+#: tools/gpg-card.c:3389
 #, 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:1678 tools/gpg-card.c:2443
+#: g10/card-util.c:1686 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1700
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2415
+#: g10/card-util.c:1703 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2474
+#: g10/card-util.c:1715 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2048,189 +2088,194 @@
 " PIN = '%s' 管理者 PIN = '%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1750
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇你要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1752 g10/card-util.c:1844
 msgid " (1) Signature key\n"
 msgstr " (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1753 g10/card-util.c:1846
 msgid " (2) Encryption key\n"
 msgstr " (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1754 g10/card-util.c:1848
 msgid " (3) Authentication key\n"
 msgstr " (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1841
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1898
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失敗: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3082
+#: g10/card-util.c:2008 tools/gpg-card.c:3100
 #, 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:1985 tools/gpg-card.c:3085 tools/gpg-card.c:3426
+#: g10/card-util.c:2011 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 #, fuzzy
 #| msgid "Continue? (Y/n) "
 msgid "Continue? (y/N) "
 msgstr "是否繼續? (Y/n) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3096
+#: g10/card-util.c:2016 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2209
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "關閉 %s 時出錯: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2255
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "關閉 %s 時出錯: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3666
+#: g10/card-util.c:2279 g10/keyedit.c:1266 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2281
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3669
+#: g10/card-util.c:2282 g10/keyedit.c:1269 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3671
+#: g10/card-util.c:2284 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3673
+#: g10/card-util.c:2287 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3674
+#: g10/card-util.c:2288 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "變更取回金鑰的 URL"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3675
+#: g10/card-util.c:2289 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3676
+#: g10/card-util.c:2290 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "變更登入名稱"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3677
+#: g10/card-util.c:2291 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3678
+#: g10/card-util.c:2292 tools/gpg-card.c:3750
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3680
+#: g10/card-util.c:2294 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3681
+#: g10/card-util.c:2295 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3682
+#: g10/card-util.c:2296 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3683
+#: g10/card-util.c:2297 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "變更或重設個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3684
+#: g10/card-util.c:2298 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3685
+#: g10/card-util.c:2299 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "用重設碼來解凍個人識別碼 (PIN)"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3689
+#: g10/card-util.c:2300 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2302
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|名字|使用指定名字做為認證用的使用者名稱"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2303
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "更改主觀信任"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3691
+#: g10/card-util.c:2304 tools/gpg-card.c:3763
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "更改主觀信任"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3941
+#: g10/card-util.c:2305
+msgid "switch to the OpenPGP app"
+msgstr ""
+
+#: g10/card-util.c:2429 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/卡片> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2470
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2501
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2503
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3831
-#: tools/gpg-card.c:4089
+#: g10/card-util.c:2619 g10/keyedit.c:2323 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command (try \"help\")\n"
 msgstr "無效的指令 (試試看 \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1234
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5415 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "無法開啟 '%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
-#: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2041 g10/gpg.c:5360 g10/keyedit.c:1457
+#: g10/keyedit.c:2431 g10/keyedit.c:2773 g10/keyedit.c:4686 g10/keyedit.c:4865
+#: g10/keyedit.c:4891 g10/keylist.c:929 g10/keyserver.c:1071 g10/revoke.c:230
+#: g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2049 g10/getkey.c:4495
+#: g10/gpg.c:5369 g10/keyedit.c:2403 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2289,9 +2334,9 @@
 msgid "subkey"
 msgstr "子鑰"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/delkey.c:299 g10/keyedit.c:2274 g10/keyedit.c:2305 g10/keyedit.c:2484
+#: g10/keyedit.c:2619 g10/keyedit.c:2685 g10/keyedit.c:2732 g10/keyedit.c:2942
+#: g10/keyedit.c:3173 g10/keyedit.c:3242 g10/keyedit.c:3307 g10/keyedit.c:3455
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
@@ -2316,99 +2361,89 @@
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encrypt.c:332 g10/sign.c:1622
+#: g10/encrypt.c:109
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+
+#: g10/encrypt.c:136 g10/encrypt.c:683
+#, fuzzy, c-format
+#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+msgid "cipher algorithm '%s' may not be used for encryption\n"
+msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
+
+#: g10/encrypt.c:139 g10/encrypt.c:686 g10/misc.c:400
+#, c-format
+msgid "(use option \"%s\" to override)\n"
+msgstr ""
+
+#: g10/encrypt.c:149 g10/encrypt.c:694 g10/decrypt-data.c:265 g10/gpg.c:4137
+#: g10/gpg.c:4177 sm/decrypt.c:1178 sm/encrypt.c:696 sm/gpgsm.c:1714
+#, 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:181 sm/encrypt.c:771
+#, 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:477 g10/sign.c:1636
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語時出錯: %s\n"
 
-#: g10/encrypt.c:339
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:484
+#, fuzzy, c-format
+#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgid "can't use a SKESK packet due to the S2K mode\n"
 msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
-#: g10/encrypt.c:370
+#: g10/encrypt.c:514
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "正在使用 %s 編密法\n"
 
-#: g10/encrypt.c:382 g10/encrypt.c:874
+#: g10/encrypt.c:527 g10/encrypt.c:913 g10/sign.c:1266
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' 已經被壓縮了\n"
 
-#: g10/encrypt.c:443 g10/encrypt.c:911 g10/sign.c:833
+#: g10/encrypt.c:587 g10/encrypt.c:949 g10/sign.c:830
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告: '%s' 是個空檔案\n"
 
-#: g10/encrypt.c:538 g10/encrypt.c:789
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgid "cipher algorithm '%s' may not be used for encryption\n"
-msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
-
-#: g10/encrypt.c:541 g10/encrypt.c:792 g10/misc.c:400
-#, c-format
-msgid "(use option \"%s\" to override)\n"
-msgstr ""
-
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
-#, 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:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:703 g10/gpg.c:4143 g10/gpg.c:4189 g10/sig-check.c:177
+#: g10/sign.c:450 sm/gpgsm.c:1724 sm/gpgsm.c:1734 sm/sign.c:834 sm/verify.c:521
 #, 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:721
+#: g10/encrypt.c:867
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "正在從 '%s' 讀取\n"
 
-#: g10/encrypt.c:777
-#, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
-
-#: g10/encrypt.c:832 sm/encrypt.c:767
-#, 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:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
-#: sm/encrypt.c:817 sm/verify.c:526
-#, c-format
-msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
-
-#: g10/encrypt.c:961 g10/sign.c:1273
+#: g10/encrypt.c:999 g10/sign.c:1287
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 
-#: g10/encrypt.c:1071
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
-
-#: g10/encrypt.c:1164
+#: g10/encrypt.c:1179
 #, fuzzy, c-format
 #| msgid "%s/%s encrypted for: \"%s\"\n"
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已加密給: \"%s\"\n"
 
-#: g10/encrypt.c:1194 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1209 g10/pkclist.c:1072 g10/pkclist.c:1123
 #, 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"
@@ -2425,7 +2460,7 @@
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以 %d 未知演算法所加密\n"
 
-#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:906
+#: g10/decrypt-data.c:371 g10/decrypt-data.c:424 sm/decrypt.c:898
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2436,412 +2471,418 @@
 msgid "problem handling encrypted packet\n"
 msgstr "處理已加密封包有問題\n"
 
-#: g10/export.c:119
+#: g10/export.c:125
 msgid "export signatures that are marked as local-only"
 msgstr "匯出標記為僅限本機使用的簽章"
 
-#: g10/export.c:121
+#: g10/export.c:127
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "匯出署名使用者 ID (通常是照片 ID)"
 
-#: g10/export.c:123
+#: g10/export.c:129
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 msgstr "匯出時從金鑰中移除無法使用的部分"
 
-#: g10/export.c:127
+#: g10/export.c:133
 msgid "remove as much as possible from key during export"
 msgstr "匯出時盡可能地從金鑰中移除"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "產生撤銷憑證"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr ""
 
-#: g10/export.c:1300
+#: g10/export.c:145
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "不允許匯出私鑰\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - 已跳過"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
-#: g10/sign.c:1117 g10/sign.c:1456
+#: g10/export.c:1558 g10/import.c:2205 g10/openfile.c:202 g10/openfile.c:296
+#: g10/sign.c:1125 g10/sign.c:1470
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "正在寫入 '%s'\n"
 
-#: g10/export.c:1756
+#: g10/export.c:1981
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
 
-#: g10/export.c:1883
+#: g10/export.c:2191
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "不允許匯出私鑰\n"
 
-#: g10/export.c:2038
+#: g10/export.c:2346
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
-#: g10/plaintext.c:167
-#, c-format
-msgid "error creating '%s': %s\n"
-msgstr "建立 '%s' 時出錯: %s\n"
-
 #: g10/getkey.c:252
 msgid "User ID not found"
 msgstr "找不到使用者 ID"
 
-#: g10/getkey.c:1324
+#: g10/getkey.c:1325
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "已自動取回 '%s' (經由 %s )\n"
 
-#: g10/getkey.c:1330
+#: g10/getkey.c:1331
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
 
-#: g10/getkey.c:1332
+#: g10/getkey.c:1333
 msgid "No fingerprint"
 msgstr "沒有指紋"
 
-#: g10/getkey.c:1574
+#: g10/getkey.c:1575
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
+#: g10/getkey.c:2018 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: g10/getkey.c:2012 g10/pkclist.c:1012
+#: g10/getkey.c:2021 g10/pkclist.c:1032
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "\"%.50s\" 選項遺失了引數\n"
 
-#: g10/getkey.c:2090
+#: g10/getkey.c:2099
 #, 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:2098
+#: g10/getkey.c:2107
 #, 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:2105
+#: g10/getkey.c:2114
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2962
+#: g10/getkey.c:2990
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:3830
+#: g10/getkey.c:3868
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4424 g10/gpg.c:2213
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "選項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:463 sm/gpgsm.c:226
 msgid "make a signature"
 msgstr "建立簽章"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:464
 msgid "make a clear text signature"
 msgstr "建立明文簽章"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "make a detached signature"
 msgstr "建立分離式簽章"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:467 sm/gpgsm.c:229
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:469
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:471 sm/gpgsm.c:231
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:473 sm/gpgsm.c:232
 msgid "verify a signature"
 msgstr "驗證簽章"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:475 sm/gpgsm.c:233
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:477
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:480
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:482 sm/gpgsm.c:238
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:483 sm/gpgsm.c:236
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:485 sm/gpgsm.c:239
 msgid "generate a new key pair"
 msgstr "產生新的金鑰對"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:488
 msgid "quickly generate a new key pair"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:491
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:497
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:500
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:504
 msgid "full featured key pair generation"
 msgstr "全能金鑰對生成"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:507
 msgid "generate a revocation certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:510 sm/gpgsm.c:242
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:512
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:514
 msgid "quickly sign a key"
 msgstr "快速簽署金鑰"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:516
 msgid "quickly sign a key locally"
 msgstr "快速在本機簽署金鑰"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:518
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "快速產生新的金鑰對"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:519
 msgid "sign a key"
 msgstr "簽署金鑰"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:520
 msgid "sign a key locally"
 msgstr "僅在本機簽署金鑰"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:521
 msgid "sign or edit a key"
 msgstr "簽署或編輯金鑰"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:523 sm/gpgsm.c:260
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:527
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:528
 msgid "export keys to a keyserver"
 msgstr "把金鑰匯出至金鑰伺服器"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:529
 msgid "import keys from a keyserver"
 msgstr "從金鑰伺服器匯入金鑰"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:532
 msgid "search for keys on a keyserver"
 msgstr "在金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:534
 msgid "update all keys from a keyserver"
 msgstr "從金鑰伺服器更新所有的金鑰"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:543
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:546
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:547
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:549
 msgid "change a card's PIN"
 msgstr "變更卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:561
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:571
 msgid "print message digests"
 msgstr "印出訊息摘要"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:575 sm/gpgsm.c:255
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:577
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:620
 msgid "|NAME|use NAME as default secret key"
 msgstr "|名字|使用指定名字做為預設私鑰"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:622 sm/gpgsm.c:353
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|名字|也加密給指定名字的使用者 ID"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:630
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|設定電子郵件別名"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:641
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:667 kbx/kbxutil.c:90 sm/gpgsm.c:437 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:668
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:718 sm/gpgsm.c:322
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "控制著安全性的選項"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:736 sm/gpgsm.c:333
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "控制著診斷性輸出的選項"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:738 sm/gpgsm.c:335
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:742 g10/gpgv.c:82 sm/gpgsm.c:340
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至指定檔案"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:755
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:773
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:779 sm/gpgsm.c:370
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "控制著互動及強制執行的選項"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:782
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:785
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "從金鑰伺服器匯入金鑰"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:790
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:793 sm/gpgsm.c:373
 msgid "disable all access to the dirmngr"
 msgstr "停用所有的 dirmngr 存取"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:805 sm/gpgsm.c:380
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "控制著組態的選項"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:836 sm/gpgsm.c:345
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:838 sm/gpgsm.c:347
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:846 sm/gpgsm.c:349
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:893 sm/gpgsm.c:421
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:912 sm/gpgsm.c:433 dirmngr/dirmngr.c:297
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:991 sm/gpgsm.c:467
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2849,7 +2890,7 @@
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:994
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2879,11 +2920,11 @@
 " --list-keys 名字 顯示金鑰\n"
 " --fingerprint 名字 顯示指紋\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1187
 msgid "Usage: @GPG@ options files (-h for help)"
 msgstr "用法: @GPG@ 選項 檔案 (或用 -h 求助)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1190
 msgid ""
 "Syntax: @GPG@ options files\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2893,7 +2934,7 @@
 "簽署, 檢查, 加密, 解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1201 sm/gpgsm.c:661
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2901,567 +2942,561 @@
 "\n"
 "已支援的演算法:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1204
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1211 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1218
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1225 g10/keylist.c:454
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1300 sm/gpgsm.c:735
 #, c-format
 msgid "usage: %s options %s\n"
 msgstr "用法: %s 選項 %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1499 sm/gpgsm.c:828
 #, c-format
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1517
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1743
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1746
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1752
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1755
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1758
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1974
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的組態項目 '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2072
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2074
 msgid "show key usage information during key listings"
 msgstr "列出金鑰時顯示金鑰用途資訊"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2076
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2078
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2080
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2084
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2086
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2088
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2090
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2092
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2094
+#, fuzzy
+#| msgid "show expiration dates during signature listings"
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "列出簽章時顯示有效期限"
+
+#: g10/gpg.c:2096
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈名稱"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2098
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期限"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2100 g10/gpg.c:2102
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "列出偏好 (專家模式)"
+
+#: g10/gpg.c:2224
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的選項 '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2226
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2316 g10/keyedit.c:1740
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3018 g10/gpg.c:3895 g10/gpg.c:3907
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不採用 %s!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3195 g10/gpg.c:3207
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' 不是有效的簽章使用期限\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3229
 #, 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:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3267 sm/gpgsm.c:1167
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無效的個人識別碼項目模式 '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3273 sm/gpgsm.c:1173
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "選項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3327
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' 不是有效的字元集\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3349 g10/gpg.c:3569 g10/keyedit.c:5610
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3367
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3370
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3377
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3380
 #, c-format
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3386 g10/gpg.c:3401 g10/gpg.c:3406
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3392
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3395
 #, c-format
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3412
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3415
 #, c-format
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3423
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3425
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3427
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3429
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3433
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3435
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3437
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3439
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3441
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3448
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3451
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3458
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3668
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3680
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "選項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3884 sm/gpgsm.c:1589
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3888
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3897
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允許跟 %s 併用!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3900
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3915 sm/gpgsm.c:1614 dirmngr/dirmngr.c:1259
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在偽造的系統時間中執行: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3936
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3967 g10/gpg.c:3991 sm/gpgsm.c:1684
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3949
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "所選的摘要演算法無效\n"
-
-#: g10/gpg.c:3961
+#: g10/gpg.c:3979
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3985
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:4000
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:4002
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:4004
 #, 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:3988
+#: g10/gpg.c:4006
 #, 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:3990
+#: g10/gpg.c:4008
 #, 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:3994
+#: g10/gpg.c:4012
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:4016
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4023
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4027
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:4012
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "無效的個人編密法偏好\n"
-
-#: g10/gpg.c:4016
+#: g10/gpg.c:4031
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4035
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4044 g10/gpg.c:4049
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4086
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:4134
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
-
-#: g10/gpg.c:4146
+#: g10/gpg.c:4149
 #, 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:4301
+#: g10/gpg.c:4313
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4325
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4399
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4428
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4431
 #, 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:4475
+#: g10/gpg.c:4489
 #, 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:4478
+#: g10/gpg.c:4492
 #, 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:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4911 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4916
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4922
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4935 g10/gpg.c:4946
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4958
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4971
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5040
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5051
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5175
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無效的雜湊演算法 '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5327 g10/tofu.c:2160
 #, 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:5286
+#: g10/gpg.c:5338
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5394
 #, c-format
 msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5405
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊息 ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5760
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5762
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5795
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
@@ -3474,7 +3509,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:427 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
 
@@ -3503,342 +3538,347 @@
 msgid "No help available for '%s'"
 msgstr "'%s' 沒有可用的說明"
 
-#: g10/import.c:169
+#: g10/import.c:170
 msgid "import signatures that are marked as local-only"
 msgstr "匯入標記為僅限本機使用的簽章"
 
-#: g10/import.c:172
+#: g10/import.c:173
 msgid "repair damage from the pks keyserver during import"
 msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
 
-#: g10/import.c:175
+#: g10/import.c:176
 #, fuzzy
 #| msgid "do not update the trustdb after import"
 msgid "do not clear the ownertrust values during import"
 msgstr "匯入後不要更新信任資料庫"
 
-#: g10/import.c:178
+#: g10/import.c:179
 msgid "do not update the trustdb after import"
 msgstr "匯入後不要更新信任資料庫"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, fuzzy
 #| msgid "enable putty support"
 msgid "enable bulk import mode"
 msgstr "啟用 putty 支援"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key during import"
 msgstr "顯示金鑰指紋"
 
-#: g10/import.c:187
+#: g10/import.c:188
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "show key but do not actually import"
 msgstr "顯示金鑰指紋"
 
-#: g10/import.c:190
+#: g10/import.c:191
 msgid "only accept updates to existing keys"
 msgstr "祇接受既有金鑰的更新"
 
-#: g10/import.c:193
+#: g10/import.c:194
 msgid "remove unusable parts from key after import"
 msgstr "匯入後從金鑰中移除無法使用的部分"
 
-#: g10/import.c:196
+#: g10/import.c:197
 msgid "remove as much as possible from key after import"
 msgstr "匯入後盡可能地從金鑰中移除"
 
-#: g10/import.c:199
+#: g10/import.c:200
 msgid "ignore key-signatures which are not self-signatures"
 msgstr ""
 
-#: g10/import.c:202
+#: g10/import.c:203
 msgid "run import filters and export key immediately"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
 #, fuzzy
 #| msgid "assume input is in binary format"
 msgid "assume the GnuPG key backup format"
 msgstr "假設輸入的是二進制格式"
 
-#: g10/import.c:209
+#: g10/import.c:210
 #, fuzzy
 #| msgid "show key fingerprint"
 msgid "repair keys on import"
 msgstr "顯示金鑰指紋"
 
-#: g10/import.c:407 g10/import.c:729
+#: g10/import.c:408 g10/import.c:730
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "正在跳過 %d 型態的區塊\n"
 
-#: g10/import.c:746
+#: g10/import.c:747
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已處理 %lu 把金鑰\n"
 
-#: g10/import.c:839
+#: g10/import.c:840
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "處理總量: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, fuzzy, c-format
 #| msgid " skipped new keys: %lu\n"
 msgid " skipped PGP-2 keys: %lu\n"
 msgstr " 已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:844
+#: g10/import.c:845
 #, c-format
 msgid " skipped new keys: %lu\n"
 msgstr " 已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:847
+#: g10/import.c:848
 #, c-format
 msgid " w/o user IDs: %lu\n"
 msgstr " 沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid " imported: %lu"
 msgstr " 已匯入: %lu"
 
-#: g10/import.c:854 sm/import.c:133
+#: g10/import.c:855 sm/import.c:133
 #, c-format
 msgid " unchanged: %lu\n"
 msgstr " 未改變的: %lu\n"
 
-#: g10/import.c:856
+#: g10/import.c:857
 #, c-format
 msgid " new user IDs: %lu\n"
 msgstr " 新的使用者 ID: %lu\n"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid " new subkeys: %lu\n"
 msgstr " 新的子鑰: %lu\n"
 
-#: g10/import.c:860
+#: g10/import.c:861
 #, c-format
 msgid " new signatures: %lu\n"
 msgstr " 新的簽章: %lu\n"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid " new key revocations: %lu\n"
 msgstr " 新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:864 sm/import.c:135
+#: g10/import.c:865 sm/import.c:135
 #, c-format
 msgid " secret keys read: %lu\n"
 msgstr " 已讀取的私鑰: %lu\n"
 
-#: g10/import.c:866 sm/import.c:137
+#: g10/import.c:867 sm/import.c:137
 #, c-format
 msgid " secret keys imported: %lu\n"
 msgstr " 已匯入的私鑰: %lu\n"
 
-#: g10/import.c:868 sm/import.c:139
+#: g10/import.c:869 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " 未改變的私鑰: %lu\n"
 
-#: g10/import.c:870 sm/import.c:141
+#: g10/import.c:871 sm/import.c:141
 #, c-format
 msgid " not imported: %lu\n"
 msgstr " 未被匯入: %lu\n"
 
-#: g10/import.c:872
+#: g10/import.c:873
 #, c-format
 msgid " signatures cleaned: %lu\n"
 msgstr " 已清除的簽章: %lu\n"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid " user IDs cleaned: %lu\n"
 msgstr " 已清除的使用者 ID: %lu\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1300
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
 
-#: g10/import.c:1341
+#: g10/import.c:1342
 #, c-format
 msgid " \"%s\": preference for cipher algorithm %s\n"
 msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, fuzzy, c-format
 #| msgid " \"%s\": preference for cipher algorithm %s\n"
 msgid " \"%s\": preference for AEAD algorithm %s\n"
 msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:1374
+#: g10/import.c:1375
 #, c-format
 msgid " \"%s\": preference for digest algorithm %s\n"
 msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1387
 #, c-format
 msgid " \"%s\": preference for compression algorithm %s\n"
 msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1400
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議你更新偏好設定, 並重新\n"
 
-#: g10/import.c:1401
+#: g10/import.c:1402
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:1426
+#: g10/import.c:1427
 #, c-format
 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:1940 g10/import.c:3077
+#: g10/import.c:2012 g10/import.c:3172
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2018
 #, c-format
 msgid "key %s: %s\n"
 msgstr "金鑰 %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2019 g10/import.c:3144
 msgid "rejected by import screener"
 msgstr "遭到匯入篩選程式駁回"
 
-#: g10/import.c:1996
+#: g10/import.c:2068
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2089
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
 
-#: g10/import.c:2028 g10/import.c:2059
+#: g10/import.c:2100 g10/import.c:2131
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2102
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能肇因於遺失自我簽章所致\n"
 
-#: g10/import.c:2109 g10/import.c:3463
+#: g10/import.c:2182 g10/import.c:3559
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2188
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2200
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫入的鑰匙圈: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2232 g10/import.c:2334 g10/import.c:3634
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2255
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2282
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2365
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2368
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2371
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2374
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2377
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2413
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 未改變\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2801 g10/import.c:3006
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰已匯入\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2809
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "金鑰 %s: 私鑰已存在\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2817
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
 
+#: g10/import.c:2979
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card. A single smartcard can have up to
@@ -3847,142 +3887,142 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2901
+#: g10/import.c:2996
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3143
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "私鑰 %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3164 g10/import.c:3203
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "未允許匯入私鑰\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3191
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 
-#: g10/import.c:3258 g10/pkclist.c:75 g10/revoke.c:775
+#: g10/import.c:3353 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/import.c:3259 g10/pkclist.c:77 g10/revoke.c:777
+#: g10/import.c:3354 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/import.c:3260 g10/pkclist.c:79 g10/revoke.c:776
+#: g10/import.c:3355 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/import.c:3261 g10/pkclist.c:81 g10/revoke.c:778
+#: g10/import.c:3356 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/import.c:3262 g10/pkclist.c:83 g10/revoke.c:779
+#: g10/import.c:3357 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
-#: g10/import.c:3387 g10/keylist.c:1109 g10/pkclist.c:87
+#: g10/import.c:3482 g10/keylist.c:1355 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "撤銷原因: "
 
-#: g10/import.c:3406 g10/keylist.c:1128 g10/pkclist.c:103
+#: g10/import.c:3501 g10/keylist.c:1374 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "撤銷註釋: "
 
-#: g10/import.c:3456
+#: g10/import.c:3552
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3581
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3588
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3608
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3729
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3746
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3748
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 
-#: g10/import.c:3669 g10/import.c:3697 g10/import.c:3753
+#: g10/import.c:3765 g10/import.c:3793 g10/import.c:3849
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未支援的公鑰演算法\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3780
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3795
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3814
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3838
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3851
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3866
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3913
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3940
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -3991,58 +4031,58 @@
 # * 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:3873
+#: g10/import.c:3972
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3983
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:3902
+#: g10/import.c:4011
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4035
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4043
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4216
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4323
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4388
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:4285
+#: g10/import.c:4404
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4470
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4508
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
@@ -4052,105 +4092,105 @@
 msgid "error allocating memory: %s\n"
 msgstr "配置記憶體時出錯: %s\n"
 
-#: g10/key-check.c:396
+#: g10/key-check.c:397
 #, 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
+#: g10/key-check.c:406
 #, 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
+#: g10/key-check.c:572
 #, fuzzy
 #| msgid "Good signature from"
 msgid " (reordered signatures follow)"
 msgstr "完好的簽章來自於"
 
-#: g10/key-check.c:708
+#: g10/key-check.c:709
 #, fuzzy, c-format
 #| msgid "key %s: %s\n"
 msgid "key %s:\n"
 msgstr "金鑰 %s: %s\n"
 
-#: g10/key-check.c:716
+#: g10/key-check.c:717
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr0 "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/key-check.c:725 g10/keylist.c:503
+#: g10/key-check.c:726 g10/keylist.c:725
 #, 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"
 msgstr0 "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/key-check.c:733 g10/keylist.c:499
+#: g10/key-check.c:734 g10/keylist.c:721
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr0 "%d 份損壞的簽章\n"
 
-#: g10/key-check.c:742
+#: g10/key-check.c:743
 #, fuzzy, c-format
 #| msgid "Good signature from"
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr0 "完好的簽章來自於"
 
-#: g10/key-check.c:752
+#: g10/key-check.c:753
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
+#: g10/keydb.c:366 g10/keydb.c:393 sm/keydb.c:305 sm/keydb.c:318
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
 
-#: g10/keydb.c:352 g10/keydb.c:379
+#: g10/keydb.c:369 g10/keydb.c:396
 #, c-format
 msgid "error creating keyring '%s': %s\n"
 msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:308
+#: g10/keydb.c:405 sm/keydb.c:324
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "鑰匙盒 '%s' 已建立\n"
 
-#: g10/keydb.c:390
+#: g10/keydb.c:407
 #, c-format
 msgid "keyring '%s' created\n"
 msgstr "鑰匙圈 '%s' 已建立\n"
 
-#: g10/keydb.c:777
+#: g10/keydb.c:797
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "金鑰區塊資源 '%s': %s\n"
 
-#: g10/keydb.c:1652
+#: g10/keydb.c:1673
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264
 msgid "revocation"
 msgstr "撤銷"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:264 g10/keylist.c:1325
 msgid "self-signature"
 msgstr "自我簽章"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:387 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4160,17 +4200,17 @@
 "請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:391 g10/pkclist.c:289
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = 我勉強信任\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:392 g10/pkclist.c:291
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = 我完全信任\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:410
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4180,50 +4220,50 @@
 "深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
 "同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:427
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 Enter.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:555
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:563
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已撤銷."
 
-#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809
-#: g10/keyedit.c:1661
+#: g10/keyedit.c:572 g10/keyedit.c:600 g10/keyedit.c:627 g10/keyedit.c:812
+#: g10/keyedit.c:1677
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "你仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:586 g10/keyedit.c:614 g10/keyedit.c:641 g10/keyedit.c:818
+#: g10/keyedit.c:1682 g10/keyedit.c:2850
 msgid " Unable to sign.\n"
 msgstr " 無法簽署.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:591
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已過期."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:619
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:648
 #, c-format
 msgid "User ID \"%s\" is signable. "
 msgstr "使用者 ID \"%s\" 可被簽署."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:650
 msgid "Sign it? (y/N) "
 msgstr "是否要簽署? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:677
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4232,11 +4272,11 @@
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:686
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:699
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4245,11 +4285,11 @@
 "你目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:704
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4258,43 +4298,43 @@
 "你目前在 \"%s\" 的簽章\n"
 "是一份本機簽章.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:730
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:750
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:754
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:760
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "你仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:782
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:806
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:824
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:830
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:871
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4303,31 +4343,31 @@
 "你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果你不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:876
 #, c-format
 msgid " (0) I will not answer.%s\n"
 msgstr " (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:878
 #, c-format
 msgid " (1) I have not checked at all.%s\n"
 msgstr " (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:880
 #, c-format
 msgid " (2) I have done casual checking.%s\n"
 msgstr " (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:883
 #, c-format
 msgid " (3) I have done very careful checking.%s\n"
 msgstr " (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:890
 msgid "Your selection? (enter '?' for more information): "
 msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:917
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4336,230 +4376,241 @@
 "你真的確定要用你的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:925
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:930
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:937
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:947
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:954
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:961
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:966
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:971
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:983
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1035 g10/keyedit.c:6488 g10/keyedit.c:6571 g10/keyedit.c:6700
+#: g10/keyedit.c:6762 g10/sign.c:533
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1122
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1154
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "金鑰 %s: 變更密語時出錯: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1268
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1271
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1272
 #, fuzzy
 #| msgid "Enter the keygrip: "
 msgid "show the keygrip"
 msgstr "請輸入金鑰鑰柄: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1273
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1275
 msgid "select user ID N"
 msgstr "選擇使用者 ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1276
 msgid "select subkey N"
 msgstr "選擇子鑰 N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1277
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1283
 msgid "sign selected user IDs * see below for related commands"
 msgstr "簽署所選的使用者 ID * 請參見底下相關的註解"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1288
 msgid "sign selected user IDs locally"
 msgstr "僅在本機簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1291
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1293
 msgid "add a user ID"
 msgstr "增加使用者 ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1295
 msgid "add a photo ID"
 msgstr "增加照片 ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1296
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1299
 msgid "add a subkey"
 msgstr "增加子鑰"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1302
 msgid "add a key to a smartcard"
 msgstr "將金鑰加到智慧卡"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1304
 msgid "move a key to a smartcard"
 msgstr "將金鑰移動到智慧卡"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1306
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1308
 msgid "move a backup key to a smartcard"
 msgstr "將備份金鑰移動到智慧卡"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1310
 msgid "delete selected subkeys"
 msgstr "刪除所選的子鑰"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1312
 msgid "add a revocation key"
 msgstr "增加撤銷金鑰"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1314
+#, fuzzy
+#| msgid "Data decryption succeeded"
+msgid "add an additional decryption subkey"
+msgstr "資料已解密成功"
+
+#: g10/keyedit.c:1316
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1318
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "變更金鑰或所選子鑰的使用期限"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1320
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1323
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1324
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1326
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1329
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1331
 msgid "set a notation for the selected user IDs"
 msgstr "為所選的使用者 ID 設定註記"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1333
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1336
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1339
 msgid "revoke signatures on the selected user IDs"
 msgstr "撤銷所選使用者 ID 的簽章"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1341
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1344
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的子鑰"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1346
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1347
 msgid "disable key"
 msgstr "停用金鑰"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1349
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1351
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1353
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1476
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1478
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1511
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
+#: g10/keyedit.c:1589
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4570,295 +4621,286 @@
 " 加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
 " (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1670 g10/keyedit.c:2850 g10/keyedit.c:3226 g10/keyedit.c:3288
+#: g10/keyedit.c:3357
 msgid "Key is revoked."
 msgstr "金鑰已撤銷."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1693
 #, fuzzy
 #| msgid "Really sign all user IDs? (y/N) "
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1697
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1705
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1716
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "未知的簽章種類 '%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1762 g10/keyedit.c:1786 g10/keyedit.c:2035
 msgid "You must select at least one user ID.\n"
 msgstr "你至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1748 g10/keyedit.c:1772 g10/keyedit.c:1970 g10/keyedit.c:2010
+#: g10/keyedit.c:1764 g10/keyedit.c:1788 g10/keyedit.c:1988 g10/keyedit.c:2037
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1767
 msgid "You can't delete the last user ID!\n"
 msgstr "你不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1770
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1771
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1813 g10/keyedit.c:1853
+#: g10/keyedit.c:1829 g10/keyedit.c:1869
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1841 g10/keyedit.c:1881 g10/keyedit.c:5127
 msgid "You must select exactly one key.\n"
 msgstr "你一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1911
 msgid "Command expects a filename argument\n"
 msgstr "這項指令要拿一個檔名來當作引數\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1932
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "無法開啟 '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1986
 msgid "You must select at least one key.\n"
 msgstr "你至少得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1992
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1994
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2041
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2042
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2060
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2071
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2073
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2131
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2176
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2183
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2185
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好設定嗎? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2259
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2263
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2294
+#, fuzzy, c-format
+#| msgid "deleting secret %s failed: %s\n"
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "刪除私鑰 %s 時失敗: %s\n"
+
+#: g10/keyedit.c:2311 g10/keyedit.c:2947 g10/keyedit.c:3247 g10/keyedit.c:3462
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2606
 #, 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:2523
+#: g10/keyedit.c:2632
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2695
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2765 g10/keyedit.c:4840 g10/keygen.c:3984
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" 不是指紋\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2785
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" 不是主要指紋\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2922 g10/keyedit.c:2925
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "無效的數值\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "No matching user IDs."
 msgstr "沒有相符的使用者 ID."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2928
 msgid "Nothing to sign.\n"
 msgstr "沒有東西可以簽署.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3123 g10/keyedit.c:6353
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "並非由你所簽署.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3181
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "檢查已建立的簽章時出錯: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3365
 #, 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:3194
+#: g10/keyedit.c:3407
 #, fuzzy, c-format
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" 不是指紋\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3431
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/keyedit.c:3341
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3358
-msgid "Digest: "
-msgstr "摘要: "
-
-#: g10/keyedit.c:3415
-msgid "Features: "
-msgstr "特點: "
-
-#: g10/keyedit.c:3432
-msgid "Keyserver no-modify"
-msgstr "金鑰伺服器無修改"
-
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3527 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3535 g10/keyedit.c:3536
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3777
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3849
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3873
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3879
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3921 g10/keyedit.c:4068 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3924 g10/keylist.c:2520
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 # of subkey
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3926 g10/keylist.c:2526
 #, c-format
 msgid "expired: %s"
 msgstr "過期: %s"
 
 # of subkey
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3928 g10/keyedit.c:4070 g10/keylist.c:340 g10/keylist.c:2532
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3930
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3938 g10/keyedit.c:3958 g10/keylist.c:343
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3997
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:4001
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:4008
 msgid "This key has been disabled"
 msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4026
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4866,17 +4908,17 @@
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非你重新執行程式.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4088 g10/keyedit.c:4553 g10/keyserver.c:358
+#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:889
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4090 g10/keyedit.c:4555 g10/keyserver.c:362
+#: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4207
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary. This command may\n"
@@ -4885,17 +4927,23 @@
 "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 " 導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4259
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告: 你的加密子鑰很快將到期.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4260
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "你可能也會想變更其使用期限.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4295
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "警告: 你的加密子鑰很快將到期.\n"
+
+#: g10/keyedit.c:4353
 msgid ""
 "WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
 "versions\n"
@@ -4904,74 +4952,74 @@
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 " 增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4358 g10/keyedit.c:4648
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4364
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4273
+#: g10/keyedit.c:4379
 #, fuzzy
 #| msgid "Such a user ID already exists on this key!\n"
 msgid "Such a user ID already exists on this key!"
 msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4481
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4491
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4495
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4502
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4518
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr0 "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4522
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4557
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4559
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4565
 #, 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"
 msgstr0 "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4573
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最小化了\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4574
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4643
 msgid ""
 "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
 "cause\n"
@@ -4980,15 +5028,15 @@
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 " 增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4654
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4671
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4697 g10/keygen.c:3999
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
@@ -4996,26 +5044,42 @@
 # 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:4607
+#: g10/keyedit.c:4713
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4735
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4753
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4759
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4830
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#: g10/keyedit.c:4869 g10/keyedit.c:4894
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(除非你用指紋指定了金鑰)\n"
+
+#: g10/keyedit.c:4915
+#, fuzzy, c-format
+#| msgid "Subkey %s is already revoked.\n"
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "子鑰 %s 已撤銷.\n"
+
+#: g10/keyedit.c:5007
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5024,263 +5088,263 @@
 "N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:5012
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:5015
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:5071
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "你不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:5131
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:5134
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5252
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5258
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5375
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5416 g10/keyedit.c:5532 g10/keyedit.c:5648 g10/keyedit.c:5791
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5589
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5671
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5672
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5737
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5884
 msgid "Proceed? (y/N) "
 msgstr "是否繼續? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5954
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:6016
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:6117
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:6139
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6280
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6283 g10/keyedit.c:6385 g10/keyedit.c:6433
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6285 g10/keyedit.c:6387 g10/keyedit.c:6435
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6289
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6294
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6299
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6359
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6388
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6395
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6420
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正要撤銷這些簽章:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6443
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6476
 #, c-format
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6524
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6534
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6551
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6647
 #, 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:6397
+#: g10/keyedit.c:6685
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6747
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6844
 #, 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:185
+#: g10/keygen.c:179
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid value for option '%s'\n"
 msgstr "選項 \"%.50s\" 的引數無效\n"
 
-#: g10/keygen.c:339
+#: g10/keygen.c:336
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "偏好設定 '%s' 重複了\n"
 
-#: g10/keygen.c:346
+#: g10/keygen.c:343
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:348
+#: g10/keygen.c:345
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "摘要偏好過多\n"
 
-#: g10/keygen.c:350
+#: g10/keygen.c:347
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "壓縮偏好過多\n"
 
-#: g10/keygen.c:352
+#: g10/keygen.c:349
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:520
+#: g10/keygen.c:529
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "偏好字串中含有無效的項目 '%s'\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1115
 #, c-format
 msgid "writing direct signature\n"
 msgstr "寫入直接簽章中\n"
 
-#: g10/keygen.c:1175
+#: g10/keygen.c:1161
 #, c-format
 msgid "writing self signature\n"
 msgstr "寫入自我簽章中\n"
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1217
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
-#: g10/keygen.c:1597 g10/keygen.c:1602 g10/keygen.c:1654 g10/keygen.c:1659
-#: g10/keygen.c:1831 g10/keygen.c:1836
+#: g10/keygen.c:1581 g10/keygen.c:1586 g10/keygen.c:1638 g10/keygen.c:1643
+#: g10/keygen.c:1815 g10/keygen.c:1820
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1608 g10/keygen.c:1665 g10/keygen.c:1673 g10/keygen.c:1842
+#: g10/keygen.c:1592 g10/keygen.c:1649 g10/keygen.c:1657 g10/keygen.c:1826
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1699
+#: g10/keygen.c:1683
 #, 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:1898
+#: g10/keygen.c:1882
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1885
 msgid "Certify"
 msgstr "保證"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1888
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1907
+#: g10/keygen.c:1891
 msgid "Authenticate"
 msgstr "鑑定"
 
@@ -5294,180 +5358,180 @@
 #. * a = Toggle authentication capability
 #. * q = Finish
 #.
-#: g10/keygen.c:1928
+#: g10/keygen.c:1912
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1965
+#: g10/keygen.c:1949
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:1956
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1961
 #, c-format
 msgid " (%c) Toggle the sign capability\n"
 msgstr " (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1980
+#: g10/keygen.c:1964
 #, c-format
 msgid " (%c) Toggle the encrypt capability\n"
 msgstr " (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1967
 #, c-format
 msgid " (%c) Toggle the authenticate capability\n"
 msgstr " (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1970
 #, c-format
 msgid " (%c) Finished\n"
 msgstr " (%c) 已完成\n"
 
-#: g10/keygen.c:2115
+#: g10/keygen.c:2099
 #, fuzzy, c-format
 #| msgid " (%d) RSA and RSA (default)\n"
 msgid " (%d) RSA and RSA%s\n"
 msgstr " (%d) RSA 和 RSA (預設)\n"
 
-#: g10/keygen.c:2119
+#: g10/keygen.c:2103
 #, fuzzy, c-format
 #| msgid " (%d) DSA and Elgamal\n"
 msgid " (%d) DSA and Elgamal%s\n"
 msgstr " (%d) DSA 和 Elgamal\n"
 
-#: g10/keygen.c:2122
+#: g10/keygen.c:2106
 #, fuzzy, c-format
 #| msgid " (%d) DSA (sign only)\n"
 msgid " (%d) DSA (sign only)%s\n"
 msgstr " (%d) DSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid " (%d) RSA (sign only)\n"
 msgid " (%d) RSA (sign only)%s\n"
 msgstr " (%d) RSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:2130
+#: g10/keygen.c:2114
 #, fuzzy, c-format
 #| msgid " (%d) Elgamal (encrypt only)\n"
 msgid " (%d) Elgamal (encrypt only)%s\n"
 msgstr " (%d) Elgamal (僅能用於加密)\n"
 
-#: g10/keygen.c:2132
+#: g10/keygen.c:2116
 #, fuzzy, c-format
 #| msgid " (%d) RSA (encrypt only)\n"
 msgid " (%d) RSA (encrypt only)%s\n"
 msgstr " (%d) RSA (僅能用於加密)\n"
 
-#: g10/keygen.c:2138
+#: g10/keygen.c:2122
 #, fuzzy, c-format
 #| msgid " (%d) DSA (set your own capabilities)\n"
 msgid " (%d) DSA (set your own capabilities)%s\n"
 msgstr " (%d) DSA (你能自己設定性能)\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid " (%d) RSA (set your own capabilities)\n"
 msgid " (%d) RSA (set your own capabilities)%s\n"
 msgstr " (%d) RSA (你能自己設定性能)\n"
 
-#: g10/keygen.c:2146
+#: g10/keygen.c:2130
 #, fuzzy, c-format
 #| msgid " (%d) sign, encrypt\n"
 msgid " (%d) ECC (sign and encrypt)%s\n"
 msgstr " (%d) 簽署, 加密\n"
 
-#: g10/keygen.c:2146 g10/keygen.c:2677
+#: g10/keygen.c:2130 g10/keygen.c:2661
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2131
 #, c-format
 msgid " (%d) ECC (sign only)\n"
 msgstr " (%d) ECC (僅能用於簽署)\n"
 
-#: g10/keygen.c:2149
+#: g10/keygen.c:2133
 #, fuzzy, c-format
 #| msgid " (%d) ECC (set your own capabilities)\n"
 msgid " (%d) ECC (set your own capabilities)%s\n"
 msgstr " (%d) ECC (你能自己設定性能)\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid " (%d) ECC (encrypt only)\n"
 msgid " (%d) ECC (encrypt only)%s\n"
 msgstr " (%d) ECC (僅能用於加密)\n"
 
-#: g10/keygen.c:2155
+#: g10/keygen.c:2139
 #, fuzzy, c-format
 #| msgid " (%d) Existing key\n"
 msgid " (%d) Existing key%s\n"
 msgstr " (%d) 現有的金鑰\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2141
 #, fuzzy, c-format
 #| msgid " (%d) Existing key from card\n"
 msgid " (%d) Existing key from card%s\n"
 msgstr " (%d) 卡片上現存的金鑰\n"
 
-#: g10/keygen.c:2253 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2237 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "請輸入金鑰鑰柄: "
 
-#: g10/keygen.c:2266 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
+#: g10/keygen.c:2250 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
 
-#: g10/keygen.c:2268 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2252 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "沒有金鑰有此金鑰鑰柄\n"
 
-#: g10/keygen.c:2287 g10/keygen.c:2297 g10/keygen.c:3435 g10/keygen.c:3446
+#: g10/keygen.c:2271 g10/keygen.c:2281 g10/keygen.c:3416 g10/keygen.c:3427
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "讀取卡片時出錯: %s\n"
 
-#: g10/keygen.c:2291 g10/keygen.c:3439 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2275 g10/keygen.c:3420 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "卡片序號: %s\n"
 
-#: g10/keygen.c:2310 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2294 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "可用金鑰:\n"
 
-#: g10/keygen.c:2503 g10/keygen.c:2517
+#: g10/keygen.c:2487 g10/keygen.c:2501
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:2558
+#: g10/keygen.c:2542
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:2566
+#: g10/keygen.c:2550
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:2583 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2567 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:2629
+#: g10/keygen.c:2613
 msgid "Please select which elliptic curve you want:\n"
 msgstr "請選擇你要使用的橢圓曲線:\n"
 
-#: g10/keygen.c:2818
+#: g10/keygen.c:2802
 msgid ""
 "Please specify how long the key should be valid.\n"
 " 0 = key does not expire\n"
@@ -5483,7 +5547,7 @@
 " <n>m = 金鑰在 n 月後會到期\n"
 " <n>y = 金鑰在 n 年後會到期\n"
 
-#: g10/keygen.c:2829
+#: g10/keygen.c:2813
 msgid ""
 "Please specify how long the signature should be valid.\n"
 " 0 = signature does not expire\n"
@@ -5499,38 +5563,38 @@
 " <n>m = 簽章在 n 月後會到期\n"
 " <n>y = 簽章在 n 年後會到期\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2836
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:2857
+#: g10/keygen.c:2841
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:2873 g10/keygen.c:2898
+#: g10/keygen.c:2857 g10/keygen.c:2882
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:2880
+#: g10/keygen.c:2864
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:2881
+#: g10/keygen.c:2865
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:2886
+#: g10/keygen.c:2870
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 到期\n"
 
-#: g10/keygen.c:2887
+#: g10/keygen.c:2871
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 到期.\n"
 
-#: g10/keygen.c:2891
+#: g10/keygen.c:2875
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5538,11 +5602,11 @@
 "你的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2888
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:2972
+#: g10/keygen.c:2956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5556,7 +5620,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:2987
+#: g10/keygen.c:2971
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5571,41 +5635,41 @@
 " \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
 "\n"
 
-#: g10/keygen.c:3006
+#: g10/keygen.c:2990
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:3015
+#: g10/keygen.c:2999
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:3016
+#: g10/keygen.c:3000
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3026
+#: g10/keygen.c:3010
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:3032
+#: g10/keygen.c:3016
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:3041
+#: g10/keygen.c:3025
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:3047
+#: g10/keygen.c:3031
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:3083
+#: g10/keygen.c:3067
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "你正在使用 '%s' 字元集.\n"
 
-#: g10/keygen.c:3089
+#: g10/keygen.c:3073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5616,11 +5680,11 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 
-#: g10/keygen.c:3102
+#: g10/keygen.c:3086
 msgid "Such a user ID already exists on this key!\n"
 msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
 
@@ -5635,31 +5699,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3119
+#: g10/keygen.c:3103
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3129
+#: g10/keygen.c:3113
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:3130
+#: g10/keygen.c:3114
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:3136
+#: g10/keygen.c:3120
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:3155
+#: g10/keygen.c:3139
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:3201
+#: g10/keygen.c:3185
 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"
@@ -5670,18 +5734,18 @@
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:3586
+#: g10/keygen.c:3567
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4587 g10/keygen.c:4660 g10/keygen.c:4678 g10/keygen.c:4707
-#: g10/keygen.c:5106 g10/keygen.c:5652 g10/keygen.c:5969 g10/keygen.c:6079
+#: g10/keygen.c:4664 g10/keygen.c:4737 g10/keygen.c:4755 g10/keygen.c:4784
+#: g10/keygen.c:5183 g10/keygen.c:5743 g10/keygen.c:6060 g10/keygen.c:6170
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:4596
+#: g10/keygen.c:4673
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5692,64 +5756,64 @@
 " \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4598
+#: g10/keygen.c:4675
 msgid "Continue? (Y/n) "
 msgstr "是否繼續? (Y/n) "
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4696
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" 的金鑰已存在\n"
 
-#: g10/keygen.c:4624
+#: g10/keygen.c:4701
 msgid "Create anyway? (y/N) "
 msgstr "無論如何還是要建立嗎? (y/N) "
 
-#: g10/keygen.c:4630
+#: g10/keygen.c:4707
 #, c-format
 msgid "creating anyway\n"
 msgstr "總之還是在建立\n"
 
-#: g10/keygen.c:5089
+#: g10/keygen.c:5166
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "請注意: 如需全能金鑰產生對話框請用 \"%s %s\".\n"
 
-#: g10/keygen.c:5138
+#: g10/keygen.c:5215
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5275
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "無法建立備份檔案 '%s': %s\n"
 
-#: g10/keygen.c:5218
+#: g10/keygen.c:5295
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
 
-#: g10/keygen.c:5382 g10/keygen.c:5584
+#: g10/keygen.c:5470 g10/keygen.c:5675
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在寫入公鑰至 '%s'\n"
 
-#: g10/keygen.c:5578
+#: g10/keygen.c:5669
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:5592
+#: g10/keygen.c:5683
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/keygen.c:5623
+#: g10/keygen.c:5714
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已建立及簽署.\n"
 
-#: g10/keygen.c:5639
+#: g10/keygen.c:5730
 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"
@@ -5757,34 +5821,34 @@
 "請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:5821 g10/keygen.c:6029
+#: g10/keygen.c:5912 g10/keygen.c:6120
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:5823 g10/keygen.c:6031
+#: g10/keygen.c:5914 g10/keygen.c:6122
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:5834 g10/keygen.c:6042
+#: g10/keygen.c:5925 g10/keygen.c:6133
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
 
-#: g10/keygen.c:5846 g10/keygen.c:5848
+#: g10/keygen.c:5937 g10/keygen.c:5939
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:5857
+#: g10/keygen.c:5946 g10/keygen.c:5948
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keygen.c:5882 g10/keygen.c:6056
+#: g10/keygen.c:5973 g10/keygen.c:6147
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
@@ -5792,75 +5856,91 @@
 msgid "never "
 msgstr "永遠不過期"
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr ""
+
+#: g10/keylist.c:431
+msgid "Digest: "
+msgstr "摘要: "
+
+#: g10/keylist.c:487
+msgid "Features: "
+msgstr "特點: "
+
+#: g10/keylist.c:504
+msgid "Keyserver no-modify"
+msgstr "金鑰伺服器無修改"
+
+#: g10/keylist.c:572
 msgid "Critical signature policy: "
 msgstr "關鍵簽章原則: "
 
-#: g10/keylist.c:352
+#: g10/keylist.c:574
 msgid "Signature policy: "
 msgstr "簽章原則: "
 
-#: g10/keylist.c:390
+#: g10/keylist.c:612
 msgid "Critical preferred keyserver: "
 msgstr "執意偏好的金鑰伺服器: "
 
-#: g10/keylist.c:443
+#: g10/keylist.c:665
 msgid "Critical signature notation: "
 msgstr "關鍵簽章註記: "
 
-#: g10/keylist.c:445
+#: g10/keylist.c:667
 msgid "Signature notation: "
 msgstr "簽章註記: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, fuzzy, c-format
 #| msgid "%d bad signatures\n"
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr0 "%d 份損壞的簽章\n"
 
-#: g10/keylist.c:508
+#: g10/keylist.c:730
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to an error\n"
 msgid "%d signature not checked due to an error\n"
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr0 "有 1 份簽章因錯誤而未被檢查\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:816
 #, fuzzy, c-format
 #| msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 msgstr0 "警告: %lu 把金鑰因尺寸太大已跳過\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:2110
+#: g10/keylist.c:2376
 msgid "Primary key fingerprint:"
 msgstr " 主鑰指紋:"
 
-#: g10/keylist.c:2112
+#: g10/keylist.c:2378
 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:2120
+#: g10/keylist.c:2386
 msgid " Primary key fingerprint:"
 msgstr " 主鑰指紋:"
 
-#: g10/keylist.c:2122 g10/keylist.c:2132
+#: g10/keylist.c:2388 g10/keylist.c:2398
 msgid " Subkey fingerprint:"
 msgstr " 子鑰指紋:"
 
 # use tty
-#: g10/keylist.c:2127 g10/keylist.c:2143
+#: g10/keylist.c:2393 g10/keylist.c:2409
 msgid " Key fingerprint ="
 msgstr " 金鑰指紋 ="
 
-#: g10/keylist.c:2194
+#: g10/keylist.c:2460
 msgid " Card serial no. ="
 msgstr " 卡片序號 ="
 
@@ -5937,330 +6017,336 @@
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, 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"
 msgstr0 "更新 %d 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "invalid keyserver options\n"
 msgid "no keyserver known\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在向 '%s' 請求金鑰\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法抓取 URI %s: %s\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:295
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:380
+#: g10/mainproc.c:398
 #, fuzzy, c-format
 #| msgid "%s encrypted session key\n"
 msgid "%s.%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:382 sm/decrypt.c:892
+#: g10/mainproc.c:400 sm/decrypt.c:884
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
 msgstr "%s 已加密的資料\n"
 
-#: g10/mainproc.c:387
+#: g10/mainproc.c:405
 #, fuzzy, c-format
 #| msgid "encrypted with unknown algorithm %d\n"
 msgid "encrypted with unknown algorithm %d.%s\n"
 msgstr "以 %d 未知演算法所加密\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:411
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的 %d 摘要演算法所產生\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:512
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:564
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰, ID %s, 建立於 %s 所加密\n"
 
-#: g10/mainproc.c:536 g10/pkclist.c:231
+#: g10/mainproc.c:568 g10/pkclist.c:231
 #, c-format
 msgid " \"%s\"\n"
 msgstr " \"%s\"\n"
 
-#: g10/mainproc.c:540
+#: g10/mainproc.c:572
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 所加密\n"
 
-#: g10/mainproc.c:563 g10/mainproc.c:986
+#: g10/mainproc.c:595 g10/mainproc.c:1028
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告: 看到了多份明文\n"
 
-#: g10/mainproc.c:571
+#: g10/mainproc.c:603
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:573
+#: g10/mainproc.c:605
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:588 g10/mainproc.c:613
+#: g10/mainproc.c:620 g10/mainproc.c:645
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:656
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:653 g10/mainproc.c:674
+#: g10/mainproc.c:685 g10/mainproc.c:706
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:660
+#: g10/mainproc.c:692
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:757 g10/mainproc.c:801
+#: g10/mainproc.c:799 g10/mainproc.c:843
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:768
+#: g10/mainproc.c:810
 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:771
+#: g10/mainproc.c:813
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:776
+#: g10/mainproc.c:818
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:788
+#: g10/mainproc.c:830
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:807
+#: g10/mainproc.c:849
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:874
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:902
+#: g10/mainproc.c:907 g10/mainproc.c:2533 sm/decrypt.c:1391 sm/encrypt.c:821
+#: sm/verify.c:547
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/mainproc.c:944
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
 
-#: g10/mainproc.c:909
+#: g10/mainproc.c:951
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:1186
+#: g10/mainproc.c:1228
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1491 g10/mainproc.c:1534
+#: g10/mainproc.c:1533 g10/mainproc.c:1576
 #, c-format
 msgid "no signature found\n"
 msgstr "找不到簽章\n"
 
-#: g10/mainproc.c:1814
+#: g10/mainproc.c:1856
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1858
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1860
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1840
+#: g10/mainproc.c:1882
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已抑制\n"
 
-#: g10/mainproc.c:1954
+#: g10/mainproc.c:1996
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這個不明確的簽章資料\n"
 
-#: g10/mainproc.c:1970 g10/mainproc.c:1977
+#: g10/mainproc.c:2012 g10/mainproc.c:2019
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
+#: g10/mainproc.c:2013 g10/mainproc.c:2020 sm/verify.c:491
 #, c-format
 msgid " using %s key %s\n"
 msgstr " 使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1982
+#: g10/mainproc.c:2024
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1988
+#: g10/mainproc.c:2030
 #, fuzzy, c-format
 #| msgid " aka \"%s\""
 msgid " issuer \"%s\"\n"
 msgstr " 亦即 \"%s\""
 
-#: g10/mainproc.c:2043
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:2085
+#: g10/mainproc.c:2127
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2285
+#: g10/mainproc.c:2327
 msgid "uncertain"
 msgstr " 不確定 "
 
-#: g10/mainproc.c:2323
+#: g10/mainproc.c:2365
 #, c-format
 msgid " aka \"%s\""
 msgstr " 亦即 \"%s\""
 
-#: g10/mainproc.c:2398
+#: g10/mainproc.c:2442 sm/verify.c:532
 #, 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:2414
+#: g10/mainproc.c:2458
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2463
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署將在 %s 到期\n"
 
-#: g10/mainproc.c:2430
+#: g10/mainproc.c:2474
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
 
-#: g10/mainproc.c:2431
+#: g10/mainproc.c:2475
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:2432
+#: g10/mainproc.c:2476
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2476 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2434
+#: g10/mainproc.c:2478
 msgid ", key algorithm "
 msgstr ", 金鑰演算法 "
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2513
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2517
+#: g10/mainproc.c:2562
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
+#: g10/mainproc.c:2658 g10/mainproc.c:2677 g10/mainproc.c:2801
 #, c-format
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2666
+#: g10/mainproc.c:2711
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected. Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2675
+#: g10/mainproc.c:2720
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2760
+#: g10/mainproc.c:2805
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
@@ -6363,27 +6449,27 @@
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未壓縮|無"
 
-#: g10/misc.c:1448
+#: g10/misc.c:1437
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1625
+#: g10/misc.c:1619
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "不明確的選項 '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1644
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的選項 '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1882
 #, 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:1910
+#: g10/misc.c:1904
 #, fuzzy, c-format
 #| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6438,7 +6524,7 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:201 sm/decrypt.c:669
+#: g10/passphrase.c:201 sm/decrypt.c:661
 #, fuzzy
 #| msgid "Please enter the new passphrase"
 msgid "Please enter the passphrase for decryption."
@@ -6503,7 +6589,7 @@
 "建立於 %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:184
 msgid ""
 "\n"
 "Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -6517,75 +6603,75 @@
 "你的金鑰也會變成非常地大!\n"
 "盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:206
 msgid "Enter JPEG filename for photo ID: "
 msgstr "輸入要當作照片 ID 的 JPEG 檔名: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:227
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "無法開啟 JPEG 圖檔 '%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:244
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:247
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "你確定要用它嗎? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:263
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s' 不是 JPEG 圖檔\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:282
 msgid "Is this photo correct (y/N/q)? "
 msgstr "這張照片正確嗎? (y/N/q) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:427
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "沒有支援的遠端程式執行\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:599
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:619
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr "無法執行 shell '%s': %s\n"
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:630 g10/photoid.c:707
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:695
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:713
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:717
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:748
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:828
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
@@ -6667,33 +6753,33 @@
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被徹底信任金鑰的憑證:\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:441
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:442
+#: g10/pkclist.c:446
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:452
 #, c-format
 msgid "This key probably belongs to the named user\n"
 msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:457
 #, c-format
 msgid "This key belongs to us\n"
 msgstr "這把金鑰是屬於我們自己的\n"
 
-#: g10/pkclist.c:459
+#: g10/pkclist.c:463
 #, fuzzy, c-format
 #| msgid "root certificate has now been marked as trusted\n"
 msgid "%s: This key is bad! It has been marked as untrusted!\n"
 msgstr "根憑證現在已標記為已信任\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:491
 #, fuzzy
 #| msgid ""
 #| "It is NOT certain that the key belongs to the person named\n"
@@ -6708,7 +6794,7 @@
 "除非你 **真的** 知道自己在做甚麼,\n"
 "否則你最好在下一個問題回答 no\n"
 
-#: g10/pkclist.c:492
+#: g10/pkclist.c:496
 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"
@@ -6718,102 +6804,102 @@
 "除非你 **真的** 知道自己在做甚麼,\n"
 "否則你最好在下一個問題回答 no\n"
 
-#: g10/pkclist.c:511
+#: g10/pkclist.c:515
 msgid "Use this key anyway? (y/N) "
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: g10/pkclist.c:589
+#: g10/pkclist.c:593
 #, c-format
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告: 正在使用不被信任的金鑰!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 #, c-format
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
 
-#: g10/pkclist.c:669
+#: g10/pkclist.c:673
 #, fuzzy, c-format
 #| msgid "user ID: \"%s\"\n"
 msgid "checking User ID \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/pkclist.c:681
+#: g10/pkclist.c:685
 #, fuzzy, c-format
 #| msgid "line %d: invalid date given\n"
 msgid "option %s given but issuer \"%s\" does not match\n"
 msgstr "第 %d 列: 無效的給定日期\n"
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:688
 #, fuzzy, c-format
 #| msgid "key %s: doesn't match our copy\n"
 msgid "issuer \"%s\" does not match any User ID\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:691
 #, fuzzy, c-format
 #| msgid "line %d: invalid date given\n"
 msgid "option %s given but no matching User ID found\n"
 msgstr "第 %d 列: 無效的給定日期\n"
 
-#: g10/pkclist.c:696
+#: g10/pkclist.c:700
 #, c-format
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
 
-#: g10/pkclist.c:699
+#: g10/pkclist.c:703
 #, c-format
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
 
-#: g10/pkclist.c:700
+#: g10/pkclist.c:704
 #, c-format
 msgid " This could mean that the signature is forged.\n"
 msgstr " 這很有可能表示此簽章是偽造的.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:710
 #, c-format
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
 
-#: g10/pkclist.c:711
+#: g10/pkclist.c:715
 #, c-format
 msgid "Note: This key has been disabled.\n"
 msgstr "請注意: 這把金鑰已停用.\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:721
 #, c-format
 msgid "Note: This key has expired!\n"
 msgstr "請注意: 這把金鑰已經過期了!\n"
 
-#: g10/pkclist.c:729
+#: g10/pkclist.c:733
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: The key's User ID is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/pkclist.c:732
+#: g10/pkclist.c:736
 #, c-format
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/pkclist.c:734
+#: g10/pkclist.c:738
 #, c-format
 msgid ""
 " There is no indication that the signature belongs to the owner.\n"
 msgstr " 沒有證據指出這個簽章屬於這個持有者.\n"
 
-#: g10/pkclist.c:743
+#: g10/pkclist.c:747
 #, c-format
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:748
 #, c-format
 msgid " The signature is probably a FORGERY.\n"
 msgstr " 這個簽章很有可能是 *偽造的*.\n"
 
-#: g10/pkclist.c:753
+#: g10/pkclist.c:757
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: This key is not certified with sufficiently trusted signatures!\n"
@@ -6822,59 +6908,59 @@
 "signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
-#: g10/pkclist.c:756
+#: g10/pkclist.c:760
 #, c-format
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
-#: g10/pkclist.c:758
+#: g10/pkclist.c:762
 #, c-format
 msgid " It is not certain that the signature belongs to the owner.\n"
 msgstr " 這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:868 g10/pkclist.c:887 g10/pkclist.c:1073 g10/pkclist.c:1115
+#: g10/pkclist.c:873 g10/pkclist.c:892 g10/pkclist.c:1093 g10/pkclist.c:1135
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:908
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: 已跳過: 公鑰已停用\n"
 
-#: g10/pkclist.c:922 g10/pkclist.c:1086
+#: g10/pkclist.c:928 g10/pkclist.c:1106
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已存在\n"
 
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1030
 #, fuzzy, c-format
 #| msgid "can't connect to '%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "無法連接至 '%s': %s\n"
 
-#: g10/pkclist.c:1025
+#: g10/pkclist.c:1045
 #, fuzzy, c-format
 #| msgid "line %d: invalid date given\n"
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "第 %d 列: 無效的給定日期\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1052
 #, fuzzy, c-format
 #| msgid "line %d: invalid date given\n"
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "第 %d 列: 無效的給定日期\n"
 
-#: g10/pkclist.c:1135
+#: g10/pkclist.c:1155
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
 
-#: g10/pkclist.c:1159
+#: g10/pkclist.c:1179
 msgid "Current recipients:\n"
 msgstr "目前的收件者:\n"
 
-#: g10/pkclist.c:1185
+#: g10/pkclist.c:1205
 msgid ""
 "\n"
 "Enter the user ID. End with an empty line: "
@@ -6882,40 +6968,40 @@
 "\n"
 "請輸入使用者 ID. 以空白列結束: "
 
-#: g10/pkclist.c:1210
+#: g10/pkclist.c:1230
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:1221 g10/pkclist.c:1299
+#: g10/pkclist.c:1241 g10/pkclist.c:1319
 #, c-format
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: g10/pkclist.c:1243
+#: g10/pkclist.c:1263
 msgid "Public key is disabled.\n"
 msgstr "公鑰已停用.\n"
 
-#: g10/pkclist.c:1253
+#: g10/pkclist.c:1273
 #, c-format
 msgid "skipped: public key already set\n"
 msgstr "已跳過: 公鑰已設過\n"
 
-#: g10/pkclist.c:1289
+#: g10/pkclist.c:1309
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的預設收件者 \"%s\"\n"
 
-#: g10/pkclist.c:1338
+#: g10/pkclist.c:1358
 #, c-format
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
-#: g10/pkclist.c:1735
+#: g10/pkclist.c:1761
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
 
-#: g10/pkclist.c:1760
+#: g10/pkclist.c:1786
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
@@ -6953,7 +7039,7 @@
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1325
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -7191,52 +7277,47 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
 
-#: g10/sig-check.c:81 g10/sign.c:463 sm/sign.c:611 sm/verify.c:502
+#: g10/sig-check.c:81 g10/sign.c:461 sm/sign.c:848 sm/verify.c:513
 #, 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"
 msgstr "你不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/sig-check.c:85
-#, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#: g10/sig-check.c:199
+#: g10/sig-check.c:192
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告: 簽章摘要與訊息不一致\n"
 
-#: g10/sig-check.c:229
+#: g10/sig-check.c:222
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
 
-#: g10/sig-check.c:231
+#: g10/sig-check.c:224
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 %s 上進一步的資訊\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:233
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:373
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 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"
 msgstr0 "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:387
+#: g10/sig-check.c:381
 #, fuzzy, c-format
 #| msgid "public key %s is %lu second newer than the signature\n"
 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"
 msgstr0 "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:401 g10/sign.c:422
+#: g10/sig-check.c:395 g10/sign.c:420
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7247,7 +7328,7 @@
 msgstr0 ""
 "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:410
+#: g10/sig-check.c:404
 #, fuzzy, c-format
 #| msgid ""
 #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -7257,78 +7338,78 @@
 msgstr0 ""
 "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:428
+#: g10/sig-check.c:422
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 
-#: g10/sig-check.c:439
+#: g10/sig-check.c:433
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "請注意: 簽章金鑰 %s 已遭撤銷\n"
 
-#: g10/sig-check.c:531
+#: g10/sig-check.c:525
 #, 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:543
+#: g10/sig-check.c:537
 #, 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:646
+#: g10/sig-check.c:640
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
-#: g10/sig-check.c:1241
+#: g10/sig-check.c:1235
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
-#: g10/sig-check.c:1244
+#: g10/sig-check.c:1238
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 
-#: g10/sign.c:110
+#: g10/sign.c:105
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
 msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:133
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:541
+#: g10/sign.c:539
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:1153
+#: g10/sign.c:1161
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:1304
+#: g10/sign.c:1318
 #, c-format
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1631
+#: g10/sign.c:1645
 #, fuzzy, c-format
 #| msgid "%s encryption will be used\n"
 msgid "%s.%s encryption will be used\n"
@@ -7403,133 +7484,133 @@
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "無法為 '%s' 建立鎖定\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "無法鎖定 '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "信任資料庫更動量過大\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "無法存取 '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 建立了無效的信任資料庫\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "請注意: 信任資料庫不可寫入\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 不是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零失敗: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加記錄失敗: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "錯誤: 信任資料庫已毀損.\n"
@@ -7951,7 +8032,7 @@
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:674 g10/trustdb.c:2364
+#: g10/trustdb.c:674 g10/trustdb.c:2376
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@ -7981,37 +8062,37 @@
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr0 "目前已處理 %lu 把金鑰\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, 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"
 msgstr0 "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2170
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2184
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2302
 #, 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:2371
+#: g10/trustdb.c:2383
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@ -8090,7 +8171,7 @@
 msgid "ultimate"
 msgstr ""
 
-#: g10/verify.c:116
+#: g10/verify.c:119
 #, c-format
 msgid ""
 "the signature could not be verified.\n"
@@ -8101,12 +8182,12 @@
 "請記住簽章檔 (.sig 或 .asc)\n"
 "應該是第一個命令列給定的檔案.\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 
-#: g10/verify.c:260
+#: g10/verify.c:263
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "無法開啟 fd %d: %s\n"
@@ -8123,19 +8204,19 @@
 msgid "Hint: Do not use option %s\n"
 msgstr "不明確的選項 '%s'\n"
 
-#: kbx/kbxutil.c:93
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "設定除錯旗標"
 
-#: kbx/kbxutil.c:94
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "啟用完整除錯"
 
-#: kbx/kbxutil.c:122
+#: kbx/kbxutil.c:121
 msgid "Usage: kbxutil options files (-h for help)"
 msgstr "用法: kbxutil 選項 檔案 (或用 -h 求助)"
 
-#: kbx/kbxutil.c:125
+#: kbx/kbxutil.c:124
 msgid ""
 "Syntax: kbxutil options files\n"
 "List, export, import Keybox data\n"
@@ -8146,16 +8227,16 @@
 #. 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-piv.c:1770 scd/app-p15.c:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5163 scd/app-nks.c:1537
+#: scd/app-openpgp.c:2443
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %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-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5182 scd/app-nks.c:1556
+#: scd/app-openpgp.c:2459
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8196,10 +8277,10 @@
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|請輸入標準金鑰的 PIN 重設碼 (PUK)."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2726
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2928 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:3131 scd/app-openpgp.c:3418 scd/app-openpgp.c:3465
+#: scd/app-openpgp.c:3603 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
@@ -8221,153 +8302,153 @@
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3674
 #, c-format
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3678
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3680
 #, c-format
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3682
 #, c-format
 msgid "writing new key\n"
 msgstr "正在寫入新的金鑰\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4542 scd/app-openpgp.c:4838
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1632
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1747
 #, 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-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:5039
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請稍候 ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:5047
 #, c-format
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:5053
 #, 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"
 msgstr0 "金鑰產生完畢 (%d 秒)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1864 scd/app-openpgp.c:5062
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5262 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
 
 #. 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-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5265 scd/app-openpgp.c:2875
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|請輸入管理者 PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5267 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|請輸入標準金鑰的 PIN 重設碼 (PUK)."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5270 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4379
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4391
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1656
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN 還沒有變更過\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN 還沒有變更過\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|請輸入標準金鑰將採用的新個人識別碼 (PIN)."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|請輸入標準金鑰將採用的 PIN 重設碼 (PUK)."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|請輸入金鑰的新個人識別碼 (PIN) 以建立完善的簽章."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2116
 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:2048
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3499 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:952
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:965
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5890
+#: scd/app-openpgp.c:1436 scd/app-openpgp.c:3446 scd/app-openpgp.c:5991
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1972
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
@@ -8375,44 +8456,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:2375
+#: scd/app-openpgp.c:2430
 #, c-format
 msgid "%sNumber&#x1f;: %s%%0AHolder&#x1f;: %s%%0ACounter&#x1f;: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2678
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "以 %s 做為預設 PIN\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2685
 #, 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:2643
+#: scd/app-openpgp.c:2698
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2757 scd/app-openpgp.c:2957 scd/app-openpgp.c:3425
 #, 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:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2774 scd/app-openpgp.c:2817 scd/app-openpgp.c:2974
+#: scd/app-openpgp.c:5422
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5899
+#: scd/app-openpgp.c:2861 scd/app-openpgp.c:6000
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2865
 #, 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"
@@ -8420,20 +8501,20 @@
 "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr0 "%d 管理者個人識別碼 (PIN) 試圖在卡片永久鎖定前遺留下來\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2898
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "管理者指令存取權限尚未組態\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3412
 msgid "||Please enter the PIN"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3461
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入卡片的重設碼"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3471 scd/app-openpgp.c:3540
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重設碼太短; 長度最少要有 %d\n"
@@ -8441,79 +8522,79 @@
 #. 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:3439
+#: scd/app-openpgp.c:3494
 msgid "|RN|New Reset Code"
 msgstr "|RN|新增重設碼"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管理者個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3495
 msgid "|N|New PIN"
 msgstr "|N|新增個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3599
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3600
 msgid "||Please enter the PIN and New PIN"
 msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3658 scd/app-openpgp.c:5122
 #, c-format
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3664 scd/app-openpgp.c:5129
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4360 scd/app-openpgp.c:4723
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺漏創生時間戳印\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4401 scd/app-openpgp.c:4409
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4717
 #, fuzzy, c-format
 #| msgid "unsupported inquiry '%s'\n"
 msgid "unsupported curve\n"
 msgstr "未支援的查詢 '%s'\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5087
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5137
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5337
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支援 %s 摘要演算法\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5395
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:5904
+#: scd/app-openpgp.c:6005
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 
-#: scd/app-openpgp.c:6431 scd/app-openpgp.c:6442
+#: scd/app-openpgp.c:6552 scd/app-openpgp.c:6564
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -8533,7 +8614,7 @@
 msgid "run in multi server mode (foreground)"
 msgstr "以多重伺服器模式執行 (前景)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|等級|設定除錯等級為指定等級"
 
@@ -8577,11 +8658,11 @@
 msgid "deny the use of admin card commands"
 msgstr "禁用管理者卡片指令"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ options (-h for help)"
 msgstr "用法: @SCDAEMON@ 選項 (或用 -h 求助)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon options command args\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8589,314 +8670,314 @@
 "語法: scdaemon 選項 指令 引數\n"
 "@GNUPG@ 智慧卡服務\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2210
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2264
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "用於 fd %d 的經手程式已啟動\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2218
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2272
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程式已終止\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
-#: dirmngr/validate.c:1262
+#: sm/call-agent.c:1100 sm/certlist.c:143 sm/keylist.c:338
+#: dirmngr/validate.c:1273
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得金鑰用途資訊時出錯: %s\n"
 
-#: sm/call-dirmngr.c:448
+#: sm/call-dirmngr.c:450
 msgid "Tor might be in use - network access is limited"
 msgstr ""
 
-#: sm/certchain.c:198
+#: sm/certchain.c:199
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "憑證所要求的驗證模型: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2229
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:201 sm/certchain.c:2229
 msgid "shell"
 msgstr "shell"
 
-#: sm/certchain.c:260 dirmngr/validate.c:144
+#: sm/certchain.c:261 dirmngr/validate.c:144
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "未支援關鍵憑證擴充欄位 %s"
 
-#: sm/certchain.c:299 dirmngr/validate.c:243
+#: sm/certchain.c:300 dirmngr/validate.c:243
 #, c-format
 msgid "issuer certificate is not marked as a CA"
 msgstr "發行者憑證並未標記為 CA"
 
-#: sm/certchain.c:337
+#: sm/certchain.c:339
 msgid "critical marked policy without configured policies"
 msgstr "關鍵已標記原則沒有已組態的原則"
 
-#: sm/certchain.c:347
+#: sm/certchain.c:357
 #, c-format
 msgid "failed to open '%s': %s\n"
 msgstr "開啟 '%s' 失敗: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:369 sm/certchain.c:401 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "請注意: 不允許非關鍵的憑證原則"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:373 sm/certchain.c:405 dirmngr/validate.c:209
 #, c-format
 msgid "certificate policy not allowed"
 msgstr "未允許憑證原則"
 
-#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
+#: sm/certchain.c:613 sm/keydb.c:1933 sm/keydb.c:2022
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "取得指紋失敗\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:642
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "從外部位置尋找發行者\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:662
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "吻合的發行者數量: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:737
+#: sm/certchain.c:741 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "無法取得 authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:809
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "從 Dirmngr 快取尋找發行者\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:834
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "吻合的憑證數量: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:837
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
 
-#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2206
-#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1920
-#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1064 sm/certchain.c:1610 sm/certchain.c:2257
+#: sm/decrypt.c:1076 sm/encrypt.c:621 sm/import.c:415 sm/keydb.c:1940
+#: sm/keydb.c:2029 sm/sign.c:649 sm/verify.c:122
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "配置 keyDB 代號失敗\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1276 sm/certchain.c:1280
 msgid "certificate has been revoked"
 msgstr "憑證已撤銷"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1295
 msgid "the status of the certificate is unknown"
 msgstr "憑證的狀態未知"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1302
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1308
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "檢查 CRL 時失敗: %s"
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1337 sm/certchain.c:1405 dirmngr/validate.c:508
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "有效性無效的憑證: %s"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1352 sm/certchain.c:1437 dirmngr/validate.c:526
 #, c-format
 msgid "certificate not yet valid"
 msgstr "憑證尚未生效"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1353 sm/certchain.c:1438
 msgid "root certificate not yet valid"
 msgstr "根憑證尚未生效"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1354 sm/certchain.c:1439
 msgid "intermediate certificate not yet valid"
 msgstr "媒介憑證尚未生效"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1367 dirmngr/validate.c:537
 #, c-format
 msgid "certificate has expired"
 msgstr "憑證已過期"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1368
 msgid "root certificate has expired"
 msgstr "根憑證已過期"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1369
 msgid "intermediate certificate has expired"
 msgstr "媒介憑證已過期"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1411
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "遺失所需的憑證屬性: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1420
 msgid "certificate with invalid validity"
 msgstr "有效性無效的憑證"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1457
 msgid "signature not created during lifetime of certificate"
 msgstr "簽章並非在憑證生存時間內所造"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1459
 msgid "certificate not created during lifetime of issuer"
 msgstr "憑證並非在發行者生存時間內所造"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1460
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "媒介憑證並非在發行者生存時間內所造"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1464
 #, c-format
 msgid " ( signature created at "
 msgstr " ( 簽章建立於 "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1465
 #, c-format
 msgid " (certificate created at "
 msgstr " ( 憑證建立於 "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1468
 #, c-format
 msgid " (certificate valid from "
 msgstr " (憑證有效自 "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1469
 #, c-format
 msgid " ( issuer valid from "
 msgstr " ( 發行者有效自 "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1500 dirmngr/validate.c:588
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指紋=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1509
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根憑證現在已標記為已信任\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1522
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "在 gpg-agent 中未啟用互動式標記為已信任\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1528
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "互動式標記為已信任在此作業階段中已停用\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1587
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告: 簽章創造時間未知 - 假設為此刻"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1651
 msgid "no issuer found in certificate"
 msgstr "憑證中找不到發行者"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1729
 msgid "self-signed certificate has a BAD signature"
 msgstr "自簽憑證有 不良 簽章"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1802 dirmngr/validate.c:586
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根憑證未標記為已信任"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1818
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1849 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:641
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "憑證鏈太長\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1861 dirmngr/validate.c:653
 #, c-format
 msgid "issuer certificate not found"
 msgstr "找不到發行者憑證"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1896 dirmngr/validate.c:679
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "憑證有 不良 簽章"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1928 dirmngr/validate.c:703
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1987 dirmngr/validate.c:728
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
 
-#: sm/certchain.c:1981 sm/certchain.c:2282 dirmngr/validate.c:748
+#: sm/certchain.c:2029 sm/certchain.c:2334 dirmngr/validate.c:758
 #, c-format
 msgid "certificate is good\n"
 msgstr "憑證完好\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2030
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "媒介憑證良好\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2031
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根憑證完好\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2216
 msgid "switching to chain model"
 msgstr "切換至鏈模型"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2225
 #, c-format
 msgid "validation model used: %s"
 msgstr "已使用的驗證模型: %s"
 
-#: sm/certcheck.c:113 dirmngr/crlcache.c:1819 dirmngr/ocsp.c:467
-#: dirmngr/validate.c:1139
+#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:467
+#: dirmngr/validate.c:1150
 #, 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:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1462 dirmngr/validate.c:906
-#: dirmngr/validate.c:930
+#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1552
+#: dirmngr/crlcache.c:1576 dirmngr/dirmngr.c:1513 dirmngr/validate.c:916
+#: dirmngr/validate.c:940
 #, c-format
 msgid "out of core\n"
 msgstr "超出核心\n"
 
-#: sm/certcheck.c:388 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:222
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(這是 MD2 演算法)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:848
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "無"
 
@@ -8916,7 +8997,7 @@
 msgid "Error - invalid DN"
 msgstr "錯誤 - 無效的 DN"
 
-#: sm/certdump.c:927
+#: sm/certdump.c:934
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the X.509 "
@@ -8930,42 +9011,42 @@
 "S/N %s, ID 0x%08lX,\n"
 "建立於 %s, 於 %s 到期.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:133 dirmngr/validate.c:1263
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:154 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "憑證應該還未被用於憑證\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:167 dirmngr/validate.c:1314
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:184 dirmngr/validate.c:1297
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "憑證應該還未被用於加密\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:186 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "憑證應該還未被用於簽署\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:188 dirmngr/validate.c:1298
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "憑證無法用於加密\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:189 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "憑證無法用於簽署\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9182,17 +9263,17 @@
 msgid "resource problem: out of core\n"
 msgstr "資源問題: 超出核心\n"
 
-#: sm/decrypt.c:1159
+#: sm/decrypt.c:1155
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(這是 RC2 演算法)\n"
 
-#: sm/decrypt.c:1161
+#: sm/decrypt.c:1157
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(這看起來不像是個加密過的訊息)\n"
 
-#: sm/decrypt.c:1318
+#: sm/decrypt.c:1314
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9203,7 +9284,7 @@
 msgid "certificate '%s' not found: %s\n"
 msgstr "找不到憑證 '%s': %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
+#: sm/delete.c:120 sm/keydb.c:2041 sm/keydb.c:2140
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
@@ -9228,123 +9309,123 @@
 msgid "no valid recipients given\n"
 msgstr "沒有給定有效的收件者\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:235
 msgid "list external keys"
 msgstr "列出外部金鑰"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:237
 msgid "list certificate chain"
 msgstr "列出憑證鏈"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:245
 msgid "import certificates"
 msgstr "匯入憑證"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:246
 msgid "export certificates"
 msgstr "匯出憑證"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:254
 msgid "register a smartcard"
 msgstr "註冊智慧卡"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:257
 msgid "pass a command to the dirmngr"
 msgstr "將指令遞送給 dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:259
 msgid "invoke gpg-protect-tool"
 msgstr "叫用 gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:279
 msgid "don't use the terminal at all"
 msgstr "完全不要使用終端機"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:307
 msgid "|N|number of certificates to include"
 msgstr "|N|要包含的憑證數量"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:309
 msgid "|FILE|take policy information from FILE"
 msgstr "|檔案|從指定檔案中取得原則資訊"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:325
 msgid "assume input is in PEM format"
 msgstr "假設輸入的是 PEM 格式"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:327
 msgid "assume input is in base-64 format"
 msgstr "假設輸入的是 base-64 格式"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:329
 msgid "assume input is in binary format"
 msgstr "假設輸入的是二進制格式"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:339
 msgid "create base-64 encoded output"
 msgstr "建立以 base-64 編碼過的輸出"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:351
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:362
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:375
 msgid "fetch missing issuer certificates"
 msgstr "取回遺失的發行者憑證"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:377
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:398
 msgid "never consult a CRL"
 msgstr "永遠不要查閱 CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:402
 msgid "do not check CRLs for root certificates"
 msgstr "不要為根憑證檢查 CRL"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:406
 msgid "check validity using OCSP"
 msgstr "用 OCSP 檢查有效性"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:408
 msgid "do not check certificate policies"
 msgstr "不要檢查憑證原則"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:411
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|名稱|使用指定名稱的編密演算法"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:413
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|名稱|使用指定名稱的訊息摘要演算法"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:423
 msgid "batch mode: never ask"
 msgstr "批次模式: 永遠不詢問"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:425
 msgid "assume yes on most questions"
 msgstr "假設大部分的問題都回答是"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:426
 msgid "assume no on most questions"
 msgstr "假設大部分的問題都回答否"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:443
 msgid "|FILE|write an audit log to FILE"
 msgstr "|檔案|將稽核日誌寫入至指定檔案"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:640
 msgid "Usage: @GPGSM@ options files (-h for help)"
 msgstr "用法: @GPGSM@ 選項 檔案 (或用 -h 求助)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:643
 msgid ""
 "Syntax: @GPGSM@ options files\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9354,27 +9435,27 @@
 "用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:851
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "請注意: 將無法加密為 '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:862
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的驗證模型 '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1779
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在匯入通用憑證 '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1825
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "無法用 '%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2203
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無效的指令 (沒有這樣的指令)\n"
@@ -9394,7 +9475,7 @@
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本的憑證檢查失敗了 - 未匯入\n"
 
-#: sm/import.c:473 sm/keydb.c:2040 sm/keydb.c:2133
+#: sm/import.c:473 sm/keydb.c:2060 sm/keydb.c:2153
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "取得已存放的旗標時出錯: %s\n"
@@ -9404,49 +9485,49 @@
 msgid "error importing certificate: %s\n"
 msgstr "匯入憑證時出錯: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1493
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取輸入時出錯: %s\n"
 
-#: sm/keydb.c:508
+#: sm/keydb.c:528
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: sm/keydb.c:600
+#: sm/keydb.c:620
 #, fuzzy, c-format
 #| msgid "error opening '%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
 
-#: sm/keydb.c:1958
+#: sm/keydb.c:1978
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "查找既有憑證的問題: %s\n"
 
-#: sm/keydb.c:1970
+#: sm/keydb.c:1990
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "尋找可寫入的 keyDB 時出錯: %s\n"
 
-#: sm/keydb.c:1978
+#: sm/keydb.c:1998
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "存放憑證時出錯: %s\n"
 
-#: sm/keydb.c:2031
+#: sm/keydb.c:2051
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "重新搜尋憑證的問題: %s\n"
 
-#: sm/keydb.c:2052 sm/keydb.c:2144
+#: sm/keydb.c:2072 sm/keydb.c:2164
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "存放旗標時出錯: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "錯誤 - "
 
@@ -9481,7 +9562,7 @@
 "\n"
 "%s%s請問你是否真的確定要這樣做了?"
 
-#: sm/qualified.c:214 sm/verify.c:696
+#: sm/qualified.c:214 sm/verify.c:716
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9499,60 +9580,60 @@
 "\"%s\"\n"
 "請注意, 這個憑證並 不會 建立出合格的簽章!"
 
-#: sm/sign.c:584
+#: sm/sign.c:821
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "雜湊演算法 %d (%s) 為簽署者 %d 所用, 但並不支援; 改用 %s\n"
 
-#: sm/sign.c:623
+#: sm/sign.c:860
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "簽署者 %d 所用的雜湊演算法: %s (%s)\n"
 
-#: sm/sign.c:675
+#: sm/sign.c:912
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查合格憑證時失敗: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:1147
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: sm/verify.c:467
+#: sm/verify.c:478
 #, c-format
 msgid "Signature made "
 msgstr "簽章建立於 "
 
-#: sm/verify.c:479
+#: sm/verify.c:490
 #, c-format
 msgid "date not given"
 msgstr " 未給定日期 "
 
-#: sm/verify.c:483
+#: sm/verify.c:494
 #, fuzzy, c-format
 #| msgid "algorithm: %s"
 msgid "algorithm:"
 msgstr "演算法: %s"
 
-#: sm/verify.c:547
+#: sm/verify.c:567
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "無效的簽章: 訊息摘要屬性與計算而得的不吻合\n"
 
-#: sm/verify.c:673
+#: sm/verify.c:693
 #, c-format
 msgid "Good signature from"
 msgstr "完好的簽章來自於"
 
-#: sm/verify.c:674
+#: sm/verify.c:694
 #, c-format
 msgid " aka"
 msgstr " 亦即"
 
-#: sm/verify.c:693
+#: sm/verify.c:713
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "這是一份合格簽章\n"
@@ -9577,575 +9658,570 @@
 msgid "can't release lock on the certificate cache: %s\n"
 msgstr "無法釋放憑證快取鎖定: %s\n"
 
-#: dirmngr/certcache.c:298
+#: dirmngr/certcache.c:313
 #, c-format
 msgid "dropping %u certificates from the cache\n"
 msgstr "正在從快取中拋棄 %u 份憑證\n"
 
-#: dirmngr/certcache.c:424 dirmngr/certcache.c:516 dirmngr/certcache.c:628
+#: dirmngr/certcache.c:439 dirmngr/certcache.c:531 dirmngr/certcache.c:643
 #, c-format
 msgid "can't parse certificate '%s': %s\n"
 msgstr "無法剖析憑證 '%s': %s\n"
 
-#: dirmngr/certcache.c:432 dirmngr/certcache.c:523 dirmngr/certcache.c:639
+#: dirmngr/certcache.c:447 dirmngr/certcache.c:538 dirmngr/certcache.c:654
 #, c-format
 msgid "certificate '%s' already cached\n"
 msgstr "憑證 '%s' 已快取\n"
 
-#: dirmngr/certcache.c:439 dirmngr/certcache.c:533 dirmngr/certcache.c:651
+#: dirmngr/certcache.c:454 dirmngr/certcache.c:548 dirmngr/certcache.c:666
 #, c-format
 msgid "trusted certificate '%s' loaded\n"
 msgstr "信任的憑證 '%s' 已載入\n"
 
-#: dirmngr/certcache.c:441
+#: dirmngr/certcache.c:456
 #, c-format
 msgid "certificate '%s' loaded\n"
 msgstr "憑證 '%s' 已載入\n"
 
-#: dirmngr/certcache.c:445 dirmngr/certcache.c:535 dirmngr/certcache.c:653
+#: dirmngr/certcache.c:460 dirmngr/certcache.c:550 dirmngr/certcache.c:668
 #, c-format
 msgid " SHA1 fingerprint = %s\n"
 msgstr " SHA1 指紋 = %s\n"
 
-#: dirmngr/certcache.c:448 dirmngr/certcache.c:538 dirmngr/certcache.c:656
+#: dirmngr/certcache.c:463 dirmngr/certcache.c:553 dirmngr/certcache.c:671
 msgid " issuer ="
 msgstr " 發行者 ="
 
-#: dirmngr/certcache.c:449 dirmngr/certcache.c:539 dirmngr/certcache.c:657
+#: dirmngr/certcache.c:464 dirmngr/certcache.c:554 dirmngr/certcache.c:672
 msgid " subject ="
 msgstr " 主旨 ="
 
-#: dirmngr/certcache.c:455 dirmngr/certcache.c:527 dirmngr/certcache.c:645
+#: dirmngr/certcache.c:470 dirmngr/certcache.c:542 dirmngr/certcache.c:660
 #, c-format
 msgid "error loading certificate '%s': %s\n"
 msgstr "載入憑證 '%s' 時出錯: %s\n"
 
-#: dirmngr/certcache.c:836
+#: dirmngr/certcache.c:852
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "固定載入的憑證: %u\n"
 
-#: dirmngr/certcache.c:838
+#: dirmngr/certcache.c:855
 #, c-format
 msgid " runtime cached certificates: %u\n"
 msgstr " 執行時期快取的憑證: %u\n"
 
-#: dirmngr/certcache.c:840
+#: dirmngr/certcache.c:858
 #, fuzzy, c-format
 #| msgid " runtime cached certificates: %u\n"
 msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr " 執行時期快取的憑證: %u\n"
 
-#: dirmngr/certcache.c:868 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:886 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "憑證早已快取\n"
 
-#: dirmngr/certcache.c:870
+#: dirmngr/certcache.c:888
 #, c-format
 msgid "certificate cached\n"
 msgstr "憑證已快取\n"
 
-#: dirmngr/certcache.c:874 dirmngr/certcache.c:897 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:892 dirmngr/certcache.c:915 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "快取憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:960
+#: dirmngr/certcache.c:978
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "無效的 SHA1 指紋字串 '%s'\n"
 
-#: dirmngr/certcache.c:1406 dirmngr/certcache.c:1415
+#: dirmngr/certcache.c:1424 dirmngr/certcache.c:1433
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "以序號取得憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:1624 dirmngr/certcache.c:1633
+#: dirmngr/certcache.c:1642 dirmngr/certcache.c:1651
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "以主旨取得憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:1739 dirmngr/validate.c:484
+#: dirmngr/certcache.c:1757 dirmngr/validate.c:494
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "憑證中找不到發行者\n"
 
-#: dirmngr/certcache.c:1749
+#: dirmngr/certcache.c:1767
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "取得 authorityKeyIdentifier 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:212
+#: dirmngr/crlcache.c:219
 #, c-format
 msgid "creating directory '%s'\n"
 msgstr "正在建立目錄 '%s'\n"
 
-#: dirmngr/crlcache.c:216
+#: dirmngr/crlcache.c:223
 #, c-format
 msgid "error creating directory '%s': %s\n"
 msgstr "建立目錄 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:244
+#: dirmngr/crlcache.c:251
 #, c-format
 msgid "ignoring database dir '%s'\n"
 msgstr "正在忽略資料庫目錄 '%s'\n"
 
-#: dirmngr/crlcache.c:253
+#: dirmngr/crlcache.c:260
 #, c-format
 msgid "error reading directory '%s': %s\n"
 msgstr "讀取目錄 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:274
+#: dirmngr/crlcache.c:281
 #, c-format
 msgid "removing cache file '%s'\n"
 msgstr "正在移除快取檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:283
+#: dirmngr/crlcache.c:290
 #, c-format
 msgid "not removing file '%s'\n"
 msgstr "不移除檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:379 dirmngr/crlcache.c:1125 dirmngr/crlcache.c:2452
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "關閉快取檔案時出錯: %s\n"
 
-#: dirmngr/crlcache.c:410 dirmngr/crlcache.c:794
+#: dirmngr/crlcache.c:417 dirmngr/crlcache.c:801
 #, c-format
 msgid "failed to open cache dir file '%s': %s\n"
 msgstr "開啟快取目錄檔案 '%s' 失敗: %s\n"
 
-#: dirmngr/crlcache.c:420
+#: dirmngr/crlcache.c:427
 #, c-format
 msgid "error creating new cache dir file '%s': %s\n"
 msgstr "建立新快取目錄檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:427
+#: dirmngr/crlcache.c:434
 #, c-format
 msgid "error writing new cache dir file '%s': %s\n"
 msgstr "寫入新快取目錄檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:434
+#: dirmngr/crlcache.c:441
 #, c-format
 msgid "error closing new cache dir file '%s': %s\n"
 msgstr "關閉新快取目錄檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:439
+#: dirmngr/crlcache.c:446
 #, c-format
 msgid "new cache dir file '%s' created\n"
 msgstr "新的快取目錄檔案 '%s' 已建立\n"
 
-#: dirmngr/crlcache.c:444
+#: dirmngr/crlcache.c:451
 #, c-format
 msgid "failed to re-open cache dir file '%s': %s\n"
 msgstr "重新開啟快取目錄檔案 '%s' 失敗: %s\n"
 
-#: dirmngr/crlcache.c:472
+#: dirmngr/crlcache.c:479
 #, c-format
 msgid "first record of '%s' is not the version\n"
 msgstr "第一個 '%s' 記錄並非版本\n"
 
-#: dirmngr/crlcache.c:487
+#: dirmngr/crlcache.c:494
 #, c-format
 msgid "old version of cache directory - cleaning up\n"
 msgstr "舊版的快取目錄 - 正在清理\n"
 
-#: dirmngr/crlcache.c:503
+#: dirmngr/crlcache.c:510
 #, c-format
 msgid "old version of cache directory - giving up\n"
 msgstr "舊版的快取目錄 - 正在放棄\n"
 
-#: dirmngr/crlcache.c:614
+#: dirmngr/crlcache.c:621
 #, c-format
 msgid "extra field detected in crl record of '%s' line %u\n"
 msgstr "'%s' 的 crl 記錄內偵測到額外的欄位位於第 %u 列\n"
 
-#: dirmngr/crlcache.c:622
+#: dirmngr/crlcache.c:629
 #, c-format
 msgid "invalid line detected in '%s' line %u\n"
 msgstr "偵測到 '%s' 第 %u 列有無效的列\n"
 
-#: dirmngr/crlcache.c:631
+#: dirmngr/crlcache.c:638
 #, c-format
 msgid "duplicate entry detected in '%s' line %u\n"
 msgstr "偵測到 '%s' 第 %u 列有重複的項目\n"
 
-#: dirmngr/crlcache.c:646
+#: dirmngr/crlcache.c:653
 #, c-format
 msgid "unsupported record type in '%s' line %u skipped\n"
 msgstr "'%s' 第 %u 列有未支援的紀錄類型故已跳過\n"
 
-#: dirmngr/crlcache.c:672
+#: dirmngr/crlcache.c:679
 #, c-format
 msgid "invalid issuer hash in '%s' line %u\n"
 msgstr "'%s' 第 %u 列有無效的發行者雜湊\n"
 
-#: dirmngr/crlcache.c:678
+#: dirmngr/crlcache.c:685
 #, c-format
 msgid "no issuer DN in '%s' line %u\n"
 msgstr "'%s' 第 %u 列沒有發行者 DN\n"
 
-#: dirmngr/crlcache.c:685
+#: dirmngr/crlcache.c:692
 #, c-format
 msgid "invalid timestamp in '%s' line %u\n"
 msgstr "'%s' 第 %u 列有無效的時間戳印\n"
 
-#: dirmngr/crlcache.c:691
+#: dirmngr/crlcache.c:698
 #, c-format
 msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 msgstr "警告: '%s' 第 %u 列有無效的快取檔案雜湊\n"
 
-#: dirmngr/crlcache.c:697
+#: dirmngr/crlcache.c:704
 #, c-format
 msgid "detected errors in cache dir file\n"
 msgstr "已於快取 dir 檔案內偵測到錯誤\n"
 
-#: dirmngr/crlcache.c:698
+#: dirmngr/crlcache.c:705
 #, c-format
 msgid "please check the reason and manually delete that file\n"
 msgstr "請檢查其原因並手動刪除該檔案\n"
 
-#: dirmngr/crlcache.c:826 dirmngr/crlcache.c:840
+#: dirmngr/crlcache.c:833 dirmngr/crlcache.c:847
 #, c-format
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "建立暫存快取目錄檔案 '%s' 失敗: %s\n"
 
-#: dirmngr/crlcache.c:936
-#, c-format
-msgid "error closing '%s': %s\n"
-msgstr "關閉 '%s' 時出錯: %s\n"
-
-#: dirmngr/crlcache.c:948
+#: dirmngr/crlcache.c:955
 #, c-format
 msgid "error renaming '%s' to '%s': %s\n"
 msgstr "把 '%s' 重新命名成 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1002
+#: dirmngr/crlcache.c:1009
 #, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "無法計算 '%s' 的雜湊: %s\n"
 
-#: dirmngr/crlcache.c:1010
+#: dirmngr/crlcache.c:1017
 #, c-format
 msgid "error setting up MD5 hash context: %s\n"
 msgstr "設定 MD5 雜湊脈絡時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1026
+#: dirmngr/crlcache.c:1033
 #, c-format
 msgid "error hashing '%s': %s\n"
 msgstr "計算 '%s' 的雜湊時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1054
+#: dirmngr/crlcache.c:1061
 #, c-format
 msgid "invalid formatted checksum for '%s'\n"
 msgstr "無效的 '%s' 格式化加總檢核碼\n"
 
-#: dirmngr/crlcache.c:1107
+#: dirmngr/crlcache.c:1114
 #, c-format
 msgid "too many open cache files; can't open anymore\n"
 msgstr "太多開啟的快取檔案; 無法再開啟更多檔案了\n"
 
-#: dirmngr/crlcache.c:1125
+#: dirmngr/crlcache.c:1132
 #, c-format
 msgid "opening cache file '%s'\n"
 msgstr "開啟快取檔案 '%s' 時失敗\n"
 
-#: dirmngr/crlcache.c:1144
+#: dirmngr/crlcache.c:1151
 #, c-format
 msgid "error opening cache file '%s': %s\n"
 msgstr "開啟快取檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1153
+#: dirmngr/crlcache.c:1160
 #, c-format
 msgid "error initializing cache file '%s' for reading: %s\n"
 msgstr "初始化快取檔案 '%s' 用於讀取時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1174
+#: dirmngr/crlcache.c:1181
 #, c-format
 msgid "calling unlock_db_file on a closed file\n"
 msgstr "正在對已關閉的檔案叫用 unlock_db_file\n"
 
-#: dirmngr/crlcache.c:1176
+#: dirmngr/crlcache.c:1183
 #, c-format
 msgid "calling unlock_db_file on an unlocked file\n"
 msgstr "正在對已解除鎖定的檔案叫用 unlock_db_file\n"
 
-#: dirmngr/crlcache.c:1230
+#: dirmngr/crlcache.c:1237
 #, c-format
 msgid "failed to create a new cache object: %s\n"
 msgstr "建立新快取物件失敗: %s\n"
 
-#: dirmngr/crlcache.c:1287
+#: dirmngr/crlcache.c:1294
 #, c-format
 msgid "no CRL available for issuer id %s\n"
 msgstr "發行者 ID %s 沒有可用的 CRL\n"
 
-#: dirmngr/crlcache.c:1294
+#: dirmngr/crlcache.c:1301
 #, c-format
 msgid "cached CRL for issuer id %s too old; update required\n"
 msgstr "發行者 ID %s 的快取 CRL 太過老舊; 需要更新\n"
 
-#: dirmngr/crlcache.c:1308
+#: dirmngr/crlcache.c:1315
 #, 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:1316
+#: dirmngr/crlcache.c:1323
 #, c-format
 msgid "force-crl-refresh active for issuer id %s; update required\n"
 msgstr "force-crl-refresh 啟用 (發行者 ID %s); 需要更新\n"
 
-#: dirmngr/crlcache.c:1325
+#: dirmngr/crlcache.c:1332
 #, c-format
 msgid "available CRL for issuer ID %s can't be used\n"
 msgstr "發行者 ID %s 的可用 CRL 無法使用\n"
 
-#: dirmngr/crlcache.c:1336
+#: dirmngr/crlcache.c:1343
 #, c-format
 msgid "cached CRL for issuer id %s tampered; we need to update\n"
 msgstr "發行者 ID %s 的快取 CRL 已遭竄改; 我們需要更新\n"
 
-#: dirmngr/crlcache.c:1348
+#: dirmngr/crlcache.c:1355
 #, c-format
 msgid "WARNING: invalid cache record length for S/N "
 msgstr "警告: 快取記錄長度無效, S/N"
 
-#: dirmngr/crlcache.c:1358
+#: dirmngr/crlcache.c:1365
 #, c-format
 msgid "problem reading cache record for S/N %s: %s\n"
 msgstr "讀取序號 %s 的快取記錄時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:1361
+#: dirmngr/crlcache.c:1368
 #, c-format
 msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
 msgstr "S/N %s 無效; 原因=%02X 日期=%.15s\n"
 
-#: dirmngr/crlcache.c:1372
+#: dirmngr/crlcache.c:1379
 #, 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:1380
+#: dirmngr/crlcache.c:1387
 #, c-format
 msgid "error getting data from cache file: %s\n"
 msgstr "從快取檔案取得資料時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1673 dirmngr/crlcache.c:1698
-#: dirmngr/crlcache.c:1767
+#: dirmngr/crlcache.c:1611 dirmngr/crlcache.c:1683 dirmngr/crlcache.c:1708
+#: dirmngr/crlcache.c:1777
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "從 libksba 得到無效的 S-表示式\n"
 
-#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1680 dirmngr/crlcache.c:1706
-#: dirmngr/crlcache.c:1774 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1618 dirmngr/crlcache.c:1690 dirmngr/crlcache.c:1716
+#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "轉換 S-表示式時失敗: %s\n"
 
-#: dirmngr/crlcache.c:1630 dirmngr/validate.c:967
+#: dirmngr/crlcache.c:1640 dirmngr/validate.c:978
 #, c-format
 msgid "unknown hash algorithm '%s'\n"
 msgstr "未知的雜湊演算法 '%s'\n"
 
-#: dirmngr/crlcache.c:1637
+#: dirmngr/crlcache.c:1647
 #, c-format
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "演算法 %d 的 gcry_md_open 失敗: %s\n"
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "建立 S-表示式時失敗: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1933
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse 失敗: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1948
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "取得 CRL 更新時間時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1955
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "此 CRL 的更新時間: 本次=%s 下次=%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1959
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "無給定 nextUpdate; 先假設有效期是一天\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1979
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "取得 CRL 項目時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1994
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "安插項目至暫存快取檔案時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2021
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRL 中找不到 CRL 發行者: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2036
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "正在以 authorityKeyIdentifier 找出 CRL 發行者憑證位置\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2082
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL 簽章驗證失敗: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2094
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "檢查 CRL 發行者憑證有效性時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2236
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2243
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2277
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "已移除陳舊的暫存快取檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "移除陳舊的暫存快取檔案 '%s' 時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "建立暫存快取檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2311
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "完成暫存快取檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2318
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "關閉暫存快取檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2343
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "警告: 新的 CRL 仍然太老舊; 早已在 %s 逾期 - 不過還是載入\n"
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2347
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新的 CRL 仍然太老舊; 早已在 %s 逾期\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2372
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "未知的關鍵 CRL 擴充欄位 %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2383
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "讀取 CRL 擴充欄位時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2434
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "建立快取檔案 '%s' 時出錯\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2466
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "把 '%s' 重新新命成 '%s' 時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2480
 #, 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:2496
+#: dirmngr/crlcache.c:2518
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "開始 CRL 傾印 (經由 %s 取得)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2544
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr " 錯誤: 將不採用此 CRL, 因為更新之後仍然太過老舊!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2550
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " 錯誤: 將不採用此 CRL, 因為有未知的關鍵擴充欄位!\n"
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2554
 msgid " ERROR: The CRL will not be used\n"
 msgstr " 錯誤: 將不採用此 CRL\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2561
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " 錯誤: 這個快取中的 CRL 可能已遭竄改!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2579
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " 警告: 無效的快取記錄長度\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2586
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "讀取快取記錄時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2597
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "讀取快取金鑰時發生問題: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2628
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "從資料庫讀取快取項目時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2631
 msgid "End CRL dump\n"
 msgstr "CRL 傾印結束\n"
 
-#: dirmngr/crlcache.c:2723
+#: dirmngr/crlcache.c:2749
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2734
+#: dirmngr/crlcache.c:2760
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "經由 DP 的 crl_cache_insert 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2794
+#: dirmngr/crlcache.c:2806
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "經由發行者的 crl_cache_insert 失敗: %s\n"
@@ -10161,23 +10237,23 @@
 msgid "CRL access not possible due to Tor mode"
 msgstr "不可能存取 CRL 因已停用 %s\n"
 
-#: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
-#: dirmngr/crlfetch.c:307
+#: dirmngr/crlfetch.c:187 dirmngr/crlfetch.c:246 dirmngr/crlfetch.c:280
+#: dirmngr/crlfetch.c:310
 #, c-format
 msgid "CRL access not possible due to disabled %s\n"
 msgstr "不可能存取 CRL 因已停用 %s\n"
 
-#: dirmngr/crlfetch.c:203
+#: dirmngr/crlfetch.c:206
 #, c-format
 msgid "error retrieving '%s': %s\n"
 msgstr "取回 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlfetch.c:231 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:234 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "啟始讀取程式物件時出錯: %s\n"
 
-#: dirmngr/crlfetch.c:332
+#: dirmngr/crlfetch.c:335
 #, c-format
 msgid "certificate search not possible due to disabled %s\n"
 msgstr "不可能進行憑證搜尋, 因為已停用 %s\n"
@@ -10322,139 +10398,139 @@
 msgid "looking up '%s'\n"
 msgstr "正在查找 '%s'\n"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:182
 msgid "list the contents of the CRL cache"
 msgstr "列出 CRL 快取的內容"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:183
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|檔案|從指定檔案載入 CRL 至快取"
 
-#: dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr.c:184
 msgid "|URL|fetch a CRL from URL"
 msgstr "|網址|從指定網址取得 CRL"
 
-#: dirmngr/dirmngr.c:181
+#: dirmngr/dirmngr.c:185
 msgid "shutdown the dirmngr"
 msgstr "關閉 dirmngr"
 
-#: dirmngr/dirmngr.c:182
+#: dirmngr/dirmngr.c:186
 msgid "flush the cache"
 msgstr "清除快取"
 
-#: dirmngr/dirmngr.c:216
+#: dirmngr/dirmngr.c:220
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:223
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|單次查詢不要傳回超過 N 筆項目"
 
-#: dirmngr/dirmngr.c:226
+#: dirmngr/dirmngr.c:231
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:228
+#: dirmngr/dirmngr.c:233
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:245
 msgid "Configuration for HTTP servers"
 msgstr "HTTP 伺服器組態"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:247
 msgid "inhibit the use of HTTP"
 msgstr "避免使用 HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:249
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分布點"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:251
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:253
 msgid "use system's HTTP proxy setting"
 msgstr "使用系統的 HTTP 代理伺服器設定"
 
-#: dirmngr/dirmngr.c:251
+#: dirmngr/dirmngr.c:256
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
 msgstr "HTTP 伺服器組態"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:259
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|使用位於 URL 的金鑰伺服器"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:261
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:263
 #, fuzzy
 #| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
 msgstr "HTTP 伺服器組態"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:265
 msgid "inhibit the use of LDAP"
 msgstr "避免使用 LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:267
 msgid "ignore LDAP CRL distribution points"
 msgstr "忽略 LDAP CRL 分布點"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:269
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|主機|指定 LDAP 查詢主機"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:271
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "不要將主機備案與 --ldap-proxy 並用"
 
-#: dirmngr/dirmngr.c:268
+#: dirmngr/dirmngr.c:273
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
 
-#: dirmngr/dirmngr.c:270
+#: dirmngr/dirmngr.c:275
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:277
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
 
-#: dirmngr/dirmngr.c:275
+#: dirmngr/dirmngr.c:280
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|把 LDAP 逾時設成 N 秒"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:283
 msgid "Configuration for OCSP"
 msgstr "OCSP 組態"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:285
 msgid "allow sending OCSP requests"
 msgstr "允許送出 OCSP 請求"
 
-#: dirmngr/dirmngr.c:282
+#: dirmngr/dirmngr.c:287
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "忽略含有 OCSP 伺服器網址的憑證"
 
-#: dirmngr/dirmngr.c:284
+#: dirmngr/dirmngr.c:289
 msgid "|URL|use OCSP responder at URL"
 msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
 
-#: dirmngr/dirmngr.c:286
+#: dirmngr/dirmngr.c:291
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
 
-#: dirmngr/dirmngr.c:294
+#: dirmngr/dirmngr.c:299
 msgid "force loading of outdated CRLs"
 msgstr "強迫載入過時的 CRL"
 
-#: dirmngr/dirmngr.c:305
+#: dirmngr/dirmngr.c:312
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10463,11 +10539,11 @@
 "@\n"
 "(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
 
-#: dirmngr/dirmngr.c:458
+#: dirmngr/dirmngr.c:474
 msgid "Usage: @DIRMNGR@ options (-h for help)"
 msgstr "用法: @DIRMNGR@ 選項 (或用 -h 求助)"
 
-#: dirmngr/dirmngr.c:460
+#: dirmngr/dirmngr.c:476
 msgid ""
 "Syntax: @DIRMNGR@ options command args\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10475,103 +10551,103 @@
 "語法: @DIRMNGR@ 選項 指令 引數\n"
 "@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
 
-#: dirmngr/dirmngr.c:540
+#: dirmngr/dirmngr.c:556
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的除錯等級為: %s\n"
 
-#: dirmngr/dirmngr.c:635 tools/gpgconf.c:724 tools/gpgconf.c:759
+#: dirmngr/dirmngr.c:651 tools/gpgconf.c:724 tools/gpgconf.c:759
 #: tools/gpgconf.c:859
 #, c-format
 msgid "usage: %s options "
 msgstr "用法: %s 選項 "
 
-#: dirmngr/dirmngr.c:1346
+#: dirmngr/dirmngr.c:1397
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "socket 名稱內不允許使用冒號\n"
 
-#: dirmngr/dirmngr.c:1585 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1636 dirmngr/server.c:1915
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1591 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1642 dirmngr/server.c:1921
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1733
+#: dirmngr/dirmngr.c:1786
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 列太長 - 已跳過\n"
 
-#: dirmngr/dirmngr.c:1793 dirmngr/dirmngr.c:1882
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1935
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 偵測到無效的指紋\n"
 
-#: dirmngr/dirmngr.c:1834 dirmngr/dirmngr.c:1860 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1887 dirmngr/dirmngr.c:1913 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 讀取錯誤: %s\n"
 
-#: dirmngr/dirmngr.c:1895
+#: dirmngr/dirmngr.c:1948
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 列尾的垃圾已忽略\n"
 
-#: dirmngr/dirmngr.c:1982
+#: dirmngr/dirmngr.c:2035
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
 
-#: dirmngr/dirmngr.c:2023
+#: dirmngr/dirmngr.c:2077
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "收到 SIGUSR2 - 無定義行動\n"
 
-#: dirmngr/dirmngr.c:2028
+#: dirmngr/dirmngr.c:2082
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "收到 SIGTERM - 正在關閉 ...\n"
 
-#: dirmngr/dirmngr.c:2030
+#: dirmngr/dirmngr.c:2084
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
 
-#: dirmngr/dirmngr.c:2035
+#: dirmngr/dirmngr.c:2089
 #, c-format
 msgid "shutdown forced\n"
 msgstr "已強迫關閉\n"
 
-#: dirmngr/dirmngr.c:2043
+#: dirmngr/dirmngr.c:2097
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT - 立即關閉\n"
 
-#: dirmngr/dirmngr.c:2050
+#: dirmngr/dirmngr.c:2104
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到訊號 %d - 無定義行動\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "網址 '%s' 重新轉向至 '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "太多重新導向\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3803
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10627,32 +10703,32 @@
 msgid "malloc failed: %s\n"
 msgstr "動態記憶體配置失敗: %s\n"
 
-#: dirmngr/ldap.c:221
+#: dirmngr/ldap.c:225
 #, c-format
 msgid "'%s' is not an LDAP URL\n"
 msgstr "'%s' 不是一個 LDAP 位址\n"
 
-#: dirmngr/ldap.c:227 dirmngr/ldap.c:248
+#: dirmngr/ldap.c:231 dirmngr/ldap.c:252
 #, c-format
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' 是無效的 LDAP 網址\n"
 
-#: dirmngr/ldap.c:984
+#: dirmngr/ldap.c:992
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search 達到伺服器的尺寸限制\n"
 
-#: dirmngr/ldapserver.c:119
+#: dirmngr/ldapserver.c:122
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: 給定的密碼沒有使用者\n"
 
-#: dirmngr/ldapserver.c:181
+#: dirmngr/ldapserver.c:188
 #, c-format
 msgid "%s:%u: ignoring unknown flag '%s'\n"
 msgstr ""
 
-#: dirmngr/ldapserver.c:203
+#: dirmngr/ldapserver.c:210
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: 正在跳過這一列\n"
@@ -10743,161 +10819,161 @@
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
 
-#: dirmngr/ocsp.c:580
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "配置清單項目時失敗: %s\n"
 
-#: dirmngr/ocsp.c:595 dirmngr/ocsp.c:779
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "取得回應程式 ID 時出錯: %s\n"
 
-#: dirmngr/ocsp.c:639
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
 
-#: dirmngr/ocsp.c:678 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:659
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "找不到發行者憑證: %s\n"
 
-#: dirmngr/ocsp.c:688
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "叫用者未傳為目標憑證\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "叫用者未傳回發行的憑證\n"
 
-#: dirmngr/ocsp.c:705
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "配置 OCSP 脈絡失敗: %s\n"
 
-#: dirmngr/ocsp.c:744
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "無定義預設 OCSP 回應程式\n"
 
-#: dirmngr/ocsp.c:750
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "未定義預設的 OCSP 簽署程式\n"
 
-#: dirmngr/ocsp.c:757
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
 
-#: dirmngr/ocsp.c:762
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "正在使用 %s OCSP 回應程式\n"
 
-#: dirmngr/ocsp.c:819
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
 
-#: dirmngr/ocsp.c:844
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s (this=%s next=%s)\n"
 msgstr "憑證狀態為: %s (本次=%s 下次=%s)\n"
 
-#: dirmngr/ocsp.c:845
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:851
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "憑證已撤銷於 %s 因: %s\n"
 
-#: dirmngr/ocsp.c:886
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP 回應程式傳回未來的狀態\n"
 
-#: dirmngr/ocsp.c:898
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP 回應程式傳回非當下的狀態\n"
 
-#: dirmngr/ocsp.c:913
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP 回應程式傳回老舊的狀態\n"
 
-#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556
 #, c-format
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) 失敗: %s\n"
 
-#: dirmngr/server.c:1284
+#: dirmngr/server.c:1291
 msgid "serialno missing in cert ID"
 msgstr "憑證 ID 中遺失 serialno"
 
-#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
-#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
+#: dirmngr/server.c:1469 dirmngr/server.c:1557 dirmngr/server.c:2000
+#: dirmngr/server.c:2071 dirmngr/server.c:2679 dirmngr/server.c:2694
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 失敗: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1606
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url 失敗: %s\n"
 
-#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
+#: dirmngr/server.c:1618 dirmngr/server.c:1649 dirmngr/server.c:1809
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "送出資料時出錯: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1757
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 失敗: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1790
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 失敗: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1817
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d 已超出\n"
 
-#: dirmngr/server.c:2973
+#: dirmngr/server.c:3124
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "無法配置控制結構: %s\n"
 
-#: dirmngr/server.c:2984
+#: dirmngr/server.c:3135
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "配置 assuan 脈絡失敗: %s\n"
 
-#: dirmngr/server.c:3005
+#: dirmngr/server.c:3156
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "伺服器啟始失敗: %s\n"
 
-#: dirmngr/server.c:3013
+#: dirmngr/server.c:3164
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "向 Assuan 註冊指令時失敗: %s\n"
 
-#: dirmngr/server.c:3046
+#: dirmngr/server.c:3197
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接受問題: %s\n"
 
-#: dirmngr/server.c:3065
+#: dirmngr/server.c:3216
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 處理時失敗: %s\n"
@@ -10907,85 +10983,85 @@
 msgid "accepting root CA not marked as a CA"
 msgstr "接受未標示為 CA 的根 CA"
 
-#: dirmngr/validate.c:265
+#: dirmngr/validate.c:266
 #, c-format
 msgid "CRL checking too deeply nested\n"
 msgstr "檢查 CRL 時遭遇太深層次的巢狀結構\n"
 
-#: dirmngr/validate.c:283
+#: dirmngr/validate.c:285
 msgid "not checking CRL for"
 msgstr "不對此檢查 CRL:"
 
-#: dirmngr/validate.c:288
+#: dirmngr/validate.c:290
 msgid "checking CRL for"
 msgstr "檢查 CRL: "
 
-#: dirmngr/validate.c:591
+#: dirmngr/validate.c:601
 #, c-format
 msgid "checking trustworthiness of root certificate failed: %s\n"
 msgstr "檢查根憑證可信度時失敗: %s\n"
 
-#: dirmngr/validate.c:770
+#: dirmngr/validate.c:780
 #, c-format
 msgid "certificate chain is good\n"
 msgstr "憑證鏈完好\n"
 
-#: dirmngr/validate.c:1310
+#: dirmngr/validate.c:1321
 #, c-format
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "憑證應該還未被用於 CRL 簽署\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:89 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "安靜模式"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:90
 msgid "print data out hex encoded"
 msgstr "列印資料超出十六進制編碼範圍"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:91
 msgid "decode received data lines"
 msgstr "對已收到的資料列解碼"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:92
 msgid "connect to the dirmngr"
 msgstr "連線至 dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:93
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "連線至 dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:96
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|名稱|連線至指定名稱的 Assuan socket"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:98
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|連線至位於 ADDR 的 Assuan 伺服器"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:100
 msgid "run the Assuan server given on the command line"
 msgstr "執行命令列所給定的 Assuan 伺服器"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:102
 msgid "do not use extended connect mode"
 msgstr "不要使用延伸連線模式"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:104
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|檔案|啟動時執行指定檔案中的指令"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:105
 msgid "run /subst on startup"
 msgstr "啟動時執行 /subst"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:228
 msgid "Usage: @GPG@-connect-agent options (-h for help)"
 msgstr "用法: @GPG@-connect-agent 選項 (或用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:231
 msgid ""
 "Syntax: @GPG@-connect-agent options\n"
 "Connect to a running agent and send commands\n"
@@ -10993,49 +11069,49 @@
 "語法: @GPG@-connect-agent 選項\n"
 "連線至運作中的代理程式並送出指令\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1294
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" 選項需要有程式及選用的引數\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1305 tools/gpg-connect-agent.c:1311
+#: tools/gpg-connect-agent.c:1317
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1414 tools/gpg-connect-agent.c:1933
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1518
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "列太長 - 已跳過\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1522
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "列因嵌入的 Nul 字符而縮短了\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1907
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "未知的指令 '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1925
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "送出列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2332
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2338
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "送出標準選項時出錯: %s\n"
@@ -11107,13 +11183,13 @@
 msgid "Note that group specifications are ignored\n"
 msgstr "請注意群組規格已忽略\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 #| msgid "error closing '%s': %s\n"
 msgid "error closing '%s'\n"
 msgstr "關閉 '%s' 時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11223,92 +11299,110 @@
 "語法: gpg-check-pattern 選項 樣式檔案\n"
 "用樣式檔案來檢查由標準輸入給定的密語\n"
 
-#: tools/gpg-card.c:2407
+#: tools/gpg-card.c:2425
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 
-#: tools/gpg-card.c:2410
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 
-#: tools/gpg-card.c:2413
+#: tools/gpg-card.c:2431
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
-#: tools/gpg-card.c:3061
+#: tools/gpg-card.c:2584 tools/gpg-card.c:2747 tools/gpg-card.c:2970
+#: tools/gpg-card.c:3079
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: tools/gpg-card.c:3413
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 " can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3440
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3686
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "加入憑證至快取"
 
-#: tools/gpg-card.c:3688
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3690
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|名字|使用指定名字做為認證用的使用者名稱"
 
-#: tools/gpg-card.c:3692
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3693
+#: tools/gpg-card.c:3765
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "加入憑證至快取"
 
-#: tools/gpg-card.c:3694
+#: tools/gpg-card.c:3766
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "加入憑證至快取"
 
-#: tools/gpg-card.c:3695
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3696
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3698
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~| msgid "selected digest algorithm is invalid\n"
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "所選的摘要演算法無效\n"
+
+#, fuzzy
+#~| msgid "invalid personal cipher preferences\n"
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "無效的個人編密法偏好\n"
+
+#, fuzzy
+#~| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
+
+#~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#~ msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+
 #~ msgid "error writing to temporary file: %s\n"
 #~ msgstr "寫入暫存檔時出錯: %s\n"
 
@@ -12093,9 +12187,6 @@
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "在私鑰清單和公鑰清單間切換"
 
-#~ msgid "Passphrase"
-#~ msgstr "密語"
-
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "用暫存檔來將資料遞送給金鑰伺服器協助程式"

_service:tar_scm:gnupg-2.3.6.tar.bz2/regexp/UnicodeData.txt -> _service:tar_scm:gnupg-2.4.3.tar.bz2/regexp/UnicodeData.txt Changed

@@ -1525,6 +1525,7 @@
 061A;ARABIC SMALL KASRA;Mn;32;NSM;;;;;N;;;;;
 061B;ARABIC SEMICOLON;Po;0;AL;;;;;N;;;;;
 061C;ARABIC LETTER MARK;Cf;0;AL;;;;;N;;;;;
+061D;ARABIC END OF TEXT MARK;Po;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;;;;;
@@ -2089,6 +2090,47 @@
 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;;;;;
+0870;ARABIC LETTER ALEF WITH ATTACHED FATHA;Lo;0;AL;;;;;N;;;;;
+0871;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA;Lo;0;AL;;;;;N;;;;;
+0872;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE;Lo;0;AL;;;;;N;;;;;
+0873;ARABIC LETTER ALEF WITH LEFT MIDDLE STROKE;Lo;0;AL;;;;;N;;;;;
+0874;ARABIC LETTER ALEF WITH ATTACHED KASRA;Lo;0;AL;;;;;N;;;;;
+0875;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA;Lo;0;AL;;;;;N;;;;;
+0876;ARABIC LETTER ALEF WITH ATTACHED ROUND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0877;ARABIC LETTER ALEF WITH ATTACHED RIGHT ROUND DOT;Lo;0;AL;;;;;N;;;;;
+0878;ARABIC LETTER ALEF WITH ATTACHED LEFT ROUND DOT;Lo;0;AL;;;;;N;;;;;
+0879;ARABIC LETTER ALEF WITH ATTACHED ROUND DOT BELOW;Lo;0;AL;;;;;N;;;;;
+087A;ARABIC LETTER ALEF WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+087B;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+087C;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+087D;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+087E;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA AND LEFT RING;Lo;0;AL;;;;;N;;;;;
+087F;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE AND LEFT RING;Lo;0;AL;;;;;N;;;;;
+0880;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA AND LEFT RING;Lo;0;AL;;;;;N;;;;;
+0881;ARABIC LETTER ALEF WITH ATTACHED RIGHT HAMZA;Lo;0;AL;;;;;N;;;;;
+0882;ARABIC LETTER ALEF WITH ATTACHED LEFT HAMZA;Lo;0;AL;;;;;N;;;;;
+0883;ARABIC TATWEEL WITH OVERSTRUCK HAMZA;Lo;0;AL;;;;;N;;;;;
+0884;ARABIC TATWEEL WITH OVERSTRUCK WAW;Lo;0;AL;;;;;N;;;;;
+0885;ARABIC TATWEEL WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+0886;ARABIC LETTER THIN YEH;Lo;0;AL;;;;;N;;;;;
+0887;ARABIC BASELINE ROUND DOT;Lo;0;AL;;;;;N;;;;;
+0888;ARABIC RAISED ROUND DOT;Sk;0;AL;;;;;N;;;;;
+0889;ARABIC LETTER NOON WITH INVERTED SMALL V;Lo;0;AL;;;;;N;;;;;
+088A;ARABIC LETTER HAH WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+088B;ARABIC LETTER TAH WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+088C;ARABIC LETTER TAH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+088D;ARABIC LETTER KEHEH WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;;
+088E;ARABIC VERTICAL TAIL;Lo;0;AL;;;;;N;;;;;
+0890;ARABIC POUND MARK ABOVE;Cf;0;AN;;;;;N;;;;;
+0891;ARABIC PIASTRE MARK ABOVE;Cf;0;AN;;;;;N;;;;;
+0898;ARABIC SMALL HIGH WORD AL-JUZ;Mn;230;NSM;;;;;N;;;;;
+0899;ARABIC SMALL LOW WORD ISHMAAM;Mn;220;NSM;;;;;N;;;;;
+089A;ARABIC SMALL LOW WORD IMAALA;Mn;220;NSM;;;;;N;;;;;
+089B;ARABIC SMALL LOW WORD TASHEEL;Mn;220;NSM;;;;;N;;;;;
+089C;ARABIC MADDA WAAJIB;Mn;230;NSM;;;;;N;;;;;
+089D;ARABIC SUPERSCRIPT ALEF MOKHASSAS;Mn;230;NSM;;;;;N;;;;;
+089E;ARABIC DOUBLED MADDA;Mn;230;NSM;;;;;N;;;;;
+089F;ARABIC HALF MADDA OVER MADDA;Mn;230;NSM;;;;;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;;;;;
@@ -2110,6 +2152,7 @@
 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;;;;;
+08B5;ARABIC LETTER QAF WITH DOT BELOW AND NO DOTS ABOVE;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;;;;;
@@ -2128,6 +2171,17 @@
 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;;;;;
+08C8;ARABIC LETTER GRAF;Lo;0;AL;;;;;N;;;;;
+08C9;ARABIC SMALL FARSI YEH;Lm;0;AL;;;;;N;;;;;
+08CA;ARABIC SMALL HIGH FARSI YEH;Mn;230;NSM;;;;;N;;;;;
+08CB;ARABIC SMALL HIGH YEH BARREE WITH TWO DOTS BELOW;Mn;230;NSM;;;;;N;;;;;
+08CC;ARABIC SMALL HIGH WORD SAH;Mn;230;NSM;;;;;N;;;;;
+08CD;ARABIC SMALL HIGH ZAH;Mn;230;NSM;;;;;N;;;;;
+08CE;ARABIC LARGE ROUND DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+08CF;ARABIC LARGE ROUND DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+08D0;ARABIC SUKUN BELOW;Mn;220;NSM;;;;;N;;;;;
+08D1;ARABIC LARGE CIRCLE BELOW;Mn;220;NSM;;;;;N;;;;;
+08D2;ARABIC LARGE ROUND DOT INSIDE CIRCLE BELOW;Mn;220;NSM;;;;;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;;;;;
@@ -2786,6 +2840,7 @@
 0C37;TELUGU LETTER SSA;Lo;0;L;;;;;N;;;;;
 0C38;TELUGU LETTER SA;Lo;0;L;;;;;N;;;;;
 0C39;TELUGU LETTER HA;Lo;0;L;;;;;N;;;;;
+0C3C;TELUGU SIGN NUKTA;Mn;7;NSM;;;;;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;;;;;
@@ -2806,6 +2861,7 @@
 0C58;TELUGU LETTER TSA;Lo;0;L;;;;;N;;;;;
 0C59;TELUGU LETTER DZA;Lo;0;L;;;;;N;;;;;
 0C5A;TELUGU LETTER RRRA;Lo;0;L;;;;;N;;;;;
+0C5D;TELUGU LETTER NAKAARA POLLU;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;;;;;
@@ -2901,6 +2957,7 @@
 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;;;;;
+0CDD;KANNADA LETTER NAKAARA POLLU;Lo;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;;;;;
@@ -2918,6 +2975,7 @@
 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;;;;;
+0CF3;KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT;Mc;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;;;;;
@@ -3282,6 +3340,7 @@
 0ECB;LAO TONE MAI CATAWA;Mn;122;NSM;;;;;N;;;;;
 0ECC;LAO CANCELLATION MARK;Mn;0;NSM;;;;;N;;;;;
 0ECD;LAO NIGGAHITA;Mn;0;NSM;;;;;N;;;;;
+0ECE;LAO YAMAKKAN;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;;;;;
@@ -5258,6 +5317,7 @@
 170A;TAGALOG LETTER BA;Lo;0;L;;;;;N;;;;;
 170B;TAGALOG LETTER MA;Lo;0;L;;;;;N;;;;;
 170C;TAGALOG LETTER YA;Lo;0;L;;;;;N;;;;;
+170D;TAGALOG LETTER RA;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;;;;;
@@ -5265,6 +5325,8 @@
 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;;;;;
+1715;TAGALOG SIGN PAMUDPOD;Mc;9;L;;;;;N;;;;;
+171F;TAGALOG LETTER ARCHAIC RA;Lo;0;L;;;;;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;;;;;
@@ -5285,7 +5347,7 @@
 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;;;;;
+1734;HANUNOO SIGN PAMUDPOD;Mc;9;L;;;;;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;;;;;
@@ -5455,6 +5517,7 @@
 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;;;;;
+180F;MONGOLIAN FREE VARIATION SELECTOR FOUR;Mn;0;NSM;;;;;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;;;;;
@@ -6059,6 +6122,20 @@
 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;;;;;
+1AC1;COMBINING LEFT PARENTHESIS ABOVE LEFT;Mn;230;NSM;;;;;N;;;;;
+1AC2;COMBINING RIGHT PARENTHESIS ABOVE RIGHT;Mn;230;NSM;;;;;N;;;;;
+1AC3;COMBINING LEFT PARENTHESIS BELOW LEFT;Mn;220;NSM;;;;;N;;;;;
+1AC4;COMBINING RIGHT PARENTHESIS BELOW RIGHT;Mn;220;NSM;;;;;N;;;;;
+1AC5;COMBINING SQUARE BRACKETS ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AC6;COMBINING NUMBER SIGN ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AC7;COMBINING INVERTED DOUBLE ARCH ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AC8;COMBINING PLUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;;
+1AC9;COMBINING DOUBLE PLUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;;
+1ACA;COMBINING DOUBLE PLUS SIGN BELOW;Mn;220;NSM;;;;;N;;;;;
+1ACB;COMBINING TRIPLE ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
+1ACC;COMBINING LATIN SMALL LETTER INSULAR G;Mn;230;NSM;;;;;N;;;;;
+1ACD;COMBINING LATIN SMALL LETTER INSULAR R;Mn;230;NSM;;;;;N;;;;;
+1ACE;COMBINING LATIN SMALL LETTER INSULAR T;Mn;230;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;;;;;
@@ -6135,6 +6212,7 @@
 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;;;;;
+1B4C;BALINESE LETTER ARCHAIC JNYA;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;;;;;
@@ -6180,6 +6258,8 @@
 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;;;;;
+1B7D;BALINESE PANTI LANTANG;Po;0;L;;;;;N;;;;;
+1B7E;BALINESE PAMADA LANTANG;Po;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;;;;;
@@ -6778,6 +6858,7 @@
 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;;;;;
+1DFA;COMBINING DOT BELOW LEFT;Mn;218;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;;;;;
@@ -7457,6 +7538,7 @@
 20BD;RUBLE SIGN;Sc;0;ET;;;;;N;;;;;
 20BE;LARI SIGN;Sc;0;ET;;;;;N;;;;;
 20BF;BITCOIN SIGN;Sc;0;ET;;;;;N;;;;;
+20C0;SOM 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;;;;
@@ -10300,6 +10382,7 @@
 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;
+2C2F;GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI;Lu;0;L;;;;;N;;;;2C5F;
 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
@@ -10347,6 +10430,7 @@
 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
+2C5F;GLAGOLITIC SMALL LETTER CAUDATE CHRIVI;Ll;0;L;;;;;N;;;2C2F;;2C2F
 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;
@@ -10795,6 +10879,17 @@
 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;;;;;
+2E53;MEDIEVAL EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+2E54;MEDIEVAL QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2E55;LEFT SQUARE BRACKET WITH STROKE;Ps;0;ON;;;;;Y;;;;;
+2E56;RIGHT SQUARE BRACKET WITH STROKE;Pe;0;ON;;;;;Y;;;;;
+2E57;LEFT SQUARE BRACKET WITH DOUBLE STROKE;Ps;0;ON;;;;;Y;;;;;
+2E58;RIGHT SQUARE BRACKET WITH DOUBLE STROKE;Pe;0;ON;;;;;Y;;;;;
+2E59;TOP HALF LEFT PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+2E5A;TOP HALF RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+2E5B;BOTTOM HALF LEFT PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+2E5C;BOTTOM HALF RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+2E5D;OBLIQUE HYPHEN;Pd;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;;;;;
@@ -12204,7 +12299,7 @@
 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;;;;;
+9FFF;<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;;;;;
@@ -14149,6 +14244,8 @@
 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
+A7C0;LATIN CAPITAL LETTER OLD POLISH O;Lu;0;L;;;;;N;;;;A7C1;
+A7C1;LATIN SMALL LETTER OLD POLISH O;Ll;0;L;;;;;N;;;A7C0;;A7C0
 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;
@@ -14158,6 +14255,17 @@
 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
+A7D0;LATIN CAPITAL LETTER CLOSED INSULAR G;Lu;0;L;;;;;N;;;;A7D1;
+A7D1;LATIN SMALL LETTER CLOSED INSULAR G;Ll;0;L;;;;;N;;;A7D0;;A7D0
+A7D3;LATIN SMALL LETTER DOUBLE THORN;Ll;0;L;;;;;N;;;;;
+A7D5;LATIN SMALL LETTER DOUBLE WYNN;Ll;0;L;;;;;N;;;;;
+A7D6;LATIN CAPITAL LETTER MIDDLE SCOTS S;Lu;0;L;;;;;N;;;;A7D7;
+A7D7;LATIN SMALL LETTER MIDDLE SCOTS S;Ll;0;L;;;;;N;;;A7D6;;A7D6
+A7D8;LATIN CAPITAL LETTER SIGMOID S;Lu;0;L;;;;;N;;;;A7D9;
+A7D9;LATIN SMALL LETTER SIGMOID S;Ll;0;L;;;;;N;;;A7D8;;A7D8
+A7F2;MODIFIER LETTER CAPITAL C;Lm;0;L;<super> 0043;;;;N;;;;;
+A7F3;MODIFIER LETTER CAPITAL F;Lm;0;L;<super> 0046;;;;N;;;;;
+A7F4;MODIFIER LETTER CAPITAL Q;Lm;0;L;<super> 0051;;;;N;;;;;
 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;;;;;
@@ -15794,6 +15902,7 @@
 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;;;;;
+FBC2;ARABIC SYMBOL WASLA ABOVE;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;;;;;
@@ -16159,6 +16268,22 @@
 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;;;;;
+FD40;ARABIC LIGATURE RAHIMAHU ALLAAH;So;0;ON;;;;;N;;;;;
+FD41;ARABIC LIGATURE RADI ALLAAHU ANH;So;0;ON;;;;;N;;;;;
+FD42;ARABIC LIGATURE RADI ALLAAHU ANHAA;So;0;ON;;;;;N;;;;;
+FD43;ARABIC LIGATURE RADI ALLAAHU ANHUM;So;0;ON;;;;;N;;;;;
+FD44;ARABIC LIGATURE RADI ALLAAHU ANHUMAA;So;0;ON;;;;;N;;;;;
+FD45;ARABIC LIGATURE RADI ALLAAHU ANHUNNA;So;0;ON;;;;;N;;;;;
+FD46;ARABIC LIGATURE SALLALLAAHU ALAYHI WA-AALIH;So;0;ON;;;;;N;;;;;
+FD47;ARABIC LIGATURE ALAYHI AS-SALAAM;So;0;ON;;;;;N;;;;;
+FD48;ARABIC LIGATURE ALAYHIM AS-SALAAM;So;0;ON;;;;;N;;;;;
+FD49;ARABIC LIGATURE ALAYHIMAA AS-SALAAM;So;0;ON;;;;;N;;;;;
+FD4A;ARABIC LIGATURE ALAYHI AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;;
+FD4B;ARABIC LIGATURE QUDDISA SIRRAH;So;0;ON;;;;;N;;;;;
+FD4C;ARABIC LIGATURE SALLALLAHU ALAYHI WAAALIHEE WA-SALLAM;So;0;ON;;;;;N;;;;;
+FD4D;ARABIC LIGATURE ALAYHAA AS-SALAAM;So;0;ON;;;;;N;;;;;
+FD4E;ARABIC LIGATURE TABAARAKA WA-TAAALAA;So;0;ON;;;;;N;;;;;
+FD4F;ARABIC LIGATURE RAHIMAHUM ALLAAH;So;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;;;;;
@@ -16277,6 +16402,7 @@
 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;;;;;
+FDCF;ARABIC LIGATURE SALAAMUHU ALAYNAA;So;0;ON;;;;;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;;;;;
@@ -16291,6 +16417,8 @@
 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;;;;;
+FDFE;ARABIC LIGATURE SUBHAANAHU WA TAAALAA;So;0;ON;;;;;N;;;;;
+FDFF;ARABIC LIGATURE AZZA WA JALL;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;;;;;
@@ -17798,6 +17926,76 @@
 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;;;;;
+10570;VITHKUQI CAPITAL LETTER A;Lu;0;L;;;;;N;;;;10597;
+10571;VITHKUQI CAPITAL LETTER BBE;Lu;0;L;;;;;N;;;;10598;
+10572;VITHKUQI CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;10599;
+10573;VITHKUQI CAPITAL LETTER CE;Lu;0;L;;;;;N;;;;1059A;
+10574;VITHKUQI CAPITAL LETTER CHE;Lu;0;L;;;;;N;;;;1059B;
+10575;VITHKUQI CAPITAL LETTER DE;Lu;0;L;;;;;N;;;;1059C;
+10576;VITHKUQI CAPITAL LETTER DHE;Lu;0;L;;;;;N;;;;1059D;
+10577;VITHKUQI CAPITAL LETTER EI;Lu;0;L;;;;;N;;;;1059E;
+10578;VITHKUQI CAPITAL LETTER E;Lu;0;L;;;;;N;;;;1059F;
+10579;VITHKUQI CAPITAL LETTER FE;Lu;0;L;;;;;N;;;;105A0;
+1057A;VITHKUQI CAPITAL LETTER GA;Lu;0;L;;;;;N;;;;105A1;
+1057C;VITHKUQI CAPITAL LETTER HA;Lu;0;L;;;;;N;;;;105A3;
+1057D;VITHKUQI CAPITAL LETTER HHA;Lu;0;L;;;;;N;;;;105A4;
+1057E;VITHKUQI CAPITAL LETTER I;Lu;0;L;;;;;N;;;;105A5;
+1057F;VITHKUQI CAPITAL LETTER IJE;Lu;0;L;;;;;N;;;;105A6;
+10580;VITHKUQI CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;105A7;
+10581;VITHKUQI CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;105A8;
+10582;VITHKUQI CAPITAL LETTER LA;Lu;0;L;;;;;N;;;;105A9;
+10583;VITHKUQI CAPITAL LETTER LLA;Lu;0;L;;;;;N;;;;105AA;
+10584;VITHKUQI CAPITAL LETTER ME;Lu;0;L;;;;;N;;;;105AB;
+10585;VITHKUQI CAPITAL LETTER NE;Lu;0;L;;;;;N;;;;105AC;
+10586;VITHKUQI CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;105AD;
+10587;VITHKUQI CAPITAL LETTER O;Lu;0;L;;;;;N;;;;105AE;
+10588;VITHKUQI CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;105AF;
+10589;VITHKUQI CAPITAL LETTER QA;Lu;0;L;;;;;N;;;;105B0;
+1058A;VITHKUQI CAPITAL LETTER RE;Lu;0;L;;;;;N;;;;105B1;
+1058C;VITHKUQI CAPITAL LETTER SE;Lu;0;L;;;;;N;;;;105B3;
+1058D;VITHKUQI CAPITAL LETTER SHE;Lu;0;L;;;;;N;;;;105B4;
+1058E;VITHKUQI CAPITAL LETTER TE;Lu;0;L;;;;;N;;;;105B5;
+1058F;VITHKUQI CAPITAL LETTER THE;Lu;0;L;;;;;N;;;;105B6;
+10590;VITHKUQI CAPITAL LETTER U;Lu;0;L;;;;;N;;;;105B7;
+10591;VITHKUQI CAPITAL LETTER VE;Lu;0;L;;;;;N;;;;105B8;
+10592;VITHKUQI CAPITAL LETTER XE;Lu;0;L;;;;;N;;;;105B9;
+10594;VITHKUQI CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;105BB;
+10595;VITHKUQI CAPITAL LETTER ZE;Lu;0;L;;;;;N;;;;105BC;
+10597;VITHKUQI SMALL LETTER A;Ll;0;L;;;;;N;;;10570;;10570
+10598;VITHKUQI SMALL LETTER BBE;Ll;0;L;;;;;N;;;10571;;10571
+10599;VITHKUQI SMALL LETTER BE;Ll;0;L;;;;;N;;;10572;;10572
+1059A;VITHKUQI SMALL LETTER CE;Ll;0;L;;;;;N;;;10573;;10573
+1059B;VITHKUQI SMALL LETTER CHE;Ll;0;L;;;;;N;;;10574;;10574
+1059C;VITHKUQI SMALL LETTER DE;Ll;0;L;;;;;N;;;10575;;10575
+1059D;VITHKUQI SMALL LETTER DHE;Ll;0;L;;;;;N;;;10576;;10576
+1059E;VITHKUQI SMALL LETTER EI;Ll;0;L;;;;;N;;;10577;;10577
+1059F;VITHKUQI SMALL LETTER E;Ll;0;L;;;;;N;;;10578;;10578
+105A0;VITHKUQI SMALL LETTER FE;Ll;0;L;;;;;N;;;10579;;10579
+105A1;VITHKUQI SMALL LETTER GA;Ll;0;L;;;;;N;;;1057A;;1057A
+105A3;VITHKUQI SMALL LETTER HA;Ll;0;L;;;;;N;;;1057C;;1057C
+105A4;VITHKUQI SMALL LETTER HHA;Ll;0;L;;;;;N;;;1057D;;1057D
+105A5;VITHKUQI SMALL LETTER I;Ll;0;L;;;;;N;;;1057E;;1057E
+105A6;VITHKUQI SMALL LETTER IJE;Ll;0;L;;;;;N;;;1057F;;1057F
+105A7;VITHKUQI SMALL LETTER JE;Ll;0;L;;;;;N;;;10580;;10580
+105A8;VITHKUQI SMALL LETTER KA;Ll;0;L;;;;;N;;;10581;;10581
+105A9;VITHKUQI SMALL LETTER LA;Ll;0;L;;;;;N;;;10582;;10582
+105AA;VITHKUQI SMALL LETTER LLA;Ll;0;L;;;;;N;;;10583;;10583
+105AB;VITHKUQI SMALL LETTER ME;Ll;0;L;;;;;N;;;10584;;10584
+105AC;VITHKUQI SMALL LETTER NE;Ll;0;L;;;;;N;;;10585;;10585
+105AD;VITHKUQI SMALL LETTER NJE;Ll;0;L;;;;;N;;;10586;;10586
+105AE;VITHKUQI SMALL LETTER O;Ll;0;L;;;;;N;;;10587;;10587
+105AF;VITHKUQI SMALL LETTER PE;Ll;0;L;;;;;N;;;10588;;10588
+105B0;VITHKUQI SMALL LETTER QA;Ll;0;L;;;;;N;;;10589;;10589
+105B1;VITHKUQI SMALL LETTER RE;Ll;0;L;;;;;N;;;1058A;;1058A
+105B3;VITHKUQI SMALL LETTER SE;Ll;0;L;;;;;N;;;1058C;;1058C
+105B4;VITHKUQI SMALL LETTER SHE;Ll;0;L;;;;;N;;;1058D;;1058D
+105B5;VITHKUQI SMALL LETTER TE;Ll;0;L;;;;;N;;;1058E;;1058E
+105B6;VITHKUQI SMALL LETTER THE;Ll;0;L;;;;;N;;;1058F;;1058F
+105B7;VITHKUQI SMALL LETTER U;Ll;0;L;;;;;N;;;10590;;10590
+105B8;VITHKUQI SMALL LETTER VE;Ll;0;L;;;;;N;;;10591;;10591
+105B9;VITHKUQI SMALL LETTER XE;Ll;0;L;;;;;N;;;10592;;10592
+105BB;VITHKUQI SMALL LETTER Y;Ll;0;L;;;;;N;;;10594;;10594
+105BC;VITHKUQI SMALL LETTER ZE;Ll;0;L;;;;;N;;;10595;;10595
 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;;;;;
@@ -18139,6 +18337,63 @@
 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;;;;;
+10780;MODIFIER LETTER SMALL CAPITAL AA;Lm;0;L;;;;;N;;;;;
+10781;MODIFIER LETTER SUPERSCRIPT TRIANGULAR COLON;Lm;0;L;<super> 02D0;;;;N;;;;;
+10782;MODIFIER LETTER SUPERSCRIPT HALF TRIANGULAR COLON;Lm;0;L;<super> 02D1;;;;N;;;;;
+10783;MODIFIER LETTER SMALL AE;Lm;0;L;<super> 00E6;;;;N;;;;;
+10784;MODIFIER LETTER SMALL CAPITAL B;Lm;0;L;<super> 0299;;;;N;;;;;
+10785;MODIFIER LETTER SMALL B WITH HOOK;Lm;0;L;<super> 0253;;;;N;;;;;
+10787;MODIFIER LETTER SMALL DZ DIGRAPH;Lm;0;L;<super> 02A3;;;;N;;;;;
+10788;MODIFIER LETTER SMALL DZ DIGRAPH WITH RETROFLEX HOOK;Lm;0;L;<super> AB66;;;;N;;;;;
+10789;MODIFIER LETTER SMALL DZ DIGRAPH WITH CURL;Lm;0;L;<super> 02A5;;;;N;;;;;
+1078A;MODIFIER LETTER SMALL DEZH DIGRAPH;Lm;0;L;<super> 02A4;;;;N;;;;;
+1078B;MODIFIER LETTER SMALL D WITH TAIL;Lm;0;L;<super> 0256;;;;N;;;;;
+1078C;MODIFIER LETTER SMALL D WITH HOOK;Lm;0;L;<super> 0257;;;;N;;;;;
+1078D;MODIFIER LETTER SMALL D WITH HOOK AND TAIL;Lm;0;L;<super> 1D91;;;;N;;;;;
+1078E;MODIFIER LETTER SMALL REVERSED E;Lm;0;L;<super> 0258;;;;N;;;;;
+1078F;MODIFIER LETTER SMALL CLOSED REVERSED OPEN E;Lm;0;L;<super> 025E;;;;N;;;;;
+10790;MODIFIER LETTER SMALL FENG DIGRAPH;Lm;0;L;<super> 02A9;;;;N;;;;;
+10791;MODIFIER LETTER SMALL RAMS HORN;Lm;0;L;<super> 0264;;;;N;;;;;
+10792;MODIFIER LETTER SMALL CAPITAL G;Lm;0;L;<super> 0262;;;;N;;;;;
+10793;MODIFIER LETTER SMALL G WITH HOOK;Lm;0;L;<super> 0260;;;;N;;;;;
+10794;MODIFIER LETTER SMALL CAPITAL G WITH HOOK;Lm;0;L;<super> 029B;;;;N;;;;;
+10795;MODIFIER LETTER SMALL H WITH STROKE;Lm;0;L;<super> 0127;;;;N;;;;;
+10796;MODIFIER LETTER SMALL CAPITAL H;Lm;0;L;<super> 029C;;;;N;;;;;
+10797;MODIFIER LETTER SMALL HENG WITH HOOK;Lm;0;L;<super> 0267;;;;N;;;;;
+10798;MODIFIER LETTER SMALL DOTLESS J WITH STROKE AND HOOK;Lm;0;L;<super> 0284;;;;N;;;;;
+10799;MODIFIER LETTER SMALL LS DIGRAPH;Lm;0;L;<super> 02AA;;;;N;;;;;
+1079A;MODIFIER LETTER SMALL LZ DIGRAPH;Lm;0;L;<super> 02AB;;;;N;;;;;
+1079B;MODIFIER LETTER SMALL L WITH BELT;Lm;0;L;<super> 026C;;;;N;;;;;
+1079C;MODIFIER LETTER SMALL CAPITAL L WITH BELT;Lm;0;L;<super> 1DF04;;;;N;;;;;
+1079D;MODIFIER LETTER SMALL L WITH RETROFLEX HOOK AND BELT;Lm;0;L;<super> A78E;;;;N;;;;;
+1079E;MODIFIER LETTER SMALL LEZH;Lm;0;L;<super> 026E;;;;N;;;;;
+1079F;MODIFIER LETTER SMALL LEZH WITH RETROFLEX HOOK;Lm;0;L;<super> 1DF05;;;;N;;;;;
+107A0;MODIFIER LETTER SMALL TURNED Y;Lm;0;L;<super> 028E;;;;N;;;;;
+107A1;MODIFIER LETTER SMALL TURNED Y WITH BELT;Lm;0;L;<super> 1DF06;;;;N;;;;;
+107A2;MODIFIER LETTER SMALL O WITH STROKE;Lm;0;L;<super> 00F8;;;;N;;;;;
+107A3;MODIFIER LETTER SMALL CAPITAL OE;Lm;0;L;<super> 0276;;;;N;;;;;
+107A4;MODIFIER LETTER SMALL CLOSED OMEGA;Lm;0;L;<super> 0277;;;;N;;;;;
+107A5;MODIFIER LETTER SMALL Q;Lm;0;L;<super> 0071;;;;N;;;;;
+107A6;MODIFIER LETTER SMALL TURNED R WITH LONG LEG;Lm;0;L;<super> 027A;;;;N;;;;;
+107A7;MODIFIER LETTER SMALL TURNED R WITH LONG LEG AND RETROFLEX HOOK;Lm;0;L;<super> 1DF08;;;;N;;;;;
+107A8;MODIFIER LETTER SMALL R WITH TAIL;Lm;0;L;<super> 027D;;;;N;;;;;
+107A9;MODIFIER LETTER SMALL R WITH FISHHOOK;Lm;0;L;<super> 027E;;;;N;;;;;
+107AA;MODIFIER LETTER SMALL CAPITAL R;Lm;0;L;<super> 0280;;;;N;;;;;
+107AB;MODIFIER LETTER SMALL TC DIGRAPH WITH CURL;Lm;0;L;<super> 02A8;;;;N;;;;;
+107AC;MODIFIER LETTER SMALL TS DIGRAPH;Lm;0;L;<super> 02A6;;;;N;;;;;
+107AD;MODIFIER LETTER SMALL TS DIGRAPH WITH RETROFLEX HOOK;Lm;0;L;<super> AB67;;;;N;;;;;
+107AE;MODIFIER LETTER SMALL TESH DIGRAPH;Lm;0;L;<super> 02A7;;;;N;;;;;
+107AF;MODIFIER LETTER SMALL T WITH RETROFLEX HOOK;Lm;0;L;<super> 0288;;;;N;;;;;
+107B0;MODIFIER LETTER SMALL V WITH RIGHT HOOK;Lm;0;L;<super> 2C71;;;;N;;;;;
+107B2;MODIFIER LETTER SMALL CAPITAL Y;Lm;0;L;<super> 028F;;;;N;;;;;
+107B3;MODIFIER LETTER GLOTTAL STOP WITH STROKE;Lm;0;L;<super> 02A1;;;;N;;;;;
+107B4;MODIFIER LETTER REVERSED GLOTTAL STOP WITH STROKE;Lm;0;L;<super> 02A2;;;;N;;;;;
+107B5;MODIFIER LETTER BILABIAL CLICK;Lm;0;L;<super> 0298;;;;N;;;;;
+107B6;MODIFIER LETTER DENTAL CLICK;Lm;0;L;<super> 01C0;;;;N;;;;;
+107B7;MODIFIER LETTER LATERAL CLICK;Lm;0;L;<super> 01C1;;;;N;;;;;
+107B8;MODIFIER LETTER ALVEOLAR CLICK;Lm;0;L;<super> 01C2;;;;N;;;;;
+107B9;MODIFIER LETTER RETROFLEX CLICK WITH RETROFLEX HOOK;Lm;0;L;<super> 1DF0A;;;;N;;;;;
+107BA;MODIFIER LETTER SMALL S WITH CURL;Lm;0;L;<super> 1DF1E;;;;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;;;;;
@@ -19140,6 +19395,9 @@
 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;;;;;
+10EFD;ARABIC SMALL LOW WORD SAKTA;Mn;220;NSM;;;;;N;;;;;
+10EFE;ARABIC SMALL LOW WORD QASR;Mn;220;NSM;;;;;N;;;;;
+10EFF;ARABIC SMALL LOW WORD MADDA;Mn;220;NSM;;;;;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;;;;;
@@ -19222,6 +19480,32 @@
 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;;;;;
+10F70;OLD UYGHUR LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10F71;OLD UYGHUR LETTER BETH;Lo;0;R;;;;;N;;;;;
+10F72;OLD UYGHUR LETTER GIMEL-HETH;Lo;0;R;;;;;N;;;;;
+10F73;OLD UYGHUR LETTER WAW;Lo;0;R;;;;;N;;;;;
+10F74;OLD UYGHUR LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10F75;OLD UYGHUR LETTER FINAL HETH;Lo;0;R;;;;;N;;;;;
+10F76;OLD UYGHUR LETTER YODH;Lo;0;R;;;;;N;;;;;
+10F77;OLD UYGHUR LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10F78;OLD UYGHUR LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10F79;OLD UYGHUR LETTER MEM;Lo;0;R;;;;;N;;;;;
+10F7A;OLD UYGHUR LETTER NUN;Lo;0;R;;;;;N;;;;;
+10F7B;OLD UYGHUR LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10F7C;OLD UYGHUR LETTER PE;Lo;0;R;;;;;N;;;;;
+10F7D;OLD UYGHUR LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10F7E;OLD UYGHUR LETTER RESH;Lo;0;R;;;;;N;;;;;
+10F7F;OLD UYGHUR LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10F80;OLD UYGHUR LETTER TAW;Lo;0;R;;;;;N;;;;;
+10F81;OLD UYGHUR LETTER LESH;Lo;0;R;;;;;N;;;;;
+10F82;OLD UYGHUR COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F83;OLD UYGHUR COMBINING DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+10F84;OLD UYGHUR COMBINING TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F85;OLD UYGHUR COMBINING TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+10F86;OLD UYGHUR PUNCTUATION BAR;Po;0;R;;;;;N;;;;;
+10F87;OLD UYGHUR PUNCTUATION TWO BARS;Po;0;R;;;;;N;;;;;
+10F88;OLD UYGHUR PUNCTUATION TWO DOTS;Po;0;R;;;;;N;;;;;
+10F89;OLD UYGHUR PUNCTUATION FOUR DOTS;Po;0;R;;;;;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;;;;;
@@ -19381,6 +19665,12 @@
 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;;;;;
+11070;BRAHMI SIGN OLD TAMIL VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11071;BRAHMI LETTER OLD TAMIL SHORT E;Lo;0;L;;;;;N;;;;;
+11072;BRAHMI LETTER OLD TAMIL SHORT O;Lo;0;L;;;;;N;;;;;
+11073;BRAHMI VOWEL SIGN OLD TAMIL SHORT E;Mn;0;NSM;;;;;N;;;;;
+11074;BRAHMI VOWEL SIGN OLD TAMIL SHORT O;Mn;0;NSM;;;;;N;;;;;
+11075;BRAHMI LETTER OLD TAMIL LLA;Lo;0;L;;;;;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;;;;;
@@ -19448,6 +19738,7 @@
 110BF;KAITHI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
 110C0;KAITHI DANDA;Po;0;L;;;;;N;;;;;
 110C1;KAITHI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+110C2;KAITHI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;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;;;;;
@@ -19772,6 +20063,9 @@
 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;;;;;
+1123F;KHOJKI LETTER QA;Lo;0;L;;;;;N;;;;;
+11240;KHOJKI LETTER SHORT I;Lo;0;L;;;;;N;;;;;
+11241;KHOJKI VOWEL SIGN VOCALIC R;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;;;;;
@@ -20385,6 +20679,7 @@
 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;;;;;
+116B9;TAKRI ABBREVIATION SIGN;Po;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;;;;;
@@ -20453,6 +20748,13 @@
 1173D;AHOM SIGN SECTION;Po;0;L;;;;;N;;;;;
 1173E;AHOM SIGN RULAI;Po;0;L;;;;;N;;;;;
 1173F;AHOM SYMBOL VI;So;0;L;;;;;N;;;;;
+11740;AHOM LETTER CA;Lo;0;L;;;;;N;;;;;
+11741;AHOM LETTER TTA;Lo;0;L;;;;;N;;;;;
+11742;AHOM LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11743;AHOM LETTER DDA;Lo;0;L;;;;;N;;;;;
+11744;AHOM LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11745;AHOM LETTER NNA;Lo;0;L;;;;;N;;;;;
+11746;AHOM LETTER LLA;Lo;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;;;;;
@@ -20889,6 +21191,22 @@
 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;;;;;
+11AB0;CANADIAN SYLLABICS NATTILIK HI;Lo;0;L;;;;;N;;;;;
+11AB1;CANADIAN SYLLABICS NATTILIK HII;Lo;0;L;;;;;N;;;;;
+11AB2;CANADIAN SYLLABICS NATTILIK HO;Lo;0;L;;;;;N;;;;;
+11AB3;CANADIAN SYLLABICS NATTILIK HOO;Lo;0;L;;;;;N;;;;;
+11AB4;CANADIAN SYLLABICS NATTILIK HA;Lo;0;L;;;;;N;;;;;
+11AB5;CANADIAN SYLLABICS NATTILIK HAA;Lo;0;L;;;;;N;;;;;
+11AB6;CANADIAN SYLLABICS NATTILIK SHRI;Lo;0;L;;;;;N;;;;;
+11AB7;CANADIAN SYLLABICS NATTILIK SHRII;Lo;0;L;;;;;N;;;;;
+11AB8;CANADIAN SYLLABICS NATTILIK SHRO;Lo;0;L;;;;;N;;;;;
+11AB9;CANADIAN SYLLABICS NATTILIK SHROO;Lo;0;L;;;;;N;;;;;
+11ABA;CANADIAN SYLLABICS NATTILIK SHRA;Lo;0;L;;;;;N;;;;;
+11ABB;CANADIAN SYLLABICS NATTILIK SHRAA;Lo;0;L;;;;;N;;;;;
+11ABC;CANADIAN SYLLABICS SPE;Lo;0;L;;;;;N;;;;;
+11ABD;CANADIAN SYLLABICS SPI;Lo;0;L;;;;;N;;;;;
+11ABE;CANADIAN SYLLABICS SPO;Lo;0;L;;;;;N;;;;;
+11ABF;CANADIAN SYLLABICS SPA;Lo;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;;;;;
@@ -20946,6 +21264,16 @@
 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;;;;;
+11B00;DEVANAGARI HEAD MARK;Po;0;L;;;;;N;;;;;
+11B01;DEVANAGARI HEAD MARK WITH HEADSTROKE;Po;0;L;;;;;N;;;;;
+11B02;DEVANAGARI SIGN BHALE;Po;0;L;;;;;N;;;;;
+11B03;DEVANAGARI SIGN BHALE WITH HOOK;Po;0;L;;;;;N;;;;;
+11B04;DEVANAGARI SIGN EXTENDED BHALE;Po;0;L;;;;;N;;;;;
+11B05;DEVANAGARI SIGN EXTENDED BHALE WITH HOOK;Po;0;L;;;;;N;;;;;
+11B06;DEVANAGARI SIGN WESTERN FIVE-LIKE BHALE;Po;0;L;;;;;N;;;;;
+11B07;DEVANAGARI SIGN WESTERN NINE-LIKE BHALE;Po;0;L;;;;;N;;;;;
+11B08;DEVANAGARI SIGN REVERSED NINE-LIKE BHALE;Po;0;L;;;;;N;;;;;
+11B09;DEVANAGARI SIGN MINDU;Po;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;;;;;
@@ -21274,6 +21602,92 @@
 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;;;;;
+11F00;KAWI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11F01;KAWI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11F02;KAWI SIGN REPHA;Lo;0;L;;;;;N;;;;;
+11F03;KAWI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11F04;KAWI LETTER A;Lo;0;L;;;;;N;;;;;
+11F05;KAWI LETTER AA;Lo;0;L;;;;;N;;;;;
+11F06;KAWI LETTER I;Lo;0;L;;;;;N;;;;;
+11F07;KAWI LETTER II;Lo;0;L;;;;;N;;;;;
+11F08;KAWI LETTER U;Lo;0;L;;;;;N;;;;;
+11F09;KAWI LETTER UU;Lo;0;L;;;;;N;;;;;
+11F0A;KAWI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11F0B;KAWI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11F0C;KAWI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11F0D;KAWI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+11F0E;KAWI LETTER E;Lo;0;L;;;;;N;;;;;
+11F0F;KAWI LETTER AI;Lo;0;L;;;;;N;;;;;
+11F10;KAWI LETTER O;Lo;0;L;;;;;N;;;;;
+11F12;KAWI LETTER KA;Lo;0;L;;;;;N;;;;;
+11F13;KAWI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11F14;KAWI LETTER GA;Lo;0;L;;;;;N;;;;;
+11F15;KAWI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11F16;KAWI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11F17;KAWI LETTER CA;Lo;0;L;;;;;N;;;;;
+11F18;KAWI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11F19;KAWI LETTER JA;Lo;0;L;;;;;N;;;;;
+11F1A;KAWI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11F1B;KAWI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11F1C;KAWI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11F1D;KAWI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11F1E;KAWI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11F1F;KAWI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11F20;KAWI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11F21;KAWI LETTER TA;Lo;0;L;;;;;N;;;;;
+11F22;KAWI LETTER THA;Lo;0;L;;;;;N;;;;;
+11F23;KAWI LETTER DA;Lo;0;L;;;;;N;;;;;
+11F24;KAWI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11F25;KAWI LETTER NA;Lo;0;L;;;;;N;;;;;
+11F26;KAWI LETTER PA;Lo;0;L;;;;;N;;;;;
+11F27;KAWI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11F28;KAWI LETTER BA;Lo;0;L;;;;;N;;;;;
+11F29;KAWI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11F2A;KAWI LETTER MA;Lo;0;L;;;;;N;;;;;
+11F2B;KAWI LETTER YA;Lo;0;L;;;;;N;;;;;
+11F2C;KAWI LETTER RA;Lo;0;L;;;;;N;;;;;
+11F2D;KAWI LETTER LA;Lo;0;L;;;;;N;;;;;
+11F2E;KAWI LETTER WA;Lo;0;L;;;;;N;;;;;
+11F2F;KAWI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11F30;KAWI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11F31;KAWI LETTER SA;Lo;0;L;;;;;N;;;;;
+11F32;KAWI LETTER HA;Lo;0;L;;;;;N;;;;;
+11F33;KAWI LETTER JNYA;Lo;0;L;;;;;N;;;;;
+11F34;KAWI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11F35;KAWI VOWEL SIGN ALTERNATE AA;Mc;0;L;;;;;N;;;;;
+11F36;KAWI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11F37;KAWI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11F38;KAWI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11F39;KAWI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11F3A;KAWI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11F3E;KAWI VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+11F3F;KAWI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+11F40;KAWI VOWEL SIGN EU;Mn;0;NSM;;;;;N;;;;;
+11F41;KAWI SIGN KILLER;Mc;9;L;;;;;N;;;;;
+11F42;KAWI CONJOINER;Mn;9;NSM;;;;;N;;;;;
+11F43;KAWI DANDA;Po;0;L;;;;;N;;;;;
+11F44;KAWI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11F45;KAWI PUNCTUATION SECTION MARKER;Po;0;L;;;;;N;;;;;
+11F46;KAWI PUNCTUATION ALTERNATE SECTION MARKER;Po;0;L;;;;;N;;;;;
+11F47;KAWI PUNCTUATION FLOWER;Po;0;L;;;;;N;;;;;
+11F48;KAWI PUNCTUATION SPACE FILLER;Po;0;L;;;;;N;;;;;
+11F49;KAWI PUNCTUATION DOT;Po;0;L;;;;;N;;;;;
+11F4A;KAWI PUNCTUATION DOUBLE DOT;Po;0;L;;;;;N;;;;;
+11F4B;KAWI PUNCTUATION TRIPLE DOT;Po;0;L;;;;;N;;;;;
+11F4C;KAWI PUNCTUATION CIRCLE;Po;0;L;;;;;N;;;;;
+11F4D;KAWI PUNCTUATION FILLED CIRCLE;Po;0;L;;;;;N;;;;;
+11F4E;KAWI PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;;
+11F4F;KAWI PUNCTUATION CLOSING SPIRAL;Po;0;L;;;;;N;;;;;
+11F50;KAWI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11F51;KAWI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11F52;KAWI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11F53;KAWI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11F54;KAWI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11F55;KAWI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11F56;KAWI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11F57;KAWI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11F58;KAWI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11F59;KAWI DIGIT NINE;Nd;0;L;;9;9;9;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;;;;;
@@ -22560,6 +22974,105 @@
 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;;;;;
+12F90;CYPRO-MINOAN SIGN CM001;Lo;0;L;;;;;N;;;;;
+12F91;CYPRO-MINOAN SIGN CM002;Lo;0;L;;;;;N;;;;;
+12F92;CYPRO-MINOAN SIGN CM004;Lo;0;L;;;;;N;;;;;
+12F93;CYPRO-MINOAN SIGN CM005;Lo;0;L;;;;;N;;;;;
+12F94;CYPRO-MINOAN SIGN CM006;Lo;0;L;;;;;N;;;;;
+12F95;CYPRO-MINOAN SIGN CM007;Lo;0;L;;;;;N;;;;;
+12F96;CYPRO-MINOAN SIGN CM008;Lo;0;L;;;;;N;;;;;
+12F97;CYPRO-MINOAN SIGN CM009;Lo;0;L;;;;;N;;;;;
+12F98;CYPRO-MINOAN SIGN CM010;Lo;0;L;;;;;N;;;;;
+12F99;CYPRO-MINOAN SIGN CM011;Lo;0;L;;;;;N;;;;;
+12F9A;CYPRO-MINOAN SIGN CM012;Lo;0;L;;;;;N;;;;;
+12F9B;CYPRO-MINOAN SIGN CM012B;Lo;0;L;;;;;N;;;;;
+12F9C;CYPRO-MINOAN SIGN CM013;Lo;0;L;;;;;N;;;;;
+12F9D;CYPRO-MINOAN SIGN CM015;Lo;0;L;;;;;N;;;;;
+12F9E;CYPRO-MINOAN SIGN CM017;Lo;0;L;;;;;N;;;;;
+12F9F;CYPRO-MINOAN SIGN CM019;Lo;0;L;;;;;N;;;;;
+12FA0;CYPRO-MINOAN SIGN CM021;Lo;0;L;;;;;N;;;;;
+12FA1;CYPRO-MINOAN SIGN CM023;Lo;0;L;;;;;N;;;;;
+12FA2;CYPRO-MINOAN SIGN CM024;Lo;0;L;;;;;N;;;;;
+12FA3;CYPRO-MINOAN SIGN CM025;Lo;0;L;;;;;N;;;;;
+12FA4;CYPRO-MINOAN SIGN CM026;Lo;0;L;;;;;N;;;;;
+12FA5;CYPRO-MINOAN SIGN CM027;Lo;0;L;;;;;N;;;;;
+12FA6;CYPRO-MINOAN SIGN CM028;Lo;0;L;;;;;N;;;;;
+12FA7;CYPRO-MINOAN SIGN CM029;Lo;0;L;;;;;N;;;;;
+12FA8;CYPRO-MINOAN SIGN CM030;Lo;0;L;;;;;N;;;;;
+12FA9;CYPRO-MINOAN SIGN CM033;Lo;0;L;;;;;N;;;;;
+12FAA;CYPRO-MINOAN SIGN CM034;Lo;0;L;;;;;N;;;;;
+12FAB;CYPRO-MINOAN SIGN CM035;Lo;0;L;;;;;N;;;;;
+12FAC;CYPRO-MINOAN SIGN CM036;Lo;0;L;;;;;N;;;;;
+12FAD;CYPRO-MINOAN SIGN CM037;Lo;0;L;;;;;N;;;;;
+12FAE;CYPRO-MINOAN SIGN CM038;Lo;0;L;;;;;N;;;;;
+12FAF;CYPRO-MINOAN SIGN CM039;Lo;0;L;;;;;N;;;;;
+12FB0;CYPRO-MINOAN SIGN CM040;Lo;0;L;;;;;N;;;;;
+12FB1;CYPRO-MINOAN SIGN CM041;Lo;0;L;;;;;N;;;;;
+12FB2;CYPRO-MINOAN SIGN CM044;Lo;0;L;;;;;N;;;;;
+12FB3;CYPRO-MINOAN SIGN CM046;Lo;0;L;;;;;N;;;;;
+12FB4;CYPRO-MINOAN SIGN CM047;Lo;0;L;;;;;N;;;;;
+12FB5;CYPRO-MINOAN SIGN CM049;Lo;0;L;;;;;N;;;;;
+12FB6;CYPRO-MINOAN SIGN CM050;Lo;0;L;;;;;N;;;;;
+12FB7;CYPRO-MINOAN SIGN CM051;Lo;0;L;;;;;N;;;;;
+12FB8;CYPRO-MINOAN SIGN CM052;Lo;0;L;;;;;N;;;;;
+12FB9;CYPRO-MINOAN SIGN CM053;Lo;0;L;;;;;N;;;;;
+12FBA;CYPRO-MINOAN SIGN CM054;Lo;0;L;;;;;N;;;;;
+12FBB;CYPRO-MINOAN SIGN CM055;Lo;0;L;;;;;N;;;;;
+12FBC;CYPRO-MINOAN SIGN CM056;Lo;0;L;;;;;N;;;;;
+12FBD;CYPRO-MINOAN SIGN CM058;Lo;0;L;;;;;N;;;;;
+12FBE;CYPRO-MINOAN SIGN CM059;Lo;0;L;;;;;N;;;;;
+12FBF;CYPRO-MINOAN SIGN CM060;Lo;0;L;;;;;N;;;;;
+12FC0;CYPRO-MINOAN SIGN CM061;Lo;0;L;;;;;N;;;;;
+12FC1;CYPRO-MINOAN SIGN CM062;Lo;0;L;;;;;N;;;;;
+12FC2;CYPRO-MINOAN SIGN CM063;Lo;0;L;;;;;N;;;;;
+12FC3;CYPRO-MINOAN SIGN CM064;Lo;0;L;;;;;N;;;;;
+12FC4;CYPRO-MINOAN SIGN CM066;Lo;0;L;;;;;N;;;;;
+12FC5;CYPRO-MINOAN SIGN CM067;Lo;0;L;;;;;N;;;;;
+12FC6;CYPRO-MINOAN SIGN CM068;Lo;0;L;;;;;N;;;;;
+12FC7;CYPRO-MINOAN SIGN CM069;Lo;0;L;;;;;N;;;;;
+12FC8;CYPRO-MINOAN SIGN CM070;Lo;0;L;;;;;N;;;;;
+12FC9;CYPRO-MINOAN SIGN CM071;Lo;0;L;;;;;N;;;;;
+12FCA;CYPRO-MINOAN SIGN CM072;Lo;0;L;;;;;N;;;;;
+12FCB;CYPRO-MINOAN SIGN CM073;Lo;0;L;;;;;N;;;;;
+12FCC;CYPRO-MINOAN SIGN CM074;Lo;0;L;;;;;N;;;;;
+12FCD;CYPRO-MINOAN SIGN CM075;Lo;0;L;;;;;N;;;;;
+12FCE;CYPRO-MINOAN SIGN CM075B;Lo;0;L;;;;;N;;;;;
+12FCF;CYPRO-MINOAN SIGN CM076;Lo;0;L;;;;;N;;;;;
+12FD0;CYPRO-MINOAN SIGN CM078;Lo;0;L;;;;;N;;;;;
+12FD1;CYPRO-MINOAN SIGN CM079;Lo;0;L;;;;;N;;;;;
+12FD2;CYPRO-MINOAN SIGN CM080;Lo;0;L;;;;;N;;;;;
+12FD3;CYPRO-MINOAN SIGN CM081;Lo;0;L;;;;;N;;;;;
+12FD4;CYPRO-MINOAN SIGN CM082;Lo;0;L;;;;;N;;;;;
+12FD5;CYPRO-MINOAN SIGN CM083;Lo;0;L;;;;;N;;;;;
+12FD6;CYPRO-MINOAN SIGN CM084;Lo;0;L;;;;;N;;;;;
+12FD7;CYPRO-MINOAN SIGN CM085;Lo;0;L;;;;;N;;;;;
+12FD8;CYPRO-MINOAN SIGN CM086;Lo;0;L;;;;;N;;;;;
+12FD9;CYPRO-MINOAN SIGN CM087;Lo;0;L;;;;;N;;;;;
+12FDA;CYPRO-MINOAN SIGN CM088;Lo;0;L;;;;;N;;;;;
+12FDB;CYPRO-MINOAN SIGN CM089;Lo;0;L;;;;;N;;;;;
+12FDC;CYPRO-MINOAN SIGN CM090;Lo;0;L;;;;;N;;;;;
+12FDD;CYPRO-MINOAN SIGN CM091;Lo;0;L;;;;;N;;;;;
+12FDE;CYPRO-MINOAN SIGN CM092;Lo;0;L;;;;;N;;;;;
+12FDF;CYPRO-MINOAN SIGN CM094;Lo;0;L;;;;;N;;;;;
+12FE0;CYPRO-MINOAN SIGN CM095;Lo;0;L;;;;;N;;;;;
+12FE1;CYPRO-MINOAN SIGN CM096;Lo;0;L;;;;;N;;;;;
+12FE2;CYPRO-MINOAN SIGN CM097;Lo;0;L;;;;;N;;;;;
+12FE3;CYPRO-MINOAN SIGN CM098;Lo;0;L;;;;;N;;;;;
+12FE4;CYPRO-MINOAN SIGN CM099;Lo;0;L;;;;;N;;;;;
+12FE5;CYPRO-MINOAN SIGN CM100;Lo;0;L;;;;;N;;;;;
+12FE6;CYPRO-MINOAN SIGN CM101;Lo;0;L;;;;;N;;;;;
+12FE7;CYPRO-MINOAN SIGN CM102;Lo;0;L;;;;;N;;;;;
+12FE8;CYPRO-MINOAN SIGN CM103;Lo;0;L;;;;;N;;;;;
+12FE9;CYPRO-MINOAN SIGN CM104;Lo;0;L;;;;;N;;;;;
+12FEA;CYPRO-MINOAN SIGN CM105;Lo;0;L;;;;;N;;;;;
+12FEB;CYPRO-MINOAN SIGN CM107;Lo;0;L;;;;;N;;;;;
+12FEC;CYPRO-MINOAN SIGN CM108;Lo;0;L;;;;;N;;;;;
+12FED;CYPRO-MINOAN SIGN CM109;Lo;0;L;;;;;N;;;;;
+12FEE;CYPRO-MINOAN SIGN CM110;Lo;0;L;;;;;N;;;;;
+12FEF;CYPRO-MINOAN SIGN CM112;Lo;0;L;;;;;N;;;;;
+12FF0;CYPRO-MINOAN SIGN CM114;Lo;0;L;;;;;N;;;;;
+12FF1;CYPRO-MINOAN SIGN CM301;Po;0;L;;;;;N;;;;;
+12FF2;CYPRO-MINOAN SIGN CM302;Po;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;;;;;
@@ -23631,6 +24144,7 @@
 1342C;EGYPTIAN HIEROGLYPH AA030;Lo;0;L;;;;;N;;;;;
 1342D;EGYPTIAN HIEROGLYPH AA031;Lo;0;L;;;;;N;;;;;
 1342E;EGYPTIAN HIEROGLYPH AA032;Lo;0;L;;;;;N;;;;;
+1342F;EGYPTIAN HIEROGLYPH V011D;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;;;;;
@@ -23640,6 +24154,35 @@
 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;;;;;
+13439;EGYPTIAN HIEROGLYPH INSERT AT MIDDLE;Cf;0;L;;;;;N;;;;;
+1343A;EGYPTIAN HIEROGLYPH INSERT AT TOP;Cf;0;L;;;;;N;;;;;
+1343B;EGYPTIAN HIEROGLYPH INSERT AT BOTTOM;Cf;0;L;;;;;N;;;;;
+1343C;EGYPTIAN HIEROGLYPH BEGIN ENCLOSURE;Cf;0;L;;;;;N;;;;;
+1343D;EGYPTIAN HIEROGLYPH END ENCLOSURE;Cf;0;L;;;;;N;;;;;
+1343E;EGYPTIAN HIEROGLYPH BEGIN WALLED ENCLOSURE;Cf;0;L;;;;;N;;;;;
+1343F;EGYPTIAN HIEROGLYPH END WALLED ENCLOSURE;Cf;0;L;;;;;N;;;;;
+13440;EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY;Mn;0;NSM;;;;;N;;;;;
+13441;EGYPTIAN HIEROGLYPH FULL BLANK;Lo;0;L;;;;;N;;;;;
+13442;EGYPTIAN HIEROGLYPH HALF BLANK;Lo;0;L;;;;;N;;;;;
+13443;EGYPTIAN HIEROGLYPH LOST SIGN;Lo;0;L;;;;;N;;;;;
+13444;EGYPTIAN HIEROGLYPH HALF LOST SIGN;Lo;0;L;;;;;N;;;;;
+13445;EGYPTIAN HIEROGLYPH TALL LOST SIGN;Lo;0;L;;;;;N;;;;;
+13446;EGYPTIAN HIEROGLYPH WIDE LOST SIGN;Lo;0;L;;;;;N;;;;;
+13447;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START;Mn;0;NSM;;;;;N;;;;;
+13448;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START;Mn;0;NSM;;;;;N;;;;;
+13449;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START;Mn;0;NSM;;;;;N;;;;;
+1344A;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP END;Mn;0;NSM;;;;;N;;;;;
+1344B;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP;Mn;0;NSM;;;;;N;;;;;
+1344C;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START AND TOP END;Mn;0;NSM;;;;;N;;;;;
+1344D;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND TOP;Mn;0;NSM;;;;;N;;;;;
+1344E;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM END;Mn;0;NSM;;;;;N;;;;;
+1344F;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START AND BOTTOM END;Mn;0;NSM;;;;;N;;;;;
+13450;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM;Mn;0;NSM;;;;;N;;;;;
+13451;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND BOTTOM;Mn;0;NSM;;;;;N;;;;;
+13452;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT END;Mn;0;NSM;;;;;N;;;;;
+13453;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP AND END;Mn;0;NSM;;;;;N;;;;;
+13454;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM AND END;Mn;0;NSM;;;;;N;;;;;
+13455;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED;Mn;0;NSM;;;;;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;;;;;
@@ -24835,6 +25378,95 @@
 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;;;;;
+16A70;TANGSA LETTER OZ;Lo;0;L;;;;;N;;;;;
+16A71;TANGSA LETTER OC;Lo;0;L;;;;;N;;;;;
+16A72;TANGSA LETTER OQ;Lo;0;L;;;;;N;;;;;
+16A73;TANGSA LETTER OX;Lo;0;L;;;;;N;;;;;
+16A74;TANGSA LETTER AZ;Lo;0;L;;;;;N;;;;;
+16A75;TANGSA LETTER AC;Lo;0;L;;;;;N;;;;;
+16A76;TANGSA LETTER AQ;Lo;0;L;;;;;N;;;;;
+16A77;TANGSA LETTER AX;Lo;0;L;;;;;N;;;;;
+16A78;TANGSA LETTER VZ;Lo;0;L;;;;;N;;;;;
+16A79;TANGSA LETTER VC;Lo;0;L;;;;;N;;;;;
+16A7A;TANGSA LETTER VQ;Lo;0;L;;;;;N;;;;;
+16A7B;TANGSA LETTER VX;Lo;0;L;;;;;N;;;;;
+16A7C;TANGSA LETTER EZ;Lo;0;L;;;;;N;;;;;
+16A7D;TANGSA LETTER EC;Lo;0;L;;;;;N;;;;;
+16A7E;TANGSA LETTER EQ;Lo;0;L;;;;;N;;;;;
+16A7F;TANGSA LETTER EX;Lo;0;L;;;;;N;;;;;
+16A80;TANGSA LETTER IZ;Lo;0;L;;;;;N;;;;;
+16A81;TANGSA LETTER IC;Lo;0;L;;;;;N;;;;;
+16A82;TANGSA LETTER IQ;Lo;0;L;;;;;N;;;;;
+16A83;TANGSA LETTER IX;Lo;0;L;;;;;N;;;;;
+16A84;TANGSA LETTER UZ;Lo;0;L;;;;;N;;;;;
+16A85;TANGSA LETTER UC;Lo;0;L;;;;;N;;;;;
+16A86;TANGSA LETTER UQ;Lo;0;L;;;;;N;;;;;
+16A87;TANGSA LETTER UX;Lo;0;L;;;;;N;;;;;
+16A88;TANGSA LETTER AWZ;Lo;0;L;;;;;N;;;;;
+16A89;TANGSA LETTER AWC;Lo;0;L;;;;;N;;;;;
+16A8A;TANGSA LETTER AWQ;Lo;0;L;;;;;N;;;;;
+16A8B;TANGSA LETTER AWX;Lo;0;L;;;;;N;;;;;
+16A8C;TANGSA LETTER UIZ;Lo;0;L;;;;;N;;;;;
+16A8D;TANGSA LETTER UIC;Lo;0;L;;;;;N;;;;;
+16A8E;TANGSA LETTER UIQ;Lo;0;L;;;;;N;;;;;
+16A8F;TANGSA LETTER UIX;Lo;0;L;;;;;N;;;;;
+16A90;TANGSA LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+16A91;TANGSA LETTER LONG UEX;Lo;0;L;;;;;N;;;;;
+16A92;TANGSA LETTER SHORT UEZ;Lo;0;L;;;;;N;;;;;
+16A93;TANGSA LETTER SHORT AWX;Lo;0;L;;;;;N;;;;;
+16A94;TANGSA LETTER UEC;Lo;0;L;;;;;N;;;;;
+16A95;TANGSA LETTER UEZ;Lo;0;L;;;;;N;;;;;
+16A96;TANGSA LETTER UEQ;Lo;0;L;;;;;N;;;;;
+16A97;TANGSA LETTER UEX;Lo;0;L;;;;;N;;;;;
+16A98;TANGSA LETTER UIUZ;Lo;0;L;;;;;N;;;;;
+16A99;TANGSA LETTER UIUC;Lo;0;L;;;;;N;;;;;
+16A9A;TANGSA LETTER UIUQ;Lo;0;L;;;;;N;;;;;
+16A9B;TANGSA LETTER UIUX;Lo;0;L;;;;;N;;;;;
+16A9C;TANGSA LETTER MZ;Lo;0;L;;;;;N;;;;;
+16A9D;TANGSA LETTER MC;Lo;0;L;;;;;N;;;;;
+16A9E;TANGSA LETTER MQ;Lo;0;L;;;;;N;;;;;
+16A9F;TANGSA LETTER MX;Lo;0;L;;;;;N;;;;;
+16AA0;TANGSA LETTER KA;Lo;0;L;;;;;N;;;;;
+16AA1;TANGSA LETTER KHA;Lo;0;L;;;;;N;;;;;
+16AA2;TANGSA LETTER GA;Lo;0;L;;;;;N;;;;;
+16AA3;TANGSA LETTER NGA;Lo;0;L;;;;;N;;;;;
+16AA4;TANGSA LETTER SA;Lo;0;L;;;;;N;;;;;
+16AA5;TANGSA LETTER YA;Lo;0;L;;;;;N;;;;;
+16AA6;TANGSA LETTER WA;Lo;0;L;;;;;N;;;;;
+16AA7;TANGSA LETTER PA;Lo;0;L;;;;;N;;;;;
+16AA8;TANGSA LETTER NYA;Lo;0;L;;;;;N;;;;;
+16AA9;TANGSA LETTER PHA;Lo;0;L;;;;;N;;;;;
+16AAA;TANGSA LETTER BA;Lo;0;L;;;;;N;;;;;
+16AAB;TANGSA LETTER MA;Lo;0;L;;;;;N;;;;;
+16AAC;TANGSA LETTER NA;Lo;0;L;;;;;N;;;;;
+16AAD;TANGSA LETTER HA;Lo;0;L;;;;;N;;;;;
+16AAE;TANGSA LETTER LA;Lo;0;L;;;;;N;;;;;
+16AAF;TANGSA LETTER HTA;Lo;0;L;;;;;N;;;;;
+16AB0;TANGSA LETTER TA;Lo;0;L;;;;;N;;;;;
+16AB1;TANGSA LETTER DA;Lo;0;L;;;;;N;;;;;
+16AB2;TANGSA LETTER RA;Lo;0;L;;;;;N;;;;;
+16AB3;TANGSA LETTER NHA;Lo;0;L;;;;;N;;;;;
+16AB4;TANGSA LETTER SHA;Lo;0;L;;;;;N;;;;;
+16AB5;TANGSA LETTER CA;Lo;0;L;;;;;N;;;;;
+16AB6;TANGSA LETTER TSA;Lo;0;L;;;;;N;;;;;
+16AB7;TANGSA LETTER GHA;Lo;0;L;;;;;N;;;;;
+16AB8;TANGSA LETTER HTTA;Lo;0;L;;;;;N;;;;;
+16AB9;TANGSA LETTER THA;Lo;0;L;;;;;N;;;;;
+16ABA;TANGSA LETTER XA;Lo;0;L;;;;;N;;;;;
+16ABB;TANGSA LETTER FA;Lo;0;L;;;;;N;;;;;
+16ABC;TANGSA LETTER DHA;Lo;0;L;;;;;N;;;;;
+16ABD;TANGSA LETTER CHA;Lo;0;L;;;;;N;;;;;
+16ABE;TANGSA LETTER ZA;Lo;0;L;;;;;N;;;;;
+16AC0;TANGSA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+16AC1;TANGSA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+16AC2;TANGSA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+16AC3;TANGSA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+16AC4;TANGSA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+16AC5;TANGSA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+16AC6;TANGSA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+16AC7;TANGSA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+16AC8;TANGSA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+16AC9;TANGSA DIGIT NINE;Nd;0;L;;9;9;9;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;;;;;
@@ -26487,6 +27119,19 @@
 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;;;;;
+1AFF0;KATAKANA LETTER MINNAN TONE-2;Lm;0;L;;;;;N;;;;;
+1AFF1;KATAKANA LETTER MINNAN TONE-3;Lm;0;L;;;;;N;;;;;
+1AFF2;KATAKANA LETTER MINNAN TONE-4;Lm;0;L;;;;;N;;;;;
+1AFF3;KATAKANA LETTER MINNAN TONE-5;Lm;0;L;;;;;N;;;;;
+1AFF5;KATAKANA LETTER MINNAN TONE-7;Lm;0;L;;;;;N;;;;;
+1AFF6;KATAKANA LETTER MINNAN TONE-8;Lm;0;L;;;;;N;;;;;
+1AFF7;KATAKANA LETTER MINNAN NASALIZED TONE-1;Lm;0;L;;;;;N;;;;;
+1AFF8;KATAKANA LETTER MINNAN NASALIZED TONE-2;Lm;0;L;;;;;N;;;;;
+1AFF9;KATAKANA LETTER MINNAN NASALIZED TONE-3;Lm;0;L;;;;;N;;;;;
+1AFFA;KATAKANA LETTER MINNAN NASALIZED TONE-4;Lm;0;L;;;;;N;;;;;
+1AFFB;KATAKANA LETTER MINNAN NASALIZED TONE-5;Lm;0;L;;;;;N;;;;;
+1AFFD;KATAKANA LETTER MINNAN NASALIZED TONE-7;Lm;0;L;;;;;N;;;;;
+1AFFE;KATAKANA LETTER MINNAN NASALIZED TONE-8;Lm;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;;;;;
@@ -26774,9 +27419,15 @@
 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;;;;;
+1B11F;HIRAGANA LETTER ARCHAIC WU;Lo;0;L;;;;;N;;;;;
+1B120;KATAKANA LETTER ARCHAIC YI;Lo;0;L;;;;;N;;;;;
+1B121;KATAKANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;;
+1B122;KATAKANA LETTER ARCHAIC WU;Lo;0;L;;;;;N;;;;;
+1B132;HIRAGANA LETTER SMALL KO;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;;;;;
+1B155;KATAKANA LETTER SMALL KO;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;;;;;
@@ -27324,6 +27975,191 @@
 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;;;;;
+1CF00;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF01;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF02;ZNAMENNY COMBINING MARK TSATA ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF03;ZNAMENNY COMBINING MARK GORAZDO NIZKO ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF04;ZNAMENNY COMBINING MARK NIZKO ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF05;ZNAMENNY COMBINING MARK SREDNE ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF06;ZNAMENNY COMBINING MARK MALO POVYSHE ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF07;ZNAMENNY COMBINING MARK POVYSHE ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF08;ZNAMENNY COMBINING MARK VYSOKO ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF09;ZNAMENNY COMBINING MARK MALO POVYSHE S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF0A;ZNAMENNY COMBINING MARK POVYSHE S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF0B;ZNAMENNY COMBINING MARK VYSOKO S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF0C;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF0D;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF0E;ZNAMENNY COMBINING MARK TSATA ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF0F;ZNAMENNY COMBINING MARK GORAZDO NIZKO ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF10;ZNAMENNY COMBINING MARK NIZKO ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF11;ZNAMENNY COMBINING MARK SREDNE ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF12;ZNAMENNY COMBINING MARK MALO POVYSHE ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF13;ZNAMENNY COMBINING MARK POVYSHE ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF14;ZNAMENNY COMBINING MARK VYSOKO ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF15;ZNAMENNY COMBINING MARK MALO POVYSHE S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF16;ZNAMENNY COMBINING MARK POVYSHE S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF17;ZNAMENNY COMBINING MARK VYSOKO S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;;
+1CF18;ZNAMENNY COMBINING MARK TSATA S KRYZHEM;Mn;0;NSM;;;;;N;;;;;
+1CF19;ZNAMENNY COMBINING MARK MALO POVYSHE S KRYZHEM;Mn;0;NSM;;;;;N;;;;;
+1CF1A;ZNAMENNY COMBINING MARK STRANNO MALO POVYSHE;Mn;0;NSM;;;;;N;;;;;
+1CF1B;ZNAMENNY COMBINING MARK POVYSHE S KRYZHEM;Mn;0;NSM;;;;;N;;;;;
+1CF1C;ZNAMENNY COMBINING MARK POVYSHE STRANNO;Mn;0;NSM;;;;;N;;;;;
+1CF1D;ZNAMENNY COMBINING MARK VYSOKO S KRYZHEM;Mn;0;NSM;;;;;N;;;;;
+1CF1E;ZNAMENNY COMBINING MARK MALO POVYSHE STRANNO;Mn;0;NSM;;;;;N;;;;;
+1CF1F;ZNAMENNY COMBINING MARK GORAZDO VYSOKO;Mn;0;NSM;;;;;N;;;;;
+1CF20;ZNAMENNY COMBINING MARK ZELO;Mn;0;NSM;;;;;N;;;;;
+1CF21;ZNAMENNY COMBINING MARK ON;Mn;0;NSM;;;;;N;;;;;
+1CF22;ZNAMENNY COMBINING MARK RAVNO;Mn;0;NSM;;;;;N;;;;;
+1CF23;ZNAMENNY COMBINING MARK TIKHAYA;Mn;0;NSM;;;;;N;;;;;
+1CF24;ZNAMENNY COMBINING MARK BORZAYA;Mn;0;NSM;;;;;N;;;;;
+1CF25;ZNAMENNY COMBINING MARK UDARKA;Mn;0;NSM;;;;;N;;;;;
+1CF26;ZNAMENNY COMBINING MARK PODVERTKA;Mn;0;NSM;;;;;N;;;;;
+1CF27;ZNAMENNY COMBINING MARK LOMKA;Mn;0;NSM;;;;;N;;;;;
+1CF28;ZNAMENNY COMBINING MARK KUPNAYA;Mn;0;NSM;;;;;N;;;;;
+1CF29;ZNAMENNY COMBINING MARK KACHKA;Mn;0;NSM;;;;;N;;;;;
+1CF2A;ZNAMENNY COMBINING MARK ZEVOK;Mn;0;NSM;;;;;N;;;;;
+1CF2B;ZNAMENNY COMBINING MARK SKOBA;Mn;0;NSM;;;;;N;;;;;
+1CF2C;ZNAMENNY COMBINING MARK RAZSEKA;Mn;0;NSM;;;;;N;;;;;
+1CF2D;ZNAMENNY COMBINING MARK KRYZH ON LEFT;Mn;0;NSM;;;;;N;;;;;
+1CF30;ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO;Mn;0;NSM;;;;;N;;;;;
+1CF31;ZNAMENNY COMBINING TONAL RANGE MARK SVETLO;Mn;0;NSM;;;;;N;;;;;
+1CF32;ZNAMENNY COMBINING TONAL RANGE MARK TRESVETLO;Mn;0;NSM;;;;;N;;;;;
+1CF33;ZNAMENNY COMBINING MARK ZADERZHKA;Mn;0;NSM;;;;;N;;;;;
+1CF34;ZNAMENNY COMBINING MARK DEMESTVENNY ZADERZHKA;Mn;0;NSM;;;;;N;;;;;
+1CF35;ZNAMENNY COMBINING MARK OTSECHKA;Mn;0;NSM;;;;;N;;;;;
+1CF36;ZNAMENNY COMBINING MARK PODCHASHIE;Mn;0;NSM;;;;;N;;;;;
+1CF37;ZNAMENNY COMBINING MARK PODCHASHIE WITH VERTICAL STROKE;Mn;0;NSM;;;;;N;;;;;
+1CF38;ZNAMENNY COMBINING MARK CHASHKA;Mn;0;NSM;;;;;N;;;;;
+1CF39;ZNAMENNY COMBINING MARK CHASHKA POLNAYA;Mn;0;NSM;;;;;N;;;;;
+1CF3A;ZNAMENNY COMBINING MARK OBLACHKO;Mn;0;NSM;;;;;N;;;;;
+1CF3B;ZNAMENNY COMBINING MARK SOROCHYA NOZHKA;Mn;0;NSM;;;;;N;;;;;
+1CF3C;ZNAMENNY COMBINING MARK TOCHKA;Mn;0;NSM;;;;;N;;;;;
+1CF3D;ZNAMENNY COMBINING MARK DVOETOCHIE;Mn;0;NSM;;;;;N;;;;;
+1CF3E;ZNAMENNY COMBINING ATTACHING VERTICAL OMET;Mn;0;NSM;;;;;N;;;;;
+1CF3F;ZNAMENNY COMBINING MARK CURVED OMET;Mn;0;NSM;;;;;N;;;;;
+1CF40;ZNAMENNY COMBINING MARK KRYZH;Mn;0;NSM;;;;;N;;;;;
+1CF41;ZNAMENNY COMBINING LOWER TONAL RANGE INDICATOR;Mn;0;NSM;;;;;N;;;;;
+1CF42;ZNAMENNY PRIZNAK MODIFIER LEVEL-2;Mn;0;NSM;;;;;N;;;;;
+1CF43;ZNAMENNY PRIZNAK MODIFIER LEVEL-3;Mn;0;NSM;;;;;N;;;;;
+1CF44;ZNAMENNY PRIZNAK MODIFIER DIRECTION FLIP;Mn;0;NSM;;;;;N;;;;;
+1CF45;ZNAMENNY PRIZNAK MODIFIER KRYZH;Mn;0;NSM;;;;;N;;;;;
+1CF46;ZNAMENNY PRIZNAK MODIFIER ROG;Mn;0;NSM;;;;;N;;;;;
+1CF50;ZNAMENNY NEUME KRYUK;So;0;L;;;;;N;;;;;
+1CF51;ZNAMENNY NEUME KRYUK TIKHY;So;0;L;;;;;N;;;;;
+1CF52;ZNAMENNY NEUME PARAKLIT;So;0;L;;;;;N;;;;;
+1CF53;ZNAMENNY NEUME DVA V CHELNU;So;0;L;;;;;N;;;;;
+1CF54;ZNAMENNY NEUME KLYUCH;So;0;L;;;;;N;;;;;
+1CF55;ZNAMENNY NEUME ZANOZHEK;So;0;L;;;;;N;;;;;
+1CF56;ZNAMENNY NEUME STOPITSA;So;0;L;;;;;N;;;;;
+1CF57;ZNAMENNY NEUME STOPITSA S OCHKOM;So;0;L;;;;;N;;;;;
+1CF58;ZNAMENNY NEUME PEREVODKA;So;0;L;;;;;N;;;;;
+1CF59;ZNAMENNY NEUME PEREVODKA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;;
+1CF5A;ZNAMENNY NEUME STOPITSA WITH SOROCHYA NOZHKA;So;0;L;;;;;N;;;;;
+1CF5B;ZNAMENNY NEUME CHELYUSTKA;So;0;L;;;;;N;;;;;
+1CF5C;ZNAMENNY NEUME PALKA;So;0;L;;;;;N;;;;;
+1CF5D;ZNAMENNY NEUME ZAPYATAYA;So;0;L;;;;;N;;;;;
+1CF5E;ZNAMENNY NEUME GOLUBCHIK BORZY;So;0;L;;;;;N;;;;;
+1CF5F;ZNAMENNY NEUME GOLUBCHIK TIKHY;So;0;L;;;;;N;;;;;
+1CF60;ZNAMENNY NEUME GOLUBCHIK MRACHNY;So;0;L;;;;;N;;;;;
+1CF61;ZNAMENNY NEUME GOLUBCHIK SVETLY;So;0;L;;;;;N;;;;;
+1CF62;ZNAMENNY NEUME GOLUBCHIK TRESVETLY;So;0;L;;;;;N;;;;;
+1CF63;ZNAMENNY NEUME VRAKHIYA PROSTAYA;So;0;L;;;;;N;;;;;
+1CF64;ZNAMENNY NEUME VRAKHIYA MRACHNAYA;So;0;L;;;;;N;;;;;
+1CF65;ZNAMENNY NEUME VRAKHIYA SVETLAYA;So;0;L;;;;;N;;;;;
+1CF66;ZNAMENNY NEUME VRAKHIYA TRESVETLAYA;So;0;L;;;;;N;;;;;
+1CF67;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA PROSTAYA;So;0;L;;;;;N;;;;;
+1CF68;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA MRACHNAYA;So;0;L;;;;;N;;;;;
+1CF69;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;;
+1CF6A;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA TRESVETLAYA;So;0;L;;;;;N;;;;;
+1CF6B;ZNAMENNY NEUME DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;;
+1CF6C;ZNAMENNY NEUME REVERSED CHELYUSTKA;So;0;L;;;;;N;;;;;
+1CF6D;ZNAMENNY NEUME DERBITSA;So;0;L;;;;;N;;;;;
+1CF6E;ZNAMENNY NEUME KHAMILO;So;0;L;;;;;N;;;;;
+1CF6F;ZNAMENNY NEUME CHASHKA;So;0;L;;;;;N;;;;;
+1CF70;ZNAMENNY NEUME PODCHASHIE;So;0;L;;;;;N;;;;;
+1CF71;ZNAMENNY NEUME SKAMEYTSA MRACHNAYA;So;0;L;;;;;N;;;;;
+1CF72;ZNAMENNY NEUME SKAMEYTSA SVETLAYA;So;0;L;;;;;N;;;;;
+1CF73;ZNAMENNY NEUME SKAMEYTSA TRESVETLAYA;So;0;L;;;;;N;;;;;
+1CF74;ZNAMENNY NEUME SKAMEYTSA TIKHAYA;So;0;L;;;;;N;;;;;
+1CF75;ZNAMENNY NEUME DEMESTVENNY KLYUCH;So;0;L;;;;;N;;;;;
+1CF76;ZNAMENNY NEUME SKAMEYTSA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;;
+1CF77;ZNAMENNY NEUME SKAMEYTSA KLYUCHENEPOSTOYANNAYA;So;0;L;;;;;N;;;;;
+1CF78;ZNAMENNY NEUME SKAMEYTSA KLYUCHEVAYA TIKHAYA;So;0;L;;;;;N;;;;;
+1CF79;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA PROSTAYA;So;0;L;;;;;N;;;;;
+1CF7A;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA SVETLAYA;So;0;L;;;;;N;;;;;
+1CF7B;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;;
+1CF7C;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;;
+1CF7D;ZNAMENNY NEUME SLOZHITIE;So;0;L;;;;;N;;;;;
+1CF7E;ZNAMENNY NEUME SLOZHITIE S ZAPYATOY;So;0;L;;;;;N;;;;;
+1CF7F;ZNAMENNY NEUME SLOZHITIE ZAKRYTOE;So;0;L;;;;;N;;;;;
+1CF80;ZNAMENNY NEUME SLOZHITIE S KRYZHEM;So;0;L;;;;;N;;;;;
+1CF81;ZNAMENNY NEUME KRYZH;So;0;L;;;;;N;;;;;
+1CF82;ZNAMENNY NEUME ROG;So;0;L;;;;;N;;;;;
+1CF83;ZNAMENNY NEUME FITA;So;0;L;;;;;N;;;;;
+1CF84;ZNAMENNY NEUME KOBYLA;So;0;L;;;;;N;;;;;
+1CF85;ZNAMENNY NEUME ZMEYTSA;So;0;L;;;;;N;;;;;
+1CF86;ZNAMENNY NEUME STATYA;So;0;L;;;;;N;;;;;
+1CF87;ZNAMENNY NEUME STATYA S ZAPYATOY;So;0;L;;;;;N;;;;;
+1CF88;ZNAMENNY NEUME STATYA S KRYZHEM;So;0;L;;;;;N;;;;;
+1CF89;ZNAMENNY NEUME STATYA S ZAPYATOY I KRYZHEM;So;0;L;;;;;N;;;;;
+1CF8A;ZNAMENNY NEUME STATYA S KRYZHEM I ZAPYATOY;So;0;L;;;;;N;;;;;
+1CF8B;ZNAMENNY NEUME STATYA ZAKRYTAYA;So;0;L;;;;;N;;;;;
+1CF8C;ZNAMENNY NEUME STATYA ZAKRYTAYA S ZAPYATOY;So;0;L;;;;;N;;;;;
+1CF8D;ZNAMENNY NEUME STATYA S ROGOM;So;0;L;;;;;N;;;;;
+1CF8E;ZNAMENNY NEUME STATYA S DVUMYA ZAPYATYMI;So;0;L;;;;;N;;;;;
+1CF8F;ZNAMENNY NEUME STATYA S ZAPYATOY I PODCHASHIEM;So;0;L;;;;;N;;;;;
+1CF90;ZNAMENNY NEUME POLKULIZMY;So;0;L;;;;;N;;;;;
+1CF91;ZNAMENNY NEUME STATYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;;
+1CF92;ZNAMENNY NEUME STRELA PROSTAYA;So;0;L;;;;;N;;;;;
+1CF93;ZNAMENNY NEUME STRELA MRACHNOTIKHAYA;So;0;L;;;;;N;;;;;
+1CF94;ZNAMENNY NEUME STRELA KRYZHEVAYA;So;0;L;;;;;N;;;;;
+1CF95;ZNAMENNY NEUME STRELA POLUPOVODNAYA;So;0;L;;;;;N;;;;;
+1CF96;ZNAMENNY NEUME STRELA POVODNAYA;So;0;L;;;;;N;;;;;
+1CF97;ZNAMENNY NEUME STRELA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;;
+1CF98;ZNAMENNY NEUME STRELA KLYUCHEPOVODNAYA;So;0;L;;;;;N;;;;;
+1CF99;ZNAMENNY NEUME STRELA KLYUCHENEPOSTOYANNAYA;So;0;L;;;;;N;;;;;
+1CF9A;ZNAMENNY NEUME STRELA TIKHAYA PUTNAYA;So;0;L;;;;;N;;;;;
+1CF9B;ZNAMENNY NEUME STRELA DVOECHELNAYA;So;0;L;;;;;N;;;;;
+1CF9C;ZNAMENNY NEUME STRELA DVOECHELNOKRYZHEVAYA;So;0;L;;;;;N;;;;;
+1CF9D;ZNAMENNY NEUME STRELA DVOECHELNOPOVODNAYA;So;0;L;;;;;N;;;;;
+1CF9E;ZNAMENNY NEUME STRELA DVOECHELNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;;
+1CF9F;ZNAMENNY NEUME STRELA DVOECHELNOPOVODNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;;
+1CFA0;ZNAMENNY NEUME STRELA GROMNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;;
+1CFA1;ZNAMENNY NEUME STRELA GROMOPOVODNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;;
+1CFA2;ZNAMENNY NEUME STRELA GROMNAYA;So;0;L;;;;;N;;;;;
+1CFA3;ZNAMENNY NEUME STRELA GROMOPOVODNAYA;So;0;L;;;;;N;;;;;
+1CFA4;ZNAMENNY NEUME STRELA GROMOPOVODNAYA WITH DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;;
+1CFA5;ZNAMENNY NEUME STRELA GROMOKRYZHEVAYA;So;0;L;;;;;N;;;;;
+1CFA6;ZNAMENNY NEUME STRELA GROMOKRYZHEVAYA POVODNAYA;So;0;L;;;;;N;;;;;
+1CFA7;ZNAMENNY NEUME MECHIK;So;0;L;;;;;N;;;;;
+1CFA8;ZNAMENNY NEUME MECHIK POVODNY;So;0;L;;;;;N;;;;;
+1CFA9;ZNAMENNY NEUME MECHIK KLYUCHEVOY;So;0;L;;;;;N;;;;;
+1CFAA;ZNAMENNY NEUME MECHIK KLYUCHEPOVODNY;So;0;L;;;;;N;;;;;
+1CFAB;ZNAMENNY NEUME MECHIK KLYUCHENEPOSTOYANNY;So;0;L;;;;;N;;;;;
+1CFAC;ZNAMENNY NEUME STRELA TRYASOGLASNAYA;So;0;L;;;;;N;;;;;
+1CFAD;ZNAMENNY NEUME STRELA TRYASOPOVODNAYA;So;0;L;;;;;N;;;;;
+1CFAE;ZNAMENNY NEUME STRELA TRYASOSTRELNAYA;So;0;L;;;;;N;;;;;
+1CFAF;ZNAMENNY NEUME OSOKA;So;0;L;;;;;N;;;;;
+1CFB0;ZNAMENNY NEUME OSOKA SVETLAYA;So;0;L;;;;;N;;;;;
+1CFB1;ZNAMENNY NEUME OSOKA TRESVETLAYA;So;0;L;;;;;N;;;;;
+1CFB2;ZNAMENNY NEUME OSOKA KRYUKOVAYA SVETLAYA;So;0;L;;;;;N;;;;;
+1CFB3;ZNAMENNY NEUME OSOKA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;;
+1CFB4;ZNAMENNY NEUME OSOKA KLYUCHEVAYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;;
+1CFB5;ZNAMENNY NEUME STRELA KRYUKOVAYA;So;0;L;;;;;N;;;;;
+1CFB6;ZNAMENNY NEUME STRELA KRYUKOVAYA POVODNAYA;So;0;L;;;;;N;;;;;
+1CFB7;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;;
+1CFB8;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;;
+1CFB9;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMNAYA;So;0;L;;;;;N;;;;;
+1CFBA;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA;So;0;L;;;;;N;;;;;
+1CFBB;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA WITH DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;;
+1CFBC;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOKRYZHEVAYA;So;0;L;;;;;N;;;;;
+1CFBD;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOKRYZHEVAYA POVODNAYA;So;0;L;;;;;N;;;;;
+1CFBE;ZNAMENNY NEUME STRELA KRYUKOVAYA TRYASKA;So;0;L;;;;;N;;;;;
+1CFBF;ZNAMENNY NEUME KUFISMA;So;0;L;;;;;N;;;;;
+1CFC0;ZNAMENNY NEUME OBLAKO;So;0;L;;;;;N;;;;;
+1CFC1;ZNAMENNY NEUME DUDA;So;0;L;;;;;N;;;;;
+1CFC2;ZNAMENNY NEUME NEMKA;So;0;L;;;;;N;;;;;
+1CFC3;ZNAMENNY NEUME PAUK;So;0;L;;;;;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;;;;;
@@ -27801,6 +28637,8 @@
 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;;;;;
+1D1E9;MUSICAL SYMBOL SORI;So;0;ON;;;;;N;;;;;
+1D1EA;MUSICAL SYMBOL KORON;So;0;ON;;;;;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;;;;;
@@ -27871,6 +28709,26 @@
 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;;;;;
+1D2C0;KAKTOVIK NUMERAL ZERO;No;0;L;;;;0;N;;;;;
+1D2C1;KAKTOVIK NUMERAL ONE;No;0;L;;;;1;N;;;;;
+1D2C2;KAKTOVIK NUMERAL TWO;No;0;L;;;;2;N;;;;;
+1D2C3;KAKTOVIK NUMERAL THREE;No;0;L;;;;3;N;;;;;
+1D2C4;KAKTOVIK NUMERAL FOUR;No;0;L;;;;4;N;;;;;
+1D2C5;KAKTOVIK NUMERAL FIVE;No;0;L;;;;5;N;;;;;
+1D2C6;KAKTOVIK NUMERAL SIX;No;0;L;;;;6;N;;;;;
+1D2C7;KAKTOVIK NUMERAL SEVEN;No;0;L;;;;7;N;;;;;
+1D2C8;KAKTOVIK NUMERAL EIGHT;No;0;L;;;;8;N;;;;;
+1D2C9;KAKTOVIK NUMERAL NINE;No;0;L;;;;9;N;;;;;
+1D2CA;KAKTOVIK NUMERAL TEN;No;0;L;;;;10;N;;;;;
+1D2CB;KAKTOVIK NUMERAL ELEVEN;No;0;L;;;;11;N;;;;;
+1D2CC;KAKTOVIK NUMERAL TWELVE;No;0;L;;;;12;N;;;;;
+1D2CD;KAKTOVIK NUMERAL THIRTEEN;No;0;L;;;;13;N;;;;;
+1D2CE;KAKTOVIK NUMERAL FOURTEEN;No;0;L;;;;14;N;;;;;
+1D2CF;KAKTOVIK NUMERAL FIFTEEN;No;0;L;;;;15;N;;;;;
+1D2D0;KAKTOVIK NUMERAL SIXTEEN;No;0;L;;;;16;N;;;;;
+1D2D1;KAKTOVIK NUMERAL SEVENTEEN;No;0;L;;;;17;N;;;;;
+1D2D2;KAKTOVIK NUMERAL EIGHTEEN;No;0;L;;;;18;N;;;;;
+1D2D3;KAKTOVIK NUMERAL NINETEEN;No;0;L;;;;19;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;;;;;
@@ -29671,6 +30529,43 @@
 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;;;;;
+1DF00;LATIN SMALL LETTER FENG DIGRAPH WITH TRILL;Ll;0;L;;;;;N;;;;;
+1DF01;LATIN SMALL LETTER REVERSED SCRIPT G;Ll;0;L;;;;;N;;;;;
+1DF02;LATIN LETTER SMALL CAPITAL TURNED G;Ll;0;L;;;;;N;;;;;
+1DF03;LATIN SMALL LETTER REVERSED K;Ll;0;L;;;;;N;;;;;
+1DF04;LATIN LETTER SMALL CAPITAL L WITH BELT;Ll;0;L;;;;;N;;;;;
+1DF05;LATIN SMALL LETTER LEZH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1DF06;LATIN SMALL LETTER TURNED Y WITH BELT;Ll;0;L;;;;;N;;;;;
+1DF07;LATIN SMALL LETTER REVERSED ENG;Ll;0;L;;;;;N;;;;;
+1DF08;LATIN SMALL LETTER TURNED R WITH LONG LEG AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1DF09;LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1DF0A;LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK;Lo;0;L;;;;;N;;;;;
+1DF0B;LATIN SMALL LETTER ESH WITH DOUBLE BAR;Ll;0;L;;;;;N;;;;;
+1DF0C;LATIN SMALL LETTER ESH WITH DOUBLE BAR AND CURL;Ll;0;L;;;;;N;;;;;
+1DF0D;LATIN SMALL LETTER TURNED T WITH CURL;Ll;0;L;;;;;N;;;;;
+1DF0E;LATIN LETTER INVERTED GLOTTAL STOP WITH CURL;Ll;0;L;;;;;N;;;;;
+1DF0F;LATIN LETTER STRETCHED C WITH CURL;Ll;0;L;;;;;N;;;;;
+1DF10;LATIN LETTER SMALL CAPITAL TURNED K;Ll;0;L;;;;;N;;;;;
+1DF11;LATIN SMALL LETTER L WITH FISHHOOK;Ll;0;L;;;;;N;;;;;
+1DF12;LATIN SMALL LETTER DEZH DIGRAPH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1DF13;LATIN SMALL LETTER L WITH BELT AND PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1DF14;LATIN SMALL LETTER ENG WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1DF15;LATIN SMALL LETTER TURNED R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1DF16;LATIN SMALL LETTER R WITH FISHHOOK AND PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1DF17;LATIN SMALL LETTER TESH DIGRAPH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1DF18;LATIN SMALL LETTER EZH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1DF19;LATIN SMALL LETTER DEZH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1DF1A;LATIN SMALL LETTER I WITH STROKE AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1DF1B;LATIN SMALL LETTER O WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1DF1C;LATIN SMALL LETTER TESH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1DF1D;LATIN SMALL LETTER C WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1DF1E;LATIN SMALL LETTER S WITH CURL;Ll;0;L;;;;;N;;;;;
+1DF25;LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
+1DF26;LATIN SMALL LETTER L WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
+1DF27;LATIN SMALL LETTER N WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
+1DF28;LATIN SMALL LETTER R WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
+1DF29;LATIN SMALL LETTER S WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
+1DF2A;LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;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;;;;;
@@ -29709,6 +30604,69 @@
 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;;;;;
+1E030;MODIFIER LETTER CYRILLIC SMALL A;Lm;0;L;<super> 0430;;;;N;;;;;
+1E031;MODIFIER LETTER CYRILLIC SMALL BE;Lm;0;L;<super> 0431;;;;N;;;;;
+1E032;MODIFIER LETTER CYRILLIC SMALL VE;Lm;0;L;<super> 0432;;;;N;;;;;
+1E033;MODIFIER LETTER CYRILLIC SMALL GHE;Lm;0;L;<super> 0433;;;;N;;;;;
+1E034;MODIFIER LETTER CYRILLIC SMALL DE;Lm;0;L;<super> 0434;;;;N;;;;;
+1E035;MODIFIER LETTER CYRILLIC SMALL IE;Lm;0;L;<super> 0435;;;;N;;;;;
+1E036;MODIFIER LETTER CYRILLIC SMALL ZHE;Lm;0;L;<super> 0436;;;;N;;;;;
+1E037;MODIFIER LETTER CYRILLIC SMALL ZE;Lm;0;L;<super> 0437;;;;N;;;;;
+1E038;MODIFIER LETTER CYRILLIC SMALL I;Lm;0;L;<super> 0438;;;;N;;;;;
+1E039;MODIFIER LETTER CYRILLIC SMALL KA;Lm;0;L;<super> 043A;;;;N;;;;;
+1E03A;MODIFIER LETTER CYRILLIC SMALL EL;Lm;0;L;<super> 043B;;;;N;;;;;
+1E03B;MODIFIER LETTER CYRILLIC SMALL EM;Lm;0;L;<super> 043C;;;;N;;;;;
+1E03C;MODIFIER LETTER CYRILLIC SMALL O;Lm;0;L;<super> 043E;;;;N;;;;;
+1E03D;MODIFIER LETTER CYRILLIC SMALL PE;Lm;0;L;<super> 043F;;;;N;;;;;
+1E03E;MODIFIER LETTER CYRILLIC SMALL ER;Lm;0;L;<super> 0440;;;;N;;;;;
+1E03F;MODIFIER LETTER CYRILLIC SMALL ES;Lm;0;L;<super> 0441;;;;N;;;;;
+1E040;MODIFIER LETTER CYRILLIC SMALL TE;Lm;0;L;<super> 0442;;;;N;;;;;
+1E041;MODIFIER LETTER CYRILLIC SMALL U;Lm;0;L;<super> 0443;;;;N;;;;;
+1E042;MODIFIER LETTER CYRILLIC SMALL EF;Lm;0;L;<super> 0444;;;;N;;;;;
+1E043;MODIFIER LETTER CYRILLIC SMALL HA;Lm;0;L;<super> 0445;;;;N;;;;;
+1E044;MODIFIER LETTER CYRILLIC SMALL TSE;Lm;0;L;<super> 0446;;;;N;;;;;
+1E045;MODIFIER LETTER CYRILLIC SMALL CHE;Lm;0;L;<super> 0447;;;;N;;;;;
+1E046;MODIFIER LETTER CYRILLIC SMALL SHA;Lm;0;L;<super> 0448;;;;N;;;;;
+1E047;MODIFIER LETTER CYRILLIC SMALL YERU;Lm;0;L;<super> 044B;;;;N;;;;;
+1E048;MODIFIER LETTER CYRILLIC SMALL E;Lm;0;L;<super> 044D;;;;N;;;;;
+1E049;MODIFIER LETTER CYRILLIC SMALL YU;Lm;0;L;<super> 044E;;;;N;;;;;
+1E04A;MODIFIER LETTER CYRILLIC SMALL DZZE;Lm;0;L;<super> A689;;;;N;;;;;
+1E04B;MODIFIER LETTER CYRILLIC SMALL SCHWA;Lm;0;L;<super> 04D9;;;;N;;;;;
+1E04C;MODIFIER LETTER CYRILLIC SMALL BYELORUSSIAN-UKRAINIAN I;Lm;0;L;<super> 0456;;;;N;;;;;
+1E04D;MODIFIER LETTER CYRILLIC SMALL JE;Lm;0;L;<super> 0458;;;;N;;;;;
+1E04E;MODIFIER LETTER CYRILLIC SMALL BARRED O;Lm;0;L;<super> 04E9;;;;N;;;;;
+1E04F;MODIFIER LETTER CYRILLIC SMALL STRAIGHT U;Lm;0;L;<super> 04AF;;;;N;;;;;
+1E050;MODIFIER LETTER CYRILLIC SMALL PALOCHKA;Lm;0;L;<super> 04CF;;;;N;;;;;
+1E051;CYRILLIC SUBSCRIPT SMALL LETTER A;Lm;0;L; 0430;;;;N;;;;;
+1E052;CYRILLIC SUBSCRIPT SMALL LETTER BE;Lm;0;L; 0431;;;;N;;;;;
+1E053;CYRILLIC SUBSCRIPT SMALL LETTER VE;Lm;0;L; 0432;;;;N;;;;;
+1E054;CYRILLIC SUBSCRIPT SMALL LETTER GHE;Lm;0;L; 0433;;;;N;;;;;
+1E055;CYRILLIC SUBSCRIPT SMALL LETTER DE;Lm;0;L; 0434;;;;N;;;;;
+1E056;CYRILLIC SUBSCRIPT SMALL LETTER IE;Lm;0;L; 0435;;;;N;;;;;
+1E057;CYRILLIC SUBSCRIPT SMALL LETTER ZHE;Lm;0;L; 0436;;;;N;;;;;
+1E058;CYRILLIC SUBSCRIPT SMALL LETTER ZE;Lm;0;L; 0437;;;;N;;;;;
+1E059;CYRILLIC SUBSCRIPT SMALL LETTER I;Lm;0;L; 0438;;;;N;;;;;
+1E05A;CYRILLIC SUBSCRIPT SMALL LETTER KA;Lm;0;L; 043A;;;;N;;;;;
+1E05B;CYRILLIC SUBSCRIPT SMALL LETTER EL;Lm;0;L; 043B;;;;N;;;;;
+1E05C;CYRILLIC SUBSCRIPT SMALL LETTER O;Lm;0;L; 043E;;;;N;;;;;
+1E05D;CYRILLIC SUBSCRIPT SMALL LETTER PE;Lm;0;L; 043F;;;;N;;;;;
+1E05E;CYRILLIC SUBSCRIPT SMALL LETTER ES;Lm;0;L; 0441;;;;N;;;;;
+1E05F;CYRILLIC SUBSCRIPT SMALL LETTER U;Lm;0;L; 0443;;;;N;;;;;
+1E060;CYRILLIC SUBSCRIPT SMALL LETTER EF;Lm;0;L; 0444;;;;N;;;;;
+1E061;CYRILLIC SUBSCRIPT SMALL LETTER HA;Lm;0;L; 0445;;;;N;;;;;
+1E062;CYRILLIC SUBSCRIPT SMALL LETTER TSE;Lm;0;L; 0446;;;;N;;;;;
+1E063;CYRILLIC SUBSCRIPT SMALL LETTER CHE;Lm;0;L; 0447;;;;N;;;;;
+1E064;CYRILLIC SUBSCRIPT SMALL LETTER SHA;Lm;0;L; 0448;;;;N;;;;;
+1E065;CYRILLIC SUBSCRIPT SMALL LETTER HARD SIGN;Lm;0;L; 044A;;;;N;;;;;
+1E066;CYRILLIC SUBSCRIPT SMALL LETTER YERU;Lm;0;L; 044B;;;;N;;;;;
+1E067;CYRILLIC SUBSCRIPT SMALL LETTER GHE WITH UPTURN;Lm;0;L; 0491;;;;N;;;;;
+1E068;CYRILLIC SUBSCRIPT SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Lm;0;L; 0456;;;;N;;;;;
+1E069;CYRILLIC SUBSCRIPT SMALL LETTER DZE;Lm;0;L; 0455;;;;N;;;;;
+1E06A;CYRILLIC SUBSCRIPT SMALL LETTER DZHE;Lm;0;L; 045F;;;;N;;;;;
+1E06B;MODIFIER LETTER CYRILLIC SMALL ES WITH DESCENDER;Lm;0;L;<super> 04AB;;;;N;;;;;
+1E06C;MODIFIER LETTER CYRILLIC SMALL YERU WITH BACK YER;Lm;0;L;<super> A651;;;;N;;;;;
+1E06D;MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE;Lm;0;L;<super> 04B1;;;;N;;;;;
+1E08F;COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;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;;;;;
@@ -29780,6 +30738,37 @@
 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;;;;;
+1E290;TOTO LETTER PA;Lo;0;L;;;;;N;;;;;
+1E291;TOTO LETTER BA;Lo;0;L;;;;;N;;;;;
+1E292;TOTO LETTER TA;Lo;0;L;;;;;N;;;;;
+1E293;TOTO LETTER DA;Lo;0;L;;;;;N;;;;;
+1E294;TOTO LETTER KA;Lo;0;L;;;;;N;;;;;
+1E295;TOTO LETTER GA;Lo;0;L;;;;;N;;;;;
+1E296;TOTO LETTER MA;Lo;0;L;;;;;N;;;;;
+1E297;TOTO LETTER NA;Lo;0;L;;;;;N;;;;;
+1E298;TOTO LETTER NGA;Lo;0;L;;;;;N;;;;;
+1E299;TOTO LETTER SA;Lo;0;L;;;;;N;;;;;
+1E29A;TOTO LETTER CHA;Lo;0;L;;;;;N;;;;;
+1E29B;TOTO LETTER YA;Lo;0;L;;;;;N;;;;;
+1E29C;TOTO LETTER WA;Lo;0;L;;;;;N;;;;;
+1E29D;TOTO LETTER JA;Lo;0;L;;;;;N;;;;;
+1E29E;TOTO LETTER HA;Lo;0;L;;;;;N;;;;;
+1E29F;TOTO LETTER RA;Lo;0;L;;;;;N;;;;;
+1E2A0;TOTO LETTER LA;Lo;0;L;;;;;N;;;;;
+1E2A1;TOTO LETTER I;Lo;0;L;;;;;N;;;;;
+1E2A2;TOTO LETTER BREATHY I;Lo;0;L;;;;;N;;;;;
+1E2A3;TOTO LETTER IU;Lo;0;L;;;;;N;;;;;
+1E2A4;TOTO LETTER BREATHY IU;Lo;0;L;;;;;N;;;;;
+1E2A5;TOTO LETTER U;Lo;0;L;;;;;N;;;;;
+1E2A6;TOTO LETTER E;Lo;0;L;;;;;N;;;;;
+1E2A7;TOTO LETTER BREATHY E;Lo;0;L;;;;;N;;;;;
+1E2A8;TOTO LETTER EO;Lo;0;L;;;;;N;;;;;
+1E2A9;TOTO LETTER BREATHY EO;Lo;0;L;;;;;N;;;;;
+1E2AA;TOTO LETTER O;Lo;0;L;;;;;N;;;;;
+1E2AB;TOTO LETTER AE;Lo;0;L;;;;;N;;;;;
+1E2AC;TOTO LETTER BREATHY AE;Lo;0;L;;;;;N;;;;;
+1E2AD;TOTO LETTER A;Lo;0;L;;;;;N;;;;;
+1E2AE;TOTO SIGN RISING TONE;Mn;230;NSM;;;;;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;;;;;
@@ -29839,6 +30828,76 @@
 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;;;;;
+1E4D0;NAG MUNDARI LETTER O;Lo;0;L;;;;;N;;;;;
+1E4D1;NAG MUNDARI LETTER OP;Lo;0;L;;;;;N;;;;;
+1E4D2;NAG MUNDARI LETTER OL;Lo;0;L;;;;;N;;;;;
+1E4D3;NAG MUNDARI LETTER OY;Lo;0;L;;;;;N;;;;;
+1E4D4;NAG MUNDARI LETTER ONG;Lo;0;L;;;;;N;;;;;
+1E4D5;NAG MUNDARI LETTER A;Lo;0;L;;;;;N;;;;;
+1E4D6;NAG MUNDARI LETTER AJ;Lo;0;L;;;;;N;;;;;
+1E4D7;NAG MUNDARI LETTER AB;Lo;0;L;;;;;N;;;;;
+1E4D8;NAG MUNDARI LETTER ANY;Lo;0;L;;;;;N;;;;;
+1E4D9;NAG MUNDARI LETTER AH;Lo;0;L;;;;;N;;;;;
+1E4DA;NAG MUNDARI LETTER I;Lo;0;L;;;;;N;;;;;
+1E4DB;NAG MUNDARI LETTER IS;Lo;0;L;;;;;N;;;;;
+1E4DC;NAG MUNDARI LETTER IDD;Lo;0;L;;;;;N;;;;;
+1E4DD;NAG MUNDARI LETTER IT;Lo;0;L;;;;;N;;;;;
+1E4DE;NAG MUNDARI LETTER IH;Lo;0;L;;;;;N;;;;;
+1E4DF;NAG MUNDARI LETTER U;Lo;0;L;;;;;N;;;;;
+1E4E0;NAG MUNDARI LETTER UC;Lo;0;L;;;;;N;;;;;
+1E4E1;NAG MUNDARI LETTER UD;Lo;0;L;;;;;N;;;;;
+1E4E2;NAG MUNDARI LETTER UK;Lo;0;L;;;;;N;;;;;
+1E4E3;NAG MUNDARI LETTER UR;Lo;0;L;;;;;N;;;;;
+1E4E4;NAG MUNDARI LETTER E;Lo;0;L;;;;;N;;;;;
+1E4E5;NAG MUNDARI LETTER ENN;Lo;0;L;;;;;N;;;;;
+1E4E6;NAG MUNDARI LETTER EG;Lo;0;L;;;;;N;;;;;
+1E4E7;NAG MUNDARI LETTER EM;Lo;0;L;;;;;N;;;;;
+1E4E8;NAG MUNDARI LETTER EN;Lo;0;L;;;;;N;;;;;
+1E4E9;NAG MUNDARI LETTER ETT;Lo;0;L;;;;;N;;;;;
+1E4EA;NAG MUNDARI LETTER ELL;Lo;0;L;;;;;N;;;;;
+1E4EB;NAG MUNDARI SIGN OJOD;Lm;0;L;;;;;N;;;;;
+1E4EC;NAG MUNDARI SIGN MUHOR;Mn;232;NSM;;;;;N;;;;;
+1E4ED;NAG MUNDARI SIGN TOYOR;Mn;232;NSM;;;;;N;;;;;
+1E4EE;NAG MUNDARI SIGN IKIR;Mn;220;NSM;;;;;N;;;;;
+1E4EF;NAG MUNDARI SIGN SUTUH;Mn;230;NSM;;;;;N;;;;;
+1E4F0;NAG MUNDARI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1E4F1;NAG MUNDARI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1E4F2;NAG MUNDARI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1E4F3;NAG MUNDARI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1E4F4;NAG MUNDARI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1E4F5;NAG MUNDARI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1E4F6;NAG MUNDARI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1E4F7;NAG MUNDARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1E4F8;NAG MUNDARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1E4F9;NAG MUNDARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1E7E0;ETHIOPIC SYLLABLE HHYA;Lo;0;L;;;;;N;;;;;
+1E7E1;ETHIOPIC SYLLABLE HHYU;Lo;0;L;;;;;N;;;;;
+1E7E2;ETHIOPIC SYLLABLE HHYI;Lo;0;L;;;;;N;;;;;
+1E7E3;ETHIOPIC SYLLABLE HHYAA;Lo;0;L;;;;;N;;;;;
+1E7E4;ETHIOPIC SYLLABLE HHYEE;Lo;0;L;;;;;N;;;;;
+1E7E5;ETHIOPIC SYLLABLE HHYE;Lo;0;L;;;;;N;;;;;
+1E7E6;ETHIOPIC SYLLABLE HHYO;Lo;0;L;;;;;N;;;;;
+1E7E8;ETHIOPIC SYLLABLE GURAGE HHWA;Lo;0;L;;;;;N;;;;;
+1E7E9;ETHIOPIC SYLLABLE HHWI;Lo;0;L;;;;;N;;;;;
+1E7EA;ETHIOPIC SYLLABLE HHWEE;Lo;0;L;;;;;N;;;;;
+1E7EB;ETHIOPIC SYLLABLE HHWE;Lo;0;L;;;;;N;;;;;
+1E7ED;ETHIOPIC SYLLABLE GURAGE MWI;Lo;0;L;;;;;N;;;;;
+1E7EE;ETHIOPIC SYLLABLE GURAGE MWEE;Lo;0;L;;;;;N;;;;;
+1E7F0;ETHIOPIC SYLLABLE GURAGE QWI;Lo;0;L;;;;;N;;;;;
+1E7F1;ETHIOPIC SYLLABLE GURAGE QWEE;Lo;0;L;;;;;N;;;;;
+1E7F2;ETHIOPIC SYLLABLE GURAGE QWE;Lo;0;L;;;;;N;;;;;
+1E7F3;ETHIOPIC SYLLABLE GURAGE BWI;Lo;0;L;;;;;N;;;;;
+1E7F4;ETHIOPIC SYLLABLE GURAGE BWEE;Lo;0;L;;;;;N;;;;;
+1E7F5;ETHIOPIC SYLLABLE GURAGE KWI;Lo;0;L;;;;;N;;;;;
+1E7F6;ETHIOPIC SYLLABLE GURAGE KWEE;Lo;0;L;;;;;N;;;;;
+1E7F7;ETHIOPIC SYLLABLE GURAGE KWE;Lo;0;L;;;;;N;;;;;
+1E7F8;ETHIOPIC SYLLABLE GURAGE GWI;Lo;0;L;;;;;N;;;;;
+1E7F9;ETHIOPIC SYLLABLE GURAGE GWEE;Lo;0;L;;;;;N;;;;;
+1E7FA;ETHIOPIC SYLLABLE GURAGE GWE;Lo;0;L;;;;;N;;;;;
+1E7FB;ETHIOPIC SYLLABLE GURAGE FWI;Lo;0;L;;;;;N;;;;;
+1E7FC;ETHIOPIC SYLLABLE GURAGE FWEE;Lo;0;L;;;;;N;;;;;
+1E7FD;ETHIOPIC SYLLABLE GURAGE PWI;Lo;0;L;;;;;N;;;;;
+1E7FE;ETHIOPIC SYLLABLE GURAGE PWEE;Lo;0;L;;;;;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;;;;;
@@ -31886,6 +32945,10 @@
 1F6D5;HINDU TEMPLE;So;0;ON;;;;;N;;;;;
 1F6D6;HUT;So;0;ON;;;;;N;;;;;
 1F6D7;ELEVATOR;So;0;ON;;;;;N;;;;;
+1F6DC;WIRELESS;So;0;ON;;;;;N;;;;;
+1F6DD;PLAYGROUND SLIDE;So;0;ON;;;;;N;;;;;
+1F6DE;WHEEL;So;0;ON;;;;;N;;;;;
+1F6DF;RING BUOY;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;;;;;
@@ -32028,6 +33091,14 @@
 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;;;;;
+1F774;LOT OF FORTUNE;So;0;ON;;;;;N;;;;;
+1F775;OCCULTATION;So;0;ON;;;;;N;;;;;
+1F776;LUNAR ECLIPSE;So;0;ON;;;;;N;;;;;
+1F77B;HAUMEA;So;0;ON;;;;;N;;;;;
+1F77C;MAKEMAKE;So;0;ON;;;;;N;;;;;
+1F77D;GONGGONG;So;0;ON;;;;;N;;;;;
+1F77E;QUAOAR;So;0;ON;;;;;N;;;;;
+1F77F;ORCUS;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;;;;;
@@ -32117,6 +33188,7 @@
 1F7D6;NEGATIVE CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;;
 1F7D7;CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
 1F7D8;NEGATIVE CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
+1F7D9;NINE POINTED WHITE STAR;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;;;;;
@@ -32129,6 +33201,7 @@
 1F7E9;LARGE GREEN SQUARE;So;0;ON;;;;;N;;;;;
 1F7EA;LARGE PURPLE SQUARE;So;0;ON;;;;;N;;;;;
 1F7EB;LARGE BROWN SQUARE;So;0;ON;;;;;N;;;;;
+1F7F0;HEAVY EQUALS SIGN;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;;;;;
@@ -32400,6 +33473,7 @@
 1F976;FREEZING FACE;So;0;ON;;;;;N;;;;;
 1F977;NINJA;So;0;ON;;;;;N;;;;;
 1F978;DISGUISED FACE;So;0;ON;;;;;N;;;;;
+1F979;FACE HOLDING BACK TEARS;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;;;;;
@@ -32482,6 +33556,7 @@
 1F9C9;MATE DRINK;So;0;ON;;;;;N;;;;;
 1F9CA;ICE CUBE;So;0;ON;;;;;N;;;;;
 1F9CB;BUBBLE TEA;So;0;ON;;;;;N;;;;;
+1F9CC;TROLL;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;;;;;
@@ -32636,9 +33711,14 @@
 1FA72;BRIEFS;So;0;ON;;;;;N;;;;;
 1FA73;SHORTS;So;0;ON;;;;;N;;;;;
 1FA74;THONG SANDAL;So;0;ON;;;;;N;;;;;
+1FA75;LIGHT BLUE HEART;So;0;ON;;;;;N;;;;;
+1FA76;GREY HEART;So;0;ON;;;;;N;;;;;
+1FA77;PINK HEART;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;;;;;
+1FA7B;X-RAY;So;0;ON;;;;;N;;;;;
+1FA7C;CRUTCH;So;0;ON;;;;;N;;;;;
 1FA80;YO-YO;So;0;ON;;;;;N;;;;;
 1FA81;KITE;So;0;ON;;;;;N;;;;;
 1FA82;PARACHUTE;So;0;ON;;;;;N;;;;;
@@ -32646,6 +33726,8 @@
 1FA84;MAGIC WAND;So;0;ON;;;;;N;;;;;
 1FA85;PINATA;So;0;ON;;;;;N;;;;;
 1FA86;NESTING DOLLS;So;0;ON;;;;;N;;;;;
+1FA87;MARACAS;So;0;ON;;;;;N;;;;;
+1FA88;FLUTE;So;0;ON;;;;;N;;;;;
 1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;;
 1FA91;CHAIR;So;0;ON;;;;;N;;;;;
 1FA92;RAZOR;So;0;ON;;;;;N;;;;;
@@ -32671,6 +33753,13 @@
 1FAA6;HEADSTONE;So;0;ON;;;;;N;;;;;
 1FAA7;PLACARD;So;0;ON;;;;;N;;;;;
 1FAA8;ROCK;So;0;ON;;;;;N;;;;;
+1FAA9;MIRROR BALL;So;0;ON;;;;;N;;;;;
+1FAAA;IDENTIFICATION CARD;So;0;ON;;;;;N;;;;;
+1FAAB;LOW BATTERY;So;0;ON;;;;;N;;;;;
+1FAAC;HAMSA;So;0;ON;;;;;N;;;;;
+1FAAD;FOLDING HAND FAN;So;0;ON;;;;;N;;;;;
+1FAAE;HAIR PICK;So;0;ON;;;;;N;;;;;
+1FAAF;KHANDA;So;0;ON;;;;;N;;;;;
 1FAB0;FLY;So;0;ON;;;;;N;;;;;
 1FAB1;WORM;So;0;ON;;;;;N;;;;;
 1FAB2;BEETLE;So;0;ON;;;;;N;;;;;
@@ -32678,9 +33767,22 @@
 1FAB4;POTTED PLANT;So;0;ON;;;;;N;;;;;
 1FAB5;WOOD;So;0;ON;;;;;N;;;;;
 1FAB6;FEATHER;So;0;ON;;;;;N;;;;;
+1FAB7;LOTUS;So;0;ON;;;;;N;;;;;
+1FAB8;CORAL;So;0;ON;;;;;N;;;;;
+1FAB9;EMPTY NEST;So;0;ON;;;;;N;;;;;
+1FABA;NEST WITH EGGS;So;0;ON;;;;;N;;;;;
+1FABB;HYACINTH;So;0;ON;;;;;N;;;;;
+1FABC;JELLYFISH;So;0;ON;;;;;N;;;;;
+1FABD;WING;So;0;ON;;;;;N;;;;;
+1FABF;GOOSE;So;0;ON;;;;;N;;;;;
 1FAC0;ANATOMICAL HEART;So;0;ON;;;;;N;;;;;
 1FAC1;LUNGS;So;0;ON;;;;;N;;;;;
 1FAC2;PEOPLE HUGGING;So;0;ON;;;;;N;;;;;
+1FAC3;PREGNANT MAN;So;0;ON;;;;;N;;;;;
+1FAC4;PREGNANT PERSON;So;0;ON;;;;;N;;;;;
+1FAC5;PERSON WITH CROWN;So;0;ON;;;;;N;;;;;
+1FACE;MOOSE;So;0;ON;;;;;N;;;;;
+1FACF;DONKEY;So;0;ON;;;;;N;;;;;
 1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;;
 1FAD1;BELL PEPPER;So;0;ON;;;;;N;;;;;
 1FAD2;OLIVE;So;0;ON;;;;;N;;;;;
@@ -32688,6 +33790,29 @@
 1FAD4;TAMALE;So;0;ON;;;;;N;;;;;
 1FAD5;FONDUE;So;0;ON;;;;;N;;;;;
 1FAD6;TEAPOT;So;0;ON;;;;;N;;;;;
+1FAD7;POURING LIQUID;So;0;ON;;;;;N;;;;;
+1FAD8;BEANS;So;0;ON;;;;;N;;;;;
+1FAD9;JAR;So;0;ON;;;;;N;;;;;
+1FADA;GINGER ROOT;So;0;ON;;;;;N;;;;;
+1FADB;PEA POD;So;0;ON;;;;;N;;;;;
+1FAE0;MELTING FACE;So;0;ON;;;;;N;;;;;
+1FAE1;SALUTING FACE;So;0;ON;;;;;N;;;;;
+1FAE2;FACE WITH OPEN EYES AND HAND OVER MOUTH;So;0;ON;;;;;N;;;;;
+1FAE3;FACE WITH PEEKING EYE;So;0;ON;;;;;N;;;;;
+1FAE4;FACE WITH DIAGONAL MOUTH;So;0;ON;;;;;N;;;;;
+1FAE5;DOTTED LINE FACE;So;0;ON;;;;;N;;;;;
+1FAE6;BITING LIP;So;0;ON;;;;;N;;;;;
+1FAE7;BUBBLES;So;0;ON;;;;;N;;;;;
+1FAE8;SHAKING FACE;So;0;ON;;;;;N;;;;;
+1FAF0;HAND WITH INDEX FINGER AND THUMB CROSSED;So;0;ON;;;;;N;;;;;
+1FAF1;RIGHTWARDS HAND;So;0;ON;;;;;N;;;;;
+1FAF2;LEFTWARDS HAND;So;0;ON;;;;;N;;;;;
+1FAF3;PALM DOWN HAND;So;0;ON;;;;;N;;;;;
+1FAF4;PALM UP HAND;So;0;ON;;;;;N;;;;;
+1FAF5;INDEX POINTING AT THE VIEWER;So;0;ON;;;;;N;;;;;
+1FAF6;HEART HANDS;So;0;ON;;;;;N;;;;;
+1FAF7;LEFTWARDS PUSHING HAND;So;0;ON;;;;;N;;;;;
+1FAF8;RIGHTWARDS PUSHING HAND;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;;;;;
@@ -32901,9 +34026,9 @@
 1FBF8;SEGMENTED DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;;
 1FBF9;SEGMENTED DIGIT NINE;Nd;0;EN; 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;;;;;
+2A6DF;<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;;;;;
+2B739;<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;;;;;
@@ -33454,6 +34579,8 @@
 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;;;;;
+31350;<CJK Ideograph Extension H, First>;Lo;0;L;;;;;N;;;;;
+323AF;<CJK Ideograph Extension H, 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;;;;;

_service:tar_scm:gnupg-2.3.6.tar.bz2/regexp/_unicode_mapping.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/regexp/_unicode_mapping.c Changed

@@ -201,84 +201,85 @@
 	{ 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 },
-
+	{ 0x2c5d, 0x2c2d },	{ 0x2c5e, 0x2c2e },	{ 0x2c5f, 0x2c2f },	{ 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 },	{ 0xa7c1, 0xa7c0 },	{ 0xa7c3, 0xa7c2 },
+	{ 0xa7c8, 0xa7c7 },	{ 0xa7ca, 0xa7c9 },	{ 0xa7d1, 0xa7d0 },	{ 0xa7d7, 0xa7d6 },
+	{ 0xa7d9, 0xa7d8 },	{ 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 },
 };

_service:tar_scm:gnupg-2.3.6.tar.bz2/regexp/jimregexp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/regexp/jimregexp.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/Makefile.am Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/Makefile.in Changed

@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+# Makefile.am - scd
 # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -162,7 +163,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)
@@ -175,12 +176,6 @@
 	$(am__objects_1)
 scdaemon_OBJECTS = $(am_scdaemon_OBJECTS)
 am__DEPENDENCIES_1 =
-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_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -243,7 +238,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)
@@ -438,7 +434,9 @@
 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.
@@ -446,16 +444,6 @@
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
 	$(am__append_7) $(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx. WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library. We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc. 256k is the largest stack
-# we use with pth.
-@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)
 
 # Convenience macros
@@ -483,6 +471,7 @@
 	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
 $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs)
 
+scdaemon_DEPENDENCIES = $(resource_objs)
 all: all-am
 
 .SUFFIXES:
@@ -517,6 +506,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=; \
@@ -846,6 +837,7 @@
 
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+@HAVE_W32_SYSTEM_TRUE@scdaemon-w32info.o : scdaemon.w32-manifest ../common/w32info-rc.h
 
 # 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.

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/apdu.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/apdu.c Changed

@@ -773,7 +773,14 @@
     return err;
 
   if (DBG_CARD_IO)
-    log_printhex (apdu, apdulen, "  PCSC_data:");
+    {
+      /* Do not dump the PIN in a VERIFY command.  */
+      if (apdulen > 5 && apdu1 == 0x20)
+        log_debug ("PCSC_data: %02X %02X %02X %02X %02X redacted\n",
+                   apdu0, apdu1, apdu2, apdu3, apdu4);
+      else
+        log_printhex (apdu, apdulen, "PCSC_data:");
+    }
 
   if ((reader_tableslot.pcsc.protocol & PCSC_PROTOCOL_T1))
       send_pci.protocol = PCSC_PROTOCOL_T1;
@@ -1555,7 +1562,14 @@
     return err;
 
   if (DBG_CARD_IO)
-    log_printhex (apdu, apdulen, " raw apdu:");
+    {
+      /* Do not dump the PIN in a VERIFY command.  */
+      if (apdulen > 5 && apdu1 == 0x20)
+        log_debug (" raw apdu: %02x%02x%02x%02x%02x redacted\n",
+                   apdu0, apdu1, apdu2, apdu3, apdu4);
+      else
+        log_printhex (apdu, apdulen, " raw apdu:");
+    }
 
   maxbuflen = *buflen;
   if (pininfo)
@@ -2015,7 +2029,7 @@
 #endif
     { /* PC/SC readers.  */
       long r;
-      pcsc_dword_t nreader;
+      pcsc_dword_t nreader = 0;
       char *p = NULL;
 
       if (!pcsc.context)
@@ -3246,7 +3260,7 @@
  * Out of historical reasons the function returns 0 on success and
  * outs the status word at the end of the result to be able to get the
  * status word in the case of a not provided RETBUF, R_SW can be used
- * to store the SW.  But note that R_SW qill only be set if the
+ * to store the SW.  But note that R_SW will only be set if the
  * function returns 0. */
 int
 apdu_send_direct (int slot, size_t extended_length,

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/app-common.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/app-common.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/app-nks.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/app-nks.c Changed

@@ -1,6 +1,6 @@
 /* app-nks.c - The Telesec NKS card application.
 * Copyright (C) 2004, 2007-2009 Free Software Foundation, Inc.
- * Copyright (C) 2004, 2007-2009, 2013-2015, 2020 g10 Code GmbH
+ * Copyright (C) 2004, 2007-2009, 2013-2015, 2020, 2022 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -100,7 +100,8 @@
 
 static struct
 {
- int nks_app_id;/* One of the NKS_APP_ constants. */
+ int nks_app_id;/* One of NKS_APP_*. Keep them sorted so that no
+ * unnecessary application switching is needed. */
 int fid; /* File ID. */
 int nks_ver; /* 0 for NKS version 2, 3 for version 3, etc. */
 int certtype; /* Type of certificate or 0 if it is not a certificate. */
@@ -157,7 +158,7 @@
 { 1, 0xC008, 3, 101 }, /* EF_C.CA.SIG */
 { 1, 0xC00E, 3, 111 }, /* EF_C.RCA.SIG */
 
- { 2, 0x4531, 15, 0, 0xC001, 0,1,1, 0x84}, /* EF_PK.CH.SIG */
+ { 2, 0x4531, 15, 0, 0xC001, 0,1,0, 0x84}, /* EF_PK.CH.SIG */
 { 2, 0xC000, 15,101 }, /* EF.C.SCA.QES (SubCA) */
 { 2, 0xC001, 15,100 }, /* EF.C.ICC.QES (Cert) */
 { 2, 0xC00E, 15,111 }, /* EF.C.RCA.QES (RootCA */
@@ -211,6 +212,8 @@
 gpg_error_t (*pincb)(void*, const char *,
 char **),
 void *pincb_arg);
+static gpg_error_t parse_keyref (app_t app, const char *keyref,
+ int want_keypair, int *r_fididx);
 
 
 &#xc;
@@ -447,6 +450,8 @@
 
 if (!err)
 {
+ if (r_algo)
+ *r_algo = algo;
 if (r_algostr)
 {
 *r_algostr = algostr;
@@ -500,7 +505,7 @@
 find_fid_by_keyref (app_t app, const char *keyref, int *r_idx, int *r_algo)
 {
 gpg_error_t err;
- int idx, fid, nks_app_id;
+ int idx;
 char keygripstr2*KEYGRIP_LEN+1;
 
 if (!keyref || !keyref0)
@@ -509,10 +514,14 @@
 {
 struct fid_cache_s *ci;
 
- for (ci = app->app_local->fid_cache; ci; ci = ci->next)
+ /* FIXME: Our cache structure needs to be revised. It doesn't
+ * take the app_id into account and we don't have a way to
+ * directly access the FID item if there are several of them
+ * with different app_ids. We disable the cache for now. */
+ for (ci = app->app_local->fid_cache ; ci; ci = ci->next)
 if (ci->fid && ci->got_keygrip && !strcmp (ci->keygripstr, keyref))
 break;
- if (ci) /* Cached */
+ if (ci && 0 ) /* Cached (disabled) */
 {
 for (idx=0; filelistidx.fid; idx++)
 if (filelistidx.fid == ci->fid)
@@ -577,45 +586,12 @@
 }
 else /* This is a usual keyref. */
 {
- if (!ascii_strncasecmp (keyref, "NKS-NKS3.", 9))
- nks_app_id = NKS_APP_NKS;
- else if (!ascii_strncasecmp (keyref, "NKS-ESIGN.", 10)
- && app->app_local->qes_app_id == NKS_APP_ESIGN)
- nks_app_id = NKS_APP_ESIGN;
- else if (!ascii_strncasecmp (keyref, "NKS-SIGG.", 9)
- && app->app_local->qes_app_id == NKS_APP_SIGG)
- nks_app_id = NKS_APP_SIGG;
- else if (!ascii_strncasecmp (keyref, "NKS-IDLM.", 9))
- nks_app_id = NKS_APP_IDLM;
- else if (!ascii_strncasecmp (keyref, "NKS-DF01.", 9))
- nks_app_id = NKS_APP_NKS;
- else
- {
- err = gpg_error (GPG_ERR_INV_ID);
- goto leave;
- }
- keyref += nks_app_id == NKS_APP_ESIGN? 10 : 9;
-
- if (!hexdigitp (keyref) || !hexdigitp (keyref+1)
- || !hexdigitp (keyref+2) || !hexdigitp (keyref+3)
- || keyref4)
- {
- err = gpg_error (GPG_ERR_INV_ID);
- goto leave;
- }
- fid = xtoi_4 (keyref);
- for (idx=0; filelistidx.fid; idx++)
- if (filelistidx.iskeypair && filelistidx.fid == fid
- && filelistidx.nks_app_id == nks_app_id)
- break;
- if (!filelistidx.fid)
- {
- err = gpg_error (GPG_ERR_NOT_FOUND);
- goto leave;
- }
+ err = parse_keyref (app, keyref, 1, &idx);
+ if (err)
+ goto leave;
 *r_idx = idx;
 
- err = switch_application (app, nks_app_id);
+ err = switch_application (app, filelistidx.nks_app_id);
 if (err)
 goto leave;
 if (r_algo)
@@ -795,6 +771,51 @@
 }
 
 
+/* Parse a keyref (NKS_*.*) and return the corresponding EF as an
+ * index into the filetable. With WANT_KEYPAIR set a keypair EF is
+ * requested; otherwise also cert EFs are returned. */
+static gpg_error_t
+parse_keyref (app_t app, const char *keyref, int want_keypair, int *r_fididx)
+{
+ int nks_app_id, fid, idx;
+
+ if (!ascii_strncasecmp (keyref, "NKS-NKS3.", 9))
+ nks_app_id = NKS_APP_NKS;
+ else if (!ascii_strncasecmp (keyref, "NKS-ESIGN.", 10)
+ && (!want_keypair || app->app_local->qes_app_id == NKS_APP_ESIGN))
+ nks_app_id = NKS_APP_ESIGN;
+ else if (!ascii_strncasecmp (keyref, "NKS-SIGG.", 9)
+ && (!want_keypair || app->app_local->qes_app_id == NKS_APP_SIGG))
+ nks_app_id = NKS_APP_SIGG;
+ else if (!ascii_strncasecmp (keyref, "NKS-IDLM.", 9))
+ nks_app_id = NKS_APP_IDLM;
+ else if (!ascii_strncasecmp (keyref, "NKS-DF01.", 9))
+ nks_app_id = NKS_APP_NKS;
+ else
+ return gpg_error (GPG_ERR_INV_ID);
+
+ keyref += nks_app_id == NKS_APP_ESIGN? 10 : 9;
+
+ if (!hexdigitp (keyref) || !hexdigitp (keyref+1)
+ || !hexdigitp (keyref+2) || !hexdigitp (keyref+3)
+ || keyref4)
+ return gpg_error (GPG_ERR_INV_ID);
+ fid = xtoi_4 (keyref);
+ for (idx=0; filelistidx.fid; idx++)
+ if (filelistidx.fid == fid
+ && filelistidx.nks_app_id == nks_app_id
+ && ((want_keypair && filelistidx.iskeypair)
+ || (!want_keypair
+ && (filelistidx.certtype || filelistidx.iskeypair > 0))))
+ break;
+ if (!filelistidx.fid)
+ return gpg_error (GPG_ERR_NOT_FOUND);
+
+ *r_fididx = idx;
+ return 0;
+}
+
+
 const char *
 get_nks_tag (app_t app, int nks_app_id)
 {
@@ -815,6 +836,21 @@
 }
 
 static void
+set_usage_string (char usagebuf5, int i)
+{
+ int usageidx = 0;
+ if (filelisti.issignkey)
+ usagebufusageidx++ = 's';
+ if (filelisti.isauthkey)
+ usagebufusageidx++ = 'a';
+ if (filelisti.isencrkey)
+ usagebufusageidx++ = 'e';
+ if (!usageidx)
+ usagebufusageidx++ = '-';
+ usagebufusageidx = 0;
+}
+
+static void
 do_learn_status_core (app_t app, ctrl_t ctrl, unsigned int flags,
 int nks_app_id)
 {
@@ -856,7 +892,6 @@
 {
 char gripstr40+1;
 char usagebuf5;
- int usageidx = 0;
 char *algostr = NULL;
 
 err = keygripstr_from_pk_file (app, filelisti.fid,
@@ -869,15 +904,7 @@
 {
 snprintf (id_buf, sizeof id_buf, "NKS-%s.%04X",
 tag, filelisti.fid);
- if (filelisti.issignkey)
- usagebufusageidx++ = 's';
- if (filelisti.isauthkey)
- usagebufusageidx++ = 'a';
- if (filelisti.isencrkey)
- usagebufusageidx++ = 'e';
- if (!usageidx)
- usagebufusageidx++ = '-';
- usagebufusageidx = 0;
+ set_usage_string (usagebuf, i);
 send_status_info (ctrl, "KEYPAIRINFO",
 gripstr, 40,
 id_buf, strlen (id_buf),
@@ -918,9 +945,8 @@
 }
 
 
-
 /* Helper to read a certificate from the file FID. The function
- * assumes that the the application has already been selected. */
+ * assumes that the application has already been selected. */
 static gpg_error_t
 readcert_from_ef (app_t app, int fid, unsigned char **cert, size_t *certlen)
 {
@@ -954,7 +980,7 @@
 return err;
 }
 
- if (!buflen || *buffer == 0xff)
+ if (!buflen || *buffer == 0xff || all_zero_p (buffer, buflen))
 {
 log_info ("nks: no certificate contained in FID 0x%04X\n", fid);
 err = gpg_error (GPG_ERR_NOT_FOUND);
@@ -1045,21 +1071,29 @@
 for (idx++; filelistidx.fid; idx++)
 {
 if (filelistidx.nks_ver > app->appversion)
- continue;
+ continue; /* EF not support by this card version. */
 
 if (!filelistidx.iskeypair)
- continue;
+ continue; /* Skip - We are only interested in keypairs. */
 
 if (app->app_local->only_idlm)
 {
+ /* IDLM cards have no other applications we want to switch
+ * to. We skip all EFs which are not known for IDLM. */
 if (filelistidx.nks_app_id != NKS_APP_IDLM)
 continue;
 }
 else
 {
+ /* Skip all EFs which are not for NKS or the card's
+ * implementation for a qualified electoric signature (QES)
+ * which is either the old SIGG or the newer ESIGN. */
 if (filelistidx.nks_app_id != NKS_APP_NKS
 && filelistidx.nks_app_id != app->app_local->qes_app_id)
 continue;
+
+ /* Switch if needed. Note that the filelist should be
+ * sorted to avoid unnecessary switches. */
 err = switch_application (app, filelistidx.nks_app_id);
 if (err)
 {
@@ -1068,6 +1102,8 @@
 }
 }
 
+ /* Get the keygrip from the EF. Note that this functions
+ * consults the cache to avoid computing the keygrip again. */
 err = keygripstr_from_pk_file (app, filelistidx.fid,
 filelistidx.iskeypair, keygripstr,
 NULL, NULL);
@@ -1080,6 +1116,7 @@
 
 if (want_keygripstr)
 {
+ /* If the keygrip matches the requested one we are ready. */
 if (!strcmp (keygripstr, want_keygripstr))
 {
 /* Found */
@@ -1087,8 +1124,10 @@
 return 0;
 }
 }
- else
+ else /* No keygrip requested - list all . */
 {
+ /* If a capability has been requested return only keys with
+ * that capability. */
 if (capability == GCRY_PK_USAGE_SIGN)
 {
 if (!filelistidx.issignkey)
@@ -1105,7 +1144,7 @@
 continue;
 }
 
- /* Found */
+ /* Found. Return but save the last idenx of the loop. */
 *idx_p = idx;
 return 0;
 }
@@ -1119,6 +1158,7 @@
 return err;
 }
 
+
 /* Read the certificate with id CERTID (as returned by learn_status in
 the CERTINFO status lines) and return it in the freshly allocated
 buffer put into CERT and the length of the certificate put into
@@ -1127,69 +1167,46 @@
 do_readcert (app_t app, const char *certid,
 unsigned char **cert, size_t *certlen)
 {
- int i, fid;
+ int idx, fid;
 gpg_error_t err;
- int nks_app_id;
 
 *cert = NULL;
 *certlen = 0;
 
- /* Handle the case with KEYGRIP. */
- if (strlen (certid) == 40)
+ /* Handle the case with KEYGRIP. We got a keygrip if the string has
+ * a length of 40 and does not start with an N as in NKS-* */
+ if (certid0 != 'N' && strlen (certid) == 40)
 {
 char keygripstr2*KEYGRIP_LEN+1;
 
- i = -1;
- err = iterate_over_filelist (app, certid, 0, keygripstr, &i);
+ idx = -1;
+ err = iterate_over_filelist (app, certid, 0, keygripstr, &idx);
 if (err)
 return err;
 
- if (filelisti.iskeypair > 0)
- fid = filelisti.iskeypair;
- else
- fid = filelisti.fid;
-
- return readcert_from_ef (app, fid, cert, certlen);
+ /* Switching is not required here because iterate_over_filelist
+ * has already done that. */
 }
+ else /* This is not a keygrip. */
+ {
+ err = parse_keyref (app, certid, 0, &idx);
+ if (err)
+ return err;
 
- if (!strncmp (certid, "NKS-NKS3.", 9))
- nks_app_id = NKS_APP_NKS;
- else if (!strncmp (certid, "NKS-ESIGN.", 10))
- nks_app_id = NKS_APP_ESIGN;
- else if (!strncmp (certid, "NKS-SIGG.", 9))
- nks_app_id = NKS_APP_SIGG;
- else if (!strncmp (certid, "NKS-DF01.", 9))
- nks_app_id = NKS_APP_NKS;
- else if (!strncmp (certid, "NKS-IDLM.", 9))
- nks_app_id = NKS_APP_IDLM;
- else
- return gpg_error (GPG_ERR_INV_ID);
- certid += nks_app_id == NKS_APP_ESIGN? 10 : 9;
-
- err = switch_application (app, nks_app_id);
- if (err)
- return err;
-
- if (!hexdigitp (certid) || !hexdigitp (certid+1)
- || !hexdigitp (certid+2) || !hexdigitp (certid+3)
- || certid4)
- return gpg_error (GPG_ERR_INV_ID);
- fid = xtoi_4 (certid);
- for (i=0; filelisti.fid; i++)
- if ((filelisti.certtype || filelisti.iskeypair > 0)
- && filelisti.nks_app_id == nks_app_id
- && filelisti.fid == fid)
- break;
- if (!filelisti.fid)
- return gpg_error (GPG_ERR_NOT_FOUND);
+ err = switch_application (app, filelistidx.nks_app_id);
+ if (err)
+ return err;
+ }
 
 /* If the requested objects is a plain public key, redirect it to
 the corresponding certificate. The whole system is a bit messy
 because we sometime use the key directly or let the caller
 retrieve the key from the certificate. The rationale for
 that is to support not-yet stored certificates. */
- if (filelisti.iskeypair > 0)
- fid = filelisti.iskeypair;
+ if (filelistidx.iskeypair > 0)
+ fid = filelistidx.iskeypair;
+ else
+ fid = filelistidx.fid;
 
 return readcert_from_ef (app, fid, cert, certlen);
 }
@@ -1265,7 +1282,7 @@
 xfree (buffer0);
 xfree (buffer1);
 }
- else if (strlen (keyid) == 40)
+ else if (keyid0 != 'N' && strlen (keyid) == 40)
 {
 char keygripstr2*KEYGRIP_LEN+1;
 int i = -1;
@@ -1280,7 +1297,6 @@
 {
 char *algostr;
 char usagebuf5;
- int usageidx = 0;
 char id_buf100;
 
 if (app_help_get_keygrip_string_pk (*pk, *pklen, NULL, NULL, NULL,
@@ -1290,15 +1306,7 @@
 snprintf (id_buf, sizeof id_buf, "NKS-%s.%04X",
 get_nks_tag (app, filelisti.nks_app_id),
 filelisti.fid);
- if (filelisti.issignkey)
- usagebufusageidx++ = 's';
- if (filelisti.isauthkey)
- usagebufusageidx++ = 'a';
- if (filelisti.isencrkey)
- usagebufusageidx++ = 'e';
- if (!usageidx)
- usagebufusageidx++ = '-';
- usagebufusageidx = 0;
+ set_usage_string (usagebuf, i);
 send_status_info (ctrl, "KEYPAIRINFO",
 keygripstr, strlen (keygripstr),
 id_buf, strlen (id_buf),
@@ -1390,10 +1398,9 @@
 * writecert it won't harm to flush the entire cache. */
 flush_fid_cache (app);
 
-
 /* The certificates we support all require PW1.CH. Note that we
 * check that the nks_app_id matches which sorts out CERTID values
- * which are subkecy to a different nks_app_id. */
+ * which are subkeys to a different nks_app_id. */
 desc = parse_pwidstr (app, "PW1.CH", 0, &tmp_app_id, &pwid);
 if (!desc || tmp_app_id != nks_app_id)
 return gpg_error (GPG_ERR_INV_ID);
@@ -1401,7 +1408,7 @@
 if (err)
 return err;
 
- /* Select the file and write the certificate. */
+ /* Select the file and write the certificate. */
 err = iso7816_select_file (app_get_slot (app), fid, 0);
 if (err)
 {
@@ -1743,28 +1750,32 @@
 unsigned char data83; /* Must be large enough for a SHA-1 digest
 + the largest OID prefix. */
 size_t datalen;
+ int algo;
+ unsigned int digestlen; /* Length of the hash. */
+ unsigned char oidbuf64;
+ size_t oidbuflen;
 
 (void)ctrl;
 
 switch (indatalen)
 {
- case 20: // plain SHA-1 or RMD160 digest
- case 28: // plain SHA-224 digest
- case 32: // plain SHA-256 digest
- case 48: // plain SHA-384 digest
- case 64: // plain SHA-512 digest
- case 35: // ASN.1 encoded SHA-1 or RMD160 digest
- case 47: // ASN.1 encoded SHA-224 digest
- case 51: // ASN.1 encoded SHA-256 digest
- case 67: // ASN.1 encoded SHA-384 digest
- case 83: // ASN.1 encoded SHA-512 digest
- break;
+ case 20: /* plain SHA-1 or RMD160 digest */
+ case 28: /* plain SHA-224 digest */
+ case 32: /* plain SHA-256 digest */
+ case 48: /* plain SHA-384 digest */
+ case 64: /* plain SHA-512 digest */
+ case 35: /* ASN.1 encoded SHA-1 or RMD160 digest */
+ case 47: /* ASN.1 encoded SHA-224 digest */
+ case 51: /* ASN.1 encoded SHA-256 digest */
+ case 67: /* ASN.1 encoded SHA-384 digest */
+ case 83: /* ASN.1 encoded SHA-512 digest */
+ break;
 default:
- log_debug ("invalid length of input data: %zu\n", indatalen);
+ log_info ("nks: invalid length of input data: %zu\n", indatalen);
 return gpg_error (GPG_ERR_INV_VALUE);
 }
 
- err = find_fid_by_keyref (app, keyidstr, &idx, NULL);
+ err = find_fid_by_keyref (app, keyidstr, &idx, &algo);
 if (err)
 return err;
 
@@ -1783,12 +1794,57 @@
 
 kid = filelistidx.kid;
 
- /* Prepare the DER object from INDATA. */
- if (app->appversion > 2 && (indatalen == 35
- || indatalen == 47
- || indatalen == 51
- || indatalen == 67
- || indatalen == 83))
+ digestlen = gcry_md_get_algo_dlen (hashalgo);
+
+ /* Prepare the input object from INDATA. */
+ if (algo == GCRY_PK_ECC)
+ {
+ if (digestlen != 32 && digestlen != 48 && digestlen != 64)
+ {
+ log_error ("nks: ECC signing not possible: dlen=%u\n", digestlen);
+ return gpg_error (GPG_ERR_DIGEST_ALGO);
+ }
+
+ if (indatalen == digestlen)
+ {
+ /* Already prepared. */
+ datalen = indatalen;
+ log_assert (datalen <= sizeof data);
+ memcpy (data, indata, datalen);
+ }
+ else if (indatalen > digestlen)
+ {
+ /* Assume a PKCS#1 prefix and remove it. */
+ oidbuflen = sizeof oidbuf;
+ err = gcry_md_get_asnoid (hashalgo, &oidbuf, &oidbuflen);
+ if (err)
+ {
+ log_error ("nks: no OID for hash algo %d\n", hashalgo);
+ return gpg_error (GPG_ERR_INTERNAL);
+ }
+ if (indatalen != oidbuflen + digestlen
+ || memcmp (indata, oidbuf, oidbuflen))
+ {
+ log_error ("nks: input data too long for ECC: len=%zu\n",
+ indatalen);
+ return gpg_error (GPG_ERR_INV_VALUE);
+ }
+ datalen = indatalen - oidbuflen;
+ log_assert (datalen <= sizeof data);
+ memcpy (data, (const char*)indata + oidbuflen, datalen);
+ }
+ else
+ {
+ log_error ("nks: input data too short for ECC: len=%zu\n",
+ indatalen);
+ return gpg_error (GPG_ERR_INV_VALUE);
+ }
+ }
+ else if (app->appversion > 2 && (indatalen == 35
+ || indatalen == 47
+ || indatalen == 51
+ || indatalen == 67
+ || indatalen == 83))
 {
 /* Verify that the caller has sent a proper ASN.1 encoded hash
 for RMD160 or SHA-{1,224,256,384,512}. */
@@ -1824,7 +1880,8 @@
 memcpy (data, indata, indatalen);
 datalen = 35;
 }
- /* Concatenate prefix and digest. */
+ /* Concatenate prefix and digest.
+ * Note that the X macro creates an "else if". Ugly - I know. */
 #define X(algo,prefix,plaindigestlen) \
 if ((hashalgo == (algo)) && (indatalen == (plaindigestlen))) \
 { \
@@ -1843,23 +1900,36 @@
 return gpg_error (GPG_ERR_INV_VALUE);
 #undef X
 
- /* Send an MSE for PSO:Computer_Signature. */
- if (app->appversion > 2)
+ /* Send an MSE for PSO:Compute_Signature. */
+ if (app->appversion > 2 && app->app_local->active_nks_app != NKS_APP_ESIGN)
 {
 unsigned char mse6;
+ unsigned int mselen;
 
- mse0 = 0x80; /* Algorithm reference. */
- mse1 = 1;
- mse2 = 2; /* RSA, card does pkcs#1 v1.5 padding, no ASN.1 check. */
- mse3 = 0x84; /* Private key reference. */
- mse4 = 1;
- mse5 = kid;
+ if (algo == GCRY_PK_ECC)
+ {
+ mse0 = 0x84; /* Private key reference. */
+ mse1 = 1;
+ mse2 = kid;
+ mselen = 3;
+ }
+ else /* RSA */
+ {
+ mse0 = 0x80; /* Algorithm reference. */
+ mse1 = 1;
+ mse2 = 2; /* Card does pkcs#1 v1.5 padding, no ASN.1 check. */
+ mse3 = 0x84; /* Private key reference. */
+ mse4 = 1;
+ mse5 = kid;
+ mselen = 6;
+ }
 err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xB6,
- mse, sizeof mse);
+ mse, mselen);
 }
 
- /* We use the Global PIN 1 */
- if (app->appversion == 15)
+ if (app->app_local->active_nks_app == NKS_APP_ESIGN)
+ pwid = 0x81;
+ else if (app->appversion == 15)
 pwid = 0x03;
 else
 pwid = 0x00;
@@ -2333,22 +2403,13 @@
 else
 {
 char idbuf20;
- const char *tagstr;
-
- if (app->app_local->active_nks_app == NKS_APP_ESIGN)
- tagstr = "ESIGN";
- else if (app->app_local->active_nks_app == NKS_APP_SIGG)
- tagstr = "SIGG";
- else if (app->app_local->active_nks_app == NKS_APP_IDLM)
- tagstr = "IDLM";
- else if (app->appversion < 3)
- tagstr = "DF01";
- else
- tagstr = "NKS3";
+ char usagebuf5;
 
 snprintf (idbuf, sizeof idbuf, "NKS-%s.%04X",
- tagstr, filelistidx.fid);
- send_keyinfo (ctrl, data, keygripstr, serialno, idbuf);
+ get_nks_tag (app, app->app_local->active_nks_app),
+ filelistidx.fid);
+ set_usage_string (usagebuf, idx);
+ send_keyinfo (ctrl, data, keygripstr, serialno, idbuf, usagebuf);
 }
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/app-openpgp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/app-openpgp.c Changed

@@ -280,7 +280,7 @@
 unsigned char **outdata, size_t *outdatalen);
 static const char *get_algorithm_attribute_string (const unsigned char *buffer,
 size_t buflen);
-static void parse_algorithm_attribute (app_t app, int keyno);
+static gpg_error_t parse_algorithm_attribute (app_t app, int keyno);
 static gpg_error_t change_keyattr_from_string
 (app_t app, ctrl_t ctrl,
 gpg_error_t (*pincb)(void*, const char *, char **),
@@ -309,6 +309,7 @@
 case 0x000B: return "Feitian Technologies";
 case 0x000D: return "Dangerous Things";
 case 0x000E: return "Excelsecu";
+ case 0x000F: return "Nitrokey";
 
 case 0x002A: return "Magrathea";
 case 0x0042: return "GnuPG e.V.";
@@ -321,6 +322,7 @@
 case 0x63AF: return "Trustica";
 case 0xBA53: return "c-base e.V.";
 case 0xBD0E: return "Paranoidlabs";
+ case 0xCA05: return "Atos CardOS";
 case 0xF1D0: return "CanoKeys";
 case 0xF517: return "FSIJ";
 case 0xF5EC: return "F-Secure";
@@ -423,7 +425,7 @@
 {
 p = xtrymalloc (c->length);
 if (!p)
- return gpg_error (gpg_err_code_from_errno (errno));
+ return gpg_error_from_syserror ();
 memcpy (p, c->data, c->length);
 *result = p;
 }
@@ -867,10 +869,12 @@
 
 #define MAX_ARGS_STORE_FPR 3
 
-/* Note, that FPR must be at least 20 bytes. */
+/* Note, that FPR must be at least 20 bytes. If UPDATE is not set,
+ * the fingerprint and the creation date is not actually stored but
+ * the fingerprint is only returned in FPR. */
 static gpg_error_t
-store_fpr (app_t app, int keynumber, u32 timestamp, unsigned char *fpr,
- int algo, ...)
+store_fpr (app_t app, int update, int keynumber, u32 timestamp,
+ unsigned char *fpr, int algo, ...)
 {
 unsigned int n, nbits;
 unsigned char *buffer, *p;
@@ -935,6 +939,9 @@
 
 xfree (buffer);
 
+ if (!update)
+ return 0;
+
 tag = (app->appversion > 0x0007? 0xC7 : 0xC6) + keynumber;
 flush_cache_item (app, 0xC5);
 tag2 = 0xCE + keynumber;
@@ -1603,7 +1610,8 @@
 
 
 static gpg_error_t
-rsa_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
+rsa_read_pubkey (app_t app, ctrl_t ctrl, int meta_update,
+ u32 created_at, int keyno,
 const unsigned char *data, size_t datalen, gcry_sexp_t *r_sexp)
 {
 gpg_error_t err;
@@ -1640,7 +1648,11 @@
 {
 unsigned char fprbuf20;
 
- err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
+ /* If META_UPDATE is not set we only compute but not store the
+ * fingerprint. This might return a wrong fingerprint if
+ * CREATED_AT is not set. */
+ err = store_fpr (app, meta_update, keyno,
+ created_at, fprbuf, PUBKEY_ALGO_RSA,
 m, mlen, e, elen);
 if (err)
 return err;
@@ -1712,7 +1724,8 @@
 }
 
 static gpg_error_t
-ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
+ecc_read_pubkey (app_t app, ctrl_t ctrl, int meta_update,
+ u32 created_at, int keyno,
 const unsigned char *data, size_t datalen, gcry_sexp_t *r_sexp)
 {
 gpg_error_t err;
@@ -1781,7 +1794,12 @@
 {
 unsigned char fprbuf20;
 
- err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
+ /* If META_UPDATE is not set we only compute but not store the
+ * fingerprint. This might return a wrong fingerprint if
+ * CREATED_AT is not set or the ECDH params do not match the
+ * current defaults. */
+ err = store_fpr (app, meta_update, keyno,
+ created_at, fprbuf, algo, oidbuf, oid_len,
 qbuf, ecc_q_len, ecdh_params (curve), (size_t)4);
 if (err)
 goto leave;
@@ -1824,13 +1842,15 @@
 
 
 /* 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
- CREATED_AT, and fingerprint is written to the card, and key data
- and fingerprint are send back to the client side.
+ * length. Key of KEYNO in APP is updated with an S-expression of
+ * public key. If CTRL is not NULL, the fingerprint is computed with
+ * CREATED_AT and key data and fingerprint are send back to the client
+ * side. If also META_UPDATE is true the fingerprint and the creation
+ * date are also written to the card.
 */
 static gpg_error_t
-read_public_key (app_t app, ctrl_t ctrl, u32 created_at, int keyno,
+read_public_key (app_t app, ctrl_t ctrl, int meta_update,
+ u32 created_at, int keyno,
 const unsigned char *buffer, size_t buflen)
 {
 gpg_error_t err;
@@ -1846,10 +1866,10 @@
 }
 
 if (app->app_local->keyattrkeyno.key_type == KEY_TYPE_RSA)
- err = rsa_read_pubkey (app, ctrl, created_at, keyno,
+ err = rsa_read_pubkey (app, ctrl, meta_update, created_at, keyno,
 data, datalen, &s_pkey);
 else if (app->app_local->keyattrkeyno.key_type == KEY_TYPE_ECC)
- err = ecc_read_pubkey (app, ctrl, created_at, keyno,
+ err = ecc_read_pubkey (app, ctrl, meta_update, created_at, keyno,
 data, datalen, &s_pkey);
 else
 err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
@@ -1861,7 +1881,7 @@
 
 len = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
 keybuf = xtrymalloc (len);
- if (!data)
+ if (!keybuf)
 {
 err = gpg_error_from_syserror ();
 gcry_sexp_release (s_pkey);
@@ -1945,14 +1965,19 @@
 /* Yubikey returns wrong code. Fix it up. */
 if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY)
 err = gpg_error (GPG_ERR_NO_OBJ);
-	 /* Yubikey NEO (!CARDTYPE_YUBIKEY) also returns wrong code. Fix it up. */
+	 /* Yubikey NEO (!CARDTYPE_YUBIKEY) also returns wrong code.
+ * Fix it up. */
 	 else if (gpg_err_code (err) == GPG_ERR_CARD)
 err = gpg_error (GPG_ERR_NO_OBJ);
 log_error (_("reading public key failed: %s\n"), gpg_strerror (err));
 goto leave;
 }
 
- err = read_public_key (app, NULL, 0U, keyno, buffer, buflen);
+ /* Note that we use 0 for the creation date and thus the - via
+ * status lines - returned fingerprint will only be valid if the
+ * key has also been created with that date. A similar problem
+ * occurs with the ECDH params which are fixed in the code. */
+ err = read_public_key (app, NULL, 0, 0U, keyno, buffer, buflen);
 }
 else
 {
@@ -2042,6 +2067,21 @@
 }
 
 
+static const char *
+get_usage_string (int keyno)
+{
+ const char *usage;
+ switch (keyno)
+ {
+ case 0: usage = "sc"; break;
+ case 1: usage = "e"; break;
+ case 2: usage = "sa"; break;
+ default: usage = "-"; break;
+ }
+ return usage;
+}
+
+
 /* Send the KEYPAIRINFO back. KEY needs to be in the range 1,3.
 This is used by the LEARN command. */
 static gpg_error_t
@@ -2061,13 +2101,7 @@
 if (!app->app_local->pkkeyno.key)
 goto leave; /* No such key - ignore. */
 
- switch (keyno)
- {
- case 0: usage = "sc"; break;
- case 1: usage = "e"; break;
- case 2: usage = "sa"; break;
- default: usage = "-"; break;
- }
+ usage = get_usage_string (keyno);
 
 if (retrieve_fprtime_from_card (app, keyno, &fprtime))
 fprtime = 0;
@@ -2256,7 +2290,28 @@
 
 *cert = NULL;
 *certlen = 0;
- if (!ascii_strcasecmp (certid, "OPENPGP.3"))
+ if (strlen (certid) == 40)
+ {
+ int keyno;
+ const unsigned char *keygrip_str;
+
+ for (keyno = 0; keyno < 3; keyno++)
+ {
+ keygrip_str = app->app_local->pkkeyno.keygrip_str;
+ if (!strncmp (keygrip_str, certid, 40))
+ break;
+ }
+
+ if (keyno == 2)
+ ;
+ else if (keyno == 1)
+ occurrence = 1;
+ else if (keyno == 0)
+ occurrence = 2;
+ else
+ return gpg_error (GPG_ERR_INV_ID);
+ }
+ else if (!ascii_strcasecmp (certid, "OPENPGP.3"))
 ;
 else if (!ascii_strcasecmp (certid, "OPENPGP.2"))
 occurrence = 1;
@@ -3939,7 +3994,7 @@
 else
 log_info ("key attribute of OPENPGP.%d changed\n", keyno+1);
 flush_cache (app);
- parse_algorithm_attribute (app, keyno);
+ err = parse_algorithm_attribute (app, keyno);
 app->did_chv1 = 0;
 app->did_chv2 = 0;
 app->did_chv3 = 0;
@@ -4488,7 +4543,7 @@
 goto leave;
 }
 
- err = store_fpr (app, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
+ err = store_fpr (app, 1, keyno, created_at, fprbuf, PUBKEY_ALGO_RSA,
 rsa_n, rsa_n_len, rsa_e, rsa_e_len);
 if (err)
 goto leave;
@@ -4513,6 +4568,8 @@
 const unsigned char *ecc_q = NULL;
 const unsigned char *ecc_d = NULL;
 size_t ecc_q_len, ecc_d_len;
+ const unsigned char *ecdh_param = NULL;
+ size_t ecdh_param_len = 0;
 const char *curve = NULL;
 u32 created_at = 0;
 const char *oidstr;
@@ -4525,7 +4582,7 @@
 unsigned char fprbuf20;
 size_t ecc_d_fixed_len;
 
- /* (private-key(ecc(curve%s)(q%m)(d%m))(created-at%d)):
+ /* (private-key(ecc(curve%s)(q%m)(d%m))(created-at%d)(ecdh-params%s)):
 curve = "NIST P-256" */
 /* (private-key(ecc(curve%s)(q%m)(d%m))(created-at%d)):
 curve = "secp256k1" */
@@ -4620,6 +4677,7 @@
 }
 if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
 goto leave;
+
 if (tok && toklen == 10 && !memcmp ("created-at", tok, toklen))
 {
 if ((err = parse_sexp (&buf,&buflen,&depth,&tok,&toklen)))
@@ -4631,6 +4689,17 @@
 created_at = created_at*10 + (*tok - '0');
 }
 }
+ else if (tok && toklen == 11 && !memcmp ("ecdh-params", tok, toklen))
+ {
+ if ((err = parse_sexp (&buf,&buflen,&depth,&tok,&toklen)))
+ goto leave;
+ if (tok)
+ {
+ ecdh_param = tok;
+ ecdh_param_len = toklen;
+ }
+ }
+
 /* Skip until end of list. */
 last_depth2 = depth;
 while (!(err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen))
@@ -4662,6 +4731,13 @@
 else
 algo = PUBKEY_ALGO_ECDSA;
 
+ if (algo == PUBKEY_ALGO_ECDH && !ecdh_param)
+ {
+ log_error ("opgp: ecdh parameters missing\n");
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto leave;
+ }
+
 oidstr = openpgp_curve_to_oid (curve, &n, NULL);
 ecc_d_fixed_len = (n+7)/8;
 err = openpgp_oid_from_str (oidstr, &oid);
@@ -4763,8 +4839,8 @@
 goto leave;
 }
 
- err = store_fpr (app, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
- ecc_q, ecc_q_len, ecdh_params (curve), (size_t)4);
+ err = store_fpr (app, 1, keyno, created_at, fprbuf, algo, oidbuf, oid_len,
+ ecc_q, ecc_q_len, ecdh_param, ecdh_param_len);
 
 leave:
 gcry_mpi_release (oid);
@@ -4792,6 +4868,7 @@
 const unsigned char *buf, *tok;
 size_t buflen, toklen;
 int depth;
+ char *algostr = NULL;
 
 (void)ctrl;
 
@@ -4834,17 +4911,41 @@
 goto leave;
 if ((err = parse_sexp (&buf, &buflen, &depth, &tok, &toklen)))
 goto leave;
- if (tok && toklen == 3 && memcmp ("rsa", tok, toklen) == 0)
- err = rsa_writekey (app, ctrl, pincb, pincb_arg, keyno, buf, buflen, depth);
- else if (tok && toklen == 3 && memcmp ("ecc", tok, toklen) == 0)
- err = ecc_writekey (app, ctrl, pincb, pincb_arg, keyno, buf, buflen, depth);
+
+ if (tok && toklen == 3 && (!memcmp ("rsa", tok, toklen)
+ || !memcmp ("ecc", tok, toklen)))
+ {
+ gcry_sexp_t stmp;
+ if (!gcry_sexp_new (&stmp, keydata, keydatalen, 0))
+ algostr = pubkey_algo_string (stmp, NULL);
+ else
+ algostr = NULL;
+ gcry_sexp_release (stmp);
+ if (app->app_local->keyattrkeyno.keyalgo && algostr
+ && strcmp (app->app_local->keyattrkeyno.keyalgo, algostr))
+ {
+ log_info ("openpgp: changing key attribute from %s to %s\n",
+ app->app_local->keyattrkeyno.keyalgo, algostr);
+ err = change_keyattr_from_string (app, ctrl, pincb, pincb_arg,
+ keyid, algostr, NULL, 0);
+ if (err)
+ return err;
+ }
+
+ if (*tok == 'r')
+ err = rsa_writekey (app, ctrl, pincb, pincb_arg, keyno,
+ buf,buflen,depth);
+ else
+ err = ecc_writekey (app, ctrl, pincb, pincb_arg, keyno,
+ buf, buflen, depth);
+ }
 else
 {
 err = gpg_error (GPG_ERR_WRONG_PUBKEY_ALGO);
- goto leave;
 }
 
 leave:
+ xfree (algostr);
 return err;
 }
 
@@ -4967,7 +5068,7 @@
 send_status_info (ctrl, "KEY-CREATED-AT",
 numbuf, (size_t)strlen(numbuf), NULL, 0);
 
- err = read_public_key (app, ctrl, created_at, keyno, buffer, buflen);
+ err = read_public_key (app, ctrl, 1, created_at, keyno, buffer, buflen);
 leave:
 xfree (buffer);
 return err;
@@ -5919,12 +6020,13 @@
 int data, int i)
 {
 char idbuf50;
+ const char *usage = get_usage_string (i);
 
 if (app->app_local->pki.read_done)
 {
 sprintf (idbuf, "OPENPGP.%d", i+1);
 send_keyinfo (ctrl, data,
- app->app_local->pki.keygrip_str, serial, idbuf);
+ app->app_local->pki.keygrip_str, serial, idbuf, usage);
 }
 }
 
@@ -6157,7 +6259,7 @@
 
 /* Parse and optionally show the algorithm attributes for KEYNO.
 KEYNO must be in the range 0..2. */
-static void
+static gpg_error_t
 parse_algorithm_attribute (app_t app, int keyno)
 {
 unsigned char *buffer;
@@ -6167,6 +6269,7 @@
 enum gcry_pk_algos galgo;
 unsigned int nbits;
 const char *curve;
+ gpg_error_t err = 0;
 
 log_assert (keyno >=0 && keyno <= 2);
 
@@ -6177,13 +6280,13 @@
 if (!relptr)
 {
 log_error ("error reading DO 0x%02X\n", 0xc1+keyno);
- return;
+ return gpg_error (GPG_ERR_CARD);
 }
 if (buflen < 1)
 {
 log_error ("error reading DO 0x%02X\n", 0xc1+keyno);
 xfree (relptr);
- return;
+ return gpg_error (GPG_ERR_CARD);
 }
 
 if (opt.verbose)
@@ -6226,17 +6329,34 @@
 app->app_local->keyattrkeyno.ecc.algo = *buffer;
 app->app_local->keyattrkeyno.ecc.flags = 0;
 
- if (bufferbuflen-1 == 0x00 || bufferbuflen-1 == 0xff)
- { /* Found "pubkey required"-byte for private key template. */
- oidlen--;
- if (bufferbuflen-1 == 0xff)
- app->app_local->keyattrkeyno.ecc.flags |= ECC_FLAG_PUBKEY;
+ if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY)
+ {
+ /* Yubikey implementations vary.
+ * Firmware version 5.2 returns "pubkey required"-byte with
+ * 0x00, but after removal and second time insertion, it
+ * returns bogus value there.
+ * Firmware version 5.4 returns none.
+ */
+ curve = ecc_curve (buffer + 1, oidlen);
+ if (!curve)
+ curve = ecc_curve (buffer + 1, oidlen - 1);
+ }
+ else
+ {
+ if (bufferbuflen-1 == 0x00 || bufferbuflen-1 == 0xff)
+ { /* Found "pubkey required"-byte for private key template. */
+ oidlen--;
+ if (bufferbuflen-1 == 0xff)
+ app->app_local->keyattrkeyno.ecc.flags |= ECC_FLAG_PUBKEY;
+ }
+ curve = ecc_curve (buffer + 1, oidlen);
 }
-
- curve = ecc_curve (buffer + 1, oidlen);
 
 if (!curve)
- log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
+ {
+ log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
+ err = gpg_error (GPG_ERR_CARD);
+ }
 else
 {
 app->app_local->keyattrkeyno.key_type = KEY_TYPE_ECC;
@@ -6266,6 +6386,7 @@
 desckeyno, app->app_local->keyattrkeyno.keyalgo);
 
 xfree (relptr);
+ return err;
 }
 
 
@@ -6336,16 +6457,16 @@
 app_select_openpgp (app_t app)
 {
 int slot = app_get_slot (app);
- int rc;
+ gpg_error_t err;
 unsigned char *buffer;
 size_t buflen;
 void *relptr;
 
 /* Note that the card can't cope with P2=0xCO, thus we need to pass a
 special flag value. */
- rc = iso7816_select_application (slot,
- openpgp_aid, sizeof openpgp_aid, 0x0001);
- if (!rc)
+ err = iso7816_select_application (slot,
+ openpgp_aid, sizeof openpgp_aid, 0x0001);
+ if (!err)
 {
 unsigned int manufacturer;
 
@@ -6361,8 +6482,8 @@
 replace a possibly already set one from a EF.GDO with this
 one. Note, that for current OpenPGP cards, no EF.GDO exists
 and thus it won't matter at all. */
- rc = iso7816_get_data (slot, 0, 0x004F, &buffer, &buflen);
- if (rc)
+ err = iso7816_get_data (slot, 0, 0x004F, &buffer, &buflen);
+ if (err)
 goto leave;
 if (opt.verbose)
 {
@@ -6396,7 +6517,7 @@
 app->app_local = xtrycalloc (1, sizeof *app->app_local);
 if (!app->app_local)
 {
- rc = gpg_error (gpg_err_code_from_errno (errno));
+ err = gpg_error_from_syserror ();
 goto leave;
 }
 
@@ -6430,6 +6551,7 @@
 {
 log_error (_("can't access %s - invalid OpenPGP card?\n"),
 "CHV Status Bytes");
+ err = gpg_error (GPG_ERR_CARD);
 goto leave;
 }
 app->force_chv1 = (buflen && *buffer == 0);
@@ -6441,6 +6563,7 @@
 {
 log_error (_("can't access %s - invalid OpenPGP card?\n"),
 "Extended Capability Flags" );
+ err = gpg_error (GPG_ERR_CARD);
 goto leave;
 }
 if (buflen)
@@ -6491,9 +6614,13 @@
 if (opt.verbose)
 show_caps (app->app_local);
 
- parse_algorithm_attribute (app, 0);
- parse_algorithm_attribute (app, 1);
- parse_algorithm_attribute (app, 2);
+ err = parse_algorithm_attribute (app, 0);
+ if (!err)
+ err = parse_algorithm_attribute (app, 1);
+ if (!err)
+ err = parse_algorithm_attribute (app, 2);
+ if (err)
+ goto leave;
 
 if (opt.verbose > 1)
 dump_all_do (slot);
@@ -6522,7 +6649,7 @@
 }
 
 leave:
- if (rc)
+ if (err)
 do_deinit (app);
- return rc;
+ return err;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/app-p15.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/app-p15.c Changed

@@ -87,7 +87,8 @@
 CARD_PRODUCT_UNKNOWN,
 CARD_PRODUCT_RSCS, /* Rohde&Schwarz Cybersecurity */
 CARD_PRODUCT_DTRUST, /* D-Trust GmbH (bundesdruckerei.de) */
- CARD_PRODUCT_GENUA /* GeNUA mbH */
+ CARD_PRODUCT_GENUA, /* GeNUA mbH */
+ CARD_PRODUCT_NEXUS /* Technology Nexus */
 }
 card_product_t;
 
@@ -326,7 +327,7 @@
 char *serial_number;
 
 /* KDF/KEK parameter for OpenPGP's ECDH. First byte is zero if not
- * available. .*/
+ * available. */
 unsigned char ecdh_kdf4;
 
 /* Length and allocated buffer with the Id of this object. */
@@ -481,7 +482,7 @@
 unsigned short auth_objects;
 } odf;
 
- /* The PKCS#15 serialnumber from EF(TokeiNFo) or NULL. Malloced. */
+ /* The PKCS#15 serialnumber from EF(TokenInfo) or NULL. Malloced. */
 unsigned char *serialno;
 size_t serialnolen;
 
@@ -550,6 +551,7 @@
 case CARD_PRODUCT_RSCS: return "R&S";
 case CARD_PRODUCT_DTRUST: return "D-Trust";
 case CARD_PRODUCT_GENUA: return "GeNUA";
+ case CARD_PRODUCT_NEXUS: return "Nexus";
 }
 return "";
 }
@@ -708,7 +710,7 @@
 unsigned char **buffer, size_t *buflen, int *r_sw)
 {
 gpg_error_t err;
- int sw;
+ int sw = 0;
 
 if (r_sw)
 *r_sw = 0x9000;
@@ -744,7 +746,15 @@
 /* On CardOS with a Linear TLV file structure the records starts
 * with some tag (often the record number) followed by the length
 * byte for this record. Detect and remove this prefix. */
- if (*buflen > 2 && (*buffer)0 != 0x30 && (*buffer)1 == *buflen - 2)
+ if (*buflen == 2 && !(*buffer)0 && !(*buffer)1)
+ ; /* deleted record. */
+ else if (*buflen > 3 && (*buffer)0 == 0xff
+ && buf16_to_uint ((*buffer)+1) == *buflen - 3)
+ {
+ memmove (*buffer, *buffer + 3, *buflen - 3);
+ *buflen = *buflen - 3;
+ }
+ else if (*buflen > 2 && (*buffer)0 != 0x30 && (*buffer)1 == *buflen - 2)
 {
 memmove (*buffer, *buffer + 2, *buflen - 2);
 *buflen = *buflen - 2;
@@ -1771,6 +1781,9 @@
 starting with 0x00 or 0xff as these values are commonly used to
 pad data blocks and are no valid ASN.1 encoding. Note the
 special handling for record mode at the end of the loop. */
+ if (record_mode && buflen == 2 && !buffer0 && !buffer1)
+ goto next_record; /* Deleted record - continue with next */
+
 while (n && *p && *p != 0xff)
 {
 const unsigned char *pp;
@@ -2028,6 +2041,8 @@
 err = 0;
 goto leave;
 }
+ if (buflen == 2 && !buffer0 && !buffer1)
+ goto next_record; /* Deleted record - continue with next */
 p = buffer;
 n = buflen;
 }
@@ -2077,6 +2092,9 @@
 * starting with 0x00 or 0xff as these values are commonly used to
 * pad data blocks and are no valid ASN.1 encoding. Note the
 * special handling for record mode at the end of the loop. */
+ if (record_mode && buflen == 2 && !buffer0 && !buffer1)
+ goto next_record; /* Deleted record - continue with next */
+
 while (n && *p && *p != 0xff)
 {
 const unsigned char *pp;
@@ -2354,6 +2372,8 @@
 err = 0;
 goto leave;
 }
+ if (buflen == 2 && !buffer0 && !buffer1)
+ goto next_record; /* Deleted record - continue with next */
 p = buffer;
 n = buflen;
 }
@@ -2404,6 +2424,9 @@
 starting with 0x00 or 0xff as these values are commonly used to
 pad data blocks and are no valid ASN.1 encoding. Note the
 special handling for record mode at the end of the loop. */
+ if (record_mode && buflen == 2 && !buffer0 && !buffer1)
+ goto next_record; /* Deleted record - continue with next */
+
 while (n && *p && *p != 0xff)
 {
 const unsigned char *pp;
@@ -2625,8 +2648,8 @@
 err = 0;
 
 next_record:
- xfree (authid);
- xfree (label);
+ xfree (authid); authid = NULL;
+ xfree (label); label = NULL;
 /* If the card uses a record oriented file structure, read the
 * next record. Otherwise we keep on parsing the current buffer. */
 recno++;
@@ -2635,11 +2658,14 @@
 xfree (buffer); buffer = NULL;
 err = select_and_read_record (app, 0, recno, "CDF",
 &buffer, &buflen, NULL);
- if (err) {
- if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
- err = 0;
- goto leave;
- }
+ if (err)
+ {
+ if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
+ err = 0;
+ goto leave;
+ }
+ if (buflen == 2 && !buffer0 && !buffer1)
+ goto next_record; /* Deleted record - continue with next */
 p = buffer;
 n = buflen;
 }
@@ -2728,6 +2754,9 @@
 starting with 0x00 or 0xff as these values are commonly used to
 pad data blocks and are no valid ASN.1 encoding. Note the
 special handling for record mode at the end of the loop. */
+ if (record_mode && buflen == 2 && !buffer0 && !buffer1)
+ goto next_record; /* Deleted record - continue with next */
+
 while (n && *p && *p != 0xff)
 {
 const unsigned char *pp;
@@ -3299,6 +3328,8 @@
 err = 0;
 goto leave;
 }
+ if (buflen == 2 && !buffer0 && !buffer1)
+ goto next_record; /* Deleted record - continue with next */
 p = buffer;
 n = buflen;
 }
@@ -3576,18 +3607,20 @@
 
 release_lists (app);
 
- if (IS_CARDOS_5 (app)
- && app->app_local->manufacturer_id
- && !ascii_strcasecmp (app->app_local->manufacturer_id, "GeNUA mbH")
- && !app->app_local->no_extended_mode)
+ /* Set a product type from the manufacturer_id. */
+ if (IS_CARDOS_5 (app) && app->app_local->manufacturer_id)
 {
- if (!app->app_local->card_product)
+ const char *manu = app->app_local->manufacturer_id;
+
+ if (app->app_local->card_product)
+ ; /* Already set. */
+ else if (!ascii_strcasecmp (manu, "GeNUA mbH"))
 app->app_local->card_product = CARD_PRODUCT_GENUA;
- if (opt.verbose)
- log_info ("p15: disabling extended mode based on TokenInfo\n");
- app->app_local->no_extended_mode = 1;
+ else if (!ascii_strcasecmp (manu, "Technology Nexus"))
+ app->app_local->card_product = CARD_PRODUCT_NEXUS;
 }
 
+
 /* Read the ODF so that we know the location of all directory
 files. */
 /* Fixme: We might need to get a non-standard ODF FID from TokenInfo. */
@@ -4114,6 +4147,47 @@
 }
 
 
+static void
+set_usage_string (char usage5, prkdf_object_t prkdf)
+{
+ size_t usagelen = 0;
+ if (prkdf->gpgusage.any)
+ {
+ if (prkdf->gpgusage.sign)
+ usageusagelen++ = 's';
+ if (prkdf->gpgusage.cert)
+ usageusagelen++ = 'c';
+ if (prkdf->gpgusage.encr)
+ usageusagelen++ = 'e';
+ if (prkdf->gpgusage.auth)
+ usageusagelen++ = 'a';
+ }
+ else
+ {
+ if ((prkdf->usageflags.sign
+ || prkdf->usageflags.sign_recover
+ || prkdf->usageflags.non_repudiation)
+ && (!prkdf->extusage.valid
+ || prkdf->extusage.sign))
+ usageusagelen++ = 's';
+ if ((prkdf->usageflags.sign
+ || prkdf->usageflags.sign_recover)
+ && (!prkdf->extusage.valid || prkdf->extusage.sign))
+ usageusagelen++ = 'c';
+ if ((prkdf->usageflags.decrypt
+ || prkdf->usageflags.unwrap)
+ && (!prkdf->extusage.valid || prkdf->extusage.encr))
+ usageusagelen++ = 'e';
+ if ((prkdf->usageflags.sign
+ || prkdf->usageflags.sign_recover)
+ && (!prkdf->extusage.valid || prkdf->extusage.auth))
+ usageusagelen++ = 'a';
+ }
+ if (!usagelen)
+ usageusagelen++ = '-';
+ usageusagelen++ = 0;
+}
+
 /* Helper to do_learn_status: Send information about all known
 keypairs back. FIXME: much code duplication from
 send_certinfo(). */
@@ -4144,40 +4218,6 @@
 char usage5;
 char keytime20;
 const char *algostr;
- size_t usagelen = 0;
-
- if (prkdf->gpgusage.any)
- {
- if (prkdf->gpgusage.sign)
- usageusagelen++ = 's';
- if (prkdf->gpgusage.cert)
- usageusagelen++ = 'c';
- if (prkdf->gpgusage.encr)
- usageusagelen++ = 'e';
- if (prkdf->gpgusage.auth)
- usageusagelen++ = 'a';
- }
- else
- {
- if ((prkdf->usageflags.sign
- || prkdf->usageflags.sign_recover
- || prkdf->usageflags.non_repudiation)
- && (!prkdf->extusage.valid
- || prkdf->extusage.sign))
- usageusagelen++ = 's';
- if ((prkdf->usageflags.sign
- || prkdf->usageflags.sign_recover)
- && (!prkdf->extusage.valid || prkdf->extusage.sign))
- usageusagelen++ = 'c';
- if ((prkdf->usageflags.decrypt
- || prkdf->usageflags.unwrap)
- && (!prkdf->extusage.valid || prkdf->extusage.encr))
- usageusagelen++ = 'e';
- if ((prkdf->usageflags.sign
- || prkdf->usageflags.sign_recover)
- && (!prkdf->extusage.valid || prkdf->extusage.auth))
- usageusagelen++ = 'a';
- }
 
 log_assert (strlen (prkdf->keygrip) == 40);
 if (prkdf->keytime && prkdf->have_keytime)
@@ -4188,10 +4228,11 @@
 
 algostr = prkdf->keyalgostr;
 
+ set_usage_string (usage, prkdf);
 send_status_info (ctrl, "KEYPAIRINFO",
 prkdf->keygrip, 2*KEYGRIP_LEN,
 buf, strlen (buf),
- usage, usagelen,
+ usage, strlen (usage),
 keytime, strlen (keytime),
 algostr, strlen (algostr?algostr:""),
 NULL, (size_t)0);
@@ -4292,6 +4333,27 @@
 return 0;
 }
 
+ if (DBG_CARD)
+ {
+ log_info ("p15: Reading CDF: id=");
+ for (i=0; i < cdf->objidlen; i++)
+ log_printf ("%02X", cdf->objidi);
+ if (cdf->label)
+ log_printf (" (%s)", cdf->label);
+ log_info ("p15: path=");
+ for (i=0; i < cdf->pathlen; i++)
+ log_printf ("%s%04hX", i?"/":"", cdf->pathi);
+ if (cdf->have_off)
+ log_printf ("%lu/%lu", cdf->off, cdf->len);
+ if (cdf->authid)
+ {
+ log_printf (" authid=");
+ for (i=0; i < cdf->authidlen; i++)
+ log_printf ("%02X", cdf->authidi);
+ }
+ log_printf ("\n");
+ }
+
 /* Read the entire file. fixme: This could be optimized by first
 reading the header to figure out how long the certificate
 actually is. */
@@ -4299,7 +4361,7 @@
 if (err)
 goto leave;
 
- if (app->app_local->no_extended_mode)
+ if (app->app_local->no_extended_mode || !cdf->len)
 err = iso7816_read_binary_ext (app_get_slot (app), 0, cdf->off, 0,
 &buffer, &buflen, NULL);
 else
@@ -4986,7 +5048,18 @@
 {
 const unsigned char *s;
 
- for (s = string; *string; string++)
+ for (s = string; *s; s++)
+ if (*s <= 0x20 || *s >= 0x7f)
+ return 1;
+ return 0;
+}
+
+static int
+any_control_or_space_mem (const void *buffer, size_t buflen)
+{
+ const unsigned char *s;
+
+ for (s = buffer; buflen; s++, buflen--)
 if (*s <= 0x20 || *s >= 0x7f)
 return 1;
 return 0;
@@ -4999,11 +5072,14 @@
 get_dispserialno (app_t app, prkdf_object_t prkdf)
 {
 char *serial;
+ const unsigned char *s;
+ int i;
 size_t n;
 
 /* 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. */
+ * prompts) or has any control character. For some cards we use a
+ * different strategy. */
 if (app->app_local->card_product == CARD_PRODUCT_RSCS)
 {
 /* We use only the right 8 hex digits. */
@@ -5011,6 +5087,26 @@
 if (serial && (n=strlen (serial)) > 8)
 memmove (serial, serial + n - 8, 9);
 }
+ else if (app->app_local->card_product == CARD_PRODUCT_NEXUS
+ && APP_CARD(app)->serialno && APP_CARD(app)->serialnolen == 4+9
+ && !memcmp (APP_CARD(app)->serialno, "\xff\x00\x00\xff", 4)
+ && !any_control_or_space_mem (APP_CARD(app)->serialno + 4, 9))
+ {
+ /* Sample: ff0000ff354830313232363537 -> "5H01 2265 7" */
+ serial = xtrymalloc (9+2+1);
+ if (serial)
+ {
+ s = APP_CARD(app)->serialno + 4;
+ for (i=0; i < 4; i++)
+ seriali = *s++;
+ seriali++ = ' ';
+ for (; i < 9; i++)
+ seriali = *s++;
+ seriali++ = ' ';
+ seriali++ = *s;
+ seriali = 0;
+ }
+ }
 else if (prkdf && prkdf->serial_number && *prkdf->serial_number
 && !strchr (prkdf->serial_number, '%')
 && !any_control_or_space (prkdf->serial_number))
@@ -5021,6 +5117,7 @@
 {
 serial = app_get_serialno (app);
 }
+
 return serial;
 }
 
@@ -5120,6 +5217,7 @@
 const char *errstr;
 const char *s;
 int remaining;
+ unsigned int min_length;
 int pin_reference;
 int verified = 0;
 int i;
@@ -5133,8 +5231,8 @@
 {
 /* We know that this card supports a verify status check. Note
 * that in contrast to PIV cards ISO7816_VERIFY_NOT_NEEDED is
- * not supported. Noet that we don't use the pin_verified cache
- * status because that is not as reliable than to ask the card
+ * not supported. We also don't use the pin_verified cache
+ * status because that is not as reliable as to ask the card
 * about its state. */
 if (prkdf) /* Clear the cache which we don't use. */
 prkdf->pin_verified = 0;
@@ -5186,12 +5284,16 @@
 }
 
 /* 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)
+ min_length etc. are exactly defined, for now we take them as a
+ plain octet count. For RSCS we enforce 6 despite that some cards
+ give 4 has min. length. */
+ min_length = aodf->min_length;
+ if (app->app_local->card_product == CARD_PRODUCT_RSCS && min_length < 6)
+ min_length = 6;
+
+ if (strlen (pinvalue) < min_length)
 {
- log_error ("p15: PIN is too short; minimum length is %lu\n",
- aodf->min_length);
+ log_error ("p15: PIN is too short; minimum length is %u\n", min_length);
 err = gpg_error (GPG_ERR_BAD_PIN);
 }
 else if (aodf->stored_length && strlen (pinvalue) > aodf->stored_length)
@@ -5519,11 +5621,12 @@
 err = gpg_error_from_syserror ();
 goto leave;
 }
- if (app->app_local->card_type == CARD_TYPE_BELPIC)
+ if (app->app_local->card_type == CARD_TYPE_BELPIC
+ || app->app_local->card_product == CARD_PRODUCT_NEXUS)
 {
- /* This card wants only the plain hash w/o any prefix. */
- /* FIXME: We may want to remove this code because it is unlikely
- * that such cards are still in use. */
+ /* The default for these cards is to use a plain hash. We
+ * assume that due to the used certificate the correct hash
+ * algo is used. */
 memcpy (frame, indata, indatalen);
 framelen = indatalen;
 }
@@ -5963,6 +6066,7 @@
 else if (!want_keygripstr || !strcmp (prkdf->keygrip, want_keygripstr))
 {
 char *keyref;
+ char usage5;
 
 if (capability == GCRY_PK_USAGE_SIGN)
 {
@@ -5988,7 +6092,8 @@
 goto leave;
 }
 
- send_keyinfo (ctrl, as_data, prkdf->keygrip, serialno, keyref);
+ set_usage_string (usage, prkdf);
+ send_keyinfo (ctrl, as_data, prkdf->keygrip, serialno, keyref, usage);
 xfree (keyref);
 if (want_keygripstr)
 {

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/app-piv.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/app-piv.c Changed

@@ -928,7 +928,7 @@
   tmpl12 = 0x81;
   tmpl13 = 8;
   gcry_create_nonce (tmpl+14, 8);
-  tmpl22 = 0x80;
+  tmpl22 = 0x82;
   tmpl23 = 0;
   tmpllen = 24;
   xfree (outdata);
@@ -1039,7 +1039,7 @@
     int special;               /* Special mode to use for thus NAME.  */
   } table = {
     /* Authenticate using the PIV Card Application Administration Key
-     * (0x0B).  Note that Yubico calls this key the "management key"
+     * (0x9B).  Note that Yubico calls this key the "management key"
      * which we don't do because that term is too similar to "Cert
      * Management Key" (0x9D).  */
     { "AUTH-ADM-KEY", 0x0000, 0x0000, 1 },
@@ -1516,7 +1516,7 @@
                      gpg_strerror (err));
           goto leave;
         }
-      usage = dobj->usage? dobj->usage : "";
+      usage = dobj->usage? dobj->usage : "-";
 
       snprintf (idbuf, sizeof idbuf, "PIV.%s", dobj->keyref);
       send_status_info (ctrl, "KEYPAIRINFO",
@@ -3529,6 +3529,13 @@
         }
       else if (!want_keygripstr || !strcmp (keygripstr, want_keygripstr))
         {
+          const char *usage;
+
+          if (data_objectsi.usage)
+            usage = data_objectsi.usage;
+          else
+            usage = "-";
+
           if (capability == GCRY_PK_USAGE_SIGN)
             {
               if (strcmp (data_objectsi.keyref, "9C"))
@@ -3546,7 +3553,7 @@
             }
 
           snprintf (idbuf, sizeof idbuf, "PIV.%s", data_objectsi.keyref);
-          send_keyinfo (ctrl, data, keygripstr, serialno, idbuf);
+          send_keyinfo (ctrl, data, keygripstr, serialno, idbuf, usage);
           if (want_keygripstr)
             {
               err = 0; /* Found */

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/app-sc-hsm.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/app-sc-hsm.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/app.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/app.c Changed

@@ -1606,9 +1606,13 @@
   /*
    * Only when a user is using Yubikey with pcsc-shared configuration,
    * we need this detection.  Otherwise, the card/token is under full
-   * control of scdaemon, there's no problem at all.
+   * control of scdaemon, there's no problem at all.  However, if the
+   * APDU command has been used we better also check whether the AID
+   * is still valid.
    */
-  if (!opt.pcsc_shared || app->card->cardtype != CARDTYPE_YUBIKEY)
+  if (app && app->card && app->card->maybe_check_aid)
+    app->card->maybe_check_aid = 0;
+  else if (!opt.pcsc_shared || app->card->cardtype != CARDTYPE_YUBIKEY)
     return 0;
 
   if (app->fnc.check_aid)
@@ -1646,6 +1650,20 @@
 
   if (!card->app)
     return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
+
+  if (card->maybe_check_aid && card->app->fnc.reselect
+      && check_external_interference (card->app, ctrl))
+    {
+      if (DBG_APP)
+        log_debug ("slot %d, app %s: forced re-select due to direct APDU use\n",
+                   card->slot, xstrapptype (card->app));
+      err = card->app->fnc.reselect (card->app, ctrl);
+      if (err)
+        log_error ("slot %d, app %s: forced re-select failed: %s - ignored\n",
+                   card->slot, xstrapptype (card->app), gpg_strerror (err));
+      err = 0;
+    }
+
   if (!ctrl->current_apptype)
     {
       /* For whatever reasons the current apptype has not been set -

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/ccid-driver.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/ccid-driver.c Changed

@@ -166,6 +166,11 @@
 
 #endif /* This source is not used by scdaemon. */
 
+#undef USE_LIBUSB_DEBUG_CB
+#if LIBUSB_API_VERSION >= 0x01000107
+# define USE_LIBUSB_DEBUG_CB 1
+#endif
+
 
 #ifndef EAGAIN
 #define EAGAIN  EWOULDBLOCK
@@ -1231,6 +1236,23 @@
 }
 
 
+#ifdef USE_LIBUSB_DEBUG_CB
+static void
+debug_libusb_cb (libusb_context *ctx, enum libusb_log_level level,
+                 const char *str)
+{
+  int n = str? strlen (str):0;
+
+  (void)ctx;
+
+  /* Strip the LF so that our logging filter does not escape it.  */
+  if (n && strn-1 == '\n')
+    n--;
+  log_debug ("libusb{%d}: %.*s\n", level, n, str);
+}
+#endif /* USE_LIBUSB_DEBUG_CB */
+
+
 /* Set the level of debugging to LEVEL and return the old level.  -1
    just returns the old level.  A level of 0 disables debugging, 1
    enables debugging, 2 enables additional tracing of the T=1
@@ -1245,6 +1267,16 @@
   int old = debug_level;
   if (level != -1)
     debug_level = level;
+#ifdef USE_LIBUSB_DEBUG_CB
+  if (level > 4)
+    {
+      log_debug ("libusb: Enable logging\n");
+      libusb_set_log_cb (NULL, debug_libusb_cb, LIBUSB_LOG_CB_GLOBAL);
+      libusb_set_option (NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
+    }
+  else
+    libusb_set_log_cb (NULL, NULL, LIBUSB_LOG_CB_GLOBAL);
+#endif /* USE_LIBUSB_DEBUG_CB */
   return old;
 }
 
@@ -1313,7 +1345,13 @@
 {
   if (handle->id_vendor == VENDOR_SCM && handle->id_product == SCM_SPR532)
     {
+#ifdef USE_NPTH
+      npth_unprotect ();
+#endif
       libusb_clear_halt (handle->idev, handle->ep_intr);
+#ifdef USE_NPTH
+      npth_protect ();
+#endif
     }
   return 0;
 }
@@ -1693,6 +1731,7 @@
           *handle = NULL;
           return err;
         }
+      npth_setname_np (thread, "ccid_usb_thread");
 
       npth_attr_destroy (&tattr);
     }
@@ -1737,9 +1776,15 @@
       goto leave;
     }
 
+#ifdef USE_NPTH
+  npth_unprotect ();
+#endif
   rc = libusb_claim_interface (idev, ifc_no);
   if (rc)
     {
+#ifdef USE_NPTH
+      npth_protect ();
+#endif
       DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc);
       rc = map_libusb_error (rc);
       goto leave;
@@ -1749,11 +1794,18 @@
   rc = libusb_set_interface_alt_setting (idev, ifc_no, set_no);
   if (rc)
     {
+#ifdef USE_NPTH
+      npth_protect ();
+#endif
       DEBUGOUT_1 ("usb_set_interface_alt_setting failed: %d\n", rc);
       rc = map_libusb_error (rc);
       goto leave;
     }
 
+#ifdef USE_NPTH
+  npth_protect ();
+#endif
+
   rc = ccid_vendor_specific_init (*handle);
 
  leave:
@@ -4050,7 +4102,7 @@
 }
 
 /*
- * Local Variables:
+ * Disabled Local Variables:
  *  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:
  */

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/command.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/command.c Changed

@@ -538,13 +538,19 @@
 int only_keypairinfo = has_option (line, "--keypairinfo");
 int opt_multi = has_option (line, "--multi");
 int opt_reread = has_option (line, "--reread");
+ int opt_force = has_option (line, "--force");
 unsigned int flags;
 card_t card;
+ const char *keygrip = NULL;
 
 if ((rc = open_card (ctrl)))
 return rc;
 
- card = card_get (ctrl, NULL);
+ line = skip_options (line);
+ if (strlen (line) == 40)
+ keygrip = line;
+
+ card = card_get (ctrl, keygrip);
 if (!card)
 return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
 
@@ -581,7 +587,7 @@
 return out_of_core ();
 }
 
- if (!has_option (line, "--force"))
+ if (!opt_force)
 {
 char *command;
 
@@ -639,6 +645,7 @@
 unsigned char *cert;
 size_t ncert;
 card_t card;
+ const char *keygrip = NULL;
 
 if ((rc = open_card (ctrl)))
 return rc;
@@ -647,7 +654,10 @@
 if (!line)
 return gpg_error_from_syserror ();
 
- card = card_get (ctrl, NULL);
+ if (strlen (line) == 40)
+ keygrip = line;
+
+ card = card_get (ctrl, keygrip);
 if (!card)
 {
 xfree (line);
@@ -974,7 +984,9 @@
 
 /* Fixme: Write an inquire function which returns the result in
 secure memory and check all further handling of the PIN. */
+ assuan_begin_confidential (ctx);
 rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
+ assuan_end_confidential (ctx);
 xfree (command);
 if (rc)
 return rc;
@@ -2183,11 +2195,15 @@
 unsigned char *result = NULL;
 size_t resultlen;
 
+ card->maybe_check_aid = 1;
 rc = apdu_send_direct (card->slot, exlen,
 apdu, apdulen, handle_more,
 NULL, &result, &resultlen);
 if (rc)
- log_error ("apdu_send_direct failed: %s\n", gpg_strerror (rc));
+ {
+ log_error ("apdu_send_direct failed: %s\n", apdu_strerror (rc));
+ rc = iso7816_map_sw (rc);
+ }
 else
 {
 rc = assuan_send_data (ctx, result, resultlen);
@@ -2229,7 +2245,7 @@
 "Unless --data is given, the\n"
 "information is returned as a status line using the format:\n"
 "\n"
- " KEYINFO <keygrip> T <serialno> <idstr>\n"
+ " KEYINFO <keygrip> T <serialno> <idstr> <usage>\n"
 "\n"
 "KEYGRIP is the keygrip.\n"
 "\n"
@@ -2237,9 +2253,13 @@
 " smartcard. If the serial number is not known a single\n"
 " dash '-' is used instead.\n"
 "\n"
- "IDSTR is the IDSTR used to distinguish keys on a smartcard. If it\n"
+ "IDSTR is a string used to distinguish keys on a smartcard. If it\n"
 " is not known a dash is used instead.\n"
 "\n"
+ "USAGE is a string of capabilities of the key, 's' for sign, \n"
+ "'e' for encryption, 'a' for auth, and 'c' for cert. If it is not\n"
+ "known a dash is used instead.\n"
+ "\n"
 "More information may be added in the future.";
 static gpg_error_t
 cmd_keyinfo (assuan_context_t ctx, char *line)
@@ -2284,14 +2304,15 @@
 * line. */
 void
 send_keyinfo (ctrl_t ctrl, int data, const char *keygrip_str,
- const char *serialno, const char *idstr)
+ const char *serialno, const char *idstr, const char *usage)
 {
 char *string;
 assuan_context_t ctx = ctrl->server_local->assuan_ctx;
 
- string = xtryasprintf ("%s T %s %s%s", keygrip_str,
+ string = xtryasprintf ("%s T %s %s %s%s", keygrip_str,
 serialno? serialno : "-",
 idstr? idstr : "-",
+ usage? usage : "-",
 data? "\n" : "");
 
 if (!string)

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/scdaemon-w32info.rc -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/scdaemon-w32info.rc Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/scdaemon.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/scdaemon.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/scd/scdaemon.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/scd/scdaemon.h Changed

@@ -69,15 +69,16 @@
 } opt;
 
 
-#define DBG_APP_VALUE     1     /* Debug app speific stuff.  */
+#define DBG_APP_VALUE     1     /* Debug app specific stuff.  */
 #define DBG_MPI_VALUE	  2	/* debug mpi details */
 #define DBG_CRYPTO_VALUE  4	/* debug low level crypto */
+#define DBG_CARD_VALUE    16    /* debug card info  */
 #define DBG_MEMORY_VALUE  32	/* debug memory allocation stuff */
 #define DBG_CACHE_VALUE   64	/* debug the caching */
 #define DBG_MEMSTAT_VALUE 128	/* show memory statistics */
 #define DBG_HASHING_VALUE 512	/* debug hashing operations */
 #define DBG_IPC_VALUE     1024
-#define DBG_CARD_IO_VALUE 2048
+#define DBG_CARD_IO_VALUE 2048  /* debug card I/O (e.g. APDUs).  */
 #define DBG_READER_VALUE  4096  /* Trace reader related functions.  */
 
 #define DBG_APP     (opt.debug & DBG_APP_VALUE)
@@ -86,6 +87,7 @@
 #define DBG_CACHE   (opt.debug & DBG_CACHE_VALUE)
 #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
 #define DBG_IPC     (opt.debug & DBG_IPC_VALUE)
+#define DBG_CARD    (opt.debug & DBG_CARD_VALUE)
 #define DBG_CARD_IO (opt.debug & DBG_CARD_IO_VALUE)
 #define DBG_READER  (opt.debug & DBG_READER_VALUE)
 
@@ -138,7 +140,8 @@
 gpg_error_t send_status_printf (ctrl_t ctrl, const char *keyword,
                                 const char *format, ...) GPGRT_ATTR_PRINTF(3,4);
 void send_keyinfo (ctrl_t ctrl, int data, const char *keygrip_str,
-                   const char *serialno, const char *idstr);
+                   const char *serialno, const char *idstr,
+                   const char *usage);
 
 void pincache_put (ctrl_t ctrl, int slot, const char *appname,
                    const char *pinref, const char *pin, unsigned int pinlen);

_service:tar_scm:gnupg-2.4.3.tar.bz2/scd/scdaemon.w32-manifest.in Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Smartcard Daemon)</description>
+<assemblyIdentity
+ type="win32"
+ name="GnuPG.scdaemon"
+ version="@BUILD_VERSION@"
+ />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+</compatibility>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/Makefile.am Changed

@@ -17,7 +17,8 @@
 
 ## 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
 noinst_PROGRAMS = $(module_tests) $(module_maint_tests)
@@ -36,6 +37,7 @@
 
 if HAVE_W32_SYSTEM
 resource_objs += gpgsm-w32info.o
+gpgsm-w32info.o : gpgsm.w32-manifest ../common/w32info-rc.h
 endif
 
 gpgsm_SOURCES = \
@@ -70,12 +72,13 @@
 gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
               $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
-	      $(LIBICONV) $(resource_objs) $(extra_sys_libs) $(NETLIBS)
-gpgsm_LDFLAGS = $(extra_bin_ldflags)
+	      $(LIBICONV) $(resource_objs) $(NETLIBS)
+gpgsm_LDFLAGS =
+gpgsm_DEPENDENCIES = $(resource_objs)
 
 
-module_tests =
-module_maint_tests = t-minip12
+module_tests = t-minip12
+module_maint_tests =
 
 t_common_src =
 t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) $(KSBA_LIBS) \

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/Makefile.in Changed

@@ -164,11 +164,11 @@
 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)"
-am__EXEEXT_1 =
-am__EXEEXT_2 = t-minip12$(EXEEXT)
+am__EXEEXT_1 = t-minip12$(EXEEXT)
+am__EXEEXT_2 =
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_gpgsm_OBJECTS = gpgsm.$(OBJEXT) misc.$(OBJEXT) keydb.$(OBJEXT) \
 	server.$(OBJEXT) call-agent.$(OBJEXT) call-dirmngr.$(OBJEXT) \
@@ -180,12 +180,6 @@
 	minip12.$(OBJEXT) qualified.$(OBJEXT) passphrase.$(OBJEXT)
 gpgsm_OBJECTS = $(am_gpgsm_OBJECTS)
 am__DEPENDENCIES_1 =
-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) $(am__DEPENDENCIES_1) $(resource_objs) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 gpgsm_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgsm_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am__objects_1 =
@@ -292,7 +286,8 @@
 std='&#x1b;m'; \
 fi; \
 }
-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)
@@ -487,7 +482,9 @@
 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) \
 $(NPTH_CFLAGS) $(GPG_ERROR_CFLAGS)
 
@@ -498,16 +495,6 @@
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
 	$(am__append_7) $(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx. WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library. We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc. 256k is the largest stack
-# we use with pth.
-@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)
 
 # Convenience macros
@@ -545,11 +532,12 @@
 gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
 $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
 $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
-	 $(LIBICONV) $(resource_objs) $(extra_sys_libs) $(NETLIBS)
+	 $(LIBICONV) $(resource_objs) $(NETLIBS)
 
-gpgsm_LDFLAGS = $(extra_bin_ldflags)
-module_tests = 
-module_maint_tests = t-minip12
+gpgsm_LDFLAGS = 
+gpgsm_DEPENDENCIES = $(resource_objs)
+module_tests = t-minip12
+module_maint_tests = 
 t_common_src = 
 t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) $(KSBA_LIBS) \
 $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
@@ -593,6 +581,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=; \
@@ -1085,6 +1075,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 ../common/w32info-rc.h
 
 # Make sure that all libs are build before we use them. This is
 # important for things like make -j2.

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/call-agent.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/call-agent.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/call-dirmngr.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/call-dirmngr.c Changed

@@ -64,6 +64,8 @@
 ctrl_t ctrl;
 int seen;
 unsigned char fpr20;
+ gnupg_isotime_t revoked_at;
+ char *revocation_reason; /* malloced or NULL */
 };
 
 
@@ -360,7 +362,7 @@
 }
 else
 {
- log_error ("unsupported inquiry '%s'\n", line);
+ log_error ("unsupported certificate inquiry '%s'\n", line);
 return gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
 }
 
@@ -384,8 +386,8 @@
 int err;
 ksba_cert_t cert;
 
-
- err = gpgsm_find_cert (parm->ctrl, line, ski, &cert, 1);
+ err = gpgsm_find_cert (parm->ctrl, line, ski, &cert,
+ FIND_CERT_ALLOW_AMBIG|FIND_CERT_WITH_EPHEM);
 if (err)
 {
 log_error ("certificate not found: %s\n", gpg_strerror (err));
@@ -491,6 +493,19 @@
 if (!*s || !unhexify_fpr (s, parm->fpr))
 parm->seen++; /* Bump it to indicate an error. */
 }
+ else if ((s = has_leading_keyword (line, "REVOCATIONINFO")))
+ {
+ if (*s && strlen (s) >= 15)
+ {
+ memcpy (parm->revoked_at, s, 15);
+ parm->revoked_at15 = 0;
+ }
+ s += 15;
+ while (*s && spacep (s))
+ s++;
+ xfree (parm->revocation_reason);
+ parm->revocation_reason = *s? xtrystrdup (s) : NULL;
+ }
 else if (warning_and_note_printer (line))
 {
 }
@@ -506,16 +521,22 @@
 
 GPG_ERR_CERTIFICATE_REVOKED
 GPG_ERR_NO_CRL_KNOWN
+ GPG_ERR_INV_CRL_OBJ
 GPG_ERR_CRL_TOO_OLD
 
 Values for USE_OCSP:
 0 = Do CRL check.
- 1 = Do an OCSP check but fallback to CRL unless CRLS are disabled.
- 2 = Do only an OCSP check using only the default responder.
+ 1 = Do an OCSP check but fallback to CRL unless CRLs are disabled.
+ 2 = Do only an OCSP check (used for the chain model).
+
+ If R_REVOKED_AT pr R_REASON are not NULL and the certificate has
+ been revoked the revocation time and the reason are copied to there.
+ The caller needs to free R_REASON.
 */
-int
+gpg_error_t
 gpgsm_dirmngr_isvalid (ctrl_t ctrl,
- ksba_cert_t cert, ksba_cert_t issuer_cert, int use_ocsp)
+ ksba_cert_t cert, ksba_cert_t issuer_cert, int use_ocsp,
+ gnupg_isotime_t r_revoked_at, char **r_reason)
 {
 static int did_options;
 int rc;
@@ -524,6 +545,11 @@
 struct inq_certificate_parm_s parm;
 struct isvalid_status_parm_s stparm;
 
+ if (r_revoked_at)
+ *r_revoked_at = 0;
+ if (r_reason)
+ *r_reason = NULL;
+
 rc = start_dirmngr (ctrl);
 if (rc)
 return rc;
@@ -553,6 +579,8 @@
 stparm.ctrl = ctrl;
 stparm.seen = 0;
 memset (stparm.fpr, 0, 20);
+ stparm.revoked_at0 = 0;
+ stparm.revocation_reason = NULL;
 
 /* It is sufficient to send the options only once because we have
 * one connection per process only. */
@@ -563,9 +591,8 @@
 NULL, NULL, NULL, NULL, NULL, NULL);
 did_options = 1;
 }
- snprintf (line, DIM(line), "ISVALID%s%s %s%s%s",
- use_ocsp == 2 || opt.no_crl_check ? " --only-ocsp":"",
- use_ocsp == 2? " --force-default-responder":"",
+ snprintf (line, DIM(line), "ISVALID%s %s%s%s",
+ (use_ocsp == 2 || opt.no_crl_check) ? " --only-ocsp":"",
 certid,
 use_ocsp? " ":"",
 use_ocsp? certfpr:"");
@@ -578,6 +605,19 @@
 if (opt.verbose > 1)
 log_info ("response of dirmngr: %s\n", rc? gpg_strerror (rc): "okay");
 
+ if (gpg_err_code (rc) == GPG_ERR_CERT_REVOKED
+ && !check_isotime (stparm.revoked_at))
+ {
+ if (r_revoked_at)
+ gnupg_copy_time (r_revoked_at, stparm.revoked_at);
+ if (r_reason)
+ {
+ *r_reason = stparm.revocation_reason;
+ stparm.revocation_reason = NULL;
+ }
+
+ }
+
 if (!rc && stparm.seen)
 {
 /* Need to also check the certificate validity. */
@@ -635,7 +675,9 @@
 ksba_cert_release (rspcert);
 }
 }
+
 release_dirmngr (ctrl);
+ xfree (stparm.revocation_reason);
 return rc;
 }
 
@@ -959,21 +1001,48 @@
 run_command_inq_cb (void *opaque, const char *line)
 {
 struct run_command_parm_s *parm = opaque;
+ gpg_error_t err;
 const char *s;
 int rc = 0;
+ ksba_cert_t cert = NULL;
+ ksba_sexp_t ski = NULL;
+ const unsigned char *der;
+ size_t derlen, n;
 
 if ((s = has_leading_keyword (line, "SENDCERT")))
- { /* send the given certificate */
- int err;
- ksba_cert_t cert;
- const unsigned char *der;
- size_t derlen;
-
+ {
+ /* Send the given certificate. */
 line = s;
 if (!*line)
 return gpg_error (GPG_ERR_ASS_PARAMETER);
 
- err = gpgsm_find_cert (parm->ctrl, line, NULL, &cert, 1);
+ err = gpgsm_find_cert (parm->ctrl, line, NULL, &cert,
+ FIND_CERT_ALLOW_AMBIG);
+ if (err)
+ {
+ log_error ("certificate not found: %s\n", gpg_strerror (err));
+ rc = gpg_error (GPG_ERR_NOT_FOUND);
+ }
+ else
+ {
+ der = ksba_cert_get_image (cert, &derlen);
+ if (!der)
+ rc = gpg_error (GPG_ERR_INV_CERT_OBJ);
+ else
+ rc = assuan_send_data (parm->ctx, der, derlen);
+ }
+ }
+ else if ((s = has_leading_keyword (line, "SENDCERT_SKI")))
+ {
+ /* Send a certificate where a sourceKeyIdentifier is included. */
+ line = s;
+ ski = make_simple_sexp_from_hexstr (line, &n);
+ line += n;
+ while (*line == ' ')
+ line++;
+
+ err = gpgsm_find_cert (parm->ctrl, line, ski, &cert,
+ FIND_CERT_ALLOW_AMBIG|FIND_CERT_WITH_EPHEM);
 if (err)
 {
 log_error ("certificate not found: %s\n", gpg_strerror (err));
@@ -986,20 +1055,45 @@
 rc = gpg_error (GPG_ERR_INV_CERT_OBJ);
 else
 rc = assuan_send_data (parm->ctx, der, derlen);
- ksba_cert_release (cert);
 }
 }
 else if ((s = has_leading_keyword (line, "PRINTINFO")))
- { /* Simply show the message given in the argument. */
+ {
+ /* Simply show the message given in the argument. */
 line = s;
 log_info ("dirmngr: %s\n", line);
 }
+ else if ((s = has_leading_keyword (line, "ISTRUSTED")))
+ {
+ /* The server is asking us whether the certificate is a trusted
+ root certificate. */
+ char fpr41;
+ struct rootca_flags_s rootca_flags;
+
+ line = s;
+
+ for (s=line,n=0; hexdigitp (s); s++, n++)
+ ;
+ if (*s || n != 40)
+ return gpg_error (GPG_ERR_ASS_PARAMETER);
+ for (s=line, n=0; n < 40; s++, n++)
+ fprn = (*s >= 'a')? (*s & 0xdf): *s;
+ fprn = 0;
+
+ if (!gpgsm_agent_istrusted (parm->ctrl, NULL, fpr, &rootca_flags))
+ rc = assuan_send_data (parm->ctx, "1", 1);
+ else
+ rc = 0;
+ return rc;
+ }
 else
 {
- log_error ("unsupported inquiry '%s'\n", line);
+ log_error ("unsupported command inquiry '%s'\n", line);
 rc = gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
 }
 
+ ksba_cert_release (cert);
+ xfree (ski);
 return rc;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/certchain.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/certchain.c Changed

@@ -122,6 +122,7 @@
     }
   else
     {
+      es_fflush (es_stdout);
       log_logv (is_error? GPGRT_LOGLVL_ERROR: GPGRT_LOGLVL_INFO,
                 format, arg_ptr);
       log_printf ("\n");
@@ -306,6 +307,7 @@
 static int
 check_cert_policy (ksba_cert_t cert, int listmode, estream_t fplist)
 {
+  static int no_policy_file;
   gpg_error_t err;
   char *policies;
   estream_t fp;
@@ -340,17 +342,29 @@
       return 0;
     }
 
-  fp = es_fopen (opt.policy_file, "r");
+  if (no_policy_file)
+    {
+      /* Avoid trying to open the policy file if we already know that
+       * it does not exist.  */
+      fp = NULL;
+      gpg_err_set_errno (ENOENT);
+    }
+  else
+    fp = es_fopen (opt.policy_file, "r");
   if (!fp)
     {
-      if (opt.verbose || errno != ENOENT)
+      if ((opt.verbose || errno != ENOENT) && !no_policy_file)
         log_info (_("failed to open '%s': %s\n"),
                   opt.policy_file, strerror (errno));
+
+      if (errno == ENOENT)
+        no_policy_file = 1;
+
       xfree (policies);
       /* With no critical policies this is only a warning */
       if (!any_critical)
         {
-          if (!opt.quiet)
+          if (opt.verbose)
             do_list (0, listmode, fplist,
                      _("Note: non-critical certificate policy not allowed"));
           return 0;
@@ -360,6 +374,8 @@
       return gpg_error (GPG_ERR_NO_POLICY_MATCH);
     }
 
+  /* FIXME: Cache the policy file content.  */
+
   for (;;)
     {
       int c;
@@ -380,7 +396,8 @@
                   /* With no critical policies this is only a warning */
                   if (!any_critical)
                     {
-                      do_list (0, listmode, fplist,
+                      if (opt.verbose)
+                        do_list (0, listmode, fplist,
                      _("Note: non-critical certificate policy not allowed"));
                       return 0;
                     }
@@ -1187,11 +1204,13 @@
 
 /* This is a helper for gpgsm_validate_chain. */
 static gpg_error_t
-is_cert_still_valid (ctrl_t ctrl, int force_ocsp, int lm, estream_t fp,
+is_cert_still_valid (ctrl_t ctrl, int chain_model, int lm, estream_t fp,
                      ksba_cert_t subject_cert, ksba_cert_t issuer_cert,
                      int *any_revoked, int *any_no_crl, int *any_crl_too_old)
 {
   gpg_error_t err;
+  gnupg_isotime_t revoked_at;
+  char *reason;
 
   if (ctrl->offline || (opt.no_crl_check && !ctrl->use_ocsp))
     {
@@ -1201,7 +1220,7 @@
     }
 
 
-  if (!(force_ocsp || ctrl->use_ocsp)
+  if (!(chain_model || ctrl->use_ocsp)
       && !opt.enable_issuer_based_crl_check)
     {
       err = ksba_cert_get_crl_dist_point (subject_cert, 0, NULL, NULL, NULL);
@@ -1220,7 +1239,20 @@
 
   err = gpgsm_dirmngr_isvalid (ctrl,
                                subject_cert, issuer_cert,
-                               force_ocsp? 2 : !!ctrl->use_ocsp);
+                               chain_model? 2 : !!ctrl->use_ocsp,
+                               revoked_at, &reason);
+  if (gpg_err_code (err) == GPG_ERR_CERT_REVOKED)
+    {
+      gnupg_copy_time (ctrl->revoked_at, revoked_at);
+      xfree (ctrl->revocation_reason);
+      ctrl->revocation_reason = reason;
+      reason = NULL;
+    }
+  else
+    {
+      xfree (reason);
+      reason = (NULL);
+    }
   audit_log_ok (ctrl->audit, AUDIT_CRL_CHECK, err);
 
   if (err)
@@ -1230,7 +1262,22 @@
       switch (gpg_err_code (err))
         {
         case GPG_ERR_CERT_REVOKED:
-          do_list (1, lm, fp, _("certificate has been revoked"));
+          if (!check_isotime (ctrl->revoked_at))
+            {
+              char *tmpstr;
+              const unsigned char *t = ctrl->revoked_at;
+
+              tmpstr = xtryasprintf ("%.4s-%.2s-%.2s %.2s:%.2s:%s (%s)",
+                                     t, t+4, t+6, t+9, t+11, t+13,
+                                     ctrl->revocation_reason?
+                                     ctrl->revocation_reason : "");
+
+              do_list (1, lm, fp, "%s: %s",
+                       _("certificate has been revoked"), tmpstr);
+              xfree (tmpstr);
+            }
+          else
+            do_list (1, lm, fp, _("certificate has been revoked"));
           *any_revoked = 1;
           /* Store that in the keybox so that key listings are able to
              return the revoked flag.  We don't care about error,
@@ -1449,6 +1496,7 @@
   int success = 0;
 
   fpr = gpgsm_get_fingerprint_string (cert, GCRY_MD_SHA1);
+  es_fflush (es_stdout);
   log_info (_("fingerprint=%s\n"), fpr? fpr : "?");
   xfree (fpr);
 
@@ -2158,11 +2206,14 @@
     {
       *retflags |= VALIDATE_FLAG_STEED;
     }
-  else if (gpg_err_code (rc) == GPG_ERR_CERT_EXPIRED
-      && !(flags & VALIDATE_FLAG_CHAIN_MODEL)
-      && (rootca_flags.valid && rootca_flags.chain_model))
+  else if (!(flags & VALIDATE_FLAG_CHAIN_MODEL)
+           && (rootca_flags.valid && rootca_flags.chain_model))
     {
-      do_list (0, listmode, listfp, _("switching to chain model"));
+      /* The root CA indicated that the chain model is to be used but
+       * we have not yet used it.  Thus do the validation again using
+       * the chain model.  */
+      if (opt.verbose)
+        do_list (0, listmode, listfp, _("switching to chain model"));
       rc = do_validate_chain (ctrl, cert, checktime,
                               r_exptime, listmode, listfp,
                               (flags |= VALIDATE_FLAG_CHAIN_MODEL),
@@ -2243,6 +2294,7 @@
             {
               if (!opt.quiet)
                 {
+                  es_fflush (es_stdout);
                   log_info ("issuer certificate (#/");
                   gpgsm_dump_string (issuer);
                   log_printf (") not found\n");

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/certdump.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/certdump.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/certlist.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/certlist.c Changed

@@ -33,7 +33,16 @@
 #include "keydb.h"
 #include "../common/i18n.h"
 
-
+/* Mode values for cert_usage_p.
+ * Take care: the values have a semantic. */
+#define USE_MODE_SIGN 0
+#define USE_MODE_ENCR 1
+#define USE_MODE_VRFY 2
+#define USE_MODE_DECR 3
+#define USE_MODE_CERT 4
+#define USE_MODE_OCSP 5
+
+/* OIDs we use here. */
 static const char oid_kp_serverAuth = "1.3.6.1.5.5.7.3.1";
 static const char oid_kp_clientAuth = "1.3.6.1.5.5.7.3.2";
 static const char oid_kp_codeSigning = "1.3.6.1.5.5.7.3.3";
@@ -41,6 +50,7 @@
 static const char oid_kp_timeStamping = "1.3.6.1.5.5.7.3.8";
 static const char oid_kp_ocspSigning = "1.3.6.1.5.5.7.3.9";
 
+
 /* Return 0 if the cert is usable for encryption. A MODE of 0 checks
 for signing a MODE of 1 checks for encryption, a MODE of 2 checks
 for verification and a MODE of 3 for decryption (just for
@@ -51,9 +61,11 @@
 {
 gpg_error_t err;
 unsigned int use;
+ unsigned int encr_bits, sign_bits;
 char *extkeyusages;
 int have_ocsp_signing = 0;
 
+
 err = ksba_cert_get_ext_key_usages (cert, &extkeyusages);
 if (gpg_err_code (err) == GPG_ERR_NO_DATA)
 err = 0; /* no policy given */
@@ -117,7 +129,7 @@
 if (gpg_err_code (err) == GPG_ERR_NO_DATA)
 {
 err = 0;
- if (opt.verbose && mode < 2 && !silent)
+ if (opt.verbose && mode < USE_MODE_VRFY && !silent)
 log_info (_("no key usage specified - assuming all usages\n"));
 use = ~0;
 }
@@ -134,7 +146,7 @@
 return err;
 }
 
- if (mode == 4)
+ if (mode == USE_MODE_CERT)
 {
 if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN)))
 return 0;
@@ -144,7 +156,7 @@
 return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
 }
 
- if (mode == 5)
+ if (mode == USE_MODE_OCSP)
 {
 if (use != ~0
 && (have_ocsp_signing
@@ -157,18 +169,24 @@
 return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
 }
 
- if ((use & ((mode&1)?
- (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT):
- (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
- )
+ encr_bits = (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT);
+ if ((opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR)
+ || gpgsm_is_ecc_key (cert))
+ encr_bits |= KSBA_KEYUSAGE_KEY_AGREEMENT;
+
+ sign_bits = (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION);
+
+ if ((use & ((mode&1)? encr_bits : sign_bits)))
 return 0;
 
 if (!silent)
- log_info
- (mode==3? _("certificate should not have been used for encryption\n"):
- mode==2? _("certificate should not have been used for signing\n"):
- mode==1? _("certificate is not usable for encryption\n"):
- /**/ _("certificate is not usable for signing\n"));
+ log_info (mode == USE_MODE_DECR?
+ _("certificate should not have been used for encryption\n") :
+ mode == USE_MODE_VRFY?
+ _("certificate should not have been used for signing\n") :
+ mode == USE_MODE_ENCR?
+ _("certificate is not usable for encryption\n") :
+ _("certificate is not usable for signing\n"));
 
 return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
 }
@@ -178,7 +196,7 @@
 int
 gpgsm_cert_use_sign_p (ksba_cert_t cert, int silent)
 {
- return cert_usage_p (cert, 0, silent);
+ return cert_usage_p (cert, USE_MODE_SIGN, silent);
 }
 
 
@@ -186,31 +204,31 @@
 int
 gpgsm_cert_use_encrypt_p (ksba_cert_t cert)
 {
- return cert_usage_p (cert, 1, 0);
+ return cert_usage_p (cert, USE_MODE_ENCR, 0);
 }
 
 int
 gpgsm_cert_use_verify_p (ksba_cert_t cert)
 {
- return cert_usage_p (cert, 2, 0);
+ return cert_usage_p (cert, USE_MODE_VRFY, 0);
 }
 
 int
 gpgsm_cert_use_decrypt_p (ksba_cert_t cert)
 {
- return cert_usage_p (cert, 3, 0);
+ return cert_usage_p (cert, USE_MODE_DECR, 0);
 }
 
 int
 gpgsm_cert_use_cert_p (ksba_cert_t cert)
 {
- return cert_usage_p (cert, 4, 0);
+ return cert_usage_p (cert, USE_MODE_CERT, 0);
 }
 
 int
 gpgsm_cert_use_ocsp_p (ksba_cert_t cert)
 {
- return cert_usage_p (cert, 5, 0);
+ return cert_usage_p (cert, USE_MODE_OCSP, 0);
 }
 
 
@@ -490,11 +508,12 @@
 int
 gpgsm_find_cert (ctrl_t ctrl,
 const char *name, ksba_sexp_t keyid, ksba_cert_t *r_cert,
- int allow_ambiguous)
+ unsigned int flags)
 {
 int rc;
 KEYDB_SEARCH_DESC desc;
 KEYDB_HANDLE kh = NULL;
+ int allow_ambiguous = (flags & FIND_CERT_ALLOW_AMBIG);
 
 *r_cert = NULL;
 rc = classify_user_id (name, &desc, 0);
@@ -505,6 +524,9 @@
 rc = gpg_error (GPG_ERR_ENOMEM);
 else
 {
+ if ((flags & FIND_CERT_WITH_EPHEM))
+ keydb_set_ephemeral (kh, 1);
+
 nextone:
 rc = keydb_search (ctrl, kh, &desc, 1);
 if (!rc)

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/decrypt.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/decrypt.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/encrypt.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/encrypt.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/fingerprint.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/fingerprint.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/gpgsm-w32info.rc -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/gpgsm-w32info.rc Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/gpgsm.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/gpgsm.c Changed

@@ -114,6 +114,7 @@
   oNoLogFile,
   oAuditLog,
   oHtmlAuditLog,
+  oLogTime,
 
   oEnableSpecialFilenames,
 
@@ -138,6 +139,7 @@
   oAssumeArmor,
   oAssumeBase64,
   oAssumeBinary,
+  oInputSizeHint,
 
   oBase64,
   oNoArmor,
@@ -169,6 +171,7 @@
   oWithKeyScreening,
   oAnswerYes,
   oAnswerNo,
+  oNoPrettyDN,
   oKeyring,
   oDefaultKey,
   oDefRecipient,
@@ -210,6 +213,8 @@
   oUseKeyboxd,
   oKeyboxdProgram,
   oRequireCompliance,
+  oCompatibilityFlags,
+  oKbxBufferSize,
   oNoAutostart
  };
 
@@ -287,6 +292,7 @@
                 N_("|FILE|write server mode logs to FILE")),
   ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"),
   ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
+  ARGPARSE_s_n (oLogTime, "log-time", "@"),
   ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
 
 
@@ -321,6 +327,7 @@
                 N_("assume input is in base-64 format")),
   ARGPARSE_s_n (oAssumeBinary, "assume-binary",
                 N_("assume input is in binary format")),
+  ARGPARSE_s_s (oInputSizeHint, "input-size-hint", "@"),
 
 
   ARGPARSE_header ("Output", N_("Options controlling the output")),
@@ -382,7 +389,7 @@
   ARGPARSE_s_n (oWithKeygrip,     "with-keygrip", "@"),
   ARGPARSE_s_n (oWithSecret,      "with-secret", "@"),
   ARGPARSE_s_n (oWithKeyScreening,"with-key-screening", "@"),
-
+  ARGPARSE_s_n (oNoPrettyDN, "no-pretty-dn", "@"),
 
 
   ARGPARSE_header ("Security", N_("Options controlling the security")),
@@ -442,6 +449,8 @@
   ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
   ARGPARSE_s_s (oXauthority, "xauthority", "@"),
   ARGPARSE_s_s (oChUid, "chuid", "@"),
+  ARGPARSE_s_s (oCompatibilityFlags, "compatibility-flags", "@"),
+  ARGPARSE_p_u (oKbxBufferSize,  "kbx-buffer-size", "@"),
 
   ARGPARSE_header (NULL, ""),  /* Stop the header group.  */
 
@@ -479,6 +488,14 @@
   };
 
 
+/* The list of compatibility flags.  */
+static struct compatibility_flags_s compatibility_flags  =
+  {
+    { COMPAT_ALLOW_KA_TO_ENCR, "allow-ka-to-encr" },
+    { 0, NULL }
+  };
+
+
 /* Global variable to keep an error count. */
 int gpgsm_errors_seen = 0;
 
@@ -489,6 +506,9 @@
 static const char *debug_level;
 static unsigned int debug_value;
 
+/* Helper for --log-time;  */
+static int opt_log_time;
+
 /* Default value for include-certs.  We need an extra macro for
    gpgconf-list because the variable will be changed by the command
    line option.
@@ -506,7 +526,7 @@
 static int default_validation_model;
 
 /* The default cipher algo.  */
-#define DEFAULT_CIPHER_ALGO "AES"
+#define DEFAULT_CIPHER_ALGO "AES256"
 
 
 static char *build_list (const char *text,
@@ -784,7 +804,7 @@
 
   /* minip12.c may be used outside of GnuPG, thus we don't have the
    * opt structure over there.  */
-  p12_set_verbosity (opt.verbose);
+  p12_set_verbosity (opt.verbose, opt.debug);
 }
 
 
@@ -1170,6 +1190,10 @@
           ctrl.is_base64 = 0;
           break;
 
+        case oInputSizeHint:
+          ctrl.input_size_hint = string_to_u64 (pargs.r.ret_str);
+          break;
+
         case oDisableCRLChecks:
           opt.no_crl_check = 1;
           break;
@@ -1237,6 +1261,7 @@
 
         case oLogFile: logfile = pargs.r.ret_str; break;
         case oNoLogFile: logfile = NULL; break;
+        case oLogTime: opt_log_time = 1; break;
 
         case oAuditLog: auditlog = pargs.r.ret_str; break;
         case oHtmlAuditLog: htmlauditlog = pargs.r.ret_str; break;
@@ -1271,6 +1296,15 @@
         case oDebugIgnoreExpiration: opt.ignore_expiration = 1; break;
         case oDebugForceECDHSHA1KDF: opt.force_ecdh_sha1kdf = 1; break;
 
+        case oCompatibilityFlags:
+          if (parse_compatibility_flags (pargs.r.ret_str, &opt.compat_flags,
+                                         compatibility_flags))
+            {
+              pargs.r_opt = ARGPARSE_INVALID_ARG;
+              pargs.err = ARGPARSE_PRINT_ERROR;
+            }
+          break;
+
         case oStatusFD:
             ctrl.status_fd = translate_sys2libc_fd_int (pargs.r.ret_int, 1);
             break;
@@ -1293,6 +1327,10 @@
           opt.with_key_screening = 1;
           break;
 
+        case oNoPrettyDN:
+          opt.no_pretty_dn = 1;
+          break;
+
         case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
         case oChUid: break;  /* Command line only (see above).  */
         case oAgentProgram: opt.agent_program = pargs.r.ret_str;  break;
@@ -1462,6 +1500,10 @@
 
         case oRequireCompliance: opt.require_compliance = 1;  break;
 
+        case oKbxBufferSize:
+          keybox_set_buffersize (pargs.r.ret_ulong, 0);
+          break;
+
         default:
           if (configname)
             pargs.err = ARGPARSE_PRINT_WARNING;
@@ -1515,6 +1557,9 @@
       comopt.keyboxd_program = NULL;
     }
 
+  if (comopt.no_autostart)
+    opt.autostart = 0;
+
   if (pwfd != -1)	/* Read the passphrase now.  */
     read_passphrase_from_fd (pwfd);
 
@@ -1557,6 +1602,10 @@
       log_set_file (logfile);
       log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
     }
+  else if (opt_log_time)
+    log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY
+                           |GPGRT_LOG_WITH_TIME));
+
 
   if (gnupg_faked_time_p ())
     {
@@ -1584,6 +1633,8 @@
   gcry_control (GCRYCTL_RESUME_SECMEM_WARN);
 
   set_debug ();
+  if (opt.verbose) /* Print the compatibility flags.  */
+    parse_compatibility_flags (NULL, &opt.compat_flags, compatibility_flags);
   gnupg_set_compliance_extra_info (opt.min_rsa_length);
 
   /* Although we always use gpgsm_exit, we better install a regular
@@ -1906,11 +1957,17 @@
       break;
 
     case aSignEncr: /* sign and encrypt the given file */
-      log_error ("this command has not yet been implemented\n");
+      log_error ("the command '%s' has not yet been implemented\n",
+                 "--sign --encrypt");
+      gpgsm_status_with_error (&ctrl, STATUS_FAILURE, "option-parser",
+                               gpg_error (GPG_ERR_NOT_IMPLEMENTED));
       break;
 
     case aClearsign: /* make a clearsig */
-      log_error ("this command has not yet been implemented\n");
+      log_error ("the command '%s' has not yet been implemented\n",
+                 "--clearsign");
+      gpgsm_status_with_error (&ctrl, STATUS_FAILURE, "option-parser",
+                               gpg_error (GPG_ERR_NOT_IMPLEMENTED));
       break;
 
     case aVerify:
@@ -2143,8 +2200,10 @@
 
 
     default:
-        log_error (_("invalid command (there is no implicit command)\n"));
-	break;
+      log_error (_("invalid command (there is no implicit command)\n"));
+      gpgsm_status_with_error (&ctrl, STATUS_FAILURE, "option-parser",
+                               gpg_error (GPG_ERR_MISSING_ACTION));
+      break;
     }
 
   /* Print the audit result if needed.  */
@@ -2204,6 +2263,8 @@
   ctrl->use_ocsp = opt.enable_ocsp;
   ctrl->validation_model = default_validation_model;
   ctrl->offline = opt.disable_dirmngr;
+  ctrl->revoked_at0 = 0;
+  ctrl->revocation_reason = NULL;
 }
 
 
@@ -2213,6 +2274,8 @@
 gpgsm_deinit_default_ctrl (ctrl_t ctrl)
 {
   gpgsm_keydb_deinit_session_data (ctrl);
+  xfree (ctrl->revocation_reason);
+  ctrl->revocation_reason = NULL;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/gpgsm.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/gpgsm.h Changed

@@ -85,6 +85,8 @@
 
   int with_key_screening; /* Option  --with-key-screening active.  */
 
+  int no_pretty_dn;       /* Option --no-pretty-dn */
+
   int pinentry_mode;
   int request_origin;
 
@@ -176,6 +178,9 @@
    * HEX_OR_FILENAME.  The actual value needs to be encoded as a SET OF
    * attribute values.  */
   strlist_t attributes;
+
+  /* Compatibility flags (COMPAT_FLAG_xxxx).  */
+  unsigned int compat_flags;
 } opt;
 
 /* Debug values and macros.  */
@@ -199,6 +204,18 @@
 #define DBG_CLOCK   (opt.debug & DBG_CLOCK_VALUE)
 #define DBG_LOOKUP  (opt.debug & DBG_LOOKUP_VALUE)
 
+
+/* Compatibility flags */
+/* Telesec RSA cards produced for NRW in 2022 came with only the
+ * keyAgreement bit set.  This flag allows there use for encryption
+ * anyway.  Example cert:
+ *    Issuer: /CN=DOI CA 10a/OU=DOI/O=PKI-1-Verwaltung/C=DE
+ * key usage: digitalSignature nonRepudiation keyAgreement
+ *  policies: 1.3.6.1.4.1.7924.1.1:N:
+ */
+#define COMPAT_ALLOW_KA_TO_ENCR   1
+
+
 /* Forward declaration for an object defined in server.c */
 struct server_local_s;
 
@@ -233,6 +250,11 @@
   int is_pem;         /* Is in PEM format */
   int is_base64;      /* is in plain base-64 format */
 
+  /* If > 0 a hint with the expected number of input data bytes.  This
+   * is not necessary an exact number but intended to be used for
+   * progress info and to decide on how to allocate buffers.  */
+  uint64_t input_size_hint;
+
   int create_base64;  /* Create base64 encoded output */
   int create_pem;     /* create PEM output */
   const char *pem_name; /* PEM name to use */
@@ -249,6 +271,10 @@
 
   /* The current time.  Used as a helper in certchain.c.  */
   ksba_isotime_t current_time;
+
+  /* The revocation info.  Used as a helper inc ertchain.c */
+  gnupg_isotime_t revoked_at;
+  char *revocation_reason;
 };
 
 
@@ -274,6 +300,7 @@
   unsigned int relax:1;  /* Relax checking of root certificates.  */
   unsigned int chain_model:1; /* Root requires the use of the chain model.  */
   unsigned int qualified:1;   /* Root CA used for qualfied signatures.   */
+  unsigned int de_vs:1;       /* Root CA is de-vs compliant.             */
 };
 
 
@@ -294,6 +321,7 @@
                                         gpg_err_code_t ec);
 gpg_error_t gpgsm_status_with_error (ctrl_t ctrl, int no, const char *text,
                                      gpg_error_t err);
+gpg_error_t gpgsm_progress_cb (ctrl_t ctrl, uint64_t current, uint64_t total);
 gpg_error_t gpgsm_proxy_pinentry_notify (ctrl_t ctrl,
                                          const unsigned char *line);
 
@@ -309,6 +337,7 @@
 int  gpgsm_get_key_algo_info (ksba_cert_t cert, unsigned int *nbits);
 int  gpgsm_get_key_algo_info2 (ksba_cert_t cert, unsigned int *nbits,
                                char **r_curve);
+int   gpgsm_is_ecc_key (ksba_cert_t cert);
 char *gpgsm_pubkey_algo_string (ksba_cert_t cert, int *r_algoid);
 gcry_mpi_t gpgsm_get_rsa_modulus (ksba_cert_t cert);
 char *gpgsm_get_certid (ksba_cert_t cert);
@@ -384,8 +413,11 @@
 int gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
                            certlist_t *listaddr, int is_encrypt_to);
 void gpgsm_release_certlist (certlist_t list);
+
+#define FIND_CERT_ALLOW_AMBIG 1
+#define FIND_CERT_WITH_EPHEM  2
 int gpgsm_find_cert (ctrl_t ctrl, const char *name, ksba_sexp_t keyid,
-                     ksba_cert_t *r_cert, int allow_ambiguous);
+                     ksba_cert_t *r_cert, unsigned int flags);
 
 /*-- keylist.c --*/
 gpg_error_t gpgsm_list_keys (ctrl_t ctrl, strlist_t names,
@@ -478,9 +510,11 @@
                                     size_t *r_resultlen);
 
 /*-- call-dirmngr.c --*/
-int gpgsm_dirmngr_isvalid (ctrl_t ctrl,
-                           ksba_cert_t cert, ksba_cert_t issuer_cert,
-                           int use_ocsp);
+gpg_error_t gpgsm_dirmngr_isvalid (ctrl_t ctrl,
+                                   ksba_cert_t cert, ksba_cert_t issuer_cert,
+                                   int use_ocsp,
+                                   gnupg_isotime_t r_revoked_at,
+                                   char **r_reason);
 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);

_service:tar_scm:gnupg-2.4.3.tar.bz2/sm/gpgsm.w32-manifest.in Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (X.509/CMS Tool)</description>
+<assemblyIdentity
+ type="win32"
+ name="GnuPG.gpgsm"
+ version="@BUILD_VERSION@"
+ />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+</compatibility>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+</trustInfo>
+</assembly>

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/keydb.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/keydb.c Changed

@@ -33,6 +33,7 @@
 #include "keydb.h"
 #include "../common/i18n.h"
 #include "../common/asshelp.h"
+#include "../common/comopt.h"
 #include "../kbx/kbx-client-util.h"
 
 
@@ -242,8 +243,23 @@
           *last_slash_in_filename = save_slash;
           goto leave;
         }
+      *last_slash_in_filename = save_slash;
+
+      if (!opt.use_keyboxd
+          && !parse_comopt (GNUPG_MODULE_NAME_GPG, 0)
+          && comopt.use_keyboxd)
+        {
+          /* The above try_make_homedir created a new default hoemdir
+           * and also wrote a new common.conf.  Thus we now see that
+           * use-keyboxd has been set.  Let's set this option and
+           * return a dedicated error code.  */
+          opt.use_keyboxd = comopt.use_keyboxd;
+          rc = gpg_error (GPG_ERR_TRUE);
+          goto leave;
+        }
     }
-  *last_slash_in_filename = save_slash;
+  else
+    *last_slash_in_filename = save_slash;
 
   /* To avoid races with other instances of gpg trying to create or
      update the keybox (it is removed during an update for a short
@@ -459,9 +475,13 @@
  leave:
   if (err)
     {
-      log_error ("keyblock resource '%s': %s\n", filename, gpg_strerror (err));
-      gpgsm_status_with_error (ctrl, STATUS_ERROR,
-                               "add_keyblock_resource", err);
+      if (gpg_err_code (err) != GPG_ERR_TRUE)
+        {
+          log_error ("keyblock resource '%s': %s\n",
+                     filename, gpg_strerror (err));
+          gpgsm_status_with_error (ctrl, STATUS_ERROR,
+                                   "add_keyblock_resource", err);
+        }
     }
   else
     any_registered = 1;
@@ -673,7 +693,7 @@
           switch (hd->activei.type)
             {
             case KEYDB_RESOURCE_TYPE_NONE:
-          break;
+              break;
             case KEYDB_RESOURCE_TYPE_KEYBOX:
               keybox_release (hd->activei.u.kr);
               break;
@@ -2027,7 +2047,7 @@
   err = keydb_search_fpr (ctrl, kh, fpr);
   if (err)
     {
-      if (gpg_err_code (err) != gpg_error (GPG_ERR_NOT_FOUND))
+      if (gpg_err_code (err) != GPG_ERR_NOT_FOUND)
         log_error (_("problem re-searching certificate: %s\n"),
                    gpg_strerror (err));
       keydb_release (kh);

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/keylist.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/keylist.c Changed

@@ -300,13 +300,15 @@
 
 
 static void
-print_capabilities (ksba_cert_t cert, estream_t fp)
+print_capabilities (ksba_cert_t cert, int algo, estream_t fp)
 {
   gpg_error_t err;
   unsigned int use;
+  unsigned int is_encr, is_sign, is_cert;
   size_t buflen;
   char buffer1;
 
+
   err = ksba_cert_get_user_data (cert, "is_qualified",
                                  &buffer, sizeof (buffer), &buflen);
   if (!err && buflen)
@@ -338,17 +340,33 @@
       return;
     }
 
+  is_encr = is_sign = is_cert = 0;
+
   if ((use & (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT)))
-    es_putc ('e', fp);
+    is_encr = 1;
   if ((use & (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
-    es_putc ('s', fp);
+    is_sign = 1;
   if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
+    is_cert = 1;
+
+  /* We need to returned the faked key usage to frontends so that they
+   * can select the right key.  Note that we don't do this for the
+   * human readable keyUsage.  */
+  if ((algo == GCRY_PK_ECC || (opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR))
+      && (use & KSBA_KEYUSAGE_KEY_AGREEMENT))
+    is_encr = 1;
+
+  if (is_encr)
+    es_putc ('e', fp);
+  if (is_sign)
+    es_putc ('s', fp);
+  if (is_cert)
     es_putc ('c', fp);
-  if ((use & (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT)))
+  if (is_encr)
     es_putc ('E', fp);
-  if ((use & (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
+  if (is_sign)
     es_putc ('S', fp);
-  if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
+  if (is_cert)
     es_putc ('C', fp);
 }
 
@@ -581,7 +599,7 @@
   /* Field 11, signature class - not used */
   es_putc (':', fp);
   /* Field 12, capabilities: */
-  print_capabilities (cert, fp);
+  print_capabilities (cert, algo, fp);
   es_putc (':', fp);
   /* Field 13, not used: */
   es_putc (':', fp);
@@ -1183,6 +1201,15 @@
     {
       err = gpgsm_validate_chain (ctrl, cert,
                                   GNUPG_ISOTIME_NONE, NULL, 1, fp, 0, NULL);
+      if (gpg_err_code (err) == GPG_ERR_CERT_REVOKED
+          && !check_isotime (ctrl->revoked_at))
+        {
+          es_fputs ("      revoked: ", fp);
+          gpgsm_print_time (fp, ctrl->revoked_at);
+          if (ctrl->revocation_reason)
+            es_fprintf (fp, " (%s)", ctrl->revocation_reason);
+          es_putc ('\n', fp);
+        }
       if (!err)
         es_fprintf (fp, "  certificate is good\n");
       else
@@ -1433,6 +1460,15 @@
 
       err = gpgsm_validate_chain (ctrl, cert,
                                   GNUPG_ISOTIME_NONE, NULL, 1, fp, 0, NULL);
+      if (gpg_err_code (err) == GPG_ERR_CERT_REVOKED
+          && !check_isotime (ctrl->revoked_at))
+        {
+          es_fputs ("      revoked: ", fp);
+          gpgsm_print_time (fp, ctrl->revoked_at);
+          if (ctrl->revocation_reason)
+            es_fprintf (fp, " (%s)", ctrl->revocation_reason);
+          es_putc ('\n', fp);
+        }
       tmperr = ksba_cert_get_user_data (cert, "is_qualified",
                                         &buffer, sizeof (buffer), &buflen);
       if (!tmperr && buflen)

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/minip12.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/minip12.c Changed

@@ -1,6 +1,7 @@
 /* minip12.c - A minimal pkcs-12 implementation.
 * Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation, Inc.
 * Copyright (C) 2014 Werner Koch
+ * Copyright (C) 2022, 2023 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
 */
 
 /* References:
@@ -76,6 +78,8 @@
 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x05, 0x0D };
 static unsigned char const oid_aes128_CBC9 = {
 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x01, 0x02 };
+static unsigned char const oid_aes256_CBC9 = {
+ 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x01, 0x2A };
 
 static unsigned char const oid_rsaEncryption9 = {
 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01 };
@@ -136,19 +140,98 @@
 int class;
 int is_constructed;
 unsigned long tag;
- unsigned long length; /* length part of the TLV */
- int nhdr;
+ size_t length; /* length part of the TLV */
+ size_t nhdr;
 int ndef; /* It is an indefinite length */
 };
 
 
+#define TLV_MAX_DEPTH 20
+
+
+struct bufferlist_s
+{
+ struct bufferlist_s *next;
+ char *buffer;
+};
+
+
+/* An object to control the ASN.1 parsing. */
+struct tlv_ctx_s
+{
+ /* The current buffer we are working on and its length. */
+ const unsigned char *buffer;
+ size_t bufsize;
+
+ size_t offset; /* The current offset into this buffer. */
+ int in_ndef; /* Flag indicating that we are in a NDEF. */
+ int pending; /* The last tlv_next has not yet been processed. */
+
+ struct tag_info ti; /* The current tag. */
+ gpg_error_t lasterr; /* Last error from tlv function. */
+ const char *lastfunc;/* Name of last called function. */
+
+ struct bufferlist_s *bufferlist; /* To keep track of amlloced buffers. */
+
+ unsigned int pop_count;/* Number of pops by tlv_next. */
+ unsigned int stacklen; /* Used size of the stack. */
+ struct {
+ const unsigned char *buffer; /* Saved value of BUFFER. */
+ size_t bufsize; /* Saved value of BUFSIZE. */
+ size_t offset; /* Saved value of OFFSET. */
+ int in_ndef; /* Saved IN_NDEF flag. */
+ } stackTLV_MAX_DEPTH;
+};
+
+
+/* Parser communication object. */
+struct p12_parse_ctx_s
+{
+ /* The callback for parsed certificates and its arg. */
+ void (*certcb)(void*, const unsigned char*, size_t);
+ void *certcbarg;
+
+ /* The supplied parseword. */
+ const char *password;
+
+ /* Set to true if the password was wrong. */
+ int badpass;
+
+ /* Malloced name of the curve. */
+ char *curve;
+
+ /* The private key as an MPI array. */
+ gcry_mpi_t *privatekey;
+};
+
+
 static int opt_verbose;
 
 
+static unsigned char *cram_octet_string (const unsigned char *input,
+ size_t length, size_t *r_newlength);
+
+
+
+&#xc;
 void
-p12_set_verbosity (int verbose)
+p12_set_verbosity (int verbose, int debug)
+{
+ opt_verbose = !!verbose;
+ if (debug)
+ opt_verbose = 2;
+}
+
+
+static void
+dump_tag_info (const char *text, struct tag_info *ti)
 {
- opt_verbose = verbose;
+ if (opt_verbose > 1)
+ log_debug ("p12_parse(%s): ti.class=%d tag=%lu len=%zu nhdr=%zu %s%s\n",
+ text,
+ ti->class, ti->tag, ti->length, ti->nhdr,
+ ti->is_constructed?" cons":"",
+ ti->ndef?" ndef":"");
 }
 
 
@@ -244,121 +327,507 @@
 }
 
 
+&#xc;
 /* Parse the buffer at the address BUFFER which is of SIZE and return
- the tag and the length part from the TLV triplet. Update BUFFER
- and SIZE on success. Checks that the encoded length does not
- exhaust the length of the provided buffer. */
+ * the tag and the length part from the TLV triplet. Update BUFFER
+ * and SIZE on success. Checks that the encoded length does not
+ * exhaust the length of the provided buffer. */
 static int
 parse_tag (unsigned char const **buffer, size_t *size, struct tag_info *ti)
 {
- int c;
- unsigned long tag;
- const unsigned char *buf = *buffer;
- size_t length = *size;
+ gpg_error_t err;
+ int tag;
+
+ err = parse_ber_header (buffer, size,
+ &ti->class, &tag,
+ &ti->is_constructed, &ti->ndef,
+ &ti->length, &ti->nhdr);
+ if (err)
+ return err;
+ if (tag < 0)
+ return gpg_error (GPG_ERR_EOVERFLOW);
+ ti->tag = tag;
+
+ if (ti->length > *size)
+ return gpg_error (GPG_ERR_BUFFER_TOO_SHORT); /* data larger than buffer. */
+
+ return 0;
+}
+
+
+/* Create a new TLV object. */
+static struct tlv_ctx_s *
+tlv_new (const unsigned char *buffer, size_t bufsize)
+{
+ struct tlv_ctx_s *tlv;
+ tlv = xtrycalloc (1, sizeof *tlv);
+ if (tlv)
+ {
+ tlv->buffer = buffer;
+ tlv->bufsize = bufsize;
+ }
+ return tlv;
+}
+
+
+/* This function can be used to store a malloced buffer into the TLV
+ * object. Ownership of BUFFER is thus transferred to TLV. This
+ * buffer will then only be released by tlv_release. */
+static gpg_error_t
+tlv_register_buffer (struct tlv_ctx_s *tlv, char *buffer)
+{
+ struct bufferlist_s *item;
+
+ item = xtrycalloc (1, sizeof *item);
+ if (!item)
+ return gpg_error_from_syserror ();
+ item->buffer = buffer;
+ item->next = tlv->bufferlist;
+ tlv->bufferlist = item;
+ return 0;
+}
+
+
+static void
+tlv_release (struct tlv_ctx_s *tlv)
+{
+ if (!tlv)
+ return;
+ while (tlv->bufferlist)
+ {
+ struct bufferlist_s *save = tlv->bufferlist->next;
+ xfree (tlv->bufferlist->buffer);
+ xfree (tlv->bufferlist);
+ tlv->bufferlist = save;
+ }
+ xfree (tlv);
+}
+
+
+/* Helper for tlv_next and tlv_peek. */
+static gpg_error_t
+_tlv_peek (struct tlv_ctx_s *tlv, size_t *r_n)
+{
+ const unsigned char *p;
+
+ if (tlv->offset > tlv->bufsize)
+ return gpg_error (GPG_ERR_BUG);
+ p = tlv->buffer + tlv->offset;
+ *r_n = tlv->bufsize - tlv->offset;
+ return parse_tag (&p, r_n, &tlv->ti);
+}
+
+
+/* Helper for tlv_expect_sequence and tlv_expect_context_tag. */
+static gpg_error_t
+_tlv_push (struct tlv_ctx_s *tlv)
+{
+ if (tlv->stacklen >= TLV_MAX_DEPTH)
+ return (tlv->lasterr = gpg_error (GPG_ERR_TOO_MANY));
+ tlv->stacktlv->stacklen.buffer = tlv->buffer;
+ tlv->stacktlv->stacklen.bufsize = tlv->bufsize;
+ tlv->stacktlv->stacklen.offset = tlv->offset;
+ tlv->stacktlv->stacklen.in_ndef = tlv->in_ndef;
+ tlv->stacklen++;
+ tlv->buffer += tlv->offset;
+ tlv->bufsize = tlv->ti.length;
+ tlv->offset = 0;
+ tlv->in_ndef = tlv->ti.ndef;
+ return 0;
+}
+
+
+/* Helper for tlv_next. */
+static gpg_error_t
+_tlv_pop (struct tlv_ctx_s *tlv)
+{
+ size_t saveoff;
+
+ if (!tlv->stacklen)
+ return gpg_error (GPG_ERR_EOF);
+
+ saveoff = tlv->offset;
+
+ tlv->stacklen--;
+ tlv->buffer = tlv->stacktlv->stacklen.buffer;
+ tlv->bufsize = tlv->stacktlv->stacklen.bufsize;
+ tlv->offset = tlv->stacktlv->stacklen.offset;
+ tlv->in_ndef = tlv->stacktlv->stacklen.in_ndef;
+
+ /* Move offset of the container to the end of the container. */
+ tlv->offset += saveoff;
+ if (tlv->offset > tlv->bufsize)
+ return gpg_error (GPG_ERR_INV_BER);
 
- ti->length = 0;
- ti->ndef = 0;
- ti->nhdr = 0;
+ tlv->pop_count++;
+ return 0;
+}
 
- /* Get the tag */
- if (!length)
- return -1; /* premature eof */
- c = *buf++; length--;
- ti->nhdr++;
 
- ti->class = (c & 0xc0) >> 6;
- ti->is_constructed = !!(c & 0x20);
- tag = c & 0x1f;
+/* Parse the next tag and value. Also detect the end of a container;
+ * tlv_popped() can be used to detect this. */
+static gpg_error_t
+tlv_next (struct tlv_ctx_s *tlv)
+{
+ gpg_error_t err;
+ size_t n;
+
+ tlv->pop_count = 0;
+ tlv->lasterr = 0;
+ tlv->lastfunc = __func__;
+ if (tlv->pending)
+ {
+ tlv->pending = 0;
+ return 0;
+ }
 
- if (tag == 0x1f)
+ if (!tlv->in_ndef && tlv->offset == tlv->bufsize)
 {
- tag = 0;
+ /* We are at the end of a container. Pop the stack. */
 do
+ err = _tlv_pop (tlv);
+ while (!err && !tlv->in_ndef && tlv->offset == tlv->bufsize);
+ if (err)
+ return (tlv->lasterr = err);
+ }
+
+ err = _tlv_peek (tlv, &n);
+ if (err)
+ return err;
+ if (tlv->in_ndef && (tlv->ti.class == CLASS_UNIVERSAL
+ && !tlv->ti.tag && !tlv->ti.is_constructed))
+ {
+ /* End tag while in ndef container. Skip the tag, and pop. */
+ tlv->offset += n - (tlv->bufsize - tlv->offset);
+ err = _tlv_pop (tlv);
+ /* FIXME: We need to peek whether there is another end tag and
+ * pop again. We can't modify the TLV object, though. */
+ if (err)
+ return (tlv->lasterr = err);
+ }
+
+ /* Set offset to the value of the TLV. */
+ tlv->offset += tlv->bufsize - tlv->offset - n;
+ dump_tag_info ("tlv_next", &tlv->ti);
+ return 0;
+}
+
+
+/* Return the current neting level of the TLV object. */
+static unsigned int
+tlv_level (struct tlv_ctx_s *tlv)
+{
+ return tlv->stacklen;
+}
+
+
+/* If called right after tlv_next the number of container levels
+ * popped are returned. */
+static unsigned int
+tlv_popped (struct tlv_ctx_s *tlv)
+{
+ return tlv->pop_count;
+}
+
+
+/* Set a flag to indicate that the last tlv_next has not yet been
+ * consumed. */
+static void
+tlv_set_pending (struct tlv_ctx_s *tlv)
+{
+ tlv->pending = 1;
+}
+
+
+/* Skip over the value of the current tag. */
+static void
+tlv_skip (struct tlv_ctx_s *tlv)
+{
+ tlv->lastfunc = __func__;
+ tlv->offset += tlv->ti.length;
+}
+
+
+/* Expect that the current tag is a sequence and setup the context for
+ * processing. */
+static gpg_error_t
+tlv_expect_sequence (struct tlv_ctx_s *tlv)
+{
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_SEQUENCE
+ && tlv->ti.is_constructed))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ return _tlv_push (tlv);
+}
+
+/* Variant of tlv_expect_sequence to be used for the ouyter sequence
+ * of an object which might have padding after the ASN.1 data. */
+static gpg_error_t
+tlv_expect_top_sequence (struct tlv_ctx_s *tlv)
+{
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_SEQUENCE
+ && tlv->ti.is_constructed))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ tlv->bufsize = tlv->ti.nhdr + tlv->ti.length;
+ return _tlv_push (tlv);
+}
+
+
+/* Expect that the current tag is a context tag and setup the context
+ * for processing. The tag of the context is returned at R_TAG. */
+static gpg_error_t
+tlv_expect_context_tag (struct tlv_ctx_s *tlv, int *r_tag)
+{
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_CONTEXT && tlv->ti.is_constructed))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ *r_tag = tlv->ti.tag;
+ return _tlv_push (tlv);
+}
+
+
+/* Expect that the current tag is a SET and setup the context for
+ * processing. */
+static gpg_error_t
+tlv_expect_set (struct tlv_ctx_s *tlv)
+{
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_SET
+ && tlv->ti.is_constructed))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ return _tlv_push (tlv);
+}
+
+
+/* Expect an object of CLASS with TAG and store its value at
+ * (R_DATA,R_DATALEN). Then skip over its value to the next tag.
+ * Note that the stored value is not allocated but points into
+ * TLV. */
+static gpg_error_t
+tlv_expect_object (struct tlv_ctx_s *tlv, int class, int tag,
+ unsigned char const **r_data, size_t *r_datalen)
+{
+ gpg_error_t err;
+ const unsigned char *p;
+
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == class && tlv->ti.tag == tag))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ p = tlv->buffer + tlv->offset;
+ if (!tlv->ti.length)
+ return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
+
+ if (class == CLASS_CONTEXT && tag == 0 && tlv->ti.is_constructed)
+ {
+ char *newbuffer;
+
+ newbuffer = cram_octet_string (p, tlv->ti.length, r_datalen);
+ if (!newbuffer)
+ return (tlv->lasterr = gpg_error (GPG_ERR_BAD_BER));
+ err = tlv_register_buffer (tlv, newbuffer);
+ if (err)
 {
- tag <<= 7;
- if (!length)
- return -1; /* premature eof */
- c = *buf++; length--;
- ti->nhdr++;
- tag |= c & 0x7f;
+ xfree (newbuffer);
+ return (tlv->lasterr = err);
 }
- while (c & 0x80);
+ *r_data = newbuffer;
 }
- ti->tag = tag;
-
- /* Get the length */
- if (!length)
- return -1; /* prematureeof */
- c = *buf++; length--;
- ti->nhdr++;
-
- if ( !(c & 0x80) )
- ti->length = c;
- else if (c == 0x80)
- ti->ndef = 1;
- else if (c == 0xff)
- return -1; /* forbidden length value */
 else
 {
- unsigned long len = 0;
- int count = c & 0x7f;
+ *r_data = p;
+ *r_datalen = tlv->ti.length;
+ }
+
+ tlv->offset += tlv->ti.length;
+ return 0;
+}
+
+
+/* Expect that the current tag is an object string and store its value
+ * at (R_DATA,R_DATALEN). Then skip over its value to the next tag.
+ * Note that the stored value are not allocated but point into TLV.
+ * If ENCAPSULATES is set the octet string is used as a new
+ * container. R_DATA and R_DATALEN are optional. */
+static gpg_error_t
+tlv_expect_octet_string (struct tlv_ctx_s *tlv, int encapsulates,
+ unsigned char const **r_data, size_t *r_datalen)
+{
+ gpg_error_t err;
+ const unsigned char *p;
+ size_t n;
+
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_OCTET_STRING
+ && (!tlv->ti.is_constructed || encapsulates)))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ p = tlv->buffer + tlv->offset;
+ if (!(n=tlv->ti.length))
+ return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
+
+ if (encapsulates && tlv->ti.is_constructed)
+ {
+ char *newbuffer;
 
- for (; count; count--)
+ newbuffer = cram_octet_string (p, n, r_datalen);
+ if (!newbuffer)
+ return (tlv->lasterr = gpg_error (GPG_ERR_BAD_BER));
+ err = tlv_register_buffer (tlv, newbuffer);
+ if (err)
 {
- len <<= 8;
- if (!length)
- return -1; /* premature_eof */
- c = *buf++; length--;
- ti->nhdr++;
- len |= c & 0xff;
+ xfree (newbuffer);
+ return (tlv->lasterr = err);
 }
- ti->length = len;
+ *r_data = newbuffer;
+ }
+ else
+ {
+ if (r_data)
+ *r_data = p;
+ if (r_datalen)
+ *r_datalen = tlv->ti.length;
 }
+ if (encapsulates)
+ return _tlv_push (tlv);
 
- if (ti->class == CLASS_UNIVERSAL && !ti->tag)
- ti->length = 0;
+ tlv->offset += tlv->ti.length;
+ return 0;
+}
 
- if (ti->length > length)
- return -1; /* data larger than buffer. */
 
- *buffer = buf;
- *size = length;
+/* Expect a NULL tag. */
+static gpg_error_t
+tlv_expect_null (struct tlv_ctx_s *tlv)
+{
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_NULL
+ && !tlv->ti.is_constructed && !tlv->ti.length))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
 return 0;
 }
 
 
-/* Given an ASN.1 chunk of a structure like:
+/* Expect that the current tag is an integer and return its value at
+ * R_VALUE. Then skip over its value to the next tag. */
+static gpg_error_t
+tlv_expect_integer (struct tlv_ctx_s *tlv, int *r_value)
+{
+ const unsigned char *p;
+ size_t n;
+ int value;
+
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_INTEGER
+ && !tlv->ti.is_constructed))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ p = tlv->buffer + tlv->offset;
+ if (!(n=tlv->ti.length))
+ return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
+
+ /* We currently support only positive values. */
+ if ((*p & 0x80))
+ return (tlv->lasterr = gpg_error (GPG_ERR_ERANGE));
+
+ for (value = 0; n; n--)
+ {
+ value <<= 8;
+ value |= (*p++) & 0xff;
+ if (value < 0)
+ return (tlv->lasterr = gpg_error (GPG_ERR_EOVERFLOW));
+ }
+ *r_value = value;
+ tlv->offset += tlv->ti.length;
+ return 0;
+}
+
+
+/* Variant of tlv_expect_integer which returns an MPI. If IGNORE_ZERO
+ * is set a value of 0 is ignored and R_VALUE not changed and the
+ * function returns GPG_ERR_FALSE. No check for negative encoded
+ * integers is doe because the old code here worked the same and we
+ * can't foreclose invalid encoded PKCS#12 stuff - after all it is
+ * PKCS#12 see https://www.cs.auckland.ac.nz/~pgut001/pubs/pfx.html */
+static gpg_error_t
+tlv_expect_mpinteger (struct tlv_ctx_s *tlv, int ignore_zero,
+ gcry_mpi_t *r_value)
+{
+ const unsigned char *p;
+ size_t n;
+
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_INTEGER
+ && !tlv->ti.is_constructed))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ p = tlv->buffer + tlv->offset;
+ if (!(n=tlv->ti.length))
+ return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
+
+ tlv->offset += tlv->ti.length;
+ if (ignore_zero && n == 1 && !*p)
+ return gpg_error (GPG_ERR_FALSE);
+
+ return gcry_mpi_scan (r_value, GCRYMPI_FMT_USG, p, n, NULL);
+}
+
+
+/* Expect that the current tag is an object id and store its value at
+ * (R_OID,R_OIDLEN). Then skip over its value to the next tag. Note
+ * that the stored value is not allocated but points into TLV. */
+static gpg_error_t
+tlv_expect_object_id (struct tlv_ctx_s *tlv,
+ unsigned char const **r_oid, size_t *r_oidlen)
+{
+ const unsigned char *p;
+ size_t n;
+
+ tlv->lastfunc = __func__;
+ if (!(tlv->ti.class == CLASS_UNIVERSAL && tlv->ti.tag == TAG_OBJECT_ID
+ && !tlv->ti.is_constructed))
+ return (tlv->lasterr = gpg_error (GPG_ERR_INV_OBJ));
+ p = tlv->buffer + tlv->offset;
+ if (!(n=tlv->ti.length))
+ return (tlv->lasterr = gpg_error (GPG_ERR_TOO_SHORT));
+
+ *r_oid = p;
+ *r_oidlen = tlv->ti.length;
+ tlv->offset += tlv->ti.length;
+ return 0;
+}
 
- 24 NDEF: OCTET STRING -- This is not passed to us
- 04 1: OCTET STRING -- INPUT point s to here
- : 30
- 04 1: OCTET STRING
- : 80
- ...
- 04 2: OCTET STRING
- : 00 00
- : } -- This denotes a Null tag and are the last
- -- two bytes in INPUT.
-
- Create a new buffer with the content of that octet string. INPUT
- is the original buffer with a length as stored at LENGTH. Returns
- NULL on error or a new malloced buffer with the length of this new
- buffer stored at LENGTH and the number of bytes parsed from input
- are added to the value stored at INPUT_CONSUMED. INPUT_CONSUMED is
- allowed to be passed as NULL if the caller is not interested in
- this value. */
+
+&#xc;
+/* Given an ASN.1 chunk of a structure like:
+ *
+ * 24 NDEF: OCTET STRING -- This is not passed to us
+ * 04 1: OCTET STRING -- INPUT point s to here
+ * : 30
+ * 04 1: OCTET STRING
+ * : 80
+ * ...
+ * 04 2: OCTET STRING
+ * : 00 00
+ * : } -- This denotes a Null tag and are the last
+ * -- two bytes in INPUT.
+ *
+ * The example is from Mozilla Firefox 1.0.4 which actually exports
+ * certs as single byte chunks of octet strings.
+ *
+ * Create a new buffer with the content of that octet string. INPUT
+ * is the original buffer with a LENGTH. Returns
+ * NULL on error or a new malloced buffer with its actual used length
+ * stored at R_NEWLENGTH. */
 static unsigned char *
-cram_octet_string (const unsigned char *input, size_t *length,
- size_t *input_consumed)
+cram_octet_string (const unsigned char *input, size_t length,
+ size_t *r_newlength)
 {
 const unsigned char *s = input;
- size_t n = *length;
+ size_t n = length;
 unsigned char *output, *d;
 struct tag_info ti;
 
 /* Allocate output buf. We know that it won't be longer than the
 input buffer. */
- d = output = gcry_malloc (n);
+ d = output = gcry_malloc (length);
 if (!output)
 goto bailout;
 
@@ -381,20 +850,15 @@
 }
 
 
- *length = d - output;
- if (input_consumed)
- *input_consumed += s - input;
+ *r_newlength = d - output;
 return output;
 
 bailout:
- if (input_consumed)
- *input_consumed += s - input;
 gcry_free (output);
 return NULL;
 }
 
 
-
 static int
 string_to_key (int id, char *salt, size_t saltlen, int iter, const char *pw,
 int req_keylen, unsigned char *keybuf)
@@ -582,7 +1046,7 @@
 return;
 }
 
- if (cipher_algo == GCRY_CIPHER_AES128
+ if ((cipher_algo == GCRY_CIPHER_AES128 || cipher_algo == GCRY_CIPHER_AES256)
 ? set_key_iv_pbes2 (chd, salt, saltlen, iter, iv, ivlen, pw, cipher_algo)
 : set_key_iv (chd, salt, saltlen, iter, pw,
 cipher_algo == GCRY_CIPHER_RFC2268_40? 5:24))
@@ -727,508 +1191,499 @@
 return 1;
 }
 
-/* Note: If R_RESULT is passed as NULL, a key object as already be
- processed and thus we need to skip it here. */
+
 static int
-parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
- int startoffset, size_t *r_consumed, const char *pw,
- void (*certcb)(void*, const unsigned char*, size_t),
- void *certcbarg, gcry_mpi_t **r_result,
- int *r_badpass)
+parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, struct tlv_ctx_s *tlv)
 {
- struct tag_info ti;
- const unsigned char *p = buffer;
- const unsigned char *p_start = buffer;
- size_t n = length;
+ gpg_error_t err = 0;
 const char *where;
+ const unsigned char *oid;
+ size_t oidlen;
+ const unsigned char *data;
+ size_t datalen;
+ int intval;
 char salt20;
 size_t saltlen;
 char iv16;
 unsigned int iter;
 unsigned char *plain = NULL;
- int bad_pass = 0;
- unsigned char *cram_buffer = NULL;
- size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
 int is_3des = 0;
 int is_pbes2 = 0;
- gcry_mpi_t *result = NULL;
- int result_count;
+ int is_aes256 = 0;
+ int keyelem_count;
+ int renewed_tlv = 0;
+ int loopcount;
+ unsigned int startlevel;
 
- if (r_result)
- *r_result = NULL;
- where = "start";
- if (parse_tag (&p, &n, &ti))
+ where = "bag.encryptedData";
+ if (opt_verbose)
+ log_info ("processing %s\n", where);
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class != CLASS_CONTEXT || ti.tag)
+ if (tlv_expect_context_tag (tlv, &intval) || intval != 0 )
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
 
 where = "bag.encryptedData.version";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.tag != TAG_INTEGER || ti.length != 1 || *p != 0)
+ if ((err = tlv_expect_integer (tlv, &intval)))
 goto bailout;
- p++; n--;
- if (parse_tag (&p, &n, &ti))
+ if (intval)
+ {
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
 
 where = "bag.encryptedData.data";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- if (ti.tag != TAG_OBJECT_ID || ti.length != DIM(oid_data)
- || memcmp (p, oid_data, DIM(oid_data)))
+ if (oidlen != DIM(oid_data) || memcmp (oid, oid_data, DIM(oid_data)))
 goto bailout;
- p += DIM(oid_data);
- n -= DIM(oid_data);
 
 where = "bag.encryptedData.keyinfo";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (!ti.class && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_pbeWithSHAAnd40BitRC2_CBC)
- && !memcmp (p, oid_pbeWithSHAAnd40BitRC2_CBC,
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
+ goto bailout;
+ if (oidlen == DIM(oid_pbeWithSHAAnd40BitRC2_CBC)
+ && !memcmp (oid, oid_pbeWithSHAAnd40BitRC2_CBC,
 DIM(oid_pbeWithSHAAnd40BitRC2_CBC)))
+ ;
+ else if (oidlen == DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC)
+ && !memcmp (oid, oid_pbeWithSHAAnd3_KeyTripleDES_CBC,
+ DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC)))
+ is_3des = 1;
+ else if (oidlen == DIM(oid_pkcs5PBES2)
+ && !memcmp (oid, oid_pkcs5PBES2, oidlen))
+ is_pbes2 = 1;
+ else
 {
- p += DIM(oid_pbeWithSHAAnd40BitRC2_CBC);
- n -= DIM(oid_pbeWithSHAAnd40BitRC2_CBC);
- }
- else if (!ti.class && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC)
- && !memcmp (p, oid_pbeWithSHAAnd3_KeyTripleDES_CBC,
- DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC)))
- {
- p += DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC);
- n -= DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC);
- is_3des = 1;
- }
- else if (!ti.class && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_pkcs5PBES2)
- && !memcmp (p, oid_pkcs5PBES2, ti.length))
- {
- p += ti.length;
- n -= ti.length;
- is_pbes2 = 1;
+ err = gpg_error (GPG_ERR_UNKNOWN_ALGORITHM);
+ goto bailout;
 }
- else
- goto bailout;
 
+ /*FIXME: This code is duplicated in parse_shrouded_key_bag. */
 if (is_pbes2)
 {
 where = "pkcs5PBES2-params";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_pkcs5PBKDF2)
- && !memcmp (p, oid_pkcs5PBKDF2, ti.length)))
- goto bailout; /* Not PBKDF2. */
- p += ti.length;
- n -= ti.length;
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
+ goto bailout;
+ if (oidlen != DIM(oid_pkcs5PBKDF2)
+ || memcmp (oid, oid_pkcs5PBKDF2, oidlen))
+ {
+ err = gpg_error (GPG_ERR_INV_BER); /* Not PBKDF2. */
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+
+ if (tlv_next (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_OCTET_STRING
- && ti.length >= 8 && ti.length < sizeof salt))
- goto bailout; /* No salt or unsupported length. */
- saltlen = ti.length;
- memcpy (salt, p, saltlen);
- p += saltlen;
- n -= saltlen;
+ if (datalen < 8 || datalen > sizeof salt)
+ {
+ log_info ("bad length of salt (%zu)\n", datalen);
+ err = gpg_error (GPG_ERR_INV_LENGTH);
+ goto bailout;
+ }
+ saltlen = datalen;
+ memcpy (salt, data, saltlen);
 
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_INTEGER && ti.length))
- goto bailout; /* No valid iteration count. */
- for (iter=0; ti.length; ti.length--)
+ if ((err = tlv_expect_integer (tlv, &intval)))
+ goto bailout;
+ if (!intval) /* Not a valid iteration count. */
 {
- iter <<= 8;
- iter |= (*p++) & 0xff;
- n--;
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto bailout;
 }
+ iter = intval;
+
 /* Note: We don't support the optional parameters but assume
 that the algorithmIdentifier follows. */
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_aes128_CBC)
- && !memcmp (p, oid_aes128_CBC, ti.length)))
- goto bailout; /* Not AES-128. */
- p += ti.length;
- n -= ti.length;
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_OCTET_STRING && ti.length == sizeof iv))
- goto bailout; /* Bad IV. */
- memcpy (iv, p, sizeof iv);
- p += sizeof iv;
- n -= sizeof iv;
+
+ if (oidlen == DIM(oid_aes128_CBC)
+ && !memcmp (oid, oid_aes128_CBC, oidlen))
+ ;
+ else if (oidlen == DIM(oid_aes256_CBC)
+ && !memcmp (oid, oid_aes256_CBC, oidlen))
+ is_aes256 = 1;
+ else
+ {
+ gpgrt_log_printhex (oid, oidlen, "cipher algo:");
+ err = gpg_error (GPG_ERR_CIPHER_ALGO);
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
+ goto bailout;
+ if (datalen != sizeof iv)
+ {
+ err = gpg_error (GPG_ERR_INV_LENGTH);
+ goto bailout; /* Bad IV. */
+ }
+ memcpy (iv, data, datalen);
 }
 else
 {
 where = "rc2or3des-params";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_OCTET_STRING
- || ti.length < 8 || ti.length > 20 )
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
- saltlen = ti.length;
- memcpy (salt, p, saltlen);
- p += saltlen;
- n -= saltlen;
- if (parse_tag (&p, &n, &ti))
+ if (datalen < 8 || datalen > 20)
+ {
+ log_info ("bad length of salt (%zu) for 3DES\n", datalen);
+ err = gpg_error (GPG_ERR_INV_LENGTH);
+ goto bailout;
+ }
+ saltlen = datalen;
+ memcpy (salt, data, saltlen);
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_INTEGER || !ti.length )
+ if ((err = tlv_expect_integer (tlv, &intval)))
 goto bailout;
- for (iter=0; ti.length; ti.length--)
+ if (!intval)
 {
- iter <<= 8;
- iter |= (*p++) & 0xff;
- n--;
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto bailout;
 }
+ iter = intval;
 }
 
 where = "rc2or3desoraes-ciphertext";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
 
- consumed = p - p_start;
- if (ti.class == CLASS_CONTEXT && ti.tag == 0 && ti.is_constructed && ti.ndef)
- {
- /* Mozilla exported certs now come with single byte chunks of
- octet strings. (Mozilla Firefox 1.0.4). Arghh. */
- where = "cram-rc2or3des-ciphertext";
- cram_buffer = cram_octet_string ( p, &n, &consumed);
- if (!cram_buffer)
- goto bailout;
- p = p_start = cram_buffer;
- if (r_consumed)
- *r_consumed = consumed;
- r_consumed = NULL; /* Ugly hack to not update that value any further. */
- ti.length = n;
- }
- else if (ti.class == CLASS_CONTEXT && ti.tag == 0 && ti.is_constructed)
- {
- where = "octets-rc2or3des-ciphertext";
- n = ti.length;
- cram_buffer = cram_octet_string ( p, &n, &consumed);
- if (!cram_buffer)
- goto bailout;
- p = p_start = cram_buffer;
- if (r_consumed)
- *r_consumed = consumed;
- r_consumed = NULL; /* Ugly hack to not update that value any further. */
- ti.length = n;
- }
- else if (ti.class == CLASS_CONTEXT && ti.tag == 0 && ti.length )
- ;
- else
+ if (tlv_expect_object (tlv, CLASS_CONTEXT, 0, &data, &datalen))
 goto bailout;
 
 if (opt_verbose)
- log_info ("%lu bytes of %s encrypted text\n",ti.length,
- is_pbes2?"AES128":is_3des?"3DES":"RC2");
+ log_info ("%zu bytes of %s encrypted text\n", datalen,
+ is_pbes2?(is_aes256?"AES256":"AES128"):is_3des?"3DES":"RC2");
 
- plain = gcry_malloc_secure (ti.length);
+ plain = gcry_malloc_secure (datalen);
 if (!plain)
 {
+ err = gpg_error_from_syserror ();
 log_error ("error allocating decryption buffer\n");
 goto bailout;
 }
- decrypt_block (p, plain, ti.length, salt, saltlen, iter,
- iv, is_pbes2?16:0, pw,
- is_pbes2 ? GCRY_CIPHER_AES128 :
+ decrypt_block (data, plain, datalen, salt, saltlen, iter,
+ iv, is_pbes2?16:0, ctx->password,
+ is_pbes2 ? (is_aes256?GCRY_CIPHER_AES256:GCRY_CIPHER_AES128) :
 is_3des ? GCRY_CIPHER_3DES : GCRY_CIPHER_RFC2268_40,
 bag_decrypted_data_p);
- n = ti.length;
- startoffset = 0;
- p_start = p = plain;
 
- where = "outer.outer.seq";
- if (parse_tag (&p, &n, &ti))
+ /* We do not need the TLV anymore and allocated a new one. */
+ where = "bag.encryptedData.decrypted-text";
+ tlv = tlv_new (plain, datalen);
+ if (!tlv)
 {
- bad_pass = 1;
+ err = gpg_error_from_syserror ();
 goto bailout;
 }
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ renewed_tlv = 1;
+
+ if (tlv_next (tlv))
 {
- bad_pass = 1;
+ ctx->badpass = 1;
 goto bailout;
 }
-
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_top_sequence (tlv))
 {
- bad_pass = 1;
+ ctx->badpass = 1;
 goto bailout;
 }
 
 /* Loop over all certificates inside the bag. */
- while (n)
+ loopcount = 0;
+ startlevel = tlv_level (tlv);
+ while (!(err = tlv_next (tlv)) && tlv_level (tlv) == startlevel)
 {
 int iscrlbag = 0;
 int iskeybag = 0;
 
+ loopcount++;
 where = "certbag.nextcert";
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
 
- where = "certbag.objectidentifier";
- if (parse_tag (&p, &n, &ti))
+ where = "certbag.oid";
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_OBJECT_ID)
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- if ( ti.length == DIM(oid_pkcs_12_CertBag)
- && !memcmp (p, oid_pkcs_12_CertBag, DIM(oid_pkcs_12_CertBag)))
- {
- p += DIM(oid_pkcs_12_CertBag);
- n -= DIM(oid_pkcs_12_CertBag);
- }
- else if ( ti.length == DIM(oid_pkcs_12_CrlBag)
- && !memcmp (p, oid_pkcs_12_CrlBag, DIM(oid_pkcs_12_CrlBag)))
- {
- p += DIM(oid_pkcs_12_CrlBag);
- n -= DIM(oid_pkcs_12_CrlBag);
- iscrlbag = 1;
- }
- else if ( ti.length == DIM(oid_pkcs_12_keyBag)
- && !memcmp (p, oid_pkcs_12_keyBag, DIM(oid_pkcs_12_keyBag)))
+ if (oidlen == DIM(oid_pkcs_12_CertBag)
+ && !memcmp (oid, oid_pkcs_12_CertBag, DIM(oid_pkcs_12_CertBag)))
+ ;
+ else if (oidlen == DIM(oid_pkcs_12_CrlBag)
+ && !memcmp (oid, oid_pkcs_12_CrlBag, DIM(oid_pkcs_12_CrlBag)))
+ iscrlbag = 1;
+ else if (oidlen == DIM(oid_pkcs_12_keyBag)
+ && !memcmp (oid, oid_pkcs_12_keyBag, DIM(oid_pkcs_12_keyBag)))
 {
 /* The TrustedMIME plugin for MS Outlook started to create
 files with just one outer 3DES encrypted container and
 inside the certificates as well as the key. */
- p += DIM(oid_pkcs_12_keyBag);
- n -= DIM(oid_pkcs_12_keyBag);
 iskeybag = 1;
 }
 else
- goto bailout;
+ {
+ gpgrt_log_printhex (oid, oidlen, "cert bag type OID:");
+ err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+ goto bailout;
+ }
 
 where = "certbag.before.certheader";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class != CLASS_CONTEXT || ti.tag)
+ if (tlv_expect_context_tag (tlv, &intval) || intval != 0 )
 goto bailout;
+
 if (iscrlbag)
 {
 log_info ("skipping unsupported crlBag\n");
- p += ti.length;
- n -= ti.length;
 }
- else if (iskeybag && (result || !r_result))
+ else if (iskeybag && ctx->privatekey)
 {
 log_info ("one keyBag already processed; skipping this one\n");
- p += ti.length;
- n -= ti.length;
 }
 else if (iskeybag)
 {
- int len;
-
 if (opt_verbose)
 log_info ("processing simple keyBag\n");
 
- /* Fixme: This code is duplicated from parse_bag_data. */
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_next (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER
- || ti.length != 1 || *p)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- p++; n--;
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
+
+ if (tlv_next (tlv))
 goto bailout;
- len = ti.length;
- if (parse_tag (&p, &n, &ti))
+ if ((err = tlv_expect_integer (tlv, &intval)))
 goto bailout;
- if (len < ti.nhdr)
+ if (intval)
+ {
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
 goto bailout;
- len -= ti.nhdr;
- if (ti.class || ti.tag != TAG_OBJECT_ID
- || ti.length != DIM(oid_rsaEncryption)
- || memcmp (p, oid_rsaEncryption,
- DIM(oid_rsaEncryption)))
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- p += DIM (oid_rsaEncryption);
- n -= DIM (oid_rsaEncryption);
- if (len < ti.length)
+
+ if (tlv_next (tlv))
 goto bailout;
- len -= ti.length;
- if (n < len)
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- p += len;
- n -= len;
- if ( parse_tag (&p, &n, &ti)
- || ti.class || ti.tag != TAG_OCTET_STRING)
+ if (oidlen != DIM(oid_rsaEncryption)
+ || memcmp (oid, oid_rsaEncryption, oidlen))
+ {
+ err = gpg_error (GPG_ERR_PUBKEY_ALGO);
+ goto bailout;
+ }
+
+ /* We ignore the next octet string. */
+ if (tlv_next (tlv))
 goto bailout;
- if ( parse_tag (&p, &n, &ti)
- || ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
- len = ti.length;
 
- result = gcry_calloc (10, sizeof *result);
- if (!result)
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_sequence (tlv))
+ goto bailout;
+
+ if (ctx->privatekey)
+ {
+ err = gpg_error (GPG_ERR_DUP_VALUE);
+ log_error ("a private key has already been received\n");
+ goto bailout;
+ }
+ ctx->privatekey = gcry_calloc (10, sizeof *ctx->privatekey);
+ if (!ctx->privatekey)
 {
- log_error ( "error allocating result array\n");
+ err = gpg_error_from_syserror ();
+ log_error ("error allocating private key element array\n");
 goto bailout;
 }
- result_count = 0;
 
 where = "reading.keybag.key-parameters";
- for (result_count = 0; len && result_count < 9;)
+ keyelem_count = 0;
+ while (!(err = tlv_next (tlv)) && !tlv_popped (tlv))
 {
- if ( parse_tag (&p, &n, &ti)
- || ti.class || ti.tag != TAG_INTEGER)
- goto bailout;
- if (len < ti.nhdr)
- goto bailout;
- len -= ti.nhdr;
- if (len < ti.length)
- goto bailout;
- len -= ti.length;
- if (!result_count && ti.length == 1 && !*p)
- ; /* ignore the very first one if it is a 0 */
- else
+ if (keyelem_count >= 9)
 {
- int rc;
-
- rc = gcry_mpi_scan (result+result_count, GCRYMPI_FMT_USG, p,
- ti.length, NULL);
- if (rc)
- {
- log_error ("error parsing key parameter: %s\n",
- gpg_strerror (rc));
- goto bailout;
- }
- result_count++;
+ err = gpg_error (GPG_ERR_TOO_MANY);
+ goto bailout;
+ }
+
+ err = tlv_expect_mpinteger (tlv, !keyelem_count,
+ ctx->privatekey+keyelem_count);
+ if (!keyelem_count && gpg_err_code (err) == GPG_ERR_FALSE)
+ ; /* Ignore the first value iff it is zero. */
+ else if (err)
+ {
+ log_error ("error parsing RSA key parameter %d: %s\n",
+ keyelem_count, gpg_strerror (err));
+ goto bailout;
 }
- p += ti.length;
- n -= ti.length;
+ if (opt_verbose > 1)
+ log_debug ("RSA key parameter %d found\n", keyelem_count);
+ keyelem_count++;
 }
- if (len)
+ if (err && gpg_err_code (err) != GPG_ERR_EOF)
 goto bailout;
+ err = 0;
 }
 else
 {
 if (opt_verbose)
 log_info ("processing certBag\n");
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_OBJECT_ID
- || ti.length != DIM(oid_x509Certificate_for_pkcs_12)
- || memcmp (p, oid_x509Certificate_for_pkcs_12,
- DIM(oid_x509Certificate_for_pkcs_12)))
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- p += DIM(oid_x509Certificate_for_pkcs_12);
- n -= DIM(oid_x509Certificate_for_pkcs_12);
+ if (oidlen != DIM(oid_x509Certificate_for_pkcs_12)
+ || memcmp (oid, oid_x509Certificate_for_pkcs_12,
+ DIM(oid_x509Certificate_for_pkcs_12)))
+ {
+ err = gpg_error (GPG_ERR_UNSUPPORTED_CERT);
+ goto bailout;
+ }
 
 where = "certbag.before.octetstring";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class != CLASS_CONTEXT || ti.tag)
+ if (tlv_expect_context_tag (tlv, &intval))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+ if (intval)
+ {
+ err = gpg_error (GPG_ERR_BAD_BER);
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_OCTET_STRING || ti.ndef)
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
 
 /* Return the certificate. */
- if (certcb)
- certcb (certcbarg, p, ti.length);
-
- p += ti.length;
- n -= ti.length;
+ if (ctx->certcb)
+ ctx->certcb (ctx->certcbarg, data, datalen);
 }
 
- /* Ugly hack to cope with the padding: Forget about the rest if
- that is less or equal to the cipher's block length. We can
- reasonable assume that all valid data will be longer than
- just one block. */
- if (n <= (is_pbes2? 16:8))
- n = 0;
-
 /* Skip the optional SET with the pkcs12 cert attributes. */
- if (n)
- {
- where = "bag.attributes";
- if (parse_tag (&p, &n, &ti))
- goto bailout;
- if (!ti.class && ti.tag == TAG_SEQUENCE)
- ; /* No attributes. */
- else if (!ti.class && ti.tag == TAG_SET && !ti.ndef)
- { /* The optional SET. */
- p += ti.length;
- n -= ti.length;
- if (n <= (is_pbes2?16:8))
- n = 0;
- if (n && parse_tag (&p, &n, &ti))
- goto bailout;
- }
- else
- goto bailout;
+ where = "bag.attribute_set";
+ err = tlv_next (tlv);
+ if (gpg_err_code (err) == GPG_ERR_EOF)
+ break;
+ if (err)
+ goto bailout;
+ err = tlv_expect_set (tlv);
+ if (!err)
+ { /* This is the optional set of attributes. Skip it. */
+ tlv_skip (tlv);
+ if (opt_verbose)
+ log_info ("skipping bag.attribute_set\n");
 }
+ else if (gpg_err_code (err) == GPG_ERR_INV_OBJ)
+ tlv_set_pending (tlv); /* The next tlv_next will be skipped. */
+ else
+ goto bailout;
 }
-
- if (r_consumed)
- *r_consumed = consumed;
- gcry_free (plain);
- gcry_free (cram_buffer);
- if (r_result)
- *r_result = result;
- return 0;
-
- bailout:
- if (result)
+ if (err && gpg_err_code (err) != GPG_ERR_EOF)
 {
- int i;
-
- for (i=0; resulti; i++)
- gcry_mpi_release (resulti);
- gcry_free (result);
+ if (!loopcount) /* The first while(tlv_next) failed. */
+ ctx->badpass = 1;
+ goto bailout;
 }
- if (r_consumed)
- *r_consumed = consumed;
+ err = 0;
+
+ leave:
+ if (renewed_tlv)
+ tlv_release (tlv);
 gcry_free (plain);
- gcry_free (cram_buffer);
- log_error ("encryptedData error at \"%s\", offset %u\n",
- where, (unsigned int)((p - p_start)+startoffset));
- if (bad_pass)
+ if (ctx->badpass)
 {
 /* Note, that the following string might be used by other programs
 to check for a bad passphrase; it should therefore not be
 translated or changed. */
 log_error ("possibly bad passphrase given\n");
- *r_badpass = 1;
 }
- return -1;
+ return err;
+
+ bailout:
+ if (!err)
+ err = gpg_error (GPG_ERR_GENERAL);
+ log_error ("%s(%s): offset %u.%zu (%s): %s - %s\n",
+ __func__, where,
+ tlv? tlv->stacklen : 0,
+ tlv? tlv->offset : 0,
+ tlv? tlv->lastfunc : "",
+ tlv ? gpg_strerror (tlv->lasterr) : "init failed",
+ gpg_strerror (err));
+ goto leave;
 }
 
 
@@ -1259,400 +1714,624 @@
 }
 
 
-static gcry_mpi_t *
-parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
- size_t *r_consumed, char **r_curve, const char *pw)
+static gpg_error_t
+parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, struct tlv_ctx_s *tlv)
 {
- int rc;
- struct tag_info ti;
- const unsigned char *p = buffer;
- const unsigned char *p_start = buffer;
- size_t n = length;
+ gpg_error_t err = 0;
 const char *where;
+ const unsigned char *oid;
+ size_t oidlen;
+ const unsigned char *data;
+ size_t datalen;
+ int intval;
 char salt20;
 size_t saltlen;
 char iv16;
 unsigned int iter;
- int len;
+ struct tlv_ctx_s *saved_tlv = NULL;
+ int renewed_tlv = 0; /* True if the TLV must be released. */
 unsigned char *plain = NULL;
- gcry_mpi_t *result = NULL;
- int result_count, i;
- unsigned char *cram_buffer = NULL;
- size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
 int is_pbes2 = 0;
- char *curve = NULL;
-
- where = "start";
- if (parse_tag (&p, &n, &ti))
- goto bailout;
- if (ti.class != CLASS_CONTEXT || ti.tag)
- goto bailout;
- if (parse_tag (&p, &n, &ti))
- goto bailout;
- if (ti.class || ti.tag != TAG_OCTET_STRING)
- goto bailout;
-
- consumed = p - p_start;
- if (ti.is_constructed && ti.ndef)
- {
- /* Mozilla exported certs now come with single byte chunks of
- octet strings. (Mozilla Firefox 1.0.4). Arghh. */
- where = "cram-data.outersegs";
- cram_buffer = cram_octet_string ( p, &n, &consumed);
- if (!cram_buffer)
- goto bailout;
- p = p_start = cram_buffer;
- if (r_consumed)
- *r_consumed = consumed;
- r_consumed = NULL; /* Ugly hack to not update that value any further. */
- }
+ int is_aes256 = 0;
 
+ where = "shrouded_key_bag";
+ if (opt_verbose)
+ log_info ("processing %s\n", where);
 
- where = "data.outerseqs";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
- goto bailout;
- if (parse_tag (&p, &n, &ti))
- goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_context_tag (tlv, &intval) || intval != 0 )
 goto bailout;
 
- where = "data.objectidentifier";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_OBJECT_ID
- || ti.length != DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)
- || memcmp (p, oid_pkcs_12_pkcs_8ShroudedKeyBag,
- DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)))
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- p += DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
- n -= DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
 
- where = "shrouded,outerseqs";
- if (parse_tag (&p, &n, &ti))
- goto bailout;
- if (ti.class != CLASS_CONTEXT || ti.tag)
+ where = "shrouded_key_bag.cipherinfo";
+ if (tlv_next (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
- goto bailout;
- if (parse_tag (&p, &n, &ti))
- goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+
+ if (tlv_next (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- if (ti.class == 0 && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC)
- && !memcmp (p, oid_pbeWithSHAAnd3_KeyTripleDES_CBC,
+
+ if (oidlen == DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC)
+ && !memcmp (oid, oid_pbeWithSHAAnd3_KeyTripleDES_CBC,
 DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC)))
+ ; /* Standard cipher. */
+ else if (oidlen == DIM(oid_pkcs5PBES2)
+ && !memcmp (oid, oid_pkcs5PBES2, DIM(oid_pkcs5PBES2)))
+ is_pbes2 = 1;
+ else
 {
- p += DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC);
- n -= DIM(oid_pbeWithSHAAnd3_KeyTripleDES_CBC);
- }
- else if (ti.class == 0 && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_pkcs5PBES2)
- && !memcmp (p, oid_pkcs5PBES2, DIM(oid_pkcs5PBES2)))
- {
- p += DIM(oid_pkcs5PBES2);
- n -= DIM(oid_pkcs5PBES2);
- is_pbes2 = 1;
+ err = gpg_error (GPG_ERR_UNKNOWN_ALGORITHM);
+ goto bailout;
 }
- else
- goto bailout;
 
 if (is_pbes2)
 {
- where = "pkcs5PBES2-params";
- if (parse_tag (&p, &n, &ti))
+ where = "shrouded_key_bag.pkcs5PBES2-params";
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_pkcs5PBKDF2)
- && !memcmp (p, oid_pkcs5PBKDF2, ti.length)))
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
+ goto bailout;
+ if (!(oidlen == DIM(oid_pkcs5PBKDF2)
+ && !memcmp (oid, oid_pkcs5PBKDF2, oidlen)))
 goto bailout; /* Not PBKDF2. */
- p += ti.length;
- n -= ti.length;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+
+ if (tlv_next (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_OCTET_STRING
- && ti.length >= 8 && ti.length < sizeof salt))
- goto bailout; /* No salt or unsupported length. */
- saltlen = ti.length;
- memcpy (salt, p, saltlen);
- p += saltlen;
- n -= saltlen;
+ if (datalen < 8 || datalen > sizeof salt)
+ {
+ log_info ("bad length of salt (%zu) for AES\n", datalen);
+ err = gpg_error (GPG_ERR_INV_LENGTH);
+ goto bailout;
+ }
+ saltlen = datalen;
+ memcpy (salt, data, saltlen);
 
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
+ goto bailout;
+ if ((err = tlv_expect_integer (tlv, &intval)))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_INTEGER && ti.length))
- goto bailout; /* No valid iteration count. */
- for (iter=0; ti.length; ti.length--)
+ if (!intval) /* Not a valid iteration count. */
 {
- iter <<= 8;
- iter |= (*p++) & 0xff;
- n--;
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto bailout;
 }
+ iter = intval;
+
 /* Note: We don't support the optional parameters but assume
 that the algorithmIdentifier follows. */
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+ if (oidlen == DIM(oid_aes128_CBC)
+ && !memcmp (oid, oid_aes128_CBC, oidlen))
+ ;
+ else if (oidlen == DIM(oid_aes256_CBC)
+ && !memcmp (oid, oid_aes256_CBC, oidlen))
+ is_aes256 = 1;
+ else
+ {
+ gpgrt_log_printhex (oid, oidlen, "cipher is:");
+ err = gpg_error (GPG_ERR_CIPHER_ALGO);
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_OBJECT_ID
- && ti.length == DIM(oid_aes128_CBC)
- && !memcmp (p, oid_aes128_CBC, ti.length)))
- goto bailout; /* Not AES-128. */
- p += ti.length;
- n -= ti.length;
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
- if (!(!ti.class && ti.tag == TAG_OCTET_STRING && ti.length == sizeof iv))
+ if (datalen != sizeof iv)
 goto bailout; /* Bad IV. */
- memcpy (iv, p, sizeof iv);
- p += sizeof iv;
- n -= sizeof iv;
+ memcpy (iv, data, datalen);
 }
 else
 {
- where = "3des-params";
- if (parse_tag (&p, &n, &ti))
+ where = "shrouded_key_bag.3des-params";
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_OCTET_STRING
- || ti.length < 8 || ti.length > 20)
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
- saltlen = ti.length;
- memcpy (salt, p, saltlen);
- p += saltlen;
- n -= saltlen;
- if (parse_tag (&p, &n, &ti))
+ if (datalen < 8 || datalen > 20)
+ {
+ log_info ("bad length of salt (%zu) for 3DES\n", datalen);
+ err = gpg_error (GPG_ERR_INV_LENGTH);
+ goto bailout;
+ }
+ saltlen = datalen;
+ memcpy (salt, data, saltlen);
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_INTEGER || !ti.length )
+ if ((err = tlv_expect_integer (tlv, &intval)))
 goto bailout;
- for (iter=0; ti.length; ti.length--)
+ if (!intval)
 {
- iter <<= 8;
- iter |= (*p++) & 0xff;
- n--;
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto bailout;
 }
+ iter = intval;
 }
 
- where = "3desoraes-ciphertext";
- if (parse_tag (&p, &n, &ti))
+ where = "shrouded_key_bag.3desoraes-ciphertext";
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class || ti.tag != TAG_OCTET_STRING || !ti.length )
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
 
 if (opt_verbose)
- log_info ("%lu bytes of %s encrypted text\n",
- ti.length, is_pbes2? "AES128":"3DES");
+ log_info ("%zu bytes of %s encrypted text\n",
+ datalen, is_pbes2? (is_aes256?"AES256":"AES128"):"3DES");
+
+ plain = gcry_malloc_secure (datalen);
 
- plain = gcry_malloc_secure (ti.length);
 if (!plain)
 {
+ err = gpg_error_from_syserror ();
 log_error ("error allocating decryption buffer\n");
 goto bailout;
 }
- consumed += p - p_start + ti.length;
- decrypt_block (p, plain, ti.length, salt, saltlen, iter,
- iv, is_pbes2? 16:0, pw,
- is_pbes2? GCRY_CIPHER_AES128 : GCRY_CIPHER_3DES,
+ decrypt_block (data, plain, datalen, salt, saltlen, iter,
+ iv, is_pbes2? 16:0, ctx->password,
+ is_pbes2 ? (is_aes256?GCRY_CIPHER_AES256:GCRY_CIPHER_AES128)
+ : GCRY_CIPHER_3DES,
 bag_data_p);
- n = ti.length;
- startoffset = 0;
- p_start = p = plain;
 
- where = "decrypted-text";
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
- goto bailout;
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER
- || ti.length != 1 || *p)
+
+ /* We do not need the TLV anymore and allocated a new one. */
+ where = "shrouded_key_bag.decrypted-text";
+ saved_tlv = tlv;
+ tlv = tlv_new (plain, datalen);
+ if (!tlv)
+ {
+ err = gpg_error_from_syserror ();
+ goto bailout;
+ }
+ renewed_tlv = 1;
+ if (opt_verbose > 1)
+ log_debug ("new parser context\n");
+
+ if (tlv_next (tlv))
+ {
+ ctx->badpass = 1;
+ goto bailout;
+ }
+ if (tlv_expect_top_sequence (tlv))
+ {
+ ctx->badpass = 1;
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
+ {
+ ctx->badpass = 1;
+ goto bailout;
+ }
+ if ((err = tlv_expect_integer (tlv, &intval)))
+ {
+ ctx->badpass = 1;
+ goto bailout;
+ }
+ if (intval)
+ {
+ ctx->badpass = 1;
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
 goto bailout;
- p++; n--;
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- len = ti.length;
- if (parse_tag (&p, &n, &ti))
- goto bailout;
- if (len < ti.nhdr)
+
+ if (tlv_next (tlv))
 goto bailout;
- len -= ti.nhdr;
- if (ti.class || ti.tag != TAG_OBJECT_ID)
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- /* gpgrt_log_printhex (p, ti.length, "OID:"); */
- if (ti.length == DIM(oid_rsaEncryption)
- && !memcmp (p, oid_rsaEncryption, DIM(oid_rsaEncryption)))
+ if (oidlen == DIM(oid_rsaEncryption)
+ && !memcmp (oid, oid_rsaEncryption, oidlen))
 {
- p += DIM (oid_rsaEncryption);
- n -= DIM (oid_rsaEncryption);
+ if (opt_verbose > 1)
+ log_debug ("RSA parameters\n");
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_null (tlv))
+ tlv_set_pending (tlv); /* NULL tag missing - ignore this. */
 }
- else if (ti.length == DIM(oid_pcPublicKey)
- && !memcmp (p, oid_pcPublicKey, DIM(oid_pcPublicKey)))
+ else if (oidlen == DIM(oid_pcPublicKey)
+ && !memcmp (oid, oid_pcPublicKey, oidlen))
 {
 /* See RFC-5915 for the format. */
- p += DIM (oid_pcPublicKey);
- n -= DIM (oid_pcPublicKey);
- if (len < ti.length)
- goto bailout;
- len -= ti.length;
- if (n < len)
- goto bailout;
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- /* gpgrt_log_debug ("ti=%d/%lu len=%lu\n",ti.class,ti.tag,ti.length); */
- if (len < ti.nhdr)
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- len -= ti.nhdr;
- if (ti.class || ti.tag != TAG_OBJECT_ID)
- goto bailout;
- curve = ksba_oid_to_str (p, ti.length);
- if (!curve)
- goto bailout;
- /* log_debug ("OID of curve is: %s\n", curve); */
- p += ti.length;
- n -= ti.length;
+ ksba_free (ctx->curve);
+ ctx->curve = ksba_oid_to_str (oid, oidlen);
+ if (!ctx->curve)
+ {
+ err = gpg_error (GPG_ERR_INV_OID_STRING);
+ goto bailout;
+ }
+ if (opt_verbose > 1)
+ log_debug ("OID of curve is: %s\n", ctx->curve);
 }
- else
+ else /* Unknown key format */
+ {
+ gpgrt_log_printhex (oid, oidlen, "key format OID:");
+ err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+ goto bailout;
+ }
+
+ /* An octet string to encapsulate the key elements. */
+ if (tlv_next (tlv))
 goto bailout;
- if (len < ti.length)
+ if (tlv_expect_octet_string (tlv, 1, &data, &datalen))
 goto bailout;
- len -= ti.length;
- if (n < len)
+
+ if (tlv_next (tlv))
 goto bailout;
- p += len;
- n -= len;
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_OCTET_STRING)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
- goto bailout;
- len = ti.length;
 
- result = gcry_calloc (10, sizeof *result);
- if (!result)
+ if (ctx->privatekey)
+ {
+ err = gpg_error (GPG_ERR_DUP_VALUE);
+ log_error ("a private key has already been received\n");
+ goto bailout;
+ }
+ ctx->privatekey = gcry_calloc (10, sizeof *ctx->privatekey);
+ if (!ctx->privatekey)
 {
- log_error ( "error allocating result array\n");
+ err = gpg_error_from_syserror ();
+ log_error ("error allocating privatekey element array\n");
 goto bailout;
 }
- result_count = 0;
 
- where = "reading.key-parameters";
- if (curve) /* ECC case. */
+ where = "shrouded_key_bag.reading.key-parameters";
+ if (ctx->curve) /* ECC case. */
 {
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER)
- goto bailout;
- if (len < ti.nhdr)
+ if (tlv_next (tlv))
 goto bailout;
- len -= ti.nhdr;
- if (len < ti.length)
+ if ((err = tlv_expect_integer (tlv, &intval)))
 goto bailout;
- len -= ti.length;
- if (ti.length != 1 && *p != 1)
+ if (intval != 1)
 {
+ err = gpg_error (GPG_ERR_INV_VALUE);
 log_error ("error parsing private ecPublicKey parameter: %s\n",
 "bad version");
 goto bailout;
 }
- p += ti.length;
- n -= ti.length;
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_OCTET_STRING)
- goto bailout;
- if (len < ti.nhdr)
+
+ if (tlv_next (tlv))
 goto bailout;
- len -= ti.nhdr;
- if (len < ti.length)
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
 goto bailout;
- len -= ti.length;
- /* log_printhex (p, ti.length, "ecc q="); */
- rc = gcry_mpi_scan (result, GCRYMPI_FMT_USG, p, ti.length, NULL);
- if (rc)
+ if (opt_verbose > 1)
+ log_printhex (data, datalen, "ecc q=");
+ err = gcry_mpi_scan (ctx->privatekey, GCRYMPI_FMT_USG,
+ data, datalen, NULL);
+ if (err)
 {
- log_error ("error parsing key parameter: %s\n", gpg_strerror (rc));
+ log_error ("error parsing key parameter: %s\n", gpg_strerror (err));
 goto bailout;
 }
- p += ti.length;
- n -= ti.length;
-
- len = 0; /* Skip the rest. */
 }
 else /* RSA case */
 {
- for (result_count=0; len && result_count < 9;)
+ int keyelem_count = 0;
+ int firstparam = 1;
+
+ while (!(err = tlv_next (tlv)) && !tlv_popped (tlv))
 {
- if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER)
- goto bailout;
- if (len < ti.nhdr)
- goto bailout;
- len -= ti.nhdr;
- if (len < ti.length)
- goto bailout;
- len -= ti.length;
- if (!result_count && ti.length == 1 && !*p)
- ; /* ignore the very first one if it is a 0 */
+ if (keyelem_count >= 9)
+ {
+ err = gpg_error (GPG_ERR_TOO_MANY);
+ goto bailout;
+ }
+
+ err = tlv_expect_mpinteger (tlv, firstparam,
+ ctx->privatekey+keyelem_count);
+ if (firstparam && gpg_err_code (err) == GPG_ERR_FALSE)
+ ; /* Ignore the first value iff it is zero. */
+ else if (err)
+ {
+ log_error ("error parsing RSA key parameter %d: %s\n",
+ keyelem_count, gpg_strerror (err));
+ goto bailout;
+ }
 else
 {
- rc = gcry_mpi_scan (result+result_count, GCRYMPI_FMT_USG, p,
- ti.length, NULL);
- if (rc)
- {
- log_error ("error parsing key parameter: %s\n",
- gpg_strerror (rc));
- goto bailout;
- }
- result_count++;
+ if (opt_verbose > 1)
+ log_debug ("RSA key parameter %d found\n", keyelem_count);
+ keyelem_count++;
 }
- p += ti.length;
- n -= ti.length;
+ firstparam = 0;
 }
+ if (err && gpg_err_code (err) != GPG_ERR_EOF)
+ goto bailout;
+ err = 0;
 }
- if (len)
+
+ if (opt_verbose > 1)
+ log_debug ("restoring parser context\n");
+ tlv_release (tlv);
+ renewed_tlv = 0;
+ tlv = saved_tlv;
+
+ where = "shrouded_key_bag.attribute_set";
+ err = tlv_next (tlv);
+ if (gpg_err_code (err) == GPG_ERR_EOF)
+ goto leave;
+ if (err)
+ goto bailout;
+ err = tlv_expect_set (tlv);
+ if (!err)
+ { /* This is the optional set of attributes. Skip it. */
+ tlv_skip (tlv);
+ if (opt_verbose)
+ log_info ("skipping %s\n", where);
+ }
+ else if (gpg_err_code (err) == GPG_ERR_INV_OBJ)
+ tlv_set_pending (tlv); /* The next tlv_next will be skipped. */
+ else /* Other error. */
 goto bailout;
 
- goto leave;
 
- bailout:
+ leave:
 gcry_free (plain);
- if (result)
+ if (renewed_tlv)
 {
- for (i=0; resulti; i++)
- gcry_mpi_release (resulti);
- gcry_free (result);
+ tlv_release (tlv);
+ if (opt_verbose > 1)
+ log_debug ("parser context released\n");
 }
- log_error ( "data error at \"%s\", offset %u\n",
- where, (unsigned int)((p - buffer) + startoffset));
- result = NULL;
+ return err;
+
+ bailout:
+ if (!err)
+ err = gpg_error (GPG_ERR_GENERAL);
+ log_error ("%s(%s): offset %u.%zu (%s): %s - %s\n",
+ __func__, where,
+ tlv? tlv->stacklen : 0,
+ tlv? tlv->offset : 0,
+ tlv? tlv->lastfunc : "",
+ tlv ? gpg_strerror (tlv->lasterr) : "init failed",
+ gpg_strerror (err));
+ goto leave;
+}
+
+
+static gpg_error_t
+parse_cert_bag (struct p12_parse_ctx_s *ctx, struct tlv_ctx_s *tlv)
+{
+ gpg_error_t err = 0;
+ const char *where;
+ int intval;
+ const unsigned char *oid;
+ size_t oidlen;
+ const unsigned char *data;
+ size_t datalen;
+
+ if (opt_verbose)
+ log_info ("processing certBag\n");
+
+ /* Expect:
+ * 0
+ * SEQUENCE
+ * OBJECT IDENTIFIER pkcs-12-certBag
+ */
+ where = "certbag.before.certheader";
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_context_tag (tlv, &intval))
+ goto bailout;
+ if (intval)
+ {
+ err = gpg_error (GPG_ERR_INV_VALUE);
+ goto bailout;
+ }
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_sequence (tlv))
+ goto bailout;
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
+ goto bailout;
+ if (oidlen != DIM(oid_x509Certificate_for_pkcs_12)
+ || memcmp (oid, oid_x509Certificate_for_pkcs_12, oidlen))
+ goto bailout;
+
+
+ /* Expect:
+ * 0
+ * OCTET STRING encapsulates -- the certificates
+ */
+ where = "certbag.before.octetstring";
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_context_tag (tlv, &intval) || intval != 0 )
+ goto bailout;
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_octet_string (tlv, 0, &data, &datalen))
+ goto bailout;
+
+ /* Return the certificate from the octet string. */
+ if (ctx->certcb)
+ ctx->certcb (ctx->certcbarg, data, datalen);
+
+ /* Expect optional:
+ * SET
+ * SEQUENCE -- we actually ignore this.
+ */
+ where = "certbag.attribute_set";
+ if (tlv_next (tlv))
+ goto bailout;
+ err = tlv_expect_set (tlv);
+ if (!err)
+ { /* This is the optional set of attributes. Skip it. */
+ tlv_skip (tlv);
+ if (opt_verbose)
+ log_info ("skipping certbag.attribute_set\n");
+ }
+ else if (gpg_err_code (err) == GPG_ERR_INV_OBJ)
+ tlv_set_pending (tlv); /* The next tlv_next will be skipped. */
+ else
+ goto bailout;
 
 leave:
- if (r_curve && result)
+ return err;
+
+ bailout:
+ log_error ("%s(%s): offset %u.%zu (%s): %s - %s\n",
+ __func__, where,
+ tlv? tlv->stacklen : 0,
+ tlv? tlv->offset : 0,
+ tlv? tlv->lastfunc : "",
+ tlv ? gpg_strerror (tlv->lasterr) : "init failed",
+ gpg_strerror (err));
+ if (!err)
+ err = gpg_error (GPG_ERR_GENERAL);
+ goto leave;
+}
+
+
+static gpg_error_t
+parse_bag_data (struct p12_parse_ctx_s *ctx, struct tlv_ctx_s *tlv)
+{
+ gpg_error_t err = 0;
+ const char *where;
+ int intval;
+ const unsigned char *oid;
+ size_t oidlen;
+ unsigned int startlevel;
+
+ if (opt_verbose)
+ log_info ("processing bag data\n");
+
+ /* Expect:
+ * 0
+ * OCTET STRING, encapsulates
+ */
+ where = "data";
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_context_tag (tlv, &intval) || intval != 0 )
+ goto bailout;
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_octet_string (tlv, 1, NULL, NULL))
+ goto bailout;
+
+
+ /* Expect:
+ * SEQUENCE
+ */
+ where = "data.outerseqs";
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_sequence (tlv))
+ goto bailout;
+
+ startlevel = tlv_level (tlv);
+ while (!(err = tlv_next (tlv)) && tlv_level (tlv) == startlevel)
 {
- *r_curve = curve;
- curve = NULL;
+ /* Expect:
+ * SEQUENCE
+ */
+ where = "data.innerseqs";
+ if (tlv_expect_sequence (tlv))
+ goto bailout;
+
+ /* Expect:
+ * OBJECT IDENTIFIER
+ */
+ where = "data.oid";
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
+ goto bailout;
+
+ /* Divert to the actual parser. */
+ if (oidlen == DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)
+ && !memcmp (oid, oid_pkcs_12_pkcs_8ShroudedKeyBag,
+ DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)))
+ {
+ if ((err = parse_shrouded_key_bag (ctx, tlv)))
+ goto bailout;
+ }
+ else if (oidlen == DIM(oid_pkcs_12_CertBag)
+ && !memcmp (oid, oid_pkcs_12_CertBag, DIM(oid_pkcs_12_CertBag)))
+ {
+ if ((err = parse_cert_bag (ctx, tlv)))
+ goto bailout;
+ }
+ else
+ {
+ tlv_skip (tlv);
+ log_info ("unknown inner data type - skipped\n");
+ }
 }
- else if (r_curve)
- *r_curve = NULL;
- ksba_free (curve);
- gcry_free (cram_buffer);
- if (r_consumed)
- *r_consumed = consumed;
- return result;
+ if (err && gpg_err_code (err) != GPG_ERR_EOF)
+ goto bailout;
+ err = 0;
+ if (tlv_popped (tlv))
+ tlv_set_pending (tlv);
+
+ leave:
+ return err;
+
+ bailout:
+ if (!err)
+ err = gpg_error (GPG_ERR_GENERAL);
+ log_error ("%s(%s): offset %u.%zu (%s): %s - %s\n",
+ __func__, where,
+ tlv? tlv->stacklen : 0,
+ tlv? tlv->offset : 0,
+ tlv? tlv->lastfunc : "",
+ tlv ? gpg_strerror (tlv->lasterr) : "init failed",
+ gpg_strerror (err));
+ goto leave;
 }
 
 
@@ -1660,190 +2339,152 @@
 secret key parameters. This is a very limited implementation in
 that it is only able to look for 3DES encoded encryptedData and
 tries to extract the first private key object it finds. In case of
- an error NULL is returned. CERTCB and CERRTCBARG are used to pass
- X.509 certificates back to the caller. */
+ an error NULL is returned. CERTCB and CERTCBARG are used to pass
+ X.509 certificates back to the caller. If R_CURVE is not NULL and
+ an ECC key was found the OID of the curve is stored there. */
 gcry_mpi_t *
 p12_parse (const unsigned char *buffer, size_t length, const char *pw,
 void (*certcb)(void*, const unsigned char*, size_t),
 void *certcbarg, int *r_badpass, char **r_curve)
 {
- struct tag_info ti;
- const unsigned char *p = buffer;
- const unsigned char *p_start = buffer;
- size_t n = length;
- const char *where;
- int bagseqlength, len;
- int bagseqndef, lenndef;
- gcry_mpi_t *result = NULL;
- unsigned char *cram_buffer = NULL;
- char *curve = NULL;
+ gpg_error_t err;
+ const char *where = "";
+ struct tlv_ctx_s *tlv;
+ struct p12_parse_ctx_s ctx = { NULL };
+ const unsigned char *oid;
+ size_t oidlen;
+ int intval;
+ unsigned int startlevel;
 
 *r_badpass = 0;
+
+ ctx.certcb = certcb;
+ ctx.certcbarg = certcbarg;
+ ctx.password = pw;
+
+ tlv = tlv_new (buffer, length);
+ if (!tlv)
+ {
+ err = gpg_error_from_syserror ();
+ goto bailout;
+ }
+
 where = "pfx";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
 
 where = "pfxVersion";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.tag != TAG_INTEGER || ti.length != 1 || *p != 3)
+ if (tlv_expect_integer (tlv, &intval) || intval != 3)
 goto bailout;
- p++; n--;
 
 where = "authSave";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- if (ti.tag != TAG_OBJECT_ID || ti.length != DIM(oid_data)
- || memcmp (p, oid_data, DIM(oid_data)))
+ if (oidlen != DIM(oid_data) || memcmp (oid, oid_data, DIM(oid_data)))
 goto bailout;
- p += DIM(oid_data);
- n -= DIM(oid_data);
 
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class != CLASS_CONTEXT || ti.tag)
+ if (tlv_expect_context_tag (tlv, &intval) || intval != 0 )
 goto bailout;
- if (parse_tag (&p, &n, &ti))
+
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class != CLASS_UNIVERSAL || ti.tag != TAG_OCTET_STRING)
+ if (tlv_expect_octet_string (tlv, 1, NULL, NULL))
 goto bailout;
 
- if (ti.is_constructed && ti.ndef)
- {
- /* Mozilla exported certs now come with single byte chunks of
- octet strings. (Mozilla Firefox 1.0.4). Arghh. */
- where = "cram-bags";
- cram_buffer = cram_octet_string ( p, &n, NULL);
- if (!cram_buffer)
- goto bailout;
- p = p_start = cram_buffer;
- }
 
 where = "bags";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
 goto bailout;
- if (ti.class != CLASS_UNIVERSAL || ti.tag != TAG_SEQUENCE)
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- bagseqndef = ti.ndef;
- bagseqlength = ti.length;
- while (bagseqlength || bagseqndef)
+
+ startlevel = tlv_level (tlv);
+ while (!(err = tlv_next (tlv)) && tlv_level (tlv) == startlevel)
 {
-/* log_debug ( "at offset %u\n", (p - p_start)); */
 where = "bag-sequence";
- if (parse_tag (&p, &n, &ti))
+ if (tlv_expect_sequence (tlv))
 goto bailout;
- if (bagseqndef && ti.class == CLASS_UNIVERSAL
- && !ti.tag && !ti.is_constructed)
- break; /* Ready */
- if (ti.class != CLASS_UNIVERSAL || ti.tag != TAG_SEQUENCE)
- goto bailout;
-
- if (!bagseqndef)
- {
- if (bagseqlength < ti.nhdr)
- goto bailout;
- bagseqlength -= ti.nhdr;
- if (bagseqlength < ti.length)
- goto bailout;
- bagseqlength -= ti.length;
- }
- lenndef = ti.ndef;
- len = ti.length;
 
- if (parse_tag (&p, &n, &ti))
+ if (tlv_next (tlv))
+ goto bailout;
+ if (tlv_expect_object_id (tlv, &oid, &oidlen))
 goto bailout;
- if (lenndef)
- len = ti.nhdr;
- else
- len -= ti.nhdr;
 
- if (ti.tag == TAG_OBJECT_ID && ti.length == DIM(oid_encryptedData)
- && !memcmp (p, oid_encryptedData, DIM(oid_encryptedData)))
+ if (oidlen == DIM(oid_encryptedData)
+ && !memcmp (oid, oid_encryptedData, DIM(oid_encryptedData)))
 {
- size_t consumed = 0;
-
- p += DIM(oid_encryptedData);
- n -= DIM(oid_encryptedData);
- if (!lenndef)
- len -= DIM(oid_encryptedData);
 where = "bag.encryptedData";
- if (parse_bag_encrypted_data (p, n, (p - p_start), &consumed, pw,
- certcb, certcbarg,
- result? NULL : &result, r_badpass))
+ if ((err=parse_bag_encrypted_data (&ctx, tlv)))
 goto bailout;
- if (lenndef)
- len += consumed;
 }
- else if (ti.tag == TAG_OBJECT_ID && ti.length == DIM(oid_data)
- && !memcmp (p, oid_data, DIM(oid_data)))
+ else if (oidlen == DIM(oid_data)
+ && !memcmp (oid, oid_data, DIM(oid_data)))
 {
- if (result)
- {
- log_info ("already got an key object, skipping this one\n");
- p += ti.length;
- n -= ti.length;
- }
- else
- {
- size_t consumed = 0;
-
- p += DIM(oid_data);
- n -= DIM(oid_data);
- if (!lenndef)
- len -= DIM(oid_data);
- result = parse_bag_data (p, n, (p - p_start),
- &consumed, &curve, pw);
- if (!result)
- goto bailout;
- if (lenndef)
- len += consumed;
- }
+ where = "bag.data";
+ if ((err=parse_bag_data (&ctx, tlv)))
+ goto bailout;
 }
- else
+ else if (oidlen == DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)
+ && !memcmp (oid, oid_pkcs_12_pkcs_8ShroudedKeyBag,
+ DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)))
 {
- log_info ("unknown bag type - skipped\n");
- p += ti.length;
- n -= ti.length;
+ where = "bag.shroudedkeybag";
+ if ((err = parse_shrouded_key_bag (&ctx, tlv)))
+ goto bailout;
 }
-
- if (len < 0 || len > n)
- goto bailout;
- p += len;
- n -= len;
- if (lenndef)
+ else
 {
- /* Need to skip the Null Tag. */
- if (parse_tag (&p, &n, &ti))
- goto bailout;
- if (!(ti.class == CLASS_UNIVERSAL && !ti.tag && !ti.is_constructed))
- goto bailout;
+ tlv_skip (tlv);
+ log_info ("unknown outer bag type - skipped\n");
 }
 }
+ if (err && gpg_err_code (err) != GPG_ERR_EOF)
+ goto bailout;
+ err = 0;
 
- gcry_free (cram_buffer);
- *r_curve = curve;
- return result;
+ tlv_release (tlv);
+ if (r_curve)
+ *r_curve = ctx.curve;
+ else
+ gcry_free (ctx.curve);
+
+ return ctx.privatekey;
 
 bailout:
- log_error ("error at \"%s\", offset %u\n",
- where, (unsigned int)(p - p_start));
- if (result)
+ *r_badpass = ctx.badpass;
+ log_error ("%s(%s): offset %u.%zu (%s): %s - %s\n",
+ __func__, where,
+ tlv? tlv->stacklen : 0,
+ tlv? tlv->offset : 0,
+ tlv? tlv->lastfunc : "",
+ tlv ? gpg_strerror (tlv->lasterr) : "init failed",
+ gpg_strerror (err));
+ if (ctx.privatekey)
 {
 int i;
 
- for (i=0; resulti; i++)
- gcry_mpi_release (resulti);
- gcry_free (result);
+ for (i=0; ctx.privatekeyi; i++)
+ gcry_mpi_release (ctx.privatekeyi);
+ gcry_free (ctx.privatekey);
+ ctx.privatekey = NULL;
 }
- gcry_free (cram_buffer);
- gcry_free (curve);
- *r_curve = NULL;
+ tlv_release (tlv);
+ gcry_free (ctx.curve);
+ if (r_curve)
+ *r_curve = NULL;
 return NULL;
 }
 
@@ -2035,7 +2676,7 @@
 /* Ready. */
 resultlen = p - result;
 if (needed != resultlen)
- log_debug ("length mismatch: %lu, %lu\n",
+ log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
 (unsigned long)needed, (unsigned long)resultlen);
 
 *r_length = resultlen;
@@ -2476,7 +3117,7 @@
 
 keybaglen = p - keybag;
 if (needed != keybaglen)
- log_debug ("length mismatch: %lu, %lu\n",
+ log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
 (unsigned long)needed, (unsigned long)keybaglen);
 
 *r_length = keybaglen;
@@ -2575,7 +3216,7 @@
 certbaglen = p - certbag;
 
 if (needed != certbaglen)
- log_debug ("length mismatch: %lu, %lu\n",
+ log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
 (unsigned long)needed, (unsigned long)certbaglen);
 
 *r_length = certbaglen;
@@ -2686,7 +3327,7 @@
 
 certseqlen = p - certseq;
 if (needed != certseqlen)
- log_debug ("length mismatch: %lu, %lu\n",
+ log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
 (unsigned long)needed, (unsigned long)certseqlen);
 
 /* Append some pad characters; we already allocated extra space. */
@@ -2852,8 +3493,8 @@
 }
 
 
-/* This is actually not a pkcs#12 function but one which creates an
- unencrypted a pkcs#1 private key. */
+/* This is actually not a PKCS#12 function but one which creates an
+ * unencrypted PKCS#1 private key. */
 unsigned char *
 p12_raw_build (gcry_mpi_t *kparms, int rawmode, size_t *r_length)
 {

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/minip12.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/minip12.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/passphrase.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/passphrase.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/server.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/server.c Changed

@@ -134,9 +134,6 @@
 {
   if (ctrl->server_local->message_fd != -1)
     {
-#ifdef HAVE_W32CE_SYSTEM
-#warning Is this correct for W32/W32CE?
-#endif
       close (ctrl->server_local->message_fd);
       ctrl->server_local->message_fd = -1;
     }
@@ -301,6 +298,10 @@
             opt.request_origin = i;
         }
     }
+  else if (!strcmp (key, "input-size-hint"))
+    {
+      ctrl->input_size_hint = string_to_u64 (value);
+    }
   else
     err = gpg_error (GPG_ERR_UNKNOWN_OPTION);
 
@@ -871,12 +872,6 @@
   if (rc)
     return rc;
 
-#ifdef HAVE_W32CE_SYSTEM
-  sysfd = _assuan_w32ce_finish_pipe ((int)sysfd, 0);
-  if (sysfd == INVALID_HANDLE_VALUE)
-    return set_error (gpg_err_code_from_syserror (),
-		      "rvid conversion failed");
-#endif
 
   fd = translate_sys2libc_fd (sysfd, 0);
   if (fd == -1)
@@ -1370,13 +1365,9 @@
   /* We use a pipe based server so that we can work from scripts.
      assuan_init_pipe_server will automagically detect when we are
      called with a socketpair and ignore FILEDES in this case. */
-#ifdef HAVE_W32CE_SYSTEM
-  #define SERVER_STDIN es_fileno(es_stdin)
-  #define SERVER_STDOUT es_fileno(es_stdout)
-#else
 #define SERVER_STDIN 0
 #define SERVER_STDOUT 1
-#endif
+
   filedes0 = assuan_fdopen (SERVER_STDIN);
   filedes1 = assuan_fdopen (SERVER_STDOUT);
   rc = assuan_new (&ctx);
@@ -1519,7 +1510,14 @@
             }
         }
       putc ('\n', statusfp);
-      fflush (statusfp);
+      if (ferror (statusfp))
+        err = gpg_error_from_syserror ();
+      else
+        {
+          fflush (statusfp);
+          if (ferror (statusfp))
+            err = gpg_error_from_syserror ();
+        }
     }
   else
     {
@@ -1543,7 +1541,7 @@
 {
   char buf30;
 
-  sprintf (buf, "%u", (unsigned int)ec);
+  snprintf (buf, sizeof buf, "%u", (unsigned int)ec);
   if (text)
     return gpgsm_status2 (ctrl, no, text, buf, NULL);
   else
@@ -1564,6 +1562,45 @@
 }
 
 
+/* This callback is used to emit progress status lines.  */
+gpg_error_t
+gpgsm_progress_cb (ctrl_t ctrl, uint64_t current, uint64_t total)
+{
+  char buffer60;
+  char units = "BKMGTPEZY?";
+  int unitidx = 0;
+
+  if (total)
+    {
+      if (current > total)
+        current = total;
+
+      while (total > 1024*1024)
+        {
+          total /= 1024;
+          current /= 1024;
+          unitidx++;
+        }
+    }
+  else
+    {
+      while (current > 1024*1024)
+        {
+          current /= 1024;
+          unitidx++;
+        }
+    }
+
+  if (unitidx > 9)
+    unitidx = 9;
+
+  snprintf (buffer, sizeof buffer, "? %lu %lu %c%s",
+            (unsigned long)current, (unsigned long)total,
+            unitsunitidx, unitidx? "iB" : "");
+  return gpgsm_status2 (ctrl, STATUS_PROGRESS, "?", buffer, NULL);
+}
+
+
 /* Helper to notify the client about Pinentry events.  Because that
    might disturb some older clients, this is only done when enabled
    via an option.  Returns an gpg error code. */

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/sign.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/sign.c Changed

@@ -1,6 +1,8 @@
 /* sign.c - Sign a message
 * Copyright (C) 2001, 2002, 2003, 2008,
 * 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2003-2012, 2016-2017, 2019,
+ * 2020, 2022-2023 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>
@@ -32,6 +35,7 @@
 
 #include "keydb.h"
 #include "../common/i18n.h"
+#include "../common/tlv.h"
 
 
 /* Hash the data and return if something was hashed. Return -1 on error. */
@@ -300,7 +304,6 @@
 }
 
 
-#if KSBA_VERSION_NUMBER >= 0x010400 && 0 /* 1.4.0 */
 static gpg_error_t
 add_signed_attribute (ksba_cms_t cms, const char *attrstr)
 {
@@ -378,7 +381,12 @@
 }
 
 /* Store the data in the CMS object for all signers. */
+#if 0
 err = ksba_cms_add_attribute (cms, -1, fields0, 0, der, derlen);
+#else
+ (void)cms;
+ err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+#endif
 if (err)
 {
 log_error ("invalid attribute specification '%s': %s\n",
@@ -391,7 +399,218 @@
 xfree (fields);
 return err;
 }
-#endif /*ksba >= 1.4.0 */
+
+
+&#xc;
+/* This function takes a binary detached signature in (BLOB,BLOBLEN)
+ * and writes it to OUT_FP. The core of the function is to replace
+ * NDEF length sequences in the input to those with fixed inputs.
+ * This helps certain other implementations to properly verify
+ * detached signature. Moreover, it allows our own trailing zero
+ * stripping code - which we need for PDF signatures - to work
+ * correctly.
+ *
+ * Example start of a detached signature as created by us:
+ * 0 NDEF: SEQUENCE { -- 1st sequence
+ * 2 9: OBJECT IDENTIFIER signedData (1 2 840 113549 1 7 2)
+ * 13 NDEF: 0 { -- 2nd sequence
+ * 15 NDEF: SEQUENCE { -- 3rd sequence
+ * 17 1: INTEGER 1 -- version
+ * 20 15: SET { -- set of algorithms
+ * 22 13: SEQUENCE {
+ * 24 9: OBJECT IDENTIFIER sha-256 (2 16 840 1 101 3 4 2 1)
+ * 35 0: NULL
+ * : }
+ * : }
+ * 37 NDEF: SEQUENCE { -- 4th pretty short sequence
+ * 39 9: OBJECT IDENTIFIER data (1 2 840 113549 1 7 1)
+ * : }
+ * 52 869: 0 {
+ * Our goal is to replace the NDEF by fixed length tags.
+ */
+static gpg_error_t
+write_detached_signature (ctrl_t ctrl, const void *blob, size_t bloblen,
+ estream_t out_fp)
+{
+ gpg_error_t err;
+ const unsigned char *p;
+ size_t n, objlen, hdrlen;
+ int class, tag, cons, ndef;
+ const unsigned char *p_ctoid, *p_version, *p_algoset, *p_dataoid;
+ size_t n_ctoid, n_version, n_algoset, n_dataoid;
+ const unsigned char *p_certset, *p_signerinfos;
+ size_t n_certset, n_signerinfos;
+ int i;
+ ksba_der_t dbld;
+ unsigned char *finalder = NULL;
+ size_t finalderlen;
+
+ (void)ctrl;
+
+ p = blob;
+ n = bloblen;
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE && cons))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No 1st sequence. */
+
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_OBJECT_ID && !cons))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No signedData OID. */
+ if (objlen > n)
+ return gpg_error (GPG_ERR_BAD_BER); /* Object larger than data. */
+ p_ctoid = p;
+ n_ctoid = objlen;
+ p += objlen;
+ n -= objlen;
+
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_CONTEXT && tag == 0 && cons))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No 2nd sequence. */
+
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE && cons))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No 3rd sequence. */
+
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_INTEGER))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No version. */
+ if (objlen > n)
+ return gpg_error (GPG_ERR_BAD_BER); /* Object larger than data. */
+ p_version = p;
+ n_version = objlen;
+ p += objlen;
+ n -= objlen;
+
+ p_algoset = p;
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_SET && cons && !ndef))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No set of algorithms. */
+ if (objlen > n)
+ return gpg_error (GPG_ERR_BAD_BER); /* Object larger than data. */
+ n_algoset = hdrlen + objlen;
+ p += objlen;
+ n -= objlen;
+
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE && cons))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No 4th sequence. */
+
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_OBJECT_ID && !cons))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No data OID. */
+ if (objlen > n)
+ return gpg_error (GPG_ERR_BAD_BER); /* Object larger than data. */
+ p_dataoid = p;
+ n_dataoid = objlen;
+ p += objlen;
+ n -= objlen;
+
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_NONE && !cons && !objlen))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No End tag. */
+
+ /* certificates 0 IMPLICIT CertificateSet OPTIONAL,
+ * Note: We ignore the following
+ * crls 1 IMPLICIT CertificateRevocationLists OPTIONAL
+ * because gpgsm does not create them. */
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,&objlen,&hdrlen)))
+ return err;
+ if (class == CLASS_CONTEXT && tag == 0 && cons)
+ {
+ if (objlen > n)
+ return gpg_error (GPG_ERR_BAD_BER); /* Object larger than data. */
+ p_certset = p;
+ n_certset = objlen;
+ p += objlen;
+ n -= objlen;
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,
+ &objlen,&hdrlen)))
+ return err;
+ }
+ else
+ {
+ p_certset = NULL;
+ n_certset = 0;
+ }
+
+ /* SignerInfos ::= SET OF SignerInfo */
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_SET && cons && !ndef))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No set of signerInfos. */
+ if (objlen > n)
+ return gpg_error (GPG_ERR_BAD_BER); /* Object larger than data. */
+ p_signerinfos = p;
+ n_signerinfos = objlen;
+ p += objlen;
+ n -= objlen;
+
+ /* For the fun of it check the 3 end tags. */
+ for (i=0; i < 3; i++)
+ {
+ if ((err=parse_ber_header (&p,&n,&class,&tag,&cons,&ndef,
+ &objlen,&hdrlen)))
+ return err;
+ if (!(class == CLASS_UNIVERSAL && tag == TAG_NONE && !cons && !objlen))
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* No End tag. */
+ }
+ if (n)
+ return gpg_error (GPG_ERR_INV_CMS_OBJ); /* Garbage */
+
+ /*---- From here on we jump to leave on error. ----*/
+
+ /* Now create a new object from the collected data. */
+ dbld = ksba_der_builder_new (16); /* (pre-allocate 16 items) */
+ if (!dbld)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ ksba_der_add_tag (dbld, 0, KSBA_TYPE_SEQUENCE);
+ ksba_der_add_val ( dbld, 0, KSBA_TYPE_OBJECT_ID, p_ctoid, n_ctoid);
+ ksba_der_add_tag ( dbld, KSBA_CLASS_CONTEXT, 0);
+ ksba_der_add_tag ( dbld, 0, KSBA_TYPE_SEQUENCE);
+ ksba_der_add_val ( dbld, 0, KSBA_TYPE_INTEGER, p_version, n_version);
+ ksba_der_add_der ( dbld, p_algoset, n_algoset);
+ ksba_der_add_tag ( dbld, 0, KSBA_TYPE_SEQUENCE);
+ ksba_der_add_val ( dbld, 0, KSBA_TYPE_OBJECT_ID, p_dataoid, n_dataoid);
+ ksba_der_add_end ( dbld);
+ if (p_certset)
+ {
+ ksba_der_add_tag ( dbld, KSBA_CLASS_CONTEXT, 0);
+ ksba_der_add_der ( dbld, p_certset, n_certset);
+ ksba_der_add_end ( dbld);
+ }
+ ksba_der_add_tag ( dbld, 0, KSBA_TYPE_SET);
+ ksba_der_add_der ( dbld, p_signerinfos, n_signerinfos);
+ ksba_der_add_end ( dbld);
+ ksba_der_add_end ( dbld);
+ ksba_der_add_end ( dbld);
+ ksba_der_add_end (dbld);
+
+ err = ksba_der_builder_get (dbld, &finalder, &finalderlen);
+ if (err)
+ goto leave;
+
+ if (es_fwrite (finalder, finalderlen, 1, out_fp) != 1)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+
+
+ leave:
+ ksba_der_release (dbld);
+ ksba_free (finalder);
+ return err;
+}
 
 
 &#xc;
@@ -409,6 +628,7 @@
 gpg_error_t err;
 gnupg_ksba_io_t b64writer = NULL;
 ksba_writer_t writer;
+ estream_t sig_fp = NULL; /* Used for detached signatures. */
 ksba_cms_t cms = NULL;
 ksba_stop_reason_t stopreason;
 KEYDB_HANDLE kh = NULL;
@@ -419,6 +639,7 @@
 ksba_isotime_t signed_at;
 certlist_t cl;
 int release_signerlist = 0;
+ int binary_detached = detached && !ctrl->create_pem && !ctrl->create_base64;
 
 audit_set_type (ctrl->audit, AUDIT_TYPE_SIGN);
 
@@ -441,17 +662,35 @@
 goto leave;
 }
 
+ /* Note that in detached mode the b64 write is actually a binary
+ * writer because we need to fixup the created signature later.
+ * Note that we do this only for binary output because we have no
+ * PEM writer interface outside of the ksba create writer code. */
 ctrl->pem_name = "SIGNED MESSAGE";
- rc = gnupg_ksba_create_writer
- (&b64writer, ((ctrl->create_pem? GNUPG_KSBA_IO_PEM : 0)
- | (ctrl->create_base64? GNUPG_KSBA_IO_BASE64 : 0)),
- ctrl->pem_name, out_fp, &writer);
+ if (binary_detached)
+ {
+ sig_fp = es_fopenmem (0, "w+");
+ rc = sig_fp? 0 : gpg_error_from_syserror ();
+ if (!rc)
+ rc = gnupg_ksba_create_writer (&b64writer, 0, NULL, sig_fp, &writer);
+ }
+ else
+ {
+ rc = gnupg_ksba_create_writer
+ (&b64writer, ((ctrl->create_pem? GNUPG_KSBA_IO_PEM : 0)
+ | (ctrl->create_base64? GNUPG_KSBA_IO_BASE64 : 0)),
+ ctrl->pem_name, out_fp, &writer);
+ }
 if (rc)
 {
 log_error ("can't create writer: %s\n", gpg_strerror (rc));
 goto leave;
 }
 
+ gnupg_ksba_set_progress_cb (b64writer, gpgsm_progress_cb, ctrl);
+ if (ctrl->input_size_hint)
+ gnupg_ksba_set_total (b64writer, ctrl->input_size_hint);
+
 err = ksba_cms_new (&cms);
 if (err)
 {
@@ -474,9 +713,7 @@
 if (!err)
 err = ksba_cms_set_content_type
 (cms, 1,
-#if KSBA_VERSION_NUMBER >= 0x010400 && 0
 opt.authenticode? KSBA_CT_SPC_IND_DATA_CTX :
-#endif
 KSBA_CT_DATA
 );
 if (err)
@@ -758,8 +995,6 @@
 }
 }
 
- /* We can add signed attributes only when build against libksba 1.4. */
-#if KSBA_VERSION_NUMBER >= 0x010400 && 0 /* 1.4.0 */
 {
 strlist_t sl;
 
@@ -767,20 +1002,19 @@
 if ((err = add_signed_attribute (cms, sl->d)))
 goto leave;
 }
-#else
- if (opt.attributes)
- log_info ("Note: option --attribute is ignored by this version\n");
-#endif /*ksba >= 1.4.0 */
 
 
 /* We need to write at least a minimal list of our capabilities to
- try to convince some MUAs to use 3DES and not the crippled
- RC2. Our list is:
-
- aes128-CBC
- des-EDE3-CBC
- */
- err = ksba_cms_add_smime_capability (cms, "2.16.840.1.101.3.4.1.2", NULL, 0);
+ * try to convince some MUAs to use 3DES and not the crippled
+ * RC2. Our list is:
+ *
+ * aes256-CBC
+ * aes128-CBC
+ * des-EDE3-CBC
+ */
+ err = ksba_cms_add_smime_capability (cms, "2.16.840.1.101.3.4.1.42", NULL,0);
+ if (!err)
+ err = ksba_cms_add_smime_capability (cms, "2.16.840.1.101.3.4.1.2", NULL,0);
 if (!err)
 err = ksba_cms_add_smime_capability (cms, "1.2.840.113549.3.7", NULL, 0);
 if (err)
@@ -797,7 +1031,7 @@
 err = ksba_cms_build (cms, &stopreason);
 if (err)
 {
- log_debug ("ksba_cms_build failed: %s\n", gpg_strerror (err));
+ log_error ("creating CMS object failed: %s\n", gpg_strerror (err));
 rc = err;
 goto leave;
 }
@@ -946,6 +1180,22 @@
 goto leave;
 }
 
+ if (binary_detached)
+ {
+ void *blob = NULL;
+ size_t bloblen;
+
+ rc = es_fclose_snatch (sig_fp, &blob, &bloblen);
+ sig_fp = NULL;
+ if (rc)
+ goto leave;
+ rc = write_detached_signature (ctrl, blob, bloblen, out_fp);
+ xfree (blob);
+ if (rc)
+ goto leave;
+ }
+
+
 audit_log (ctrl->audit, AUDIT_SIGNING_DONE);
 log_info ("signature created\n");
 
@@ -959,5 +1209,6 @@
 gnupg_ksba_destroy_writer (b64writer);
 keydb_release (kh);
 gcry_md_close (data_md);
+ es_fclose (sig_fp);
 return rc;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/t-minip12.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/t-minip12.c Changed

@@ -1,5 +1,5 @@
 /* t-minip12.c - Test driver for minip12.c
- * Copyright (C) 2020 g10 Code GmbH
+ * Copyright (C) 2020, 2023 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -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>
@@ -22,6 +23,8 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdarg.h>
+#include <ctype.h>
 
 #include "../common/util.h"
 #include "minip12.h"
@@ -31,7 +34,336 @@
 
 static int verbose;
 static int debug;
+static int any_error;
 
+static void die (const char *format, ...) GPGRT_ATTR_NR_PRINTF(1,2);
+static void err (const char *format, ...) GPGRT_ATTR_PRINTF(1,2);
+static void inf (const char *format, ...) GPGRT_ATTR_PRINTF(1,2);
+/* static void dbg (const char *format, ...) GPGRT_ATTR_PRINTF(1,2); */
+static void printresult (const char *format, ...) GPGRT_ATTR_PRINTF(1,2);
+static char *my_xstrconcat (const char *s1, ...) GPGRT_ATTR_SENTINEL(0);
+
+#define xstrconcat my_xstrconcat
+#define trim_spaces(a) my_trim_spaces ((a))
+#define my_isascii(c) (!((c) & 0x80))
+
+
+
+
+&#xc;
+/* Print diagnostic message and exit with failure. */
+static void
+die (const char *format, ...)
+{
+ va_list arg_ptr;
+
+ fflush (stdout);
+ fprintf (stderr, "%s: ", PGM);
+
+ va_start (arg_ptr, format);
+ vfprintf (stderr, format, arg_ptr);
+ va_end (arg_ptr);
+ if (!*format || formatstrlen(format)-1 != '\n')
+ putc ('\n', stderr);
+
+ exit (1);
+}
+
+
+/* Print diagnostic message. */
+static void
+err (const char *format, ...)
+{
+ va_list arg_ptr;
+
+ any_error = 1;
+
+ fflush (stdout);
+ fprintf (stderr, "%s: ", PGM);
+
+ va_start (arg_ptr, format);
+ vfprintf (stderr, format, arg_ptr);
+ va_end (arg_ptr);
+ if (!*format || formatstrlen(format)-1 != '\n')
+ putc ('\n', stderr);
+}
+
+
+/* Print an info message. */
+static void
+inf (const char *format, ...)
+{
+ va_list arg_ptr;
+
+ if (verbose)
+ {
+ fprintf (stderr, "%s: ", PGM);
+
+ va_start (arg_ptr, format);
+ vfprintf (stderr, format, arg_ptr);
+ va_end (arg_ptr);
+ if (!*format || formatstrlen(format)-1 != '\n')
+ putc ('\n', stderr);
+ }
+}
+
+
+/* Print a debug message. */
+/* static void */
+/* dbg (const char *format, ...) */
+/* { */
+/* va_list arg_ptr; */
+
+/* if (debug) */
+/* { */
+/* fprintf (stderr, "%s: DBG: ", PGM); */
+
+/* va_start (arg_ptr, format); */
+/* vfprintf (stderr, format, arg_ptr); */
+/* va_end (arg_ptr); */
+/* if (!*format || formatstrlen(format)-1 != '\n') */
+/* putc ('\n', stderr); */
+/* } */
+/* } */
+
+
+/* Print a result line to stdout. */
+static void
+printresult (const char *format, ...)
+{
+ va_list arg_ptr;
+
+ fflush (stdout);
+#ifdef HAVE_FLOCKFILE
+ flockfile (stdout);
+#endif
+ va_start (arg_ptr, format);
+ vfprintf (stdout, format, arg_ptr);
+ if (*format && formatstrlen(format)-1 != '\n')
+ putc ('\n', stdout);
+ va_end (arg_ptr);
+ fflush (stdout);
+#ifdef HAVE_FLOCKFILE
+ funlockfile (stdout);
+#endif
+}
+
+
+/* Helper for xstrconcat and strconcat. */
+static char *
+do_strconcat (int xmode, const char *s1, va_list arg_ptr)
+{
+ const char *argv48;
+ size_t argc;
+ size_t needed;
+ char *buffer, *p;
+
+ argc = 0;
+ argvargc++ = s1;
+ needed = strlen (s1);
+ while (((argvargc = va_arg (arg_ptr, const char *))))
+ {
+ needed += strlen (argvargc);
+ if (argc >= DIM (argv)-1)
+ die ("too may args for strconcat\n");
+ argc++;
+ }
+ needed++;
+ buffer = xmode? xmalloc (needed) : malloc (needed);
+ for (p = buffer, argc=0; argvargc; argc++)
+ p = stpcpy (p, argvargc);
+
+ return buffer;
+}
+
+
+/* Concatenate the string S1 with all the following strings up to a
+ NULL. Returns a malloced buffer with the new string or dies on error. */
+static char *
+my_xstrconcat (const char *s1, ...)
+{
+ va_list arg_ptr;
+ char *result;
+
+ if (!s1)
+ result = xstrdup ("");
+ else
+ {
+ va_start (arg_ptr, s1);
+ result = do_strconcat (1, s1, arg_ptr);
+ va_end (arg_ptr);
+ }
+ return result;
+}
+
+
+static char *
+my_trim_spaces (char *str )
+{
+ char *string, *p, *mark;
+
+ string = str;
+ for (p=string; *p && isspace (*(unsigned char *)p) ; p++)
+ ;
+ for (mark=NULL; (*string = *p); string++, p++ )
+ if (isspace (*(unsigned char *)p))
+ {
+ if (!mark)
+ mark = string;
+ }
+ else
+ mark = NULL;
+ if (mark)
+ *mark = '\0';
+
+ return str ;
+}
+
+
+/* Prepend FNAME with the srcdir environment variable's value and
+ * return an allocated filename. */
+static char *
+prepend_srcdir (const char *fname)
+{
+ static const char *srcdir;
+
+ if (!srcdir && !(srcdir = getenv ("srcdir")))
+ return xstrdup (fname);
+ else
+ return xstrconcat (srcdir, "/", fname, NULL);
+}
+
+
+/* (BUFFER,BUFLEN) and return a malloced hexstring. */
+static char *
+hash_buffer (const void *buffer, size_t buflen)
+{
+ unsigned char hash20;
+ char *result;
+ int i;
+
+ gcry_md_hash_buffer (GCRY_MD_SHA1, hash, buffer, buflen);
+ result = xmalloc (41);
+ for (i=0; i < 20; i++)
+ snprintf (result + 2*i, 3, "%02x", hashi);
+ return result;
+}
+
+
+/* Read next line but skip over empty and comment lines. Caller must
+ xfree the result. */
+static char *
+read_textline (FILE *fp, int *lineno)
+{
+ char line4096;
+ char *p;
+
+ do
+ {
+ if (!fgets (line, sizeof line, fp))
+ {
+ if (feof (fp))
+ return NULL;
+ die ("error reading input line: %s\n", strerror (errno));
+ }
+ ++*lineno;
+ p = strchr (line, '\n');
+ if (!p)
+ die ("input line %d not terminated or too long\n", *lineno);
+ *p = 0;
+ for (p--;p > line && my_isascii (*p) && isspace (*p); p--)
+ *p = 0;
+ }
+ while (!*line || *line == '#');
+ return xstrdup (line);
+}
+
+
+/* Copy the data after the tag to BUFFER. BUFFER will be allocated as
+ needed. */
+static void
+copy_data (char **buffer, const char *line, int lineno)
+{
+ const char *s;
+
+ xfree (*buffer);
+ *buffer = NULL;
+
+ s = strchr (line, ':');
+ if (!s)
+ {
+ err ("syntax error at input line %d", lineno);
+ return;
+ }
+ for (s++; my_isascii (*s) && isspace (*s); s++)
+ ;
+ *buffer = xstrdup (s);
+}
+
+
+static void
+hexdowncase (char *string)
+{
+ char *p;
+
+ if (string)
+ for (p=string; *p; p++)
+ if (my_isascii (*p))
+ *p = tolower (*p);
+}
+
+
+/* Return the value of the variable VARNAME from ~/.gnupg-autogen.rc
+ * or NULL if it does not exists or is empty. */
+static char *
+value_from_gnupg_autogen_rc (const char *varname)
+{
+ const char *home;
+ char *fname;
+ FILE *fp;
+ char *line = NULL;
+ char *p;
+ int lineno = 0;
+
+ if (!(home = getenv ("HOME")))
+ home = "";
+ fname = xstrconcat (home, "/.gnupg-autogen.rc", NULL);
+ fp = fopen (fname, "r");
+ if (!fp)
+ goto leave;
+
+ while ((line = read_textline (fp, &lineno)))
+ {
+ p = strchr (line, '=');
+ if (p)
+ {
+ *p++ = 0;
+ trim_spaces (line);
+ if (!strcmp (line, varname))
+ {
+ trim_spaces (p);
+ if (*p)
+ {
+ memmove (line, p, strlen (p)+1);
+ if (*line == '~' && line1 == '/')
+ {
+ p = xstrconcat (home, line+1, NULL);
+ xfree (line);
+ line = p;
+ }
+ break; /* found. */
+ }
+ }
+ }
+ xfree (line);
+ }
+
+ leave:
+ if (fp)
+ fclose (fp);
+ xfree (fname);
+ return line;
+}
 
 
 static void
@@ -45,13 +377,92 @@
 }
 
 
+/* Parse one PKCS#12 file. Returns zero on success. */
+static int
+one_file (const char *name, const char *pass)
+{
+ FILE *fp;
+ struct stat st;
+ unsigned char *buf;
+ size_t buflen;
+ gcry_mpi_t *result;
+ int badpass;
+ char *curve = NULL;
+
+ fp = fopen (name, "rb");
+ if (!fp)
+ {
+ fprintf (stderr, PGM": can't open '%s': %s\n", name, strerror (errno));
+ return 1;
+ }
+
+ if (fstat (fileno(fp), &st))
+ {
+ fprintf (stderr, PGM": can't stat '%s': %s\n", name, strerror (errno));
+ return 1;
+ }
 
-int
-main (int argc, char **argv)
+ buflen = st.st_size;
+ buf = xmalloc (buflen+1);
+ if (fread (buf, buflen, 1, fp) != 1)
+ {
+ fprintf (stderr, "error reading '%s': %s\n", name, strerror (errno));
+ return 1;
+ }
+ fclose (fp);
+
+ result = p12_parse (buf, buflen, pass, cert_cb, NULL, &badpass, &curve);
+ if (result)
+ {
+ int i, rc;
+ unsigned char *tmpbuf;
+
+ if (curve)
+ log_info ("curve: %s\n", curve);
+ for (i=0; resulti; i++)
+ {
+ rc = gcry_mpi_aprint (GCRYMPI_FMT_HEX, &tmpbuf, NULL, resulti);
+ if (rc)
+ log_error ("%d: error printing number: %s\n",
+ i, gpg_strerror (rc));
+ else
+ {
+ log_info ("%d: %s\n", i, tmpbuf);
+ gcry_free (tmpbuf);
+ }
+ }
+ }
+ if (badpass)
+ log_error ("Bad password given?\n");
+
+ xfree (buf);
+ return 0;
+}
+
+
+static void
+cert_collect_cb (void *opaque, const unsigned char *cert, size_t certlen)
+{
+ char **certstr = opaque;
+ char *hash, *save;
+
+ hash = hash_buffer (cert, certlen);
+ if (*certstr)
+ {
+ save = *certstr;
+ *certstr = xstrconcat (save, ",", hash, NULL);
+ xfree (save);
+ xfree (hash);
+ }
+ else
+ *certstr = hash;
+}
+
+
+static int
+run_one_test (const char *name, const char *desc, const char *pass,
+ const char *certexpected, const char *keyexpected)
 {
- int last_argc = -1;
- char const *name = NULL;
- char const *pass = NULL;
 FILE *fp;
 struct stat st;
 unsigned char *buf;
@@ -59,6 +470,225 @@
 gcry_mpi_t *result;
 int badpass;
 char *curve = NULL;
+ char *resulthash = NULL;
+ char *p;
+ char *certstr = NULL;
+ int ret;
+
+ inf ("testing '%s' (%s)", name , desc? desc:"");
+ fp = fopen (name, "rb");
+ if (!fp)
+ {
+ err ("can't open '%s': %s\n", name, strerror (errno));
+ printresult ("FAIL: %s - test file not found\n", name);
+ return 1;
+ }
+
+ if (fstat (fileno (fp), &st))
+ {
+ err ("can't stat '%s': %s\n", name, strerror (errno));
+ printresult ("FAIL: %s - error stating test file\n", name);
+ fclose (fp);
+ return 1;
+ }
+
+ buflen = st.st_size;
+ buf = xmalloc (buflen+1);
+ if (fread (buf, buflen, 1, fp) != 1)
+ {
+ err ("error reading '%s': %s\n", name, strerror (errno));
+ printresult ("FAIL: %s - error reading test file\n", name);
+ fclose (fp);
+ xfree (buf);
+ return 1;
+ }
+ fclose (fp);
+
+ result = p12_parse (buf, buflen, pass? pass:"", cert_collect_cb, &certstr,
+ &badpass, &curve);
+ if (result)
+ {
+ int i, rc;
+ char *tmpstring;
+ unsigned char *tmpbuf;
+ char numbuf20;
+
+ if (curve)
+ {
+ if (verbose > 1)
+ inf ("curve: %s\n", curve);
+ tmpstring = xstrconcat ("curve:", curve, "\n", NULL);
+ }
+ else
+ tmpstring = xstrdup ("\n");
+ for (i=0; resulti; i++)
+ {
+ rc = gcry_mpi_aprint (GCRYMPI_FMT_HEX, &tmpbuf, NULL, resulti);
+ if (rc)
+ die ("result %d: error printing number: %s\n",
+ i, gpg_strerror (rc));
+ else
+ {
+ if (verbose > 1)
+ inf ("result %d: %s\n", i, tmpbuf);
+ snprintf (numbuf, sizeof numbuf, "%d:", i);
+ p = xstrconcat (tmpstring, numbuf, tmpbuf, "\n", NULL);
+ xfree (tmpstring);
+ tmpstring = p;
+ gcry_free (tmpbuf);
+ }
+ }
+
+ resulthash = hash_buffer (tmpstring, strlen (tmpstring));
+ xfree (tmpstring);
+ }
+
+ if (verbose > 1)
+ {
+ inf ("cert(exp)=%s", certexpected);
+ inf ("cert(got)=%s", certstr? certstr:"null");
+ inf ("key(exp)=%s", keyexpected);
+ inf ("key(got)=%s", resulthash? resulthash:"null");
+ }
+
+ ret = 1;
+ if (!result)
+ printresult ("FAIL: %s - error from parser\n", name);
+ else if (certexpected && !certstr)
+ printresult ("FAIL: %s - expected certs but got none\n", name);
+ else if (!certexpected && certstr)
+ printresult ("FAIL: %s - no certs expected but got one\n", name);
+ else if (certexpected && certstr && strcmp (certexpected, certstr))
+ printresult ("FAIL: %s - certs not as expected\n", name);
+ else if (keyexpected && !resulthash)
+ printresult ("FAIL: %s - expected key but got none\n", name);
+ else if (!keyexpected && resulthash)
+ printresult ("FAIL: %s - key not expected but got one\n", name);
+ else if (keyexpected && resulthash && strcmp (keyexpected, resulthash))
+ printresult ("FAIL: %s - keys not as expected\n", name);
+ else
+ {
+ printresult ("PASS: %s\n", name);
+ ret = 0;
+ }
+
+ if (result)
+ {
+ int i;
+ for (i=0; resulti; i++)
+ gcry_mpi_release (resulti);
+ gcry_free (result);
+ }
+ xfree (certstr);
+ xfree (resulthash);
+ xfree (curve);
+ xfree (buf);
+ return ret;
+}
+
+
+/* Run a regression test using the Info take from DESCFNAME. */
+static int
+run_tests_from_file (const char *descfname)
+{
+ FILE *fp;
+ char *descdir;
+ int lineno, ntests;
+ char *line;
+ char *name = NULL;
+ char *desc = NULL;
+ char *pass = NULL;
+ char *cert = NULL;
+ char *key = NULL;
+ int ret = 0;
+ char *p;
+
+ inf ("Running tests from '%s'", descfname);
+ descdir = xstrdup (descfname);
+ p = strrchr (descdir, '/');
+ if (p)
+ *p = 0;
+ else
+ {
+ xfree (descdir);
+ descdir = xstrdup (".");
+ }
+
+ fp = fopen (descfname, "r");
+ if (!fp)
+ die ("error opening '%s': %s\n", descfname, strerror (errno));
+
+ lineno = ntests = 0;
+ while ((line = read_textline (fp, &lineno)))
+ {
+ if (!strncmp (line, "Name:", 5))
+ {
+ if (name)
+ ret |= run_one_test (name, desc, pass, cert, key);
+ xfree (cert); cert = NULL;
+ xfree (desc); desc = NULL;
+ xfree (pass); pass = NULL;
+ xfree (key); key = NULL;
+ copy_data (&name, line, lineno);
+ if (name)
+ {
+ p = xstrconcat (descdir, "/", name, NULL);
+ xfree (name);
+ name = p;
+ }
+ }
+ else if (!strncmp (line, "Desc:", 5))
+ copy_data (&desc, line, lineno);
+ else if (!strncmp (line, "Pass:", 5))
+ copy_data (&pass, line, lineno);
+ else if (!strncmp (line, "Cert:", 5))
+ {
+ p = NULL;
+ copy_data (&p, line, lineno);
+ hexdowncase (p);
+ if (p && cert)
+ {
+ char *save = cert;
+ cert = xstrconcat (save, ",", p, NULL);
+ xfree (save);
+ xfree (p);
+ }
+ else
+ cert = p;
+ }
+ else if (!strncmp (line, "Key:", 4))
+ {
+ copy_data (&key, line, lineno);
+ hexdowncase (key);
+ }
+ else
+ inf ("%s:%d: unknown tag ignored", descfname, lineno);
+
+ xfree (line);
+ }
+ if (name)
+ ret |= run_one_test (name, desc, pass, cert, key);
+ xfree (name);
+ xfree (desc);
+ xfree (pass);
+ xfree (cert);
+ xfree (key);
+
+ fclose (fp);
+ xfree (descdir);
+ return ret;
+}
+
+
+
+int
+main (int argc, char **argv)
+{
+ int last_argc = -1;
+ char const *name = NULL;
+ char const *pass = NULL;
+ int ret;
+ int no_extra = 0;
 
 if (argc)
 { argc--; argv++; }
@@ -73,12 +703,20 @@
 else if (!strcmp (*argv, "--help"))
 {
 fputs ("usage: " PGM " <pkcs12file> <passphrase>\n"
+ "Without <pkcs12file> a regression test is run\n"
 "Options:\n"
+ " --no-extra do not run extra tests\n"
 " --verbose print timings etc.\n"
+ " given twice shows more\n"
 " --debug flyswatter\n"
 , stdout);
 exit (0);
 }
+ else if (!strcmp (*argv, "--no-extra"))
+ {
+ no_extra = 1;
+ argc--; argv++;
+ }
 else if (!strcmp (*argv, "--verbose"))
 {
 verbose++;
@@ -97,7 +735,12 @@
 }
 }
 
- if (argc == 1)
+ if (!argc)
+ {
+ name = NULL;
+ pass = NULL;
+ }
+ else if (argc == 1)
 {
 name = argv0;
 pass = "";
@@ -109,57 +752,38 @@
 }
 else
 {
- fprintf (stderr, "usage: " PGM " <file> <passphrase>\n");
+ fprintf (stderr, "usage: " PGM " <file> <passphrase>\n");
 exit (1);
 }
 
 gcry_control (GCRYCTL_DISABLE_SECMEM, NULL);
 gcry_control (GCRYCTL_INITIALIZATION_FINISHED, NULL);
 
-
- fp = fopen (name, "rb");
- if (!fp)
+ if (name)
 {
- fprintf (stderr, PGM": can't open '%s': %s\n", name, strerror (errno));
- return 1;
+ p12_set_verbosity (verbose, debug);
+ ret = one_file (name, pass);
 }
-
- if (fstat (fileno(fp), &st))
- {
- fprintf (stderr, PGM": can't stat '%s': %s\n", name, strerror (errno));
- return 1;
- }
-
- buflen = st.st_size;
- buf = gcry_malloc (buflen+1);
- if (!buf || fread (buf, buflen, 1, fp) != 1)
+ else
 {
- fprintf (stderr, "error reading '%s': %s\n", name, strerror (errno));
- return 1;
- }
- fclose (fp);
+ char *descfname, *p;
 
- result = p12_parse (buf, buflen, pass, cert_cb, NULL, &badpass, &curve);
- if (result)
- {
- int i, rc;
- unsigned char *tmpbuf;
+ if (verbose > 1)
+ p12_set_verbosity (verbose > 1? (verbose - 1):0, debug);
+ descfname = prepend_srcdir ("../tests/cms/samplekeys/Description-p12");
+ ret = run_tests_from_file (descfname);
+ xfree (descfname);
 
- if (curve)
- log_info ("curve: %s\n", curve);
- for (i=0; resulti; i++)
+ /* Check whether we have non-public regression test cases. */
+ p = no_extra? NULL:value_from_gnupg_autogen_rc ("GNUPG_EXTRA_TESTS_DIR");
+ if (p)
 {
- rc = gcry_mpi_aprint (GCRYMPI_FMT_HEX, &tmpbuf, NULL, resulti);
- if (rc)
- log_error ("%d: error printing number: %s\n",
- i, gpg_strerror (rc));
- else
- {
- log_info ("%d: %s\n", i, tmpbuf);
- gcry_free (tmpbuf);
- }
+ descfname = xstrconcat (p, "/pkcs12/Description", NULL);
+ xfree (p);
+ ret |= run_tests_from_file (descfname);
+ xfree (descfname);
 }
 }
 
- return 0;
+ return ret;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/sm/verify.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/sm/verify.c Changed

@@ -105,12 +105,17 @@
   int signer;
   const char *algoid;
   int algo;
-  int is_detached;
+  int is_detached, maybe_detached;
   estream_t in_fp = NULL;
   char *p;
 
   audit_set_type (ctrl->audit, AUDIT_TYPE_VERIFY);
 
+  /* Although we detect detached signatures during the parsing phase,
+   * we need to know it earlier and thus accept the caller idea of
+   * what to verify.  */
+  maybe_detached = (data_fd != -1);
+
   kh = keydb_new (ctrl);
   if (!kh)
     {
@@ -131,7 +136,8 @@
   rc = gnupg_ksba_create_reader
     (&b64reader, ((ctrl->is_pem? GNUPG_KSBA_IO_PEM : 0)
                   | (ctrl->is_base64? GNUPG_KSBA_IO_BASE64 : 0)
-                  | (ctrl->autodetect_encoding? GNUPG_KSBA_IO_AUTODETECT : 0)),
+                  | (ctrl->autodetect_encoding? GNUPG_KSBA_IO_AUTODETECT : 0)
+                  | (maybe_detached? GNUPG_KSBA_IO_STRIP : 0)),
      in_fp, &reader);
   if (rc)
     {
@@ -152,6 +158,10 @@
         }
     }
 
+  gnupg_ksba_set_progress_cb (b64writer, gpgsm_progress_cb, ctrl);
+  if (ctrl->input_size_hint)
+    gnupg_ksba_set_total (b64writer, ctrl->input_size_hint);
+
   rc = ksba_cms_new (&cms);
   if (rc)
     goto leave;
@@ -299,6 +309,7 @@
       unsigned int nbits;
       int pkalgo;
       char *pkalgostr = NULL;
+      char *pkcurve = NULL;
       char *pkfpr = NULL;
       unsigned int pkalgoflags, verifyflags;
 
@@ -457,7 +468,7 @@
 
       pkfpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1);
       pkalgostr = gpgsm_pubkey_algo_string (cert, NULL);
-      pkalgo = gpgsm_get_key_algo_info (cert, &nbits);
+      pkalgo = gpgsm_get_key_algo_info2 (cert, &nbits, &pkcurve);
       /* Remap the ECC algo to the algo we use.  Note that EdDSA has
        * already been mapped.  */
       if (pkalgo == GCRY_PK_ECC)
@@ -513,9 +524,19 @@
           goto next_signer;
         }
 
+      /* Print compliance warning for the key.  */
+      if (!opt.quiet
+          && !gnupg_pk_is_compliant (opt.compliance, pkalgo, pkalgoflags,
+                                     NULL, nbits, pkcurve))
+          {
+            log_info (_("WARNING: This key is not suitable for signing"
+                        " in %s mode\n"),
+                      gnupg_compliance_option_string (opt.compliance));
+          }
+
       /* Check compliance with CO_DE_VS.  */
       if (gnupg_pk_is_compliant (CO_DE_VS, pkalgo, pkalgoflags,
-                                 NULL, nbits, NULL)
+                                 NULL, nbits, pkcurve)
           && gnupg_gcrypt_is_compliant (CO_DE_VS)
           && gnupg_digest_is_compliant (CO_DE_VS, sigval_hash_algo))
         gpgsm_status (ctrl, STATUS_VERIFICATION_COMPLIANCE_MODE,
@@ -528,7 +549,6 @@
           gpgsm_errors_seen = 1;
         }
 
-
       /* Now we can check the signature.  */
       if (msgdigest)
         { /* Signed attributes are available. */
@@ -634,8 +654,8 @@
 
         /* FIXME: INFO_PKALGO correctly shows ECDSA but PKALGO is then
          * ECC.  We should use the ECDSA here and need to find a way to
-         * figure this oult without using the bodus assumtion in
-         * gpgsm_check_cms_signature that ECC is alwas ECDSA.  */
+         * figure this out without using the bogus assumption in
+         * gpgsm_check_cms_signature that ECC is always ECDSA.  */
 
         fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1);
         tstr = strtimestamp_r (sigtime);
@@ -715,6 +735,7 @@
       gcry_sexp_release (sigval);
       xfree (msgdigest);
       xfree (pkalgostr);
+      xfree (pkcurve);
       xfree (pkfpr);
       ksba_cert_release (cert);
       cert = NULL;

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/cms/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/Makefile.am Changed

@@ -28,12 +28,15 @@
 
 AM_CFLAGS =
 
+GPGSM = ../../sm/gpgsm
+
 # Note that we need to use /bin/pwd so that we don't get into trouble
 # if the shell used for inittests would uses an internal version of
 # pwd which handles symlinks differently.
 OLD_TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
                         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
-	                GPGSM="$(GPGSM)" "$(srcdir)/runtest"
+			GNUPG_IN_TEST_SUITE=fact \
+	                GPGSM="$(GPGSM)$(EXEEXT)" "$(srcdir)/runtest"
 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
@@ -41,6 +44,7 @@
 	abs_top_srcdir="$(abs_top_srcdir)" \
 	objdir="$(abs_top_builddir)" \
         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
+	GNUPG_IN_TEST_SUITE=fact \
 	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = \
@@ -82,13 +86,19 @@
 testscripts = sm-sign+verify sm-verify
 
 EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \
+             samplemsgs/README \
+	     samplekeys/Description-p12 \
 	     samplekeys/steed-self-signing-nonthority.pem \
 	     samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
              samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
              samplekeys/cert_g10code_pete1.pem \
              samplekeys/cert_g10code_test1.pem \
              samplekeys/cert_g10code_theo1.pem \
-             samplemsgs/README \
+             samplekeys/ov-user.p12 \
+             samplekeys/ov-server.p12 \
+             samplekeys/opensc-test.p12 \
+             samplekeys/t5793-openssl.pfx \
+             samplekeys/t5793-test.pfx \
              samplemsgs/pwri-sample.cbc.p7m \
              samplemsgs/pwri-sample.cbc-2.p7m \
              samplemsgs/pwri-sample.gcm.p7m \

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/cms/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/Makefile.in Changed

@@ -390,16 +390,6 @@
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
 	$(am__append_7) $(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx.  WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library.  We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc.  256k is the largest stack
-# we use with pth.
-@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 = 
 
 # Convenience macros
@@ -408,13 +398,15 @@
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
 AM_CFLAGS = 
+GPGSM = ../../sm/gpgsm
 
 # Note that we need to use /bin/pwd so that we don't get into trouble
 # if the shell used for inittests would uses an internal version of
 # pwd which handles symlinks differently.
 OLD_TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
                         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
-	                GPGSM="$(GPGSM)" "$(srcdir)/runtest"
+			GNUPG_IN_TEST_SUITE=fact \
+	                GPGSM="$(GPGSM)$(EXEEXT)" "$(srcdir)/runtest"
 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
@@ -422,6 +414,7 @@
 	abs_top_srcdir="$(abs_top_srcdir)" \
 	objdir="$(abs_top_builddir)" \
         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
+	GNUPG_IN_TEST_SUITE=fact \
 	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = \
@@ -451,13 +444,19 @@
 # use that low-level asschk stuff.
 testscripts = sm-sign+verify sm-verify
 EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \
+             samplemsgs/README \
+	     samplekeys/Description-p12 \
 	     samplekeys/steed-self-signing-nonthority.pem \
 	     samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
              samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
              samplekeys/cert_g10code_pete1.pem \
              samplekeys/cert_g10code_test1.pem \
              samplekeys/cert_g10code_theo1.pem \
-             samplemsgs/README \
+             samplekeys/ov-user.p12 \
+             samplekeys/ov-server.p12 \
+             samplekeys/opensc-test.p12 \
+             samplekeys/t5793-openssl.pfx \
+             samplekeys/t5793-test.pfx \
              samplemsgs/pwri-sample.cbc.p7m \
              samplemsgs/pwri-sample.cbc-2.p7m \
              samplemsgs/pwri-sample.gcm.p7m \

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/cms/all-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/all-tests.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/cms/run-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/run-tests.scm Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/samplekeys/Description-p12 Added

@@ -0,0 +1,32 @@
+# Description-p12  - Machine readable description of our P12 test vectors
+
+Name: ov-user.p12
+Desc: Private test key from www.openvalidation.org
+Pass: start
+Cert: 4753a910e0c8b4caa8663ca0e4273a884eb5397d
+Key:  93be89edd11214ab74280d988a665b6beef876c5
+
+Name: ov-server.p12
+Desc: Private test key from www.openvalidation.org
+Pass: start
+Cert: 1997fadf6cc1af03e4845c4cba38fb2397315143
+Key:  63b1d7233e75c3a462cb4b8ea3ad285e8ecba91c
+
+Name: opensc-test.p12
+Desc: PKCS#12 key and certificates taken from OpenSC (RC2+3DES,PKCS#8)
+Pass: password
+Cert: 115abfc3ae554092a57ade74177fedf9459af5d2
+Cert: a0d6d318952c313ff8c33cd3f629647ff1de76b3
+Key:  5a36c61706367ecdb52e8779e3a32bbac1069fa1
+
+Name: t5793-openssl.pfx
+Desc: self-signed key issued keys
+Pass: test
+Cert: 80348a438e4b803b99e708da0b7fdd0659dedd15
+Key:  c271e44ab4fb19ca1aae71102ea4d7292ccc981d
+
+Name: t5793-test.pfx
+Desc: QuaVadis format of t5793-openssl
+Pass: test
+Cert: 80348a438e4b803b99e708da0b7fdd0659dedd15
+Key:  c271e44ab4fb19ca1aae71102ea4d7292ccc981d

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/samplekeys/opensc-test.p12 Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/samplekeys/ov-server.p12 Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/samplekeys/ov-user.p12 Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/samplekeys/t5793-openssl.pfx Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/cms/samplekeys/t5793-test.pfx Added

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgconf.ctl.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgconf.ctl.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgme/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgme/Makefile.am Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgme/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgme/Makefile.in Changed

@@ -390,16 +390,6 @@
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
 	$(am__append_7) $(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx.  WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library.  We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc.  256k is the largest stack
-# we use with pth.
-@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 = 
 
 # Convenience macros
@@ -414,6 +404,7 @@
 	abs_top_srcdir=$(abs_top_srcdir) \
 	objdir=$(abs_top_builddir) \
         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
+	GNUPG_IN_TEST_SUITE=fact \
 	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
 
 EXTRA_DIST = gpgme-defs.scm run-tests.scm setup.scm wrap.scm all-tests.scm
@@ -529,7 +520,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -596,15 +587,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	cscopelist-am ctags-am distclean distclean-generic 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-generic pdf \
-	pdf-am ps ps-am tags-am uninstall uninstall-am
+	clean-local cscopelist-am ctags-am distclean distclean-generic \
+	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-generic pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am
 
 .PRECIOUS: Makefile
 
@@ -622,6 +614,7 @@
 
 .PHONY: xcheck
 xcheck:
+	@$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests
 	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
@@ -629,6 +622,9 @@
 # start before all programs are built.
 all-local: $(required_pgms)
 
+clean-local:
+	-rm -rf tests lang
+
 # 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:

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgme/all-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgme/all-tests.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgscm/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgscm/Makefile.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgscm/ffi.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgscm/ffi.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgscm/init.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgscm/init.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgscm/scheme.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgscm/scheme.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/gpgscm/tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/gpgscm/tests.scm Changed

@@ -192,6 +192,9 @@
 (define (in-srcdir . names)
 (canonical-path (apply path-join (cons (getenv "abs_top_srcdir") names))))
 
+(define (in-objdir . names)
+ (canonical-path (apply path-join (cons (getenv "objdir") names))))
+
 ;; Split a list of paths.
 (define (pathsep-split s)
 (string-split s *pathsep*))
@@ -288,7 +291,7 @@
 ;; Otherwise this works like mkdtemp.
 (define (mkdtemp-autoremove . components)
 (let ((dir (apply mkdtemp components)))
- (atexit (lambda () (unlink-recursively dir)))
+ (atexit (lambda () (if (= *exit-status* 0) (unlink-recursively dir))))
 dir))
 
 (define-macro (with-temporary-working-directory . expressions)
@@ -490,6 +493,12 @@
 	(fail "mismatch"))
 (list tmpfiles source #f)))
 
+(define (tr:assert-same reference)
+ (lambda (tmpfiles source)
+ (if (not (string=? (call-with-input-file source read-all) reference))
+	(fail "mismatch"))
+ (list tmpfiles source #f)))
+
 (define (tr:call-with-content function . args)
 (lambda (tmpfiles source)
 (catch (list tmpfiles source *error*)
@@ -670,14 +679,14 @@
 	name))
 
 (package
- (define (scm setup name path . args)
+ (define (scm setup variant name path . args)
 ;; Start the process.
 (define (spawn-scm args' in out err)
 (spawn-process-fd `(,*argv0* ,@(verbosity (*verbose*))
 				 ,(locate-test (test-name path))
 				 ,@(if setup (force setup) '())
 				 ,@args' ,@args) in out err))
- (new name #f spawn-scm #f #f CLOSED_FD (expect-failure? name)))
+ (new variant name #f spawn-scm #f #f CLOSED_FD (expect-failure? name)))
 
 (define (binary setup name path . args)
 ;; Start the process.
@@ -685,9 +694,9 @@
 (spawn-process-fd `(,(test-name path)
 			 ,@(if setup (force setup) '()) ,@args' ,@args)
 			 in out err))
- (new name #f spawn-binary #f #f CLOSED_FD (expect-failure? name)))
+ (new #f name #f spawn-binary #f #f CLOSED_FD (expect-failure? name)))
 
- (define (new name directory spawn pid retcode logfd expect-failure)
+ (define (new variant name directory spawn pid retcode logfd expect-failure)
 (package
 
 ;; XXX: OO glue.
@@ -716,7 +725,11 @@
 
 (define (open-log-file)
 	(unless log-file-name
-		(set! log-file-name (string-append (basename name) ".log")))
+	 (set! log-file-name (path-join
+			 (getenv "objdir")
+			 (if variant
+				 (string-append name "." variant ".log")
+				 (string-append name ".log")))))
 	(catch '() (unlink log-file-name))
 	(open log-file-name (logior O_RDWR O_BINARY O_CREAT) #o600))
 
@@ -765,7 +778,10 @@
 		(seek logfd 0 SEEK_SET)
 		(splice logfd STDERR_FILENO)
 		(close logfd))
-	(echo (string-append (status-string) ":") name))
+	(echo (string-append (status-string) ":")
+	 (if variant
+		 (string-append "<" variant ">" name)
+		 name)))
 
 (define (xml)
 	(xx::tag

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/migrations/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/migrations/Makefile.am Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/migrations/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/migrations/Makefile.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/migrations/all-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/migrations/all-tests.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/migrations/from-classic.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/migrations/from-classic.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/migrations/run-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/migrations/run-tests.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/Makefile.am Changed

@@ -39,6 +39,7 @@
 	abs_top_srcdir="$(abs_top_srcdir)" \
 	objdir="$(abs_top_builddir)" \
         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
+	GNUPG_IN_TEST_SUITE=fact \
 	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = \
@@ -46,6 +47,7 @@
 	enarmor.scm \
 	mds.scm \
 	decrypt.scm \
+	decrypt-sym.scm \
 	decrypt-multifile.scm \
 	decrypt-dsa.scm \
 	decrypt-session-key.scm \
@@ -86,6 +88,7 @@
 	trust-pgp-1.scm \
 	trust-pgp-2.scm \
 	trust-pgp-3.scm \
+	trust-pgp-4.scm \
 	gpgtar.scm \
 	use-exact-key.scm \
 	default-key.scm \
@@ -207,7 +210,9 @@
             privkeys/1E28F20E41B54C2D1234D896096495FF57E08D18.asc \
             privkeys/EB33B687EB8581AB64D04852A54453E85F3DF62D.asc \
 	    privkeys/C6A6390E9388CDBAD71EAEA698233FE5E04F001E.asc \
-	    privkeys/D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3.asc
+	    privkeys/D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3.asc \
+	    privkeys/891067FFFC6D67D37BD4BFC399191C5F3989D1B5.key \
+	    privkeys/F27FC04CB01723A4CB6F5399F7B86CCD82C0169C.key
 
 sample_keys = samplekeys/README \
               samplekeys/ecc-sample-1-pub.asc \
@@ -226,6 +231,7 @@
 	      samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc \
               samplekeys/rsa-rsa-sample-1.asc \
               samplekeys/ed25519-cv25519-sample-1.asc \
+              samplekeys/ed25519-cv25519-sample-2.asc \
 	      samplekeys/silent-running.asc \
 	      samplekeys/ssh-dsa.key \
 	      samplekeys/ssh-ecdsa.key \
@@ -238,6 +244,10 @@
 sample_msgs = samplemsgs/clearsig-1-key-1.asc \
 	      samplemsgs/clearsig-2-keys-1.asc \
 	      samplemsgs/clearsig-2-keys-2.asc \
+	      samplemsgs/enc-sym-cfb-1.asc \
+	      samplemsgs/enc-sym-cfb-2.asc \
+	      samplemsgs/enc-sym-ocb-1.asc \
+	      samplemsgs/enc-sym-ocb-2.asc \
 	      samplemsgs/enc-1-key-1.asc \
 	      samplemsgs/enc-1-key-2.asc \
 	      samplemsgs/enc-2-keys-1.asc \
@@ -277,8 +287,6 @@
 	     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

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/Makefile.in Changed

@@ -433,16 +433,6 @@
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
 	$(am__append_7) $(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx.  WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library.  We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc.  256k is the largest stack
-# we use with pth.
-@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 = 
 
 # Convenience macros
@@ -458,25 +448,73 @@
 	abs_top_srcdir="$(abs_top_srcdir)" \
 	objdir="$(abs_top_builddir)" \
         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
+	GNUPG_IN_TEST_SUITE=fact \
 	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
+XTESTS = \
+	version.scm \
+	enarmor.scm \
+	mds.scm \
+	decrypt.scm \
+	decrypt-sym.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 \
+	trust-pgp-4.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
+
 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 \
@@ -566,7 +604,9 @@
             privkeys/1E28F20E41B54C2D1234D896096495FF57E08D18.asc \
             privkeys/EB33B687EB8581AB64D04852A54453E85F3DF62D.asc \
 	    privkeys/C6A6390E9388CDBAD71EAEA698233FE5E04F001E.asc \
-	    privkeys/D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3.asc
+	    privkeys/D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3.asc \
+	    privkeys/891067FFFC6D67D37BD4BFC399191C5F3989D1B5.key \
+	    privkeys/F27FC04CB01723A4CB6F5399F7B86CCD82C0169C.key
 
 sample_keys = samplekeys/README \
               samplekeys/ecc-sample-1-pub.asc \
@@ -585,6 +625,7 @@
 	      samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc \
               samplekeys/rsa-rsa-sample-1.asc \
               samplekeys/ed25519-cv25519-sample-1.asc \
+              samplekeys/ed25519-cv25519-sample-2.asc \
 	      samplekeys/silent-running.asc \
 	      samplekeys/ssh-dsa.key \
 	      samplekeys/ssh-ecdsa.key \
@@ -597,6 +638,10 @@
 sample_msgs = samplemsgs/clearsig-1-key-1.asc \
 	      samplemsgs/clearsig-2-keys-1.asc \
 	      samplemsgs/clearsig-2-keys-2.asc \
+	      samplemsgs/enc-sym-cfb-1.asc \
+	      samplemsgs/enc-sym-cfb-2.asc \
+	      samplemsgs/enc-sym-ocb-1.asc \
+	      samplemsgs/enc-sym-ocb-2.asc \
 	      samplemsgs/enc-1-key-1.asc \
 	      samplemsgs/enc-1-key-2.asc \
 	      samplemsgs/enc-2-keys-1.asc \

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/README -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/README Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/all-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/all-tests.scm Changed

@@ -30,6 +30,7 @@
    (make-environment-cache
     (test::scm
      #f
+     #f
      (path-join "tests" "openpgp" "setup.scm")
      (in-srcdir "tests" "openpgp" "setup.scm"))))
 
@@ -40,7 +41,8 @@
    (make-environment-cache
     (test::scm
      #f
-     (qualify (path-join "tests" "openpgp" "setup.scm") variant)
+     variant
+     (path-join "tests" "openpgp" "setup.scm")
      (in-srcdir "tests" "openpgp" "setup.scm")
      (string-append "--" variant))))
 
@@ -48,34 +50,42 @@
  (define setup-use-keyboxd (setup* "use-keyboxd"))
 
  (define all-tests
-   (parse-makefile-expand "Makefile"
+   (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am")
 			  (lambda (filename port key) (parse-makefile port key))
 			  "XTESTS"))
 
+ (define keyboxd-enabled?
+   ;; Parse the variable "libexec_PROGRAMS" in kbx/Makefile
+   (not (null?
+	 (parse-makefile-expand (in-objdir "kbx" "Makefile")
+				(lambda (filename port key) (parse-makefile port key))
+				"libexec_PROGRAMS"))))
+
  (define tests
    (map (lambda (name)
 	  (test::scm setup
-		     (qualify (path-join "tests" "openpgp" name) "standard")
+		     "standard"
+		     (path-join "tests" "openpgp" name)
 		     (in-srcdir "tests" "openpgp" name))) all-tests))
 
  (when *run-all-tests*
        (set! tests
 	     (append
 	      tests
-              ;; The second pass uses the keyboxd
-	      (map (lambda (name)
-		     (test::scm setup-use-keyboxd
-				(qualify (path-join "tests" "openpgp" name)
-					 "keyboxd")
-				(in-srcdir "tests" "openpgp" name)
-				"--use-keyboxd")) all-tests)
-              ;; The third pass uses the legact pubring.gpg
+	      ;; The second pass uses the keyboxd
+	      (if keyboxd-enabled?
+		  (map (lambda (name)
+			 (test::scm setup-use-keyboxd
+				    "keyboxd"
+				    (path-join "tests" "openpgp" name)
+				    (in-srcdir "tests" "openpgp" name)
+				    "--use-keyboxd")) all-tests))
+	      ;; The third pass uses the legact pubring.gpg
 	      (map (lambda (name)
 		     (test::scm setup-use-keyring
-				(qualify (path-join "tests" "openpgp" name)
-					 "keyring")
+				"keyring"
+				(path-join "tests" "openpgp" name)
 				(in-srcdir "tests" "openpgp" name)
-				"--use-keyring")) all-tests)
-              )))
+				"--use-keyring")) all-tests))))
 
  tests)

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/decrypt-sym.scm Added

@@ -0,0 +1,38 @@
+#!/usr/bin/env gpgscm
+
+;; Copyright (C) 2022 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 <http://www.gnu.org/licenses/>.
+
+(load (in-srcdir "tests" "openpgp" "defs.scm"))
+(setup-legacy-environment)
+
+(define passphrase "password")
+(define plaintext "Hello, world!\n")
+
+
+(for-each-p
+ "Checking decryption of symmetric encrypted files"
+ (lambda (name)
+ (tr:do
+ (tr:open (in-srcdir "tests" "openpgp" "samplemsgs"
+ (string-append name ".asc")))
+ (tr:gpg passphrase '(--passphrase-fd "0" --yes --decrypt))
+ (tr:assert-same plaintext)))
+ '("enc-sym-cfb-1"
+ "enc-sym-cfb-2"
+ "enc-sym-ocb-1"
+ "enc-sym-ocb-2"))

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/defs.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/defs.scm Changed

@@ -146,6 +146,9 @@
   (gpg-conf' "" args))
 (define (gpg-conf' input args)
   (let ((s (call-popen `(,(tool-hardcoded 'gpgconf)
+			 ,@(if *win32*
+			       (list '--build-prefix (getenv "objdir"))
+			       '())
 			 ,@args) input)))
     (map (lambda (line) (map percent-decode (string-split line #\:)))
 	 (string-split-newlines s))))
@@ -210,6 +213,9 @@
 (define (tr:gpg input args)
   (tr:spawn input `(,@GPG --output **out** ,@args **in**)))
 
+(define (tr:gpgstatus input args)
+  (tr:spawn input `(,@GPG --output dummy --status-file **out** ,@args **in**)))
+
 (define (pipe:gpg args)
   (pipe:spawn `(,@GPG --output - ,@args)))
 
@@ -418,6 +424,13 @@
      "EB33B687EB8581AB64D04852A54453E85F3DF62D"
      "C6A6390E9388CDBAD71EAEA698233FE5E04F001E"
      "D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3"))
+  (for-each
+   (lambda (name)
+     (file-copy (in-srcdir "tests" "openpgp" "privkeys"
+                           (string-append name ".key"))
+	        (string-append "private-keys-v1.d/" name ".key")))
+   '("891067FFFC6D67D37BD4BFC399191C5F3989D1B5"
+     "F27FC04CB01723A4CB6F5399F7B86CCD82C0169C"))
 
   (log "Importing public demo and test keys")
   (for-each

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/encrypt.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/encrypt.scm Changed

@@ -59,3 +59,68 @@
 (tr:gpg "" '(--yes --decrypt))
 (tr:assert-identity source)))
 plain-files)
+
+
+(info "Importing additional sample keys for OCB tests")
+(for-each
+ (lambda (name)
+ (call `(,@GPG --yes --import ,(in-srcdir "tests" "openpgp" "samplekeys"
+ (string-append name ".asc")))))
+ '("ed25519-cv25519-sample-1"
+ "ed25519-cv25519-sample-2"
+ "rsa-rsa-sample-1"))
+
+(for-each-p
+ "Checking OCB mode"
+ (lambda (source)
+ (tr:do
+ (tr:open source)
+ (tr:gpg "" `(--yes -er ,"patrice.lumumba"))
+ (tr:gpg "" '(--yes -d))
+ (tr:assert-identity source)))
+ all-files)
+
+;; For reference:
+;; BEGIN_ENCRYPTION <mdc_method> <sym_algo> <aead_algo>
+
+(for-each-p
+ "Checking two OCB capable keys"
+ (lambda (source)
+ (tr:do
+ (tr:open source)
+ (tr:gpgstatus "" `(--yes -e
+ -r ,"patrice.lumumba"
+ -r ,"mahsa.amini"))
+ (tr:call-with-content
+ (lambda (c)
+ (unless (string-contains? c "GNUPG: BEGIN_ENCRYPTION 0 9 2")
+	 (fail (string-append "Unexpected status: " c)))))))
+ '("plain-1"))
+
+(for-each-p
+ "Checking two OCB capable keys plus one not capable"
+ (lambda (source)
+ (tr:do
+ (tr:open source)
+ (tr:gpgstatus "" `(--yes -o out -e
+ -r ,"patrice.lumumba"
+ -r ,"mahsa.amini"
+ -r ,"steve.biko"))
+ (tr:call-with-content
+ (lambda (c)
+ (unless (string-contains? c "GNUPG: BEGIN_ENCRYPTION 2 9")
+ (fail (string-append "Unexpected status: " c)))))))
+ '("plain-1"))
+
+(for-each-p
+ "Checking non OCB capable key with --force-ocb"
+ (lambda (source)
+ (tr:do
+ (tr:open source)
+ (tr:gpgstatus "" `(--yes -e --force-ocb
+ -r ,"steve.biko"))
+ (tr:call-with-content
+ (lambda (c)
+ (unless (string-contains? c "GNUPG: BEGIN_ENCRYPTION 0 9 2")
+	 (fail (string-append "Unexpected status: " c)))))))
+ '("plain-1"))

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/fake-pinentry.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/fake-pinentry.c Changed

@@ -196,28 +196,20 @@
 return NULL;
 }
 
-int
-main (int argc, char **argv)
+static int
+parse_pinentry_user_data (const char *args,
+ char **r_passphrase)
 {
- char *args;
- char *option_user_data = NULL;
- int got_environment_user_data;
 char *logfile;
 char *passphrasefile;
 char *passphrase;
 
- /* We get our options via PINENTRY_USER_DATA. */
- (void) argc, (void) argv;
-
- setvbuf (stdin, NULL, _IOLBF, BUFSIZ);
- setvbuf (stdout, NULL, _IOLBF, BUFSIZ);
+ *r_passphrase = NULL;
 
- args = getenv ("PINENTRY_USER_DATA");
- got_environment_user_data = !!args;
- if (! args)
- args = "";
+ if (log_stream)
+ fclose (log_stream);
+ log_stream = NULL;
 
- restart:
 logfile = option_value (args, "--logfile");
 if (logfile)
 {
@@ -232,7 +224,7 @@
 if (! log_stream)
 {
 perror (logfile);
- return 1;
+ return -1;
 }
 }
 
@@ -251,20 +243,31 @@
 {
 reply ("# Passphrasefile '%s' is empty. Terminating.\n",
 passphrasefile);
- return 1;
+ return -1;
 }
 
 rstrip (passphrase);
 }
 else
- {
- passphrase = skip_options (args);
- if (*passphrase == 0)
- passphrase = "no PINENTRY_USER_DATA -- using default passphrase";
- }
+ passphrase = strdup (skip_options (args));
+
+ *r_passphrase = passphrase;
+ return 0;
+}
 
- reply ("# fake-pinentry(%u) started. Passphrase='%s'.\n",
- (unsigned int)getpid (), passphrase);
+
+int
+main (int argc, char **argv)
+{
+ char *passphrase = NULL;
+
+ /* We get our options via PINENTRY_USER_DATA. */
+ (void) argc, (void) argv;
+
+ setvbuf (stdin, NULL, _IOLBF, BUFSIZ);
+ setvbuf (stdout, NULL, _IOLBF, BUFSIZ);
+
+ reply ("# fake-pinentry(%u) started.\n", (unsigned int)getpid ());
 reply ("OK - what's up?\n");
 
 while (! feof (stdin))
@@ -282,7 +285,12 @@
 #define OPT_USER_DATA	"OPTION pinentry-user-data="
 
 if (strncmp (buffer, "GETPIN", 6) == 0)
- reply ("D %s\n", passphrase);
+ {
+ if (passphrase)
+ reply ("D %s\n", passphrase);
+ else
+ reply ("D deafult\n");
+ }
 else if (strncmp (buffer, "BYE", 3) == 0)
 	{
 	 reply ("OK\n");
@@ -290,18 +298,12 @@
 	}
 else if (strncmp (buffer, OPT_USER_DATA, strlen (OPT_USER_DATA)) == 0)
 {
- if (got_environment_user_data)
+ if (parse_pinentry_user_data (buffer + strlen (OPT_USER_DATA),
+ &passphrase) < 0)
 {
- reply ("OK - I already got the data from the environment.\n");
- continue;
+ /* Failure. */
+ return 1;
 }
-
- if (log_stream)
- fclose (log_stream);
- log_stream = NULL;
- free (option_user_data);
- option_user_data = args = strdup (buffer + strlen (OPT_USER_DATA));
- goto restart;
 }
 
 reply ("OK\n");
@@ -313,6 +315,7 @@
 if (log_stream)
 fclose (log_stream);
 
- free (option_user_data);
+ if (passphrase)
+ free (passphrase);
 return 0;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/issue2941.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/issue2941.scm Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/privkeys/891067FFFC6D67D37BD4BFC399191C5F3989D1B5.key Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/privkeys/F27FC04CB01723A4CB6F5399F7B86CCD82C0169C.key Added

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/quick-key-manipulation.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/quick-key-manipulation.scm Changed

@@ -33,7 +33,10 @@
 
 (define alpha "Alpha <alpha@invalid.example.net>")
 (define bravo "Bravo <bravo@invalid.example.net>")
+(define bravohash "F75B1420CC5881F4005333379355CFF5873094DE")
 (define charlie "Charlie <charlie@invalid.example.net>")
+(define delta "Delta <delta@invalid.example.net>")
+(define deltahash "359DC5EFF98B14A58AAA615C638E8BD0CEDA537B")
 
 (define (key-data key)
 (filter (lambda (x) (or (string=? (car x) "pub")
@@ -75,7 +78,8 @@
 
 (info "Checking that we can mark an user ID as primary.")
 (call-check `(,@gpg --quick-set-primary-uid ,(exact alpha) ,alpha))
-(call-check `(,@gpg --quick-set-primary-uid ,(exact alpha) ,bravo))
+(info "Checking that we can mark a user ID as primary by its hash...")
+(call-check `(,@gpg --quick-set-primary-uid ,(exact alpha) ,bravohash))
 ;; XXX I don't know how to verify this. The keylisting does not seem
 ;; to indicate the primary UID.
 
@@ -87,6 +91,10 @@
 (info "Checking that we can revoke a user ID...")
 (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,alpha))
 
+(info "Checking that we can revoke a user ID by its hash...")
+(call-check `(,@GPG --quick-add-uid ,(exact bravo) ,delta))
+(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,deltahash))
+
 (info "Checking that we get an error revoking a non-existent user ID.")
 (catch '()
 (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,charlie))

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/run-tests.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/run-tests.scm Changed

@@ -29,14 +29,39 @@
 (define setup
 (make-environment-cache (test::scm
 			 #f
+			 #f
 			 (path-join "tests" "openpgp" "setup.scm")
 			 (in-srcdir "tests" "openpgp" "setup.scm"))))
 
+(define (qualify path variant)
+ (string-append "<" variant ">" path))
+
+(define (setup* variant)
+ (make-environment-cache
+ (test::scm
+ #f
+ (qualify (path-join "tests" "openpgp" "setup.scm") variant)
+ (in-srcdir "tests" "openpgp" "setup.scm")
+ (string-append "--" variant))))
+
+(define setup-use-keyboxd (setup* "use-keyboxd"))
+(define use-keyboxd? (or (and (not (null? *args*))
+ (string=? "--use-keyboxd" (car *args*)))
+ (string=? "keyboxd" (getenv "GPGSCM_TEST_VARIANT"))))
+
 (define tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))
 
 (run-tests (if (null? tests)
 	 (load-tests "tests" "openpgp")
-	 (map (lambda (name)
-		 (test::scm setup
-				 (path-join "tests" "openpgp" name)
-				 (in-srcdir "tests" "openpgp" name))) tests)))
+ (if use-keyboxd?
+	 (map (lambda (name)
+		 (test::scm setup-use-keyboxd
+				 "keyboxd"
+				 (path-join "tests" "openpgp" name)
+				 (in-srcdir "tests" "openpgp" name)
+ "--use-keyboxd")) tests)
+	 (map (lambda (name)
+		 (test::scm setup
+				 #f
+				 (path-join "tests" "openpgp" name)
+				 (in-srcdir "tests" "openpgp" name))) tests))))

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/samplekeys/README -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/samplekeys/README Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/samplekeys/ed25519-cv25519-sample-1.asc -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/samplekeys/ed25519-cv25519-sample-1.asc Changed

@@ -1,21 +1,21 @@
 pub   ed25519 2016-06-22 SC
       B21DEAB4F875FB3DA42F1D1D139563682A020D0A
       Keygrip = 1E28F20E41B54C2D1234D896096495FF57E08D18
-uid            unknown patrice.lumumba@example.net
+uid                      patrice.lumumba@example.net
 sub   cv25519 2016-06-22 E
       8D0221D9B2877A741D69AC4E9185878E4FCD74C0
       Keygrip = EB33B687EB8581AB64D04852A54453E85F3DF62D
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
 
 mDMEV2o9XRYJKwYBBAHaRw8BAQdAZ8zkuQDL9x7rcvvoo6s3iEF1j88Dknd9nZhL
-nTEoBRm0G3BhdHJpY2UubHVtdW1iYUBleGFtcGxlLm5ldIh5BBMWCAAhBQJXaj1d
-AhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEBOVY2gqAg0KmQ0BAMUNzAlT
-OzG7tolSI92lhePi5VqutdqTEQTyYYWi1aEsAP0YfiuosNggTc0oRTSz46S3i0Qj
-AlpXwfU00888yIreDbg4BFdqPY0SCisGAQQBl1UBBQEBB0AWeeZlz31O4qTmIKr3
-CZhlRUXZFxc3YKyoCXyIZBBRawMBCAeIYQQYFggACQUCV2o9jQIbDAAKCRATlWNo
-KgINCsuFAP9BplWl813pi779V8OMsRGs/ynyihnOESft/H8qlM8PDQEAqIUPpIty
-OX/OBFy2RIlIi7J1bTp9RzcbzQ/4Fk4hWQQ=
-=qRfF
+nTEoBRm0G3BhdHJpY2UubHVtdW1iYUBleGFtcGxlLm5ldIiTBBMWCAA7AhsDAheA
+FiEEsh3qtPh1+z2kLx0dE5VjaCoCDQoFAmNkyZ0FCwkIBwICIgIGFQgJCgsCBBYC
+AwECHgcACgkQE5VjaCoCDQoKxwEAyVSPe4kwcvjlL9iZYftqwmCQpL6Sd7smgBdb
+naqvAEMA/RrGBjSTGzTvFMVlIcT0Jr1uPVHig7twPnpzbL1uWUwLuDgEV2o9jRIK
+KwYBBAGXVQEFAQEHQBZ55mXPfU7ipOYgqvcJmGVFRdkXFzdgrKgJfIhkEFFrAwEI
+B4hhBBgWCAAJBQJXaj2NAhsMAAoJEBOVY2gqAg0Ky4UA/0GmVaXzXemLvv1Xw4yx
+Eaz/KfKKGc4RJ+38fyqUzw8NAQCohQ+ki3I5f84EXLZEiUiLsnVtOn1HNxvND/gW
+TiFZBA==
+=u4Iu
 -----END PGP PUBLIC KEY BLOCK-----

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/samplekeys/ed25519-cv25519-sample-2.asc Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/samplemsgs/enc-sym-cfb-1.asc Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/samplemsgs/enc-sym-cfb-2.asc Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/samplemsgs/enc-sym-ocb-1.asc Added

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/samplemsgs/enc-sym-ocb-2.asc Added

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/openpgp/shell.scm -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/openpgp/shell.scm Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/pkits/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/pkits/Makefile.am Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/pkits/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/pkits/Makefile.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/tpm2dtests/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/tpm2dtests/Makefile.am Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tests/tpm2dtests/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tests/tpm2dtests/Makefile.in Changed

@@ -391,16 +391,6 @@
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
 	$(am__append_7) $(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx.  WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library.  We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc.  256k is the largest stack
-# we use with pth.
-@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 = 
 
 # Convenience macros
@@ -418,6 +408,7 @@
 	SWTPM="$(SWTPM)" \
 	SWTPM_IOCTL="$(SWTPM_IOCTL)" \
         GNUPG_BUILD_ROOT="$(abs_top_builddir)/tests" \
+	GNUPG_IN_TEST_SUITE=fact \
 	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
 XTESTS = \
@@ -427,7 +418,7 @@
 	unimportable.scm
 
 EXTRA_DIST = defs.scm shell.scm all-tests.scm run-tests.scm $(XTESTS) \
-	     start_sw_tpm.sh
+	     start_sw_tpm.sh setup.scm
 
 CLEANFILES = gpg.conf gpg-agent.conf S.gpg-agent \
 	     pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \

_service:tar_scm:gnupg-2.4.3.tar.bz2/tests/tpm2dtests/setup.scm Added

@@ -0,0 +1,48 @@
+#!/usr/bin/env gpgscm
+
+;; Copyright (C) 2016 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 <http://www.gnu.org/licenses/>.
+
+(load (in-srcdir "tests" "tpm2dtests" "defs.scm"))
+
+(define cache (flag "--create-tarball" *args*))
+(unless (and cache (= 1 (length cache)))
+	(fail "Usage: setup.scm --create-tarball <file> --use-keyring"))
+
+(when (> (*verbose*) 0)
+ (define (pad symbol length)
+	(let loop ((cs (string->list (symbol->string symbol)))
+		 (result (make-string length #\space))
+		 (i 0))
+	 (if (null? cs)
+	 result
+	 (begin
+		(string-set! result i (car cs))
+		(loop (cdr cs) result (+ 1 i))))))
+ (log " I am going to use these tools:\n"
+	 "==============================")
+ (for-each
+ (lambda (t)
+	 (log (pad t 25) (tool t)))
+ '(gpgconf gpg gpg-agent scdaemon gpgsm dirmngr gpg-connect-agent
+		 gpg-preset-passphrase gpgtar pinentry)))
+
+;;(setenv "GNUPGHOME" (getcwd) #t)
+(create-gpghome)
+(start-agent)
+(stop-agent)
+(call-check `(,(tool 'gpgtar) --create --output ,(car cache) "."))

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/Makefile.am -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/Makefile.am Changed

@@ -38,12 +38,17 @@
 gpgtar_rc_objs            = gpgtar-w32info.o
 gpg_check_pattern_rc_objs = gpg-check-pattern-w32info.o
 gpg_wks_client_rc_objs    = gpg-wks-client-w32info.o
-resource_objs += $(gpg_connect_agent_rc_objs)
-resource_objs += $(gpgconf_rc_objs)
-resource_objs += $(gpg_card_tool_rc_objs)
-resource_objs += $(gpgtar_rc_objs)
-resource_objs += $(gpg_check_pattern_rc_objs)
-resource_objs += $(gpg_wks_client_rc_objs)
+
+gpg-connect-agent-w32info.o  : gpg-connect-agent.w32-manifest \
+                                                     ../common/w32info-rc.h
+gpgconf-w32info.o            : gpgconf.w32-manifest  ../common/w32info-rc.h
+gpg-card-w32info.o           : gpg-card.w32-manifest ../common/w32info-rc.h
+gpgtar-w32info.o             : gpgtar.w32-manifest   ../common/w32info-rc.h
+gpg-check-pattern-w32info.o  : gpg-check-pattern.w32-manifest \
+                                                     ../common/w32info-rc.h
+gpg-wks-client-w32info.o     : gpg-wks-client.w32-manifest \
+                                                     ../common/w32info-rc.h
+
 endif
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
@@ -65,38 +70,23 @@
 endif
 
 libexec_PROGRAMS = gpg-check-pattern gpg-pair-tool
+if !HAVE_W32_SYSTEM
+libexec_PROGRAMS += gpg-auth
+endif
 
-if !HAVE_W32CE_SYSTEM
 noinst_PROGRAMS = clean-sat make-dns-cert
-endif
 
-if !HAVE_W32CE_SYSTEM
 if BUILD_GPGTAR
   bin_PROGRAMS += gpgtar
 else
   noinst_PROGRAMS += gpgtar
 endif
-endif
 
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
 
-# Some modules require PTH under W32CE.
-if HAVE_W32CE_SYSTEM
-maybe_commonpth_libs = $(commonpth_libs)
-else
-maybe_commonpth_libs = $(common_libs)
-endif
-
-if HAVE_W32CE_SYSTEM
-pwquery_libs =
-else
 pwquery_libs = ../common/libsimple-pwquery.a
-endif
 
-if HAVE_W32CE_SYSTEM
-opt_libassuan_libs = $(LIBASSUAN_LIBS)
-endif
 
 regexp_libs = ../regexp/libregexp.a
 
@@ -109,11 +99,11 @@
 
 # common sucks in gpg-error, will they, nil they (some compilers
 # do not eliminate the supposed-to-be-unused-inline-functions).
-gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
+gpgconf_LDADD = $(common_libs) \
                 $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	        $(LIBICONV) $(W32SOCKLIBS) \
 	        $(gpgconf_rc_objs)
-gpgconf_LDFLAGS = $(extra_bin_ldflags)
+gpgconf_LDFLAGS =
 
 gpgconf_w32_SOURCES = $(gpgconf_SOURCES)
 gpgconf_w32_LDADD = $(gpgconf_LDADD)
@@ -207,6 +197,12 @@
 		       $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 		       $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
 
+gpg_auth_SOURCES = gpg-auth.c
+gpg_auth_LDADD = $(common_libs) \
+	         $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
+                 $(GPG_ERROR_LIBS) \
+                 $(LIBINTL) $(NETLIBS) $(LIBICONV)
+
 # Instead of a symlink we install a simple wrapper script for the new
 # gpg-wks-client location.  We assume bin is a sibling of libexec.
 install-exec-local:

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/Makefile.in Changed

@@ -143,23 +143,18 @@
 @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_connect_agent_rc_objs) \
-@HAVE_W32_SYSTEM_TRUE@	$(gpgconf_rc_objs) \
-@HAVE_W32_SYSTEM_TRUE@	$(gpg_card_tool_rc_objs) \
-@HAVE_W32_SYSTEM_TRUE@	$(gpgtar_rc_objs) \
-@HAVE_W32_SYSTEM_TRUE@	$(gpg_check_pattern_rc_objs) \
-@HAVE_W32_SYSTEM_TRUE@	$(gpg_wks_client_rc_objs)
 bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
 	gpg-card$(EXEEXT) gpg-wks-client$(EXEEXT) $(am__EXEEXT_2) \
 	$(am__EXEEXT_3) $(am__EXEEXT_4)
-@HAVE_W32_SYSTEM_FALSE@am__append_10 = watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit
-@HAVE_W32_SYSTEM_TRUE@am__append_11 = gpgconf-w32
-libexec_PROGRAMS = gpg-check-pattern$(EXEEXT) gpg-pair-tool$(EXEEXT)
-@HAVE_W32CE_SYSTEM_FALSE@noinst_PROGRAMS = clean-sat$(EXEEXT) \
-@HAVE_W32CE_SYSTEM_FALSE@	make-dns-cert$(EXEEXT) \
-@HAVE_W32CE_SYSTEM_FALSE@	$(am__EXEEXT_5)
-@BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@am__append_12 = gpgtar
-@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__append_13 = gpgtar
+@HAVE_W32_SYSTEM_FALSE@am__append_9 = watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit
+@HAVE_W32_SYSTEM_TRUE@am__append_10 = gpgconf-w32
+libexec_PROGRAMS = gpg-check-pattern$(EXEEXT) gpg-pair-tool$(EXEEXT) \
+	$(am__EXEEXT_5)
+@HAVE_W32_SYSTEM_FALSE@am__append_11 = gpg-auth
+noinst_PROGRAMS = clean-sat$(EXEEXT) make-dns-cert$(EXEEXT) \
+	$(am__EXEEXT_6)
+@BUILD_GPGTAR_TRUE@am__append_12 = gpgtar
+@BUILD_GPGTAR_FALSE@am__append_13 = gpgtar
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -189,20 +184,25 @@
 @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)
+@BUILD_GPGTAR_TRUE@am__EXEEXT_4 = gpgtar$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)"
-@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_5 = \
-@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@	gpgtar$(EXEEXT)
+@HAVE_W32_SYSTEM_FALSE@am__EXEEXT_5 = gpg-auth$(EXEEXT)
+@BUILD_GPGTAR_FALSE@am__EXEEXT_6 = 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_auth_OBJECTS = gpg-auth.$(OBJEXT)
+gpg_auth_OBJECTS = $(am_gpg_auth_OBJECTS)
+am__DEPENDENCIES_1 =
+gpg_auth_DEPENDENCIES = $(common_libs) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_gpg_card_OBJECTS = gpg-card.$(OBJEXT) card-call-scd.$(OBJEXT) \
 	card-keys.$(OBJEXT) card-yubikey.$(OBJEXT) card-misc.$(OBJEXT)
 gpg_card_OBJECTS = $(am_gpg_card_OBJECTS)
-am__DEPENDENCIES_1 =
 gpg_card_DEPENDENCIES = ../common/libgpgrl.a $(common_libs) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -262,21 +262,20 @@
 	$(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) \
+gpgconf_DEPENDENCIES = $(common_libs) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(gpgconf_rc_objs)
+	$(am__DEPENDENCIES_1) $(gpgconf_rc_objs)
 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_3 = $(maybe_commonpth_libs) $(am__DEPENDENCIES_2) \
+am__DEPENDENCIES_2 = $(common_libs) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(gpgconf_rc_objs)
-gpgconf_w32_DEPENDENCIES = $(am__DEPENDENCIES_3)
+	$(am__DEPENDENCIES_1) $(gpgconf_rc_objs)
+gpgconf_w32_DEPENDENCIES = $(am__DEPENDENCIES_2)
 gpgconf_w32_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(gpgconf_w32_LDFLAGS) $(LDFLAGS) -o $@
 am_gpgparsemail_OBJECTS = gpgparsemail.$(OBJEXT) rfc822parse.$(OBJEXT)
@@ -350,7 +349,8 @@
 am__depfiles_remade = ./$(DEPDIR)/card-call-scd.Po \
 	./$(DEPDIR)/card-keys.Po ./$(DEPDIR)/card-misc.Po \
 	./$(DEPDIR)/card-yubikey.Po ./$(DEPDIR)/clean-sat.Po \
-	./$(DEPDIR)/gpg-card.Po ./$(DEPDIR)/gpg-connect-agent.Po \
+	./$(DEPDIR)/gpg-auth.Po ./$(DEPDIR)/gpg-card.Po \
+	./$(DEPDIR)/gpg-connect-agent.Po \
 	./$(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Po \
 	./$(DEPDIR)/gpg_pair_tool-gpg-pair-tool.Po \
 	./$(DEPDIR)/gpg_wks_client-call-dirmngr.Po \
@@ -392,13 +392,13 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo " CCLD " $@;
 am__v_CCLD_1 = 
-SOURCES = clean-sat.c $(gpg_card_SOURCES) $(gpg_check_pattern_SOURCES) \
-	$(gpg_connect_agent_SOURCES) $(gpg_pair_tool_SOURCES) \
-	$(gpg_wks_client_SOURCES) $(gpg_wks_server_SOURCES) \
-	$(gpgconf_SOURCES) $(gpgconf_w32_SOURCES) \
-	$(gpgparsemail_SOURCES) gpgsplit.c $(gpgtar_SOURCES) \
-	make-dns-cert.c $(watchgnupg_SOURCES)
-DIST_SOURCES = clean-sat.c $(gpg_card_SOURCES) \
+SOURCES = clean-sat.c $(gpg_auth_SOURCES) $(gpg_card_SOURCES) \
+	$(gpg_check_pattern_SOURCES) $(gpg_connect_agent_SOURCES) \
+	$(gpg_pair_tool_SOURCES) $(gpg_wks_client_SOURCES) \
+	$(gpg_wks_server_SOURCES) $(gpgconf_SOURCES) \
+	$(gpgconf_w32_SOURCES) $(gpgparsemail_SOURCES) gpgsplit.c \
+	$(gpgtar_SOURCES) make-dns-cert.c $(watchgnupg_SOURCES)
+DIST_SOURCES = clean-sat.c $(gpg_auth_SOURCES) $(gpg_card_SOURCES) \
 	$(gpg_check_pattern_SOURCES) $(gpg_connect_agent_SOURCES) \
 	$(gpg_pair_tool_SOURCES) $(gpg_wks_client_SOURCES) \
 	$(gpg_wks_server_SOURCES) $(gpgconf_SOURCES) \
@@ -648,17 +648,7 @@
 	$(am__append_2) $(am__append_3) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
 	$(am__append_8)
-@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
-
-# Under Windows we use LockFileEx. WindowsCE provides this only on
-# the WindowsMobile 6 platform and thus we need to use the coredll6
-# import library. We also want to use a stacksize of 256k instead of
-# the 2MB which is the default with cegcc. 256k is the largest stack
-# we use with pth.
-@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
@@ -677,13 +667,7 @@
 @BUILD_WKS_TOOLS_TRUE@gpg_wks_server = gpg-wks-server
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
-@HAVE_W32CE_SYSTEM_FALSE@maybe_commonpth_libs = $(common_libs)
-
-# Some modules require PTH under W32CE.
-@HAVE_W32CE_SYSTEM_TRUE@maybe_commonpth_libs = $(commonpth_libs)
-@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)
+pwquery_libs = ../common/libsimple-pwquery.a
 regexp_libs = ../regexp/libregexp.a
 gpgsplit_LDADD = $(common_libs) \
 	 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
@@ -693,12 +677,12 @@
 
 # common sucks in gpg-error, will they, nil they (some compilers
 # do not eliminate the supposed-to-be-unused-inline-functions).
-gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
+gpgconf_LDADD = $(common_libs) \
 $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	 $(LIBICONV) $(W32SOCKLIBS) \
 	 $(gpgconf_rc_objs)
 
-gpgconf_LDFLAGS = $(extra_bin_ldflags)
+gpgconf_LDFLAGS = 
 gpgconf_w32_SOURCES = $(gpgconf_SOURCES)
 gpgconf_w32_LDADD = $(gpgconf_LDADD)
 gpgconf_w32_LDFLAGS = $(gpgconf_LDFLAGS) -Wl,-subsystem,windows
@@ -788,6 +772,12 @@
 		 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 		 $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
 
+gpg_auth_SOURCES = gpg-auth.c
+gpg_auth_LDADD = $(common_libs) \
+	 $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
+ $(GPG_ERROR_LIBS) \
+ $(LIBINTL) $(NETLIBS) $(LIBICONV)
+
 all: all-am
 
 .SUFFIXES:
@@ -926,6 +916,10 @@
 	@rm -f clean-sat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(clean_sat_OBJECTS) $(clean_sat_LDADD) $(LIBS)
 
+gpg-auth$(EXEEXT): $(gpg_auth_OBJECTS) $(gpg_auth_DEPENDENCIES) $(EXTRA_gpg_auth_DEPENDENCIES) 
+	@rm -f gpg-auth$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(gpg_auth_OBJECTS) $(gpg_auth_LDADD) $(LIBS)
+
 gpg-card$(EXEEXT): $(gpg_card_OBJECTS) $(gpg_card_DEPENDENCIES) $(EXTRA_gpg_card_DEPENDENCIES) 
 	@rm -f gpg-card$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gpg_card_OBJECTS) $(gpg_card_LDADD) $(LIBS)
@@ -1024,6 +1018,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/card-misc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/card-yubikey.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clean-sat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpg-auth.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpg-card.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpg-connect-agent.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Po@am__quote@ # am--include-marker
@@ -1502,6 +1497,7 @@
 	-rm -f ./$(DEPDIR)/card-misc.Po
 	-rm -f ./$(DEPDIR)/card-yubikey.Po
 	-rm -f ./$(DEPDIR)/clean-sat.Po
+	-rm -f ./$(DEPDIR)/gpg-auth.Po
 	-rm -f ./$(DEPDIR)/gpg-card.Po
 	-rm -f ./$(DEPDIR)/gpg-connect-agent.Po
 	-rm -f ./$(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Po
@@ -1583,6 +1579,7 @@
 	-rm -f ./$(DEPDIR)/card-misc.Po
 	-rm -f ./$(DEPDIR)/card-yubikey.Po
 	-rm -f ./$(DEPDIR)/clean-sat.Po
+	-rm -f ./$(DEPDIR)/gpg-auth.Po
 	-rm -f ./$(DEPDIR)/gpg-card.Po
 	-rm -f ./$(DEPDIR)/gpg-connect-agent.Po
 	-rm -f ./$(DEPDIR)/gpg_check_pattern-gpg-check-pattern.Po
@@ -1655,6 +1652,16 @@
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
 
+@HAVE_W32_SYSTEM_TRUE@gpg-connect-agent-w32info.o : gpg-connect-agent.w32-manifest \
+@HAVE_W32_SYSTEM_TRUE@ ../common/w32info-rc.h
+@HAVE_W32_SYSTEM_TRUE@gpgconf-w32info.o : gpgconf.w32-manifest ../common/w32info-rc.h
+@HAVE_W32_SYSTEM_TRUE@gpg-card-w32info.o : gpg-card.w32-manifest ../common/w32info-rc.h
+@HAVE_W32_SYSTEM_TRUE@gpgtar-w32info.o : gpgtar.w32-manifest ../common/w32info-rc.h
+@HAVE_W32_SYSTEM_TRUE@gpg-check-pattern-w32info.o : gpg-check-pattern.w32-manifest \
+@HAVE_W32_SYSTEM_TRUE@ ../common/w32info-rc.h
+@HAVE_W32_SYSTEM_TRUE@gpg-wks-client-w32info.o : gpg-wks-client.w32-manifest \
+@HAVE_W32_SYSTEM_TRUE@ ../common/w32info-rc.h
+
 # Instead of a symlink we install a simple wrapper script for the new
 # gpg-wks-client location. We assume bin is a sibling of libexec.
 install-exec-local:

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/call-dirmngr.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/call-dirmngr.c Changed

@@ -1,5 +1,5 @@
 /* call-dirmngr.c - Interact with the Dirmngr.
- * Copyright (C) 2016 g10 Code GmbH
+ * Copyright (C) 2016, 2022 g10 Code GmbH
  * Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
  *
  * This file is part of GnuPG.
@@ -124,10 +124,54 @@
 {
   struct wkd_get_parm_s *parm = opaque;
   gpg_error_t err = 0;
+  const char *s, *s2;
+  const char *warn = NULL;
+  int is_note = 0;
 
-  (void)line;
   (void)parm;
 
+  /* Note: The code below is mostly duplicated from g10/call-dirmngr.c */
+  if ((s = has_leading_keyword (line, "WARNING"))
+      || (is_note = !!(s = has_leading_keyword (line, "NOTE"))))
+    {
+      if ((s2 = has_leading_keyword (s, "wkd_cached_result")))
+        {
+          if (opt.verbose)
+            warn = _("WKD uses a cached result");
+        }
+      else if ((s2 = has_leading_keyword (s, "tor_not_running")))
+        warn = _("Tor is not running");
+      else if ((s2 = has_leading_keyword (s, "tor_config_problem")))
+        warn = _("Tor is not properly configured");
+      else if ((s2 = has_leading_keyword (s, "dns_config_problem")))
+        warn = _("DNS is not properly configured");
+      else if ((s2 = has_leading_keyword (s, "http_redirect")))
+        warn = _("unacceptable HTTP redirect from server");
+      else if ((s2 = has_leading_keyword (s, "http_redirect_cleanup")))
+        warn = _("unacceptable HTTP redirect from server was cleaned up");
+      else if ((s2 = has_leading_keyword (s, "tls_cert_error")))
+        warn = _("server uses an invalid certificate");
+      else
+        warn = NULL;
+
+      if (warn)
+        {
+          if (is_note)
+            log_info (_("Note: %s\n"), warn);
+          else
+            log_info (_("WARNING: %s\n"), warn);
+          if (s2 && opt.verbose)
+            {
+              while (*s2 && !spacep (s2))
+                s2++;
+              while (*s2 && spacep (s2))
+                s2++;
+              if (*s2)
+                log_info ("(%s)\n", s2);
+            }
+        }
+    }
+
   return err;
 }
 
@@ -311,3 +355,71 @@
   assuan_release (ctx);
   return err;
 }
+
+
+/* Send the KS_GET command to the dirmngr.  The caller provides CB
+ * which is called for each key.  The callback is called wit a stream
+ * conveying a single key and several other informational parameters.
+ * DOMAIN restricts the returned keys to this domain.  */
+gpg_error_t
+wkd_dirmngr_ks_get (const char *domain, gpg_error_t cb (estream_t key))
+{
+  gpg_error_t err;
+  assuan_context_t ctx;
+  struct wkd_get_parm_s parm;
+  char *line = NULL;
+  int any = 0;
+
+  memset (&parm, 0, sizeof parm);
+
+  err = connect_dirmngr (&ctx);
+  if (err)
+    return err;
+
+  line = es_bsprintf ("KS_GET --ldap --first %s", domain? domain:"");
+  if (!line)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+  if (strlen (line) + 2 >= ASSUAN_LINELENGTH)
+    {
+      err = gpg_error (GPG_ERR_TOO_LARGE);
+      goto leave;
+    }
+
+  parm.memfp = es_fopenmem (0, "rwb");
+  if (!parm.memfp)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+
+  for (;;)
+    {
+      err = assuan_transact (ctx, any? "KS_GET --next" : line,
+                             wkd_get_data_cb, &parm,
+                             NULL, NULL, wkd_get_status_cb, &parm);
+      if (err)
+        {
+          if (gpg_err_code (err) == GPG_ERR_NO_DATA
+              && gpg_err_source (err) == GPG_ERR_SOURCE_DIRMNGR)
+            err = any? 0 : gpg_error (GPG_ERR_NOT_FOUND);
+          goto leave;
+        }
+      any = 1;
+
+      es_rewind (parm.memfp);
+      err = cb (parm.memfp);
+      if (err)
+        break;
+      es_ftruncate (parm.memfp, 0);
+    }
+
+
+ leave:
+  es_fclose (parm.memfp);
+  xfree (line);
+  assuan_release (ctx);
+  return err;
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/call-dirmngr.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/call-dirmngr.h Changed

_service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-auth.c Added

@@ -0,0 +1,999 @@
+/* gpg-auth.c - Authenticate using GnuPG
+ * Copyright (C) 2022 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * This file 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.
+ *
+ * This file 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 Lesser 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://gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define INCLUDED_BY_MAIN_MODULE 1
+
+#include "../common/util.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
+#include "../common/init.h"
+#include "../common/sysutils.h"
+#include "../common/asshelp.h"
+#include "../common/session-env.h"
+#include "../common/membuf.h"
+#include "../common/exechelp.h"
+
+
+/* We keep all global options in the structure OPT. */
+struct
+{
+ int interactive;
+ int verbose;
+ unsigned int debug;
+ int quiet;
+ int with_colons;
+ const char *agent_program;
+ int autostart;
+ int use_scd_directly;
+
+ /* Options passed to the gpg-agent: */
+ char *lc_ctype;
+ char *lc_messages;
+} opt;
+
+/* Debug values and macros. */
+#define DBG_IPC_VALUE 1024 /* Debug assuan communication. */
+#define DBG_EXTPROG_VALUE 16384 /* Debug external program calls */
+
+#define DBG_IPC (opt.debug & DBG_IPC_VALUE)
+#define DBG_EXTPROG (opt.debug & DBG_EXTPROG_VALUE)
+
+
+/* Constants to identify the commands and options. */
+enum opt_values
+ {
+ aNull = 0,
+
+ oQuiet = 'q',
+ oVerbose	= 'v',
+
+ oDebug = 500,
+
+ oGpgProgram,
+ oGpgsmProgram,
+ oAgentProgram,
+ oStatusFD,
+ oWithColons,
+ oNoAutostart,
+
+ oLCctype,
+ oLCmessages,
+
+ oUseSCDDirectly,
+
+ oDummy
+ };
+
+
+/* The list of commands and options. */
+static gpgrt_opt_t opts = {
+ ARGPARSE_group (301, ("@\nOptions:\n ")),
+
+ ARGPARSE_s_n (oVerbose, "verbose", ("verbose")),
+ ARGPARSE_s_n (oQuiet,	"quiet", ("be somewhat more quiet")),
+ ARGPARSE_s_s (oDebug, "debug", "@"),
+ ARGPARSE_s_i (oStatusFD, "status-fd", N_("|FD|write status info to this FD")),
+ ARGPARSE_s_n (oWithColons, "with-colons", "@"),
+ ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
+ ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
+ ARGPARSE_s_s (oLCctype, "lc-ctype", "@"),
+ ARGPARSE_s_s (oLCmessages, "lc-messages","@"),
+ ARGPARSE_s_n (oUseSCDDirectly, "use-scdaemon-directly", "@"),
+
+ ARGPARSE_end ()
+};
+
+/* The list of supported debug flags. */
+static struct debug_flags_s debug_flags =
+ {
+ { DBG_IPC_VALUE , "ipc" },
+ { DBG_EXTPROG_VALUE, "extprog" },
+ { 0, NULL }
+ };
+
+&#xc;
+/* Print usage information and provide strings for help. */
+static const char *
+my_strusage( int level )
+{
+ const char *p;
+
+ switch (level)
+ {
+ case 9: p = "GPL-3.0-or-later"; break;
+ case 11: p = "gpg-auth"; 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;
+
+ case 1:
+ case 40:
+ p = ("Usage: gpg-auth"
+ " options (-h for help)");
+ break;
+ case 41:
+ p = ("Syntax: gpg-auth"
+ " options \n\n"
+ "Tool to authenticate a user using a smartcard.\n"
+ "Use command \"help\" to list all commands.");
+ break;
+
+ default: p = NULL; break;
+ }
+ return p;
+}
+&#xc;
+/* Command line parsing. */
+static void
+parse_arguments (gpgrt_argparse_t *pargs, gpgrt_opt_t *popts)
+{
+ while (gpgrt_argparse (NULL, pargs, popts))
+ {
+ switch (pargs->r_opt)
+ {
+	case oQuiet: opt.quiet = 1; break;
+ case oVerbose: opt.verbose++; break;
+ case oDebug:
+ if (parse_debug_flag (pargs->r.ret_str, &opt.debug, debug_flags))
+ {
+ pargs->r_opt = ARGPARSE_INVALID_ARG;
+ pargs->err = ARGPARSE_PRINT_ERROR;
+ }
+ break;
+
+ case oAgentProgram: opt.agent_program = pargs->r.ret_str; break;
+
+ case oStatusFD:
+ gnupg_set_status_fd (translate_sys2libc_fd_int (pargs->r.ret_int, 1));
+ break;
+
+ case oWithColons: opt.with_colons = 1; break;
+ case oNoAutostart: opt.autostart = 0; break;
+
+ case oLCctype: opt.lc_ctype = pargs->r.ret_str; break;
+ case oLCmessages: opt.lc_messages = pargs->r.ret_str; break;
+
+	case oUseSCDDirectly: opt.use_scd_directly = 1; break;
+
+ default: pargs->err = ARGPARSE_PRINT_ERROR; break;
+	}
+ }
+}
+
+
+&#xc;
+struct ga_key_list {
+ struct ga_key_list *next;
+ char keygrip41; /* Keygrip to identify a key. */
+ size_t pubkey_len;
+ char *pubkey; /* Public key in SSH format. */
+ char *comment;
+};
+
+/* Local prototypes. */
+static gpg_error_t scd_passwd_reset (assuan_context_t ctx, const char *keygrip);
+static gpg_error_t ga_scd_connect (assuan_context_t *r_scd_ctx, int use_agent);
+static gpg_error_t ga_scd_get_auth_keys (assuan_context_t ctx,
+ struct ga_key_list **r_key_list);
+static gpg_error_t ga_filter_by_authorized_keys (const char *user,
+ struct ga_key_list **r_key_list);
+static void ga_release_auth_keys (struct ga_key_list *key_list);
+static gpg_error_t scd_pkauth (assuan_context_t ctx, const char *keygrip);
+static gpg_error_t authenticate (assuan_context_t ctx, struct ga_key_list *key_list);
+static int getpin (const char *comment, const char *info, char *buf, size_t *r_len);
+
+/* gpg-auth main. */
+int
+main (int argc, char **argv)
+{
+ gpg_error_t err;
+ gpgrt_argparse_t pargs;
+ assuan_context_t scd_ctx = NULL;
+ struct ga_key_list *key_list = NULL;
+ const char *user;
+
+ gnupg_reopen_std ("gpg-auth");
+ gpgrt_set_strusage (my_strusage);
+ log_set_prefix ("gpg-auth", GPGRT_LOG_WITH_PREFIX);
+
+ /* Make sure that our subsystems are ready. */
+ i18n_init();
+ init_common_subsystems (&argc, &argv);
+
+ assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
+ setup_libassuan_logging (&opt.debug, NULL);
+
+ /* Setup default options. */
+ opt.autostart = 1;
+
+ /* Parse the command line. */
+ pargs.argc = &argc;
+ pargs.argv = &argv;
+ pargs.flags = ARGPARSE_FLAG_KEEP;
+ parse_arguments (&pargs, opts);
+ gpgrt_argparse (NULL, &pargs, NULL); /* Release internal state. */
+
+ if (log_get_errorcount (0))
+ exit (2);
+
+ if (argc != 0)
+ gpgrt_usage (1); /* Never returns. */
+
+ if (opt.use_scd_directly)
+ {
+ user = getenv ("PAM_USER");
+ if (user == NULL)
+ exit (2);
+ }
+ else
+ user = NULL;
+
+ err = ga_scd_connect (&scd_ctx, opt.use_scd_directly);
+
+ if (!err)
+ err = ga_scd_get_auth_keys (scd_ctx, &key_list);
+
+ if (!err)
+ err = ga_filter_by_authorized_keys (user, &key_list);
+
+ if (!err)
+ err = authenticate (scd_ctx, key_list);
+
+ ga_release_auth_keys (key_list);
+
+ if (scd_ctx)
+ assuan_release (scd_ctx);
+
+ if (err)
+ exit (1);
+
+ return 0;
+}
+
+static gpg_error_t
+authenticate (assuan_context_t ctx, struct ga_key_list *key_list)
+{
+ gpg_error_t err;
+
+ while (key_list)
+ {
+ err = scd_passwd_reset (ctx, key_list->keygrip);
+ if (err)
+ return err;
+
+ assuan_set_pointer (ctx, key_list->comment);
+ err = scd_pkauth (ctx, key_list->keygrip);
+ if (!err)
+ /* Success! */
+ return 0;
+
+ key_list = key_list->next;
+ }
+
+ return gpg_error (GPG_ERR_NOT_FOUND);
+}
+&#xc;
+static gpg_error_t
+get_serialno_cb (void *opaque, const char *line)
+{
+ char **serialno = opaque;
+ const char *keyword = line;
+ const char *s;
+ int keywordlen, n;
+
+ for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
+ ;
+ while (spacep (line))
+ line++;
+
+ if (keywordlen == 8 && !memcmp (keyword, "SERIALNO", keywordlen))
+ {
+ if (*serialno)
+ return gpg_error (GPG_ERR_CONFLICT); /* Unexpected status line. */
+ for (n=0,s=line; hexdigitp (s); s++, n++)
+ ;
+ if (!n || (n&1)|| !(spacep (s) || !*s) )
+ return gpg_error (GPG_ERR_ASS_PARAMETER);
+ *serialno = xtrymalloc (n+1);
+ if (!*serialno)
+ return gpg_error_from_syserror ();
+ memcpy (*serialno, line, n);
+ (*serialno)n = 0;
+ }
+
+ return 0;
+}
+
+/* Helper function, which is used by scd_connect.
+
+ Try to retrieve the SCDaemon's socket name from the gpg-agent
+ context CTX. On success, *SOCKET_NAME is filled with a copy of the
+ socket name. Return proper error code or zero on success. */
+static gpg_error_t
+agent_scd_getinfo_socket_name (assuan_context_t ctx, char **socket_name)
+{
+ membuf_t data;
+ gpg_error_t err = 0;
+ unsigned char *databuf;
+ size_t datalen;
+
+ init_membuf (&data, 256);
+ *socket_name = NULL;
+
+ err = assuan_transact (ctx, "SCD GETINFO socket_name", put_membuf_cb, &data,
+			 NULL, NULL, NULL, NULL);
+ databuf = get_membuf (&data, &datalen);
+ if (!err)
+ {
+ if (databuf && datalen)
+	{
+	 char *res = xtrymalloc (datalen + 1);
+	 if (!res)
+	 err = gpg_error_from_syserror ();
+	 else
+	 {
+	 memcpy (res, databuf, datalen);
+	 resdatalen = 0;
+	 *socket_name = res;
+	 }
+	}
+ }
+
+ xfree (databuf);
+
+ return err;
+}
+&#xc;
+/* Callback parameter for learn card */
+struct learn_parm_s
+{
+ void (*kpinfo_cb)(void*, const char *);
+ void *kpinfo_cb_arg;
+ void (*certinfo_cb)(void*, const char *);
+ void *certinfo_cb_arg;
+ void (*sinfo_cb)(void*, const char *, size_t, const char *);
+ void *sinfo_cb_arg;
+};
+
+/* Connect to the agent and send the standard options. */
+static gpg_error_t
+start_agent (assuan_context_t *ctx_p)
+{
+ gpg_error_t err;
+ session_env_t session_env;
+
+ session_env = session_env_new ();
+ if (!session_env)
+ log_fatal ("error allocating session environment block: %s\n",
+ strerror (errno));
+
+ err = start_new_gpg_agent (ctx_p,
+ GPG_ERR_SOURCE_DEFAULT,
+ opt.agent_program,
+ NULL, NULL,
+ session_env,
+ opt.autostart,
+ !opt.quiet, 0,
+ NULL, NULL);
+
+ session_env_release (session_env);
+ return err;
+}
+
+static gpg_error_t
+scd_serialno (assuan_context_t ctx)
+{
+ char *serialno = NULL;
+ gpg_error_t err;
+
+ err = assuan_transact (ctx, "SERIALNO", NULL, NULL, NULL, NULL,
+ get_serialno_cb, &serialno);
+ xfree (serialno);
+ return err;
+}
+
+
+static gpg_error_t
+scd_passwd_reset (assuan_context_t ctx, const char *keygrip)
+{
+ char lineASSUAN_LINELENGTH;
+ gpg_error_t err;
+
+ snprintf (line, DIM(line), "PASSWD --clear OPENPGP.2 %s", keygrip);
+ err = assuan_transact (ctx, line, NULL, NULL, NULL, NULL,
+ NULL, NULL);
+ return err;
+}
+
+
+/* Connect to scdaemon by pipe or socket. Execute initial "SEREIALNO"
+ command to enable all connected token under scdaemon control. */
+static gpg_error_t
+ga_scd_connect (assuan_context_t *r_scd_ctx, int use_scd_directly)
+{
+ assuan_context_t assuan_ctx;
+ gpg_error_t err;
+
+ err = assuan_new (&assuan_ctx);
+ if (err)
+ return err;
+
+ if (!use_scd_directly)
+ /* Use scdaemon under gpg-agent. */
+ {
+ char *scd_socket_name = NULL;
+ assuan_context_t ctx;
+
+ err = start_agent (&ctx);
+ if (err)
+ return err;
+
+ /* Note that if gpg-agent is there but no scdaemon yet,
+ * gpg-agent automatically invokes scdaemon by this query
+ * itself.
+ */
+ err = agent_scd_getinfo_socket_name (ctx, &scd_socket_name);
+ assuan_release (ctx);
+
+ if (!err)
+	err = assuan_socket_connect (assuan_ctx, scd_socket_name, 0, 0);
+
+ if (!err && DBG_IPC)
+	log_debug ("got scdaemon socket name from gpg-agent, "
+ "connected to socket '%s'", scd_socket_name);
+
+ xfree (scd_socket_name);
+ }
+ else
+ {
+ const char *scd_path;
+ const char *pgmname;
+ const char *argv3;
+ int no_close_list2;
+
+ scd_path = gnupg_module_name (GNUPG_MODULE_NAME_SCDAEMON);
+ if (!(pgmname = strrchr (scd_path, '/')))
+ pgmname = scd_path;
+ else
+ pgmname++;
+
+ /* Fill argument vector for scdaemon. */
+ argv0 = pgmname;
+ argv1 = "--server";
+ argv2 = NULL;
+
+ no_close_list0 = assuan_fd_from_posix_fd (fileno (stderr));
+ no_close_list1 = ASSUAN_INVALID_FD;
+
+ /* Connect to the scdaemon */
+ err = assuan_pipe_connect (assuan_ctx, scd_path, argv, no_close_list,
+ NULL, NULL, 0);
+ if (err)
+	{
+	 log_error ("could not spawn scdaemon: %s\n", gpg_strerror (err));
+ return err;
+	}
+
+ if (DBG_IPC)
+	log_debug ("spawned a new scdaemon (path: '%s')", scd_path);
+ }
+
+ if (err)
+ assuan_release (assuan_ctx);
+ else
+ {
+ scd_serialno (assuan_ctx);
+ *r_scd_ctx = assuan_ctx;
+ }
+
+ return err;
+}
+
+
+/* Handle the NEEDPIN inquiry. */
+static gpg_error_t
+inq_needpin (void *opaque, const char *line)
+{
+ assuan_context_t ctx = opaque;
+ const char *s;
+ char *pin;
+ size_t pinlen;
+ int rc;
+ const char *comment = assuan_get_pointer (ctx);
+
+ rc = 0;
+
+ if ((s = has_leading_keyword (line, "NEEDPIN")))
+ {
+ line = s;
+ pinlen = 90;
+ pin = gcry_malloc_secure (pinlen);
+ if (!pin)
+ return out_of_core ();
+
+ rc = getpin (comment, line, pin, &pinlen);
+ if (!rc)
+ {
+ assuan_begin_confidential (ctx);
+ rc = assuan_send_data (ctx, pin, pinlen);
+ assuan_end_confidential (ctx);
+ }
+ wipememory (pin, pinlen);
+ xfree (pin);
+ }
+ else if ((s = has_leading_keyword (line, "POPUPPINPADPROMPT")))
+ {
+
+ if (comment)
+ {
+ int msg_len = 27 + strlen (comment);
+ fprintf (stdout, "i %d\n", msg_len);
+ fprintf (stdout, "Please use PINPAD for KEY: %s\n", comment);
+ fflush (stdout);
+ }
+ else
+ {
+ fputs ("i 18\n", stdout);
+ fputs ("Please use PINPAD!\n", stdout);
+ fflush (stdout);
+ }
+ }
+ else if ((s = has_leading_keyword (line, "DISMISSPINPADPROMPT")))
+ {
+ ;
+ }
+ else
+ {
+ log_error ("unsupported inquiry '%s'\n", line);
+ rc = gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
+ }
+
+ return gpg_error (rc);
+}
+
+struct card_keyinfo_parm_s {
+ int error;
+ struct ga_key_list *list;
+};
+
+/* Callback function for scd_keyinfo_list. */
+static gpg_error_t
+card_keyinfo_cb (void *opaque, const char *line)
+{
+ gpg_error_t err = 0;
+ struct card_keyinfo_parm_s *parm = opaque;
+ const char *keyword = line;
+ int keywordlen;
+ struct ga_key_list *keyinfo = NULL;
+
+ for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
+ ;
+ while (spacep (line))
+ line++;
+
+ if (keywordlen == 7 && !memcmp (keyword, "KEYINFO", keywordlen))
+ {
+ const char *s;
+ int n;
+ struct ga_key_list **l_p = &parm->list;
+
+ /* It's going to append the information at the end. */
+ while ((*l_p))
+ l_p = &(*l_p)->next;
+
+ keyinfo = xtrycalloc (1, sizeof *keyinfo);
+ if (!keyinfo)
+ goto alloc_error;
+
+ for (n=0,s=line; hexdigitp (s); s++, n++)
+ ;
+
+ if (n != 40)
+ goto parm_error;
+
+ memcpy (keyinfo->keygrip, line, 40);
+ keyinfo->keygrip40 = 0;
+
+ line = s;
+
+ if (!*line)
+ goto parm_error;
+
+ while (spacep (line))
+ line++;
+
+ if (*line++ != 'T')
+ goto parm_error;
+
+ if (!*line)
+ goto parm_error;
+
+ while (spacep (line))
+ line++;
+
+ for (n=0,s=line; hexdigitp (s); s++, n++)
+ ;
+
+ if (!n)
+ goto skip;
+
+ skip:
+ *l_p = keyinfo;
+ }
+
+ return err;
+
+ alloc_error:
+ xfree (keyinfo);
+ if (!parm->error)
+ parm->error = gpg_error_from_syserror ();
+ return 0;
+
+ parm_error:
+ xfree (keyinfo);
+ if (!parm->error)
+ parm->error = gpg_error (GPG_ERR_ASS_PARAMETER);
+ return 0;
+}
+
+
+/* Call the scdaemon to retrieve list of available keys on cards. On
+ success, the allocated structure is stored at R_KEY_LIST. On
+ error, an error code is returned and NULL is stored at R_KEY_LIST. */
+static gpg_error_t
+scd_keyinfo_list (assuan_context_t ctx, struct ga_key_list **r_key_list)
+{
+ int err;
+ struct card_keyinfo_parm_s parm;
+
+ memset (&parm, 0, sizeof parm);
+
+ err = assuan_transact (ctx, "KEYINFO --list=auth", NULL, NULL, NULL, NULL,
+ card_keyinfo_cb, &parm);
+ if (!err && parm.error)
+ err = parm.error;
+
+ if (!err)
+ *r_key_list = parm.list;
+ else
+ ga_release_auth_keys (parm.list);
+
+ return err;
+}
+
+/* A variant of put_membuf_cb, which only put the second field. */
+static gpg_error_t
+put_second_field_cb (void *opaque, const void *buf, size_t len)
+{
+ char lineASSUAN_LINELENGTH;
+ membuf_t *data = opaque;
+
+ if (buf && len < ASSUAN_LINELENGTH)
+ {
+ const char *fields3;
+ size_t field_len;
+
+ memcpy (line, buf, len);
+ if (split_fields (line, fields, DIM (fields)) < 2)
+	return 0;
+
+ field_len = strlen (fields1);
+ put_membuf (data, fields1, field_len);
+ }
+ return 0;
+}
+
+static gpg_error_t
+scd_get_pubkey (assuan_context_t ctx, struct ga_key_list *key)
+{
+ char lineASSUAN_LINELENGTH;
+ membuf_t data;
+ unsigned char *databuf;
+ size_t datalen;
+ gpg_error_t err = 0;
+
+ init_membuf (&data, 256);
+
+ snprintf (line, DIM(line), "READKEY --format=ssh %s", key->keygrip);
+ err = assuan_transact (ctx, line, put_second_field_cb, &data,
+ NULL, NULL, NULL, NULL);
+ databuf = get_membuf (&data, &datalen);
+
+ if (!err)
+ {
+ key->pubkey_len = datalen;
+ key->pubkey = databuf;
+ }
+ else
+ xfree (databuf);
+
+ return err;
+}
+
+
+static gpg_error_t
+ga_scd_get_auth_keys (assuan_context_t ctx, struct ga_key_list **r_key_list)
+{
+ gpg_error_t err;
+ struct ga_key_list *kl, *key_list = NULL;
+
+ /* Get list of auth keys with their keygrips. */
+ err = scd_keyinfo_list (ctx, &key_list);
+
+ /* And retrieve public key for each key. */
+ kl = key_list;
+ while (kl)
+ {
+ err = scd_get_pubkey (ctx, kl);
+ if (err)
+ break;
+ kl = kl->next;
+ }
+
+ if (err)
+ ga_release_auth_keys (key_list);
+ else
+ *r_key_list = key_list;
+
+ return err;
+}
+
+struct ssh_key_list {
+ struct ssh_key_list *next;
+ char *pubkey; /* Public key in SSH format. */
+ char *comment;
+};
+
+static void
+release_ssh_key_list (struct ssh_key_list *key_list)
+{
+ struct ssh_key_list *key;
+
+ while (key_list)
+ {
+ key = key_list;
+ key_list = key_list->next;
+ xfree (key->pubkey);
+ xfree (key->comment);
+ xfree (key);
+ }
+}
+
+static gpg_error_t
+ssh_authorized_keys (const char *user, struct ssh_key_list **r_ssh_key_list)
+{
+ gpg_error_t err = 0;
+ char *fname = NULL;
+ estream_t fp = NULL;
+ char *line = NULL;
+ size_t length_of_line = 0;
+ size_t maxlen;
+ ssize_t len;
+ const char *fields3;
+ struct ssh_key_list *ssh_key_list = NULL;
+ struct ssh_key_list *ssh_key_prev = NULL;
+ struct ssh_key_list *ssh_key = NULL;
+
+ if (user)
+ {
+ char tilde_user256;
+
+ snprintf (tilde_user, sizeof tilde_user, "~%s", user);
+ fname = make_absfilename_try (tilde_user, ".ssh", "authorized_keys", NULL);
+ }
+ else
+ fname = make_absfilename_try ("~", ".ssh", "authorized_keys", NULL);
+
+ if (fname == NULL)
+ return gpg_error (GPG_ERR_INV_NAME);
+
+ fp = es_fopen (fname, "r");
+ if (!fp)
+ {
+ err = gpg_error_from_syserror ();
+ xfree (fname);
+ return err;
+ }
+ xfree (fname);
+
+ maxlen = 2048; /* Set limit. */
+ while ((len = es_read_line (fp, &line, &length_of_line, &maxlen)) > 0)
+ {
+ if (!maxlen)
+ {
+ err = gpg_error (GPG_ERR_LINE_TOO_LONG);
+ log_error (_("error reading '%s': %s\n"), fname, gpg_strerror (err));
+ goto leave;
+ }
+
+ /* Strip newline and carriage return, if present. */
+ while (len > 0 && (linelen - 1 == '\n' || linelen - 1 == '\r'))
+	line--len = '\0';
+
+ fields2 = NULL;
+ if (split_fields (line, fields, DIM (fields)) < 2)
+ continue; /* Skip empty lines or line with only a field. */
+ if (*fields0 == '#')
+ continue; /* Skip comments. */
+
+ ssh_key = xtrycalloc (1, sizeof *ssh_key);
+ if (!ssh_key)
+ {
+ err = gpg_error_from_syserror ();
+ release_ssh_key_list (ssh_key_list);
+ goto leave;
+ }
+
+ ssh_key->pubkey = strdup (fields1);
+ ssh_key->comment = strdup (fields2);
+ if (ssh_key_list)
+ ssh_key_prev->next = ssh_key;
+ else
+ ssh_key_list = ssh_key;
+
+ ssh_key_prev = ssh_key;
+ }
+
+ *r_ssh_key_list = ssh_key_list;
+
+ leave:
+ xfree (line);
+ es_fclose (fp);
+ return err;
+}
+
+static gpg_error_t
+ga_filter_by_authorized_keys (const char *user, struct ga_key_list **r_key_list)
+{
+ gpg_error_t err;
+ struct ga_key_list *cur = *r_key_list;
+ struct ga_key_list *key_list = NULL;
+ struct ga_key_list *prev = NULL;
+ struct ssh_key_list *ssh_key_list = NULL;
+
+ err = ssh_authorized_keys (user, &ssh_key_list);
+ if (err)
+ return err;
+
+ if (ssh_key_list == NULL)
+ return gpg_error (GPG_ERR_NOT_FOUND);
+
+ while (cur)
+ {
+ struct ssh_key_list *skl = ssh_key_list;
+
+ while (skl)
+ if (!strncmp (cur->pubkey, skl->pubkey, cur->pubkey_len))
+ break;
+ else
+ skl = skl->next;
+
+ /* valid? */
+ if (skl)
+ {
+ if (key_list)
+ prev->next = cur;
+ else
+ key_list = cur;
+ cur->comment = skl->comment;
+ skl->comment = NULL;
+ prev = cur;
+ cur = cur->next;
+ }
+ else
+ {
+ struct ga_key_list *k = cur;
+
+ cur = cur->next;
+ xfree (k->pubkey);
+ xfree (k);
+ }
+ }
+
+ if (prev && prev->next)
+ prev->next = NULL;
+
+ release_ssh_key_list (ssh_key_list);
+ *r_key_list = key_list;
+ return 0;
+}
+
+static void
+ga_release_auth_keys (struct ga_key_list *key_list)
+{
+ struct ga_key_list *key;
+
+ while (key_list)
+ {
+ key = key_list;
+ key_list = key_list->next;
+ xfree (key->pubkey);
+ xfree (key);
+ }
+}
+
+static int
+getpin (const char *comment, const char *info, char *buf, size_t *r_len)
+{
+ int rc = 0;
+ char lineASSUAN_LINELENGTH;
+ const char *fields2;
+
+ (void)info;
+
+ if (comment)
+ {
+ int msg_len = 29 + strlen (comment);
+ fprintf (stdout, "P %d\n", msg_len);
+ fprintf (stdout, "Please input PIN for KEY (%s): \n", comment);
+ fflush (stdout);
+ }
+ else
+ {
+ fputs ("P 18\n", stdout);
+ fputs ("Please input PIN: \n", stdout);
+ fflush (stdout);
+ }
+
+ fgets (line, ASSUAN_LINELENGTH, stdin);
+ if (split_fields (line, fields, DIM (fields)) < DIM (fields))
+ rc = GPG_ERR_PROTOCOL_VIOLATION;
+ else if (strcmp (fields0, "p") != 0)
+ rc = GPG_ERR_CANCELED;
+ if (!fgets (line, ASSUAN_LINELENGTH, stdin))
+ rc = GPG_ERR_PROTOCOL_VIOLATION;
+ if (!rc)
+ {
+ size_t len = strlen (line);
+
+ /* Strip newline and carriage return, if present. */
+ while (len > 0 && (linelen - 1 == '\n' || linelen - 1 == '\r'))
+ line--len = '\0';
+
+ len++;			/* Include last '\0' in the data. */
+ if (len > *r_len)
+ rc = GPG_ERR_BUFFER_TOO_SHORT;
+ else
+ memcpy (buf, line, len);
+ *r_len = len;
+ }
+
+ return rc;
+}
+
+
+static gpg_error_t
+scd_pkauth (assuan_context_t ctx, const char *keygrip)
+{
+ char lineASSUAN_LINELENGTH;
+ gpg_error_t err;
+
+ snprintf (line, DIM(line), "PKAUTH --challenge-response %s", keygrip);
+ err = assuan_transact (ctx, line, NULL, NULL, inq_needpin, ctx,
+ NULL, NULL);
+ return err;
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-card.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-card.c Changed

@@ -1,5 +1,5 @@
 /* gpg-card.c - An interactive tool to work with cards.
- * Copyright (C) 2019, 2020, 2021 g10 Code GmbH
+ * Copyright (C) 2019--2022 g10 Code GmbH
 *
 * This file is part of GnuPG.
 *
@@ -39,10 +39,12 @@
 #include "../common/userids.h"
 #include "../common/ccparray.h"
 #include "../common/exectool.h"
+#include "../common/exechelp.h"
 #include "../common/ttyio.h"
 #include "../common/server-help.h"
 #include "../common/openpgpdefs.h"
 #include "../common/tlv.h"
+#include "../common/comopt.h"
 
 #include "gpg-card.h"
 
@@ -292,6 +294,19 @@
 if (log_get_errorcount (0))
 exit (2);
 
+ /* Process common component options. */
+ gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
+ gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
+ if (parse_comopt (GNUPG_MODULE_NAME_CARD, opt.debug))
+ {
+ gnupg_status_printf (STATUS_FAILURE, "option-parser %u",
+ gpg_error (GPG_ERR_GENERAL));
+ exit(2);
+ }
+
+ if (comopt.no_autostart)
+ opt.autostart = 0;
+
 /* Set defaults for non given options. */
 if (!opt.gpg_program)
 opt.gpg_program = gnupg_module_name (GNUPG_MODULE_NAME_GPG);
@@ -775,7 +790,10 @@
 }
 else /* Print the primary key as fallback. */
 print_shax_fpr (fp, pubkey->fpr, pubkey->fprlen);
-
+ }
+ if (kb->protocol == GNUPG_PROTOCOL_OPENPGP
+ || kb->protocol == GNUPG_PROTOCOL_CMS)
+ {
 /* Find the primary or subkey of that key. */
 for (; pubkey; pubkey = pubkey->next)
 if (pubkey->grip_valid
@@ -1225,7 +1243,7 @@
 
 if (!info->serialno || info->need_sn_cmd)
 {
- /* This is probably the first call or was explictly requested.
+ /* This is probably the first call or was explicitly requested.
 * We need to send a SERIALNO command to scdaemon so that our
 * session knows all cards. */
 err = scd_serialno (NULL, NULL);
@@ -2722,7 +2740,7 @@
 "in non-interactive and without a PINREF a default value is\n"
 "used for these cards. The option --reset is used with TCOS\n"
 "cards to reset the PIN using the PUK or vice versa; --nullpin\n"
- "is used for these cards to set the intial PIN.",
+ "is used for these cards to set the initial PIN.",
 0);
 
 if (opt.interactive || opt.verbose)
@@ -2804,7 +2822,7 @@
 
 log_assert (DIM (info->chvinfo) >= 4);
 
- /* If there is a qualified signature use a a menu to select
+ /* If there is a qualified signature use a menu to select
 * between standard PIN and QES PINs. */
 if (info->chvinfo2 != -2 || info->chvinfo3 != -2)
 {
@@ -2921,7 +2939,7 @@
 else if (!ascii_strcasecmp (pinref, "OPENPGP.3"))
 log_info ("Admin PIN changed.\n");
 else if (reset_mode)
- log_info ("PIN resetted.\n");
+ log_info ("PIN reset.\n");
 else
 log_info ("PIN changed.\n");
 
@@ -3505,7 +3523,7 @@
 err = yubikey_commands (info, fp, nwords, words);
 err2 = scd_learn (info, 0);
 if (err2)
- log_error ("Error re-reading card: %s\n", gpg_strerror (err));
+ log_error ("Error re-reading card: %s\n", gpg_strerror (err2));
 
 leave:
 return err;
@@ -3617,6 +3635,60 @@
 
 
 static gpg_error_t
+cmd_gpg (card_info_t info, char *argstr, int use_gpgsm)
+{
+ gpg_error_t err;
+ char **argarray;
+ ccparray_t ccp;
+ const char **argv = NULL;
+ pid_t pid;
+ int i;
+
+ if (!info)
+ return print_help
+ ("GPGSM <commands_and_options>\n"
+ "\n"
+ "Run gpg/gpgsm directly from this shell.\n",
+ 0);
+
+ /* Fixme: We need to write and use a version of strtokenize which
+ * takes care of shell-style quoting. */
+ argarray = strtokenize (argstr, " \t\n\v");
+ if (!argarray)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ ccparray_init (&ccp, 0);
+ for (i=0; argarrayi; i++)
+ ccparray_put (&ccp, argarrayi);
+ argv = ccparray_get (&ccp, NULL);
+ if (!argv)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+
+ err = gnupg_spawn_process (use_gpgsm? opt.gpgsm_program:opt.gpg_program,
+ argv, NULL, (GNUPG_SPAWN_KEEP_STDOUT
+ |GNUPG_SPAWN_KEEP_STDERR),
+ NULL, NULL, NULL, &pid);
+ if (!err)
+ {
+ err = gnupg_wait_process (use_gpgsm? opt.gpgsm_program:opt.gpg_program,
+ pid, 1, NULL);
+ gnupg_release_process (pid);
+ }
+
+
+ leave:
+ xfree (argv);
+ xfree (argarray);
+ return err;
+}
+
+
+static gpg_error_t
 cmd_history (card_info_t info, char *argstr)
 {
 int opt_list, opt_clear;
@@ -3653,7 +3725,7 @@
 cmdNAME, cmdURL, cmdFETCH, cmdLOGIN, cmdLANG, cmdSALUT, cmdCAFPR,
 cmdFORCESIG, cmdGENERATE, cmdPASSWD, cmdPRIVATEDO, cmdWRITECERT,
 cmdREADCERT, cmdWRITEKEY, cmdUNBLOCK, cmdFACTRST, cmdKDFSETUP,
- cmdUIF, cmdAUTH, cmdYUBIKEY, cmdAPDU, cmdHISTORY,
+ cmdUIF, cmdAUTH, cmdYUBIKEY, cmdAPDU, cmdGPG, cmdGPGSM, cmdHISTORY,
 cmdINVCMD
 };
 
@@ -3694,6 +3766,8 @@
 { "writecert", cmdWRITECERT, N_("store a certificate to a data object")},
 { "writekey", cmdWRITEKEY, N_("store a private key to a data object")},
 { "yubikey", cmdYUBIKEY, N_("Yubikey management commands")},
+ { "gpg", cmdGPG, NULL},
+ { "gpgsm", cmdGPGSM, NULL},
 { "apdu", cmdAPDU, NULL},
 { "history", cmdHISTORY, N_("manage the command history")},
 { NULL, cmdINVCMD, NULL }
@@ -3824,6 +3898,8 @@
 case cmdUIF: err = cmd_uif (info, argstr); break;
 case cmdYUBIKEY: err = cmd_yubikey (info, argstr); break;
 case cmdAPDU: err = cmd_apdu (info, argstr); break;
+ case cmdGPG: err = cmd_gpg (info, argstr, 0); break;
+ case cmdGPGSM: err = cmd_gpg (info, argstr, 1); break;
 case cmdHISTORY: err = 0; break; /* Only used in interactive mode. */
 
 case cmdINVCMD:
@@ -4081,6 +4157,8 @@
 case cmdUIF: err = cmd_uif (info, argstr); break;
 case cmdYUBIKEY: err = cmd_yubikey (info, argstr); break;
 case cmdAPDU: err = cmd_apdu (info, argstr); break;
+ case cmdGPG: err = cmd_gpg (info, argstr, 0); break;
+ case cmdGPGSM: err = cmd_gpg (info, argstr, 1); break;
 case cmdHISTORY: err = cmd_history (info, argstr); break;
 
 case cmdINVCMD:

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-card.w32-manifest.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-card.w32-manifest.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-check-pattern.w32-manifest.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-check-pattern.w32-manifest.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-connect-agent.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-connect-agent.c Changed

@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <assert.h>
 
+#define INCLUDED_BY_MAIN_MODULE 1
 #include "../common/i18n.h"
 #include "../common/util.h"
 #include "../common/asshelp.h"
@@ -39,6 +40,7 @@
 # include "../common/exechelp.h"
 #endif
 #include "../common/init.h"
+#include "../common/comopt.h"
 
 
 #define CONTROL_D ('D' - 'A' + 1)
@@ -58,6 +60,7 @@
 oExec = 'E',
 oRun = 'r',
 oSubst = 's',
+ oUnBuffered = 'u',
 
 oNoVerbose	= 500,
 oHomedir,
@@ -110,6 +113,7 @@
 ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
 ARGPARSE_s_s (oKeyboxdProgram, "keyboxd-program", "@"),
 ARGPARSE_s_s (oChUid, "chuid", "@"),
+ ARGPARSE_s_n (oUnBuffered, "unbuffered", "@"),
 
 ARGPARSE_end ()
 };
@@ -137,6 +141,7 @@
 int enable_varsubst; /* Set if variable substitution is enabled. */
 int trim_leading_spaces;
 int no_history;
+ int unbuffered; /* Set if unbuffered mode for stdin/out is preferred. */
 } opt;
 
 
@@ -1005,10 +1010,7 @@
 if (fd >= 0 && fd < DIM (open_fd_table))
 {
 open_fd_tablefd.inuse = 1;
-#ifdef HAVE_W32CE_SYSTEM
-# warning fixme: implement our pipe emulation.
-#endif
-#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
 {
 HANDLE prochandle, handle, newhandle;
 
@@ -1038,12 +1040,12 @@
 log_info ("file '%s' opened in \"%s\" mode, fd=%d (libc=%d)\n",
 name, mode, (int)open_fd_tablefd.handle, fd);
 set_int_var (varname, (int)open_fd_tablefd.handle);
-#else
+#else /* Unix */
 if (opt.verbose)
 log_info ("file '%s' opened in \"%s\" mode, fd=%d\n",
 name, mode, fd);
 set_int_var (varname, fd);
-#endif
+#endif /* Unix */
 }
 else
 {
@@ -1242,6 +1244,7 @@
 opt.trim_leading_spaces = 1;
 break;
 case oChUid: changeuser = pargs.r.ret_str; break;
+ case oUnBuffered: opt.unbuffered = 1; break;
 
 default: pargs.err = 2; break;
 	}
@@ -1254,6 +1257,16 @@
 if (log_get_errorcount (0))
 exit (2);
 
+ /* Process common component options. Note that we set the config
+ * dir only here so that --homedir will have an effect. */
+ gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
+ gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
+ if (parse_comopt (GNUPG_MODULE_NAME_CONNECT_AGENT, opt.verbose > 1))
+ exit(2);
+
+ if (comopt.no_autostart)
+ opt.autostart = 0;
+
 /* --uiserver is a shortcut for a specific raw socket. This comes
 in particular handy on Windows. */
 if (opt.use_uiserver)
@@ -1318,8 +1331,7 @@
 assuan_fd_t no_close3;
 
 no_close0 = assuan_fd_from_posix_fd (es_fileno (es_stderr));
- no_close1 = assuan_fd_from_posix_fd (log_get_fd ());
- no_close2 = ASSUAN_INVALID_FD;
+ no_close1 = ASSUAN_INVALID_FD;
 
 rc = assuan_new (&ctx);
 if (rc)
@@ -1402,6 +1414,11 @@
 log_info (_("receiving line failed: %s\n"), gpg_strerror (rc) );
 }
 
+ if (!script_fp && opt.unbuffered)
+ {
+ gpgrt_setvbuf (gpgrt_stdin, NULL, _IONBF, 0);
+ setvbuf (stdout, NULL, _IONBF, 0);
+ }
 
 for (loopidx=0; loopidx < DIM (loopstack); loopidx++)
 loopstackloopidx.collecting = 0;
@@ -1969,6 +1986,7 @@
 FILE *fp = NULL;
 char buffer1024;
 int rc, n;
+ int cancelled = 0;
 
 /* Skip the command and trailing spaces. */
 for (; *line && !spacep (line); line++)
@@ -2013,11 +2031,7 @@
 {
 if (d->is_prog)
 {
-#ifdef HAVE_W32CE_SYSTEM
- fp = NULL;
-#else
 fp = popen (d->file, "r");
-#endif
 if (!fp)
 log_error ("error executing '%s': %s\n",
 d->file, strerror (errno));
@@ -2050,21 +2064,20 @@
 log_error ("error reading from '%s': %s\n", d->file, strerror (errno));
 }
 
- rc = assuan_send_data (ctx, NULL, 0);
- if (rc)
- log_error ("sending data back failed: %s\n", gpg_strerror (rc) );
-
 if (d->is_var)
 ;
 else if (d->is_prog)
 {
-#ifndef HAVE_W32CE_SYSTEM
 if (pclose (fp))
- log_error ("error running '%s': %s\n", d->file, strerror (errno));
-#endif
+ cancelled = 1;
 }
 else
 fclose (fp);
+
+ rc = assuan_send_data (ctx, NULL, cancelled);
+ if (rc)
+ log_error ("sending data back failed: %s\n", gpg_strerror (rc) );
+
 return 1;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-connect-agent.w32-manifest.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-connect-agent.w32-manifest.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-wks-client.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-wks-client.c Changed

@@ -1,5 +1,5 @@
 /* gpg-wks-client.c - A client for the Web Key Service protocols.
- * Copyright (C) 2016 Werner Koch
+ * Copyright (C) 2016, 2022 g10 Code GmbH
 * Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
 *
 * This file is part of GnuPG.
@@ -39,6 +39,7 @@
 #include "../common/exectool.h"
 #include "../common/mbox-util.h"
 #include "../common/name-value.h"
+#include "../common/comopt.h"
 #include "call-dirmngr.h"
 #include "mime-maker.h"
 #include "send-mail.h"
@@ -62,6 +63,7 @@
 aCreate,
 aReceive,
 aRead,
+ aMirror,
 aInstallKey,
 aRemoveKey,
 aPrintWKDHash,
@@ -72,6 +74,10 @@
 oFakeSubmissionAddr,
 oStatusFD,
 oWithColons,
+ oBlacklist,
+ oNoAutostart,
+ oAddRevocs,
+ oNoAddRevocs,
 
 oDummy
 };
@@ -91,14 +97,16 @@
 ("receive a MIME confirmation request")),
 ARGPARSE_c (aRead, "read",
 ("receive a plain text confirmation request")),
+ ARGPARSE_c (aMirror, "mirror",
+ "mirror an LDAP directory"),
 ARGPARSE_c (aInstallKey, "install-key",
 "install a key into a directory"),
 ARGPARSE_c (aRemoveKey, "remove-key",
 "remove a key from a directory"),
 ARGPARSE_c (aPrintWKDHash, "print-wkd-hash",
- "Print the WKD identifier for the given user ids"),
+ "print the WKD identifier for the given user ids"),
 ARGPARSE_c (aPrintWKDURL, "print-wkd-url",
- "Print the WKD URL for the given user id"),
+ "print the WKD URL for the given user id"),
 
 ARGPARSE_group (301, ("@\nOptions:\n ")),
 
@@ -109,8 +117,12 @@
 ARGPARSE_s_n (oSend, "send", "send the mail using sendmail"),
 ARGPARSE_s_s (oOutput, "output", "|FILE|write the mail to FILE"),
 ARGPARSE_s_i (oStatusFD, "status-fd", N_("|FD|write status info to this FD")),
+ ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
 ARGPARSE_s_n (oWithColons, "with-colons", "@"),
+ ARGPARSE_s_s (oBlacklist, "blacklist", "@"),
 ARGPARSE_s_s (oDirectory, "directory", "@"),
+ ARGPARSE_s_n (oAddRevocs, "add-revocs", "add revocation certificates"),
+ ARGPARSE_s_n (oNoAddRevocs, "no-add-revocs", "do not add revocation certificates"),
 
 ARGPARSE_s_s (oFakeSubmissionAddr, "fake-submission-addr", "@"),
 
@@ -136,13 +148,19 @@
 /* Value of the option --fake-submission-addr. */
 const char *fake_submission_addr;
 
+/* An array with blacklisted addresses and its length. Use
+ * is_in_blacklist to check. */
+static char **blacklist_array;
+static size_t blacklist_array_len;
+
 
 static void wrong_args (const char *text) GPGRT_ATTR_NORETURN;
+static void add_blacklist (const char *fname);
 static gpg_error_t proc_userid_from_stdin (gpg_error_t (*func)(const char *),
 const char *text);
 static gpg_error_t command_supported (char *userid);
 static gpg_error_t command_check (char *userid);
-static gpg_error_t command_send (const char *fingerprint, const char *userid);
+static gpg_error_t command_create (const char *fingerprint, const char *userid);
 static gpg_error_t encrypt_response (estream_t *r_output, estream_t input,
 const char *addrspec,
 const char *fingerprint);
@@ -150,6 +168,7 @@
 static gpg_error_t command_receive_cb (void *opaque,
 const char *mediatype, estream_t fp,
 unsigned int flags);
+static gpg_error_t command_mirror (char *domain);
 
 
 &#xc;
@@ -236,12 +255,25 @@
 case oWithColons:
 opt.with_colons = 1;
 break;
+ case oNoAutostart:
+ opt.no_autostart = 1;
+ break;
+ case oBlacklist:
+ add_blacklist (pargs->r.ret_str);
+ break;
+ case oAddRevocs:
+ opt.add_revocs = 1;
+ break;
+ case oNoAddRevocs:
+ opt.add_revocs = 0;
+ break;
 
 	case aSupported:
 	case aCreate:
 	case aReceive:
 	case aRead:
 case aCheck:
+ case aMirror:
 case aInstallKey:
 case aRemoveKey:
 case aPrintWKDHash:
@@ -277,6 +309,8 @@
 assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
 setup_libassuan_logging (&opt.debug, NULL);
 
+ opt.add_revocs = 1; /* Default add revocation certs. */
+
 /* Parse the command line. */
 pargs.argc = &argc;
 pargs.argv = &argv;
@@ -284,9 +318,26 @@
 cmd = parse_arguments (&pargs, opts);
 gpgrt_argparse (NULL, &pargs, NULL);
 
+ /* Check if gpg is build with sendmail support */
+ if (opt.use_sendmail && !NAME_OF_SENDMAIL0)
+ {
+ err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+ log_error ("sending mail is not supported in this build: %s\n",
+ gpg_strerror (err));
+ }
+
 if (log_get_errorcount (0))
 exit (2);
 
+ /* Process common component options. Note that we set the config
+ * dir only here so that --homedir will have an effect. */
+ gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
+ gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
+ if (parse_comopt (GNUPG_MODULE_NAME_CONNECT_AGENT, opt.verbose > 1))
+ exit(2);
+ if (comopt.no_autostart)
+ opt.no_autostart = 1;
+
 /* Print a warning if an argument looks like an option. */
 if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
 {
@@ -305,11 +356,12 @@
 opt.directory = "openpgpkey";
 
 /* Tell call-dirmngr what options we want. */
- set_dirmngr_options (opt.verbose, (opt.debug & DBG_IPC_VALUE), 1);
+ set_dirmngr_options (opt.verbose, (opt.debug & DBG_IPC_VALUE),
+ !opt.no_autostart);
 
 
 /* Check that the top directory exists. */
- if (cmd == aInstallKey || cmd == aRemoveKey)
+ if (cmd == aInstallKey || cmd == aRemoveKey || cmd == aMirror)
 {
 struct stat sb;
 
@@ -352,7 +404,7 @@
 case aCreate:
 if (argc != 2)
 wrong_args ("--create FINGERPRINT USER-ID");
- err = command_send (argv0, argv1);
+ err = command_create (argv0, argv1);
 if (err)
 log_error ("creating request failed: %s\n", gpg_strerror (err));
 break;
@@ -379,6 +431,13 @@
 err = command_check (argv0);
 break;
 
+ case aMirror:
+ if (!argc)
+ err = command_mirror (NULL);
+ else
+ err = command_mirror (argv);
+ break;
+
 case aInstallKey:
 if (!argc)
 err = wks_cmd_install_key (NULL, NULL);
@@ -444,6 +503,153 @@
 }
 
 
+
+/* Read a file FNAME into a buffer and return that malloced buffer.
+ * Caller must free the buffer. On error NULL is returned, on success
+ * the valid length of the buffer is stored at R_LENGTH. The returned
+ * buffer is guaranteed to be Nul terminated. */
+static char *
+read_file (const char *fname, size_t *r_length)
+{
+ estream_t fp;
+ char *buf;
+ size_t buflen;
+
+ if (!strcmp (fname, "-"))
+ {
+ size_t nread, bufsize = 0;
+
+ fp = es_stdin;
+ es_set_binary (fp);
+ buf = NULL;
+ buflen = 0;
+#define NCHUNK 32767
+ do
+ {
+ bufsize += NCHUNK;
+ if (!buf)
+ buf = xmalloc (bufsize+1);
+ else
+ buf = xrealloc (buf, bufsize+1);
+
+ 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);
+ return NULL;
+ }
+ buflen += nread;
+ }
+ while (nread == NCHUNK);
+#undef NCHUNK
+ }
+ else
+ {
+ struct stat st;
+
+ fp = es_fopen (fname, "rb");
+ if (!fp)
+ {
+ log_error ("can't open '%s': %s\n", fname, strerror (errno));
+ return NULL;
+ }
+
+ if (fstat (es_fileno (fp), &st))
+ {
+ log_error ("can't stat '%s': %s\n", fname, strerror (errno));
+ es_fclose (fp);
+ return NULL;
+ }
+
+ buflen = st.st_size;
+ buf = xmalloc (buflen+1);
+ if (es_fread (buf, buflen, 1, fp) != 1)
+ {
+ log_error ("error reading '%s': %s\n", fname, strerror (errno));
+ es_fclose (fp);
+ xfree (buf);
+ return NULL;
+ }
+ es_fclose (fp);
+ }
+ bufbuflen = 0;
+ if (r_length)
+ *r_length = buflen;
+ return buf;
+}
+
+
+static int
+cmp_blacklist (const void *arg_a, const void *arg_b)
+{
+ const char *a = *(const char **)arg_a;
+ const char *b = *(const char **)arg_b;
+ return strcmp (a, b);
+}
+
+
+/* Add a blacklist to our global table. This is called during option
+ * parsing and thus any use of log_error will eventually stop further
+ * processing. */
+static void
+add_blacklist (const char *fname)
+{
+ char *buffer;
+ char *p, *pend;
+ char **array;
+ size_t arraysize, arrayidx;
+
+ buffer = read_file (fname, NULL);
+ if (!buffer)
+ return;
+
+ /* Estimate the number of entries by counting the non-comment lines. */
+ arraysize = 2; /* For the first and an extra NULL item. */
+ for (p=buffer; *p; p++)
+ if (*p == '\n' && p1 && p1 != '#')
+ arraysize++;
+
+ array = xcalloc (arraysize, sizeof *array);
+ arrayidx = 0;
+
+ /* Loop over all lines. */
+ for (p = buffer; p && *p; p = pend)
+ {
+ pend = strchr (p, '\n');
+ if (pend)
+ *pend++ = 0;
+ trim_spaces (p);
+ if (!*p || *p == '#' )
+ continue;
+ ascii_strlwr (p);
+ log_assert (arrayidx < arraysize);
+ arrayarrayidx = p;
+ arrayidx++;
+ }
+ log_assert (arrayidx < arraysize);
+
+ qsort (array, arrayidx, sizeof *array, cmp_blacklist);
+
+ blacklist_array = array;
+ blacklist_array_len = arrayidx;
+ gpgrt_annotate_leaked_object (buffer);
+ gpgrt_annotate_leaked_object (blacklist_array);
+}
+
+
+/* Return true if NAME is in a blacklist. */
+static int
+is_in_blacklist (const char *name)
+{
+ if (!name || !blacklist_array)
+ return 0;
+ return !!bsearch (&name, blacklist_array, blacklist_array_len,
+ sizeof *blacklist_array, cmp_blacklist);
+}
+
+
+&#xc;
 /* Read user ids from stdin and call FUNC for each user id. TEXT is
 * used for error messages. */
 static gpg_error_t
@@ -509,9 +715,9 @@
 ccparray_init (&ccp, 0);
 
 ccparray_put (&ccp, "--no-options");
- if (!opt.verbose)
+ if (opt.verbose < 2)
 ccparray_put (&ccp, "--quiet");
- else if (opt.verbose > 1)
+ else
 ccparray_put (&ccp, "--verbose");
 ccparray_put (&ccp, "--batch");
 ccparray_put (&ccp, "--always-trust");
@@ -598,9 +804,9 @@
 * tricks. A regular client will anyway only send a minimal key;
 * that is one w/o key signatures and attribute packets. */
 ccparray_put (&ccp, "--max-output=0x10000");
- if (!opt.verbose)
+ if (opt.verbose < 2)
 ccparray_put (&ccp, "--quiet");
- else if (opt.verbose > 1)
+ else
 ccparray_put (&ccp, "--verbose");
 ccparray_put (&ccp, "--batch");
 ccparray_put (&ccp, "--status-fd=2");
@@ -916,6 +1122,9 @@
 log_info (" created: %s\n", asctimestamp (sl->created));
 if (sl->mbox)
 log_info (" addr-spec: %s\n", sl->mbox);
+ if (sl->expired || sl->revoked)
+ log_info (" flags:%s%s\n",
+ sl->expired? " expired":"", sl->revoked?" revoked":"");
 }
 }
 if (!found)
@@ -924,6 +1133,19 @@
 addrspec);
 err = gpg_error (GPG_ERR_CERT_REVOKED);
 }
+ else if (opt.output)
+ {
+ /* Save to file. */
+ const char *fname = opt.output;
+
+ if (*fname == '-' && !fname1)
+ fname = NULL;
+ es_rewind (key);
+ err = wks_write_to_file (key, fname);
+ if (err)
+ log_error ("writing key to '%s' failed: %s\n",
+ fname? fname : "stdout", gpg_strerror (err));
+ }
 
 leave:
 xfree (fpr);
@@ -938,7 +1160,7 @@
 /* Locate the key by fingerprint and userid and send a publication
 * request. */
 static gpg_error_t
-command_send (const char *fingerprint, const char *userid)
+command_create (const char *fingerprint, const char *userid)
 {
 gpg_error_t err;
 KEYDB_SEARCH_DESC desc;
@@ -954,6 +1176,7 @@
 uidinfo_list_t uidlist = NULL;
 uidinfo_list_t uid, thisuid;
 time_t thistime;
+ int any;
 
 if (classify_user_id (fingerprint, &desc, 1)
 || desc.mode != KEYDB_SEARCH_MODE_FPR)
@@ -970,7 +1193,7 @@
 err = gpg_error (GPG_ERR_INV_USER_ID);
 goto leave;
 }
- err = wks_get_key (&key, fingerprint, addrspec, 0);
+ err = wks_get_key (&key, fingerprint, addrspec, 0, 1);
 if (err)
 goto leave;
 
@@ -1014,12 +1237,20 @@
 }
 thistime = 0;
 thisuid = NULL;
+ any = 0;
 for (uid = uidlist; uid; uid = uid->next)
 {
 if (!uid->mbox)
 continue; /* Should not happen anyway. */
 if (policy->mailbox_only && ascii_strcasecmp (uid->uid, uid->mbox))
 continue; /* UID has more than just the mailbox. */
+ if (uid->expired)
+ {
+ if (opt.verbose)
+ log_info ("ignoring expired user id '%s'\n", uid->uid);
+ continue;
+ }
+ any = 1;
 if (uid->created > thistime)
 {
 thistime = uid->created;
@@ -1028,6 +1259,14 @@
 }
 if (!thisuid)
 thisuid = uidlist; /* This is the case for a missing timestamp. */
+ if (!any)
+ {
+ log_error ("public key %s has no mail address '%s'\n",
+ fingerprint, addrspec);
+ err = gpg_error (GPG_ERR_INV_USER_ID);
+ goto leave;
+ }
+
 if (opt.verbose)
 log_info ("submitting key with user id '%s'\n", thisuid->uid);
 
@@ -1038,7 +1277,7 @@
 estream_t newkey;
 
 es_rewind (key);
- err = wks_filter_uid (&newkey, key, thisuid->uid, 0);
+ err = wks_filter_uid (&newkey, key, thisuid->uid, 1);
 if (err)
 {
 log_error ("error filtering key: %s\n", gpg_strerror (err));
@@ -1063,11 +1302,47 @@
 * the key again. */
 es_fclose (key);
 key = NULL;
- err = wks_get_key (&key, fingerprint, addrspec, 1);
+ err = wks_get_key (&key, fingerprint, addrspec, 1, 1);
 if (err)
 goto leave;
 }
 
+ if (opt.add_revocs)
+ {
+ if (es_fseek (key, 0, SEEK_END))
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("error seeking stream: %s\n", gpg_strerror (err));
+ goto leave;
+ }
+ err = wks_find_add_revocs (key, addrspec);
+ if (err)
+ {
+ log_error ("error finding revocations for '%s': %s\n",
+ addrspec, gpg_strerror (err));
+ goto leave;
+ }
+ }
+
+
+ /* Now put the armor around the key. */
+ {
+ estream_t newkey;
+
+ es_rewind (key);
+ err = wks_armor_key (&newkey, key,
+ no_encrypt? NULL
+ /* */ : ("Content-Type: application/pgp-keys\n"
+ "\n"));
+ if (err)
+ {
+ log_error ("error armoring key: %s\n", gpg_strerror (err));
+ goto leave;
+ }
+ es_fclose (key);
+ key = newkey;
+ }
+
 /* Hack to support posteo but let them disable this by setting the
 * new policy-version flag. */
 if (policy->protocol_version < 3
@@ -1112,7 +1387,7 @@
 if (no_encrypt)
 {
 void *data;
- size_t datalen, n;
+ size_t datalen;
 
 if (posteo_hack)
 {
@@ -1137,16 +1412,7 @@
 goto leave;
 }
 key = NULL;
- /* We need to skip over the first line which has a content-type
- * header not needed here. */
- for (n=0; n < datalen ; n++)
- if (((const char *)data)n == '\n')
- {
- n++;
- break;
- }
-
- err = mime_maker_add_body_data (mime, (char*)data + n, datalen - n);
+ err = mime_maker_add_body_data (mime, data, datalen);
 xfree (data);
 if (err)
 goto leave;
@@ -1245,9 +1511,9 @@
 ccparray_init (&ccp, 0);
 
 ccparray_put (&ccp, "--no-options");
- if (!opt.verbose)
+ if (opt.verbose < 2)
 ccparray_put (&ccp, "--quiet");
- else if (opt.verbose > 1)
+ else
 ccparray_put (&ccp, "--verbose");
 ccparray_put (&ccp, "--batch");
 ccparray_put (&ccp, "--status-fd=2");
@@ -1594,3 +1860,230 @@
 
 return err;
 }
+
+
+&#xc;
+/* An object used to communicate with the mirror_one_key callback. */
+struct
+{
+ const char *domain;
+ int anyerror;
+ unsigned int nkeys; /* Number of keys processed. */
+ unsigned int nuids; /* Number of published user ids. */
+} mirror_one_key_parm;
+
+
+/* Return true if the Given a mail DOMAIN and the full addrspec MBOX
+ * match. */
+static int
+domain_matches_mbox (const char *domain, const char *mbox)
+{
+ const char *s;
+
+ if (!domain || !mbox)
+ return 0;
+ s = strchr (domain, '@');
+ if (s)
+ domain = s+1;
+ if (!*domain)
+ return 0; /* Not a valid domain. */
+
+ s = strchr (mbox, '@');
+ if (!s || !s1)
+ return 0; /* Not a valid mbox. */
+ mbox = s+1;
+
+ return !ascii_strcasecmp (domain, mbox);
+}
+
+
+/* Core of mirror_one_key with the goal of mirroring just one uid.
+ * UIDLIST is used to figure out whether the given MBOX occurs several
+ * times in UIDLIST and then to single out the newest one. This is
+ * so that for a key with
+ * uid: Joe Someone <joe@example.org>
+ * uid: Joe <joe@example.org>
+ * only the news user id (and thus its self-signature) is used.
+ * UIDLIST is nodified to set all MBOX fields to NULL for a processed
+ * user id. FPR is the fingerprint of the key.
+ */
+static gpg_error_t
+mirror_one_keys_userid (estream_t key, const char *mbox, uidinfo_list_t uidlist,
+ const char *fpr)
+{
+ gpg_error_t err;
+ uidinfo_list_t uid, thisuid, firstuid;
+ time_t thistime;
+ estream_t newkey = NULL;
+
+ /* Find the UID we want to use. */
+ thistime = 0;
+ thisuid = firstuid = NULL;
+ for (uid = uidlist; uid; uid = uid->next)
+ {
+ if ((uid->flags & 1) || !uid->mbox || strcmp (uid->mbox, mbox))
+ continue; /* Already processed or no matching mbox. */
+ uid->flags |= 1; /* Set "processed" flag. */
+ if (!firstuid)
+ firstuid = uid;
+ if (uid->created > thistime)
+ {
+ thistime = uid->created;
+ thisuid = uid;
+ }
+ }
+ if (!thisuid)
+ thisuid = firstuid; /* This is the case for a missing timestamp. */
+ if (!thisuid)
+ {
+ log_error ("error finding the user id for %s (%s)\n", fpr, mbox);
+ err = gpg_error (GPG_ERR_NO_USER_ID);
+ goto leave;
+ }
+
+ /* Always filter the key so that the result will be non-armored. */
+ es_rewind (key);
+ err = wks_filter_uid (&newkey, key, thisuid->uid, 1);
+ if (err)
+ {
+ log_error ("error filtering key %s: %s\n", fpr, gpg_strerror (err));
+ err = gpg_error (GPG_ERR_NO_PUBKEY);
+ goto leave;
+ }
+
+ if (opt.add_revocs)
+ {
+ if (es_fseek (newkey, 0, SEEK_END))
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("error seeking stream: %s\n", gpg_strerror (err));
+ goto leave;
+ }
+ err = wks_find_add_revocs (newkey, mbox);
+ if (err)
+ {
+ log_error ("error finding revocations for '%s': %s\n",
+ mbox, gpg_strerror (err));
+ goto leave;
+ }
+ es_rewind (newkey);
+ }
+
+ err = wks_install_key_core (newkey, mbox);
+ if (opt.verbose)
+ log_info ("key %s published for '%s'\n", fpr, mbox);
+ mirror_one_key_parm.nuids++;
+ if (!opt.quiet && !(mirror_one_key_parm.nuids % 25))
+ log_info ("%u user ids from %d keys so far\n",
+ mirror_one_key_parm.nuids, mirror_one_key_parm.nkeys);
+
+ leave:
+ es_fclose (newkey);
+ return err;
+}
+
+
+/* The callback used by command_mirror. It received an estream with
+ * one key and should return success to process the next key. */
+static gpg_error_t
+mirror_one_key (estream_t key)
+{
+ gpg_error_t err = 0;
+ char *fpr;
+ uidinfo_list_t uidlist = NULL;
+ uidinfo_list_t uid;
+ const char *domain = mirror_one_key_parm.domain;
+
+ /* List the key to get all user ids. */
+ err = wks_list_key (key, &fpr, &uidlist);
+ if (err)
+ {
+ log_error ("error parsing a key: %s - skipped\n",
+ gpg_strerror (err));
+ mirror_one_key_parm.anyerror = 1;
+ err = 0;
+ goto leave;
+ }
+ for (uid = uidlist; uid; uid = uid->next)
+ {
+ if (!uid->mbox || (uid->flags & 1))
+ continue; /* No mail box or already processed. */
+ if (uid->expired)
+ continue;
+ if (!domain_matches_mbox (domain, uid->mbox))
+ continue; /* We don't want this one. */
+ if (is_in_blacklist (uid->mbox))
+ continue;
+
+ err = mirror_one_keys_userid (key, uid->mbox, uidlist, fpr);
+ if (err)
+ {
+ log_error ("error processing key %s: %s - skipped\n",
+ fpr, gpg_strerror (err));
+ mirror_one_key_parm.anyerror = 1;
+ err = 0;
+ goto leave;
+ }
+ }
+ mirror_one_key_parm.nkeys++;
+
+
+ leave:
+ free_uidinfo_list (uidlist);
+ xfree (fpr);
+ return err;
+}
+
+
+/* Copy the keys from the configured LDAP server into a local WKD.
+ * DOMAINLIST is an array of domain names to restrict the copy to only
+ * the given domains; if it is NULL all keys are mirrored. */
+static gpg_error_t
+command_mirror (char *domainlist)
+{
+ gpg_error_t err;
+ const char *domain;
+ char *domainbuf = NULL;
+
+ mirror_one_key_parm.anyerror = 0;
+ mirror_one_key_parm.nkeys = 0;
+ mirror_one_key_parm.nuids = 0;
+
+ if (!domainlist)
+ {
+ mirror_one_key_parm.domain = "";
+ err = wkd_dirmngr_ks_get (NULL, mirror_one_key);
+ }
+ else
+ {
+ while ((domain = *domainlist++))
+ {
+ if (*domain != '.' && domain1 != '@')
+ {
+ /* This does not already specify a mail search by
+ * domain. Change it. */
+ xfree (domainbuf);
+ domainbuf = xstrconcat (".@", domain, NULL);
+ domain = domainbuf;
+ }
+ mirror_one_key_parm.domain = domain;
+ if (opt.verbose)
+ log_info ("mirroring keys for domain '%s'\n", domain+2);
+ err = wkd_dirmngr_ks_get (domain, mirror_one_key);
+ if (err)
+ break;
+ }
+ }
+
+ if (!opt.quiet)
+ log_info ("a total of %u user ids from %d keys published\n",
+ mirror_one_key_parm.nuids, mirror_one_key_parm.nkeys);
+ if (err)
+ log_error ("error mirroring LDAP directory: %s <%s>\n",
+ gpg_strerror (err), gpg_strsource (err));
+ else if (mirror_one_key_parm.anyerror)
+ log_info ("warning: errors encountered - not all keys are mirrored\n");
+
+ xfree (domainbuf);
+ return err;
+}

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-wks-client.w32-manifest.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-wks-client.w32-manifest.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-wks-server.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-wks-server.c Changed

@@ -809,17 +809,65 @@
 }
 
 
+/* Create the name for the pending file from NONCE and ADDRSPEC and
+ * store it at R_NAME.  */
+static gpg_error_t
+make_pending_fname (const char *nonce, const char *addrspec, char **r_name)
+{
+  gpg_error_t err = 0;
+  const char *domain;
+  char *addrspechash = NULL;
+  char sha1buf20;
+
+  *r_name = NULL;
+
+  domain = addrspec? strchr (addrspec, '@') : NULL;
+  if (!domain || !domain1 || domain == addrspec)
+    {
+      err = gpg_error (GPG_ERR_INV_ARG);
+      goto leave;
+    }
+  domain++;
+  if (strchr (domain, '/') || strchr (domain, '\\'))
+    {
+      log_info ("invalid domain detected ('%s')\n", domain);
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+      goto leave;
+    }
+  gcry_md_hash_buffer (GCRY_MD_SHA1, sha1buf, addrspec, domain - addrspec - 1);
+  addrspechash = zb32_encode (sha1buf, 8*20);
+  if (!addrspechash)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+
+  *r_name = strconcat (nonce, ".", addrspechash, NULL);
+  if (!*r_name)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+
+ leave:
+  xfree (addrspechash);
+  return err;
+}
+
+
 /* We store the key under the name of the nonce we will then send to
  * the user.  On success the nonce is stored at R_NONCE and the file
- * name at R_FNAME.  */
+ * name at R_FNAME.  ADDRSPEC is used as part of the pending file name
+ * so that the nonce is associated with an address */
 static gpg_error_t
-store_key_as_pending (const char *dir, estream_t key,
+store_key_as_pending (const char *dir, estream_t key, const char *addrspec,
                       char **r_nonce, char **r_fname)
 {
   gpg_error_t err;
   char *dname = NULL;
   char *fname = NULL;
   char *nonce = NULL;
+  char *pendingname = NULL;
   estream_t outfp = NULL;
   char buffer1024;
   size_t nbytes, nwritten;
@@ -848,7 +896,11 @@
       goto leave;
     }
 
-  fname = strconcat (dname, "/", nonce, NULL);
+  err = make_pending_fname (nonce, addrspec, &pendingname);
+  if (err)
+    goto leave;
+
+  fname = strconcat (dname, "/", pendingname, NULL);
   if (!fname)
     {
       err = gpg_error_from_syserror ();
@@ -917,6 +969,7 @@
       xfree (fname);
     }
   xfree (dname);
+  xfree (pendingname);
   return err;
 }
 
@@ -1207,7 +1260,7 @@
 
           xfree (nonce);
           xfree (fname);
-          err = store_key_as_pending (dname, key, &nonce, &fname);
+          err = store_key_as_pending (dname, key, sl->mbox, &nonce, &fname);
           if (err)
             goto leave;
 
@@ -1363,6 +1416,7 @@
   char *fnewname = NULL;
   estream_t key = NULL;
   char *hash = NULL;
+  char *pendingname = NULL;
   const char *domain;
   const char *s;
   uidinfo_list_t sl;
@@ -1379,7 +1433,21 @@
   domain = strchr (address, '@');
   log_assert (domain && domain1);
   domain++;
-  fname = make_filename_try (opt.directory, domain, "pending", nonce, NULL);
+  if (strchr (domain, '/') || strchr (domain, '\\')
+      || strchr (nonce, '/') || strchr (nonce, '\\'))
+    {
+      log_info ("invalid domain or nonce received ('%s', '%s')\n",
+                domain, nonce);
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+      goto leave;
+    }
+
+  err = make_pending_fname (nonce, address, &pendingname);
+  if (err)
+    goto leave;
+
+  fname = make_filename_try (opt.directory, domain, "pending", pendingname,
+                             NULL);
   if (!fname)
     {
       err = gpg_error_from_syserror ();
@@ -1491,6 +1559,7 @@
   xfree (fnewname);
   xfree (fname);
   xfree (nonce2);
+  xfree (pendingname);
   return err;
 }
 
@@ -1717,7 +1786,8 @@
                      __func__, gpg_strerror (err));
           goto leave;
         }
-      if (strlen (dentry->d_name) != 32)
+      /* The old files are 32 bytes, those created since 2.3.8 are 65 bytes. */
+      if (strlen (dentry->d_name) != 32 && strlen (dentry->d_name) != 65)
         {
           log_info ("garbage file '%s' ignored\n", fname);
           continue;

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpg-wks.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpg-wks.h Changed

@@ -38,6 +38,8 @@
   int quiet;
   int use_sendmail;
   int with_colons;
+  int no_autostart;
+  int add_revocs;
   const char *output;
   const char *gpg_program;
   const char *directory;
@@ -78,6 +80,9 @@
   struct uidinfo_list_s *next;
   time_t created; /* Time the userid was created.  */
   char *mbox;  /* NULL or the malloced mailbox from UID.  */
+  unsigned int flags;  /* These flags are cleared on creation.  */
+  unsigned int expired:1;
+  unsigned int revoked:1;
   char uid1;
 };
 typedef struct uidinfo_list_s *uidinfo_list_t;
@@ -89,19 +94,24 @@
 void wks_write_status (int no, const char *format, ...) GPGRT_ATTR_PRINTF(2,3);
 void free_uidinfo_list (uidinfo_list_t list);
 gpg_error_t wks_get_key (estream_t *r_key, const char *fingerprint,
-                         const char *addrspec, int exact);
+                         const char *addrspec, int exact, int binary);
 gpg_error_t wks_list_key (estream_t key, char **r_fpr,
                           uidinfo_list_t *r_mboxes);
 gpg_error_t wks_filter_uid (estream_t *r_newkey, estream_t key,
                             const char *uid, int binary);
+gpg_error_t wks_armor_key (estream_t *r_newkey, estream_t key,
+                           const char *prefix);
+gpg_error_t wks_find_add_revocs (estream_t key, const char *addrspec);
 gpg_error_t wks_send_mime (mime_maker_t mime);
 gpg_error_t wks_parse_policy (policy_flags_t flags, estream_t stream,
                               int ignore_unknown);
 void wks_free_policy (policy_flags_t policy);
+gpg_error_t wks_write_to_file (estream_t src, const char *fname);
 
 gpg_error_t wks_fname_from_userid (const char *userid, int hash_only,
                                    char **r_fname, char **r_addrspec);
 gpg_error_t wks_compute_hu_fname (char **r_fname, const char *addrspec);
+gpg_error_t wks_install_key_core (estream_t key, const char *addrspec);
 gpg_error_t wks_cmd_install_key (const char *fname, const char *userid);
 gpg_error_t wks_cmd_remove_key (const char *userid);
 gpg_error_t wks_cmd_print_wkd_hash (const char *userid);

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgconf-comp.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgconf-comp.c Changed

@@ -1370,7 +1370,7 @@
 
   result = 0;
   errlines = NULL;
-  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
                              NULL, NULL, &errfp, &pid);
   if (err)
     result |= 1; /* Program could not be run.  */
@@ -1759,7 +1759,7 @@
   /* First we need to read the option table from the program.  */
   argv0 = "--dump-option-table";
   argv1 = NULL;
-  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
                              NULL, &outfp, NULL, &pid);
   if (err)
     {
@@ -1940,7 +1940,7 @@
   /* Now read the default options.  */
   argv0 = "--gpgconf-list";
   argv1 = NULL;
-  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
                              NULL, &outfp, NULL, &pid);
   if (err)
     {
@@ -2974,7 +2974,7 @@
   /* Under Windows we don't support groups. */
   if (group && *group)
     gc_error (0, 0, _("Note that group specifications are ignored\n"));
-#ifndef HAVE_W32CE_SYSTEM
+
   if (*user)
     {
       static char *my_name;
@@ -2994,8 +2994,9 @@
       if (!strcmp (user, my_name))
         return 1; /* Found.  */
     }
-#endif /*HAVE_W32CE_SYSTEM*/
+
 #else /*!HAVE_W32_SYSTEM*/
+
   /* First check whether the user matches.  */
   if (*user)
     {
@@ -3054,7 +3055,9 @@
         if (!strcmp (group, my_supgroupsn))
           return 1; /* Found.  */
     }
+
 #endif /*!HAVE_W32_SYSTEM*/
+
   return 0; /* No match.  */
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgconf.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgconf.c Changed

@@ -53,6 +53,8 @@
 aListDirs = 'L',
 aKill = 'K',
 aReload = 'R',
+ aShowVersions = 'V',
+ aShowConfigs = 'X',
 
 oNoVerbose	= 500,
 oHomedir,
@@ -74,8 +76,6 @@
 aCreateSocketDir,
 aRemoveSocketDir,
 aApplyProfile,
- aShowVersions,
- aShowConfigs,
 aShowCodepages
 };
 
@@ -107,8 +107,8 @@
 { aKill, "kill", 256, N_("kill a given component")},
 { aCreateSocketDir, "create-socketdir", 256, "@"},
 { aRemoveSocketDir, "remove-socketdir", 256, "@"},
- ARGPARSE_c (aShowVersions, "show-versions", "@"),
- ARGPARSE_c (aShowConfigs, "show-configs", "@"),
+ ARGPARSE_c (aShowVersions, "show-versions", ""),
+ ARGPARSE_c (aShowConfigs, "show-configs", ""),
 ARGPARSE_c (aShowCodepages, "show-codepages", "@"),
 
 { 301, NULL, 0, N_("@\nOptions:\n ") },
@@ -1079,8 +1079,43 @@
 static void
 show_version_gnupg (estream_t fp, const char *prefix)
 {
+ char *fname, *p;
+ size_t n;
+ estream_t verfp;
+ char line100;
+
 es_fprintf (fp, "%s%sGnuPG %s (%s)\n%s%s\n", prefix, *prefix?"":"* ",
 gpgrt_strusage (13), BUILD_REVISION, prefix, gpgrt_strusage (17));
+
+ /* Show the GnuPG VS-Desktop version in --show-configs mode */
+ if (prefix && *prefix == '#')
+ {
+ fname = make_filename (gnupg_bindir (), NULL);
+ n = strlen (fname);
+ if (n > 10 && (!ascii_strcasecmp (fname + n - 10, "/GnuPG/bin")
+ || !ascii_strcasecmp (fname + n - 10, "\\GnuPG\\bin")))
+ {
+ /* Append VERSION to the ../../ direcory. Note that VERSION
+ * is only 7 bytes and thus fits. */
+ strcpy (fname + n - 9, "VERSION");
+ verfp = es_fopen (fname, "r");
+ if (!verfp)
+ es_fprintf (fp, "%sVERSION file not found\n", prefix);
+ else if (!es_fgets (line, sizeof line, verfp))
+ es_fprintf (fp, "%sVERSION file is empty\n", prefix);
+ else
+ {
+ trim_spaces (line);
+ for (p=line; *p; p++)
+ if (*p < ' ' || *p > '~' || *p == '')
+ *p = '?';
+ es_fprintf (fp, "%s%s\n", prefix, line);
+ }
+ es_fclose (verfp);
+ }
+ xfree (fname);
+ }
+
 #ifdef HAVE_W32_SYSTEM
 {
 OSVERSIONINFO osvi = { sizeof (osvi) };
@@ -1147,7 +1182,7 @@
 pgmname = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
 argv0 = "--gpgconf-versions";
 argv1 = NULL;
- err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+ err = gnupg_spawn_process (pgmname, argv, NULL, 0,
 NULL, &outfp, NULL, &pid);
 if (err)
 {
@@ -1322,7 +1357,7 @@
 { 1, "HKLM\\Software\\Gpg4win:VS-Desktop-Version" },
 { 1, "\\" GNUPG_REGISTRY_DIR ":HomeDir" },
 { 1, "\\" GNUPG_REGISTRY_DIR ":DefaultLogFile" },
- { 2, "Software\\Microsoft\\Office\\Outlook\\Addins\\GNU.GpgOL"
+ { 2, "\\Software\\Microsoft\\Office\\Outlook\\Addins\\GNU.GpgOL"
 ":LoadBehavior" },
 { 2, "HKCU\\Software\\Microsoft\\Office\\16.0\\Outlook\\Options\\Mail:"
 "ReadAsPlain" },
@@ -1354,6 +1389,7 @@
 int group = 0;
 char *namebuf = NULL;
 const char *name;
+ int from_hklm;
 
 for (idx=0; (name = namesidx.name); idx++)
 {
@@ -1367,7 +1403,7 @@
 name = namebuf;
 }
 
- value = read_w32_reg_string (name);
+ value = read_w32_reg_string (name, &from_hklm);
 if (!value)
 continue;
 
@@ -1382,12 +1418,11 @@
 }
 
 if (group == 3)
- es_fprintf (outfp, "### %s=%s\n", namesidx.name, value);
+ es_fprintf (outfp, "### %s=%s%s\n", namesidx.name, value,
+ from_hklm? " hklm":"");
 else
- es_fprintf (outfp, "### %s\n### ->%s<-\n", name, value);
-
- /* FIXME: We may want to add an indiction whethe found via HKLM
- * or HKCU. */
+ es_fprintf (outfp, "### %s\n### ->%s<-%s\n", name, value,
+ from_hklm? " hklm":"");
 
 xfree (value);
 }
@@ -1395,8 +1430,78 @@
 es_fprintf (outfp, "###\n");
 xfree (namebuf);
 }
+
+
+/* Print registry entries take from a configuration file. */
+static void
+show_registry_entries_from_file (estream_t outfp)
+{
+ gpg_error_t err;
+ char *fname;
+ estream_t fp;
+ char *line = NULL;
+ size_t length_of_line = 0;
+ size_t maxlen;
+ ssize_t len;
+ char *value = NULL;
+ int from_hklm;
+ int any = 0;
+
+ fname = make_filename (gnupg_datadir (), "gpgconf.rnames", NULL);
+ fp = es_fopen (fname, "r");
+ if (!fp)
+ {
+ err = gpg_error_from_syserror ();
+ if (gpg_err_code (err) != GPG_ERR_ENOENT)
+ log_error ("error opening '%s': %s\n", fname, gpg_strerror (err));
+ goto leave;
+ }
+
+ maxlen = 2048; /* Set limit. */
+ while ((len = es_read_line (fp, &line, &length_of_line, &maxlen)) > 0)
+ {
+ if (!maxlen)
+ {
+ err = gpg_error (GPG_ERR_LINE_TOO_LONG);
+ log_error ("error reading '%s': %s\n", fname, gpg_strerror (err));
+ goto leave;
+ }
+ trim_spaces (line);
+ if (*line == '#')
+ continue;
+
+ xfree (value);
+ value = read_w32_reg_string (line, &from_hklm);
+ if (!value)
+ continue;
+
+ if (!any)
+ {
+ any = 1;
+ es_fprintf (outfp, "### Taken from gpgconf.rnames:\n");
+ }
+
+ es_fprintf (outfp, "### %s\n### ->%s<-%s\n", line, value,
+ from_hklm? " hklm":"");
+
+ }
+ if (len < 0 || es_ferror (fp))
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("error reading '%s': %s\n", fname, gpg_strerror (err));
+ }
+
+ leave:
+ if (any)
+ es_fprintf (outfp, "###\n");
+ xfree (value);
+ xfree (line);
+ es_fclose (fp);
+ xfree (fname);
+}
 #endif /*HAVE_W32_SYSTEM*/
 
+
 /* Show all config files. */
 static void
 show_configs (estream_t outfp)
@@ -1404,6 +1509,11 @@
 static const char *names = { "common.conf", "gpg-agent.conf",
 "scdaemon.conf", "dirmngr.conf",
 "gpg.conf", "gpgsm.conf" };
+ static const char *envvars = { "PATH",
+ "http_proxy", "HTTP_PROXY",
+ "https_proxy", "HTTPS_PROXY",
+ "LD_LIBRARY_PATH", "LD_PRELOAD",
+ "LD_AUDIT", "LD_ORIGIN_PATH" };
 gpg_error_t err;
 int idx;
 char *fname;
@@ -1434,6 +1544,11 @@
 list_dirs (outfp, NULL, 1);
 es_fprintf (outfp, "\n");
 
+ for (idx=0; idx < DIM(envvars); idx++)
+ if ((s = getenv (envvarsidx)))
+ es_fprintf (outfp, "%s=%s\n", envvarsidx, s);
+ es_fprintf (outfp, "\n");
+
 fname = make_filename (gnupg_sysconfdir (), "gpgconf.conf", NULL);
 if (!gnupg_access (fname, F_OK))
 {
@@ -1486,14 +1601,16 @@
 if ((sl->flags & 1))
 {
 char *p;
+ int from_hklm;
 
 if (!any)
 {
 any = 1;
 es_fprintf (outfp, "###\n### Encountered in config files:\n");
 }
- if ((p = read_w32_reg_string (sl->d)))
- es_fprintf (outfp, "### %s ->%s<-\n", sl->d, p);
+ if ((p = read_w32_reg_string (sl->d, &from_hklm)))
+ es_fprintf (outfp, "### %s ->%s<-%s\n", sl->d, p,
+ from_hklm? " hklm":"");
 else
 es_fprintf (outfp, "### %s not set\n", sl->d);
 xfree (p);
@@ -1502,6 +1619,7 @@
 if (!any)
 es_fprintf (outfp, "###\n");
 show_other_registry_entries (outfp);
+ show_registry_entries_from_file (outfp);
 #endif /*HAVE_W32_SYSTEM*/
 
 free_strlist (list);

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgconf.w32-manifest.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgconf.w32-manifest.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgtar-create.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgtar-create.c Changed

@@ -1,5 +1,5 @@
 /* gpgtar-create.c - Create a TAR archive
- * Copyright (C) 2016-2017, 2019-2022 g10 Code GmbH
+ * Copyright (C) 2016-2017, 2019-2023 g10 Code GmbH
  * Copyright (C) 2010, 2012, 2013 Werner Koch
  * Copyright (C) 2010 Free Software Foundation, Inc.
  *
@@ -49,10 +49,19 @@
 #define lstat(a,b) gnupg_stat ((a), (b))
 #endif
 
+/* Number of files to be write.  */
+static unsigned long global_total_files;
+
+/* Count the number of written file and thus headers.  Extended
+ * headers are not counted. */
+static unsigned long global_written_files;
+
+/* Total data expected to be written.  */
+static unsigned long long global_total_data;
+
+/* Number of data bytes written so far.  */
+static unsigned long long global_written_data;
 
-/* Count the number of written headers.  Extended headers are not
- * counted. */
-static unsigned long global_header_count;
 
 
 /* Object to control the file scanning.  */
@@ -62,10 +71,62 @@
 {
   tar_header_t flist;
   tar_header_t *flist_tail;
+  unsigned long file_count;
   int nestlevel;
 };
 
 
+/* See ../g10/progress.c:write_status_progress for some background.  */
+static void
+write_progress (int countmode, unsigned long long current,
+                unsigned long long total_arg)
+{
+  char units = "BKMGTPEZY?";
+  int unitidx = 0;
+  uint64_t total = total_arg;
+
+  if (!opt.status_stream)
+    return;  /* Not enabled.  */
+
+  if (countmode)
+    {
+      if (total && current > total)
+        current = total;
+    }
+  else if (total)  /* Size mode: This may use units.  */
+    {
+      if (current > total)
+        current = total;
+
+      while (total > 1024*1024)
+        {
+          total /= 1024;
+          current /= 1024;
+          unitidx++;
+        }
+    }
+  else /* Size mode */
+    {
+      while (current > 1024*1024)
+        {
+          current /= 1024;
+          unitidx++;
+        }
+    }
+
+  if (unitidx > sizeof units - 1)
+    unitidx = sizeof units - 1;
+
+  if (countmode)
+    es_fprintf (opt.status_stream, "GNUPG: PROGRESS gpgtar c %zu %zu\n",
+                (size_t)current, (size_t)total);
+  else
+    es_fprintf (opt.status_stream, "GNUPG: PROGRESS gpgtar s %zu %zu %c%s\n",
+                (size_t)current, (size_t)total,
+                unitsunitidx,
+                unitidx? "iB" : "");
+}
+
 
 /* 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
@@ -300,6 +361,12 @@
         gpgtar_print_header (hdr, NULL, log_get_stream ());
       *scanctrl->flist_tail = hdr;
       scanctrl->flist_tail = &hdr->next;
+      scanctrl->file_count++;
+      /* Print a progress line during scnanning in increments of 5000
+       * and not of 100 as we doing during write: Scanning is of
+       * course much faster.  */
+      if (!(scanctrl->file_count % 5000))
+        write_progress (1, scanctrl->file_count, 0);
     }
 
   return 0;
@@ -709,7 +776,7 @@
            * will do.  To ease testing we also put in the PID.  The
            * count is bumped after the header has been written.  */
           snprintf (raw->name, sizeof raw->name-1, "_@paxheader.%u.%lu",
-                    (unsigned int)getpid(), global_header_count + 1);
+                    (unsigned int)getpid(), global_written_files + 1);
         }
     }
 
@@ -881,7 +948,7 @@
 
 
 static gpg_error_t
-write_file (estream_t stream, tar_header_t hdr)
+write_file (estream_t stream, tar_header_t hdr, unsigned int *skipped_open)
 {
   gpg_error_t err;
   char recordRECORDSIZE;
@@ -895,7 +962,7 @@
     {
       if (gpg_err_code (err) == GPG_ERR_NOT_SUPPORTED)
         {
-          log_info ("skipping unsupported file '%s'\n", hdr->name);
+          log_info ("silently skipping unsupported file '%s'\n", hdr->name);
           err = 0;
         }
       return err;
@@ -907,9 +974,12 @@
       if (!infp)
         {
           err = gpg_error_from_syserror ();
-          log_error ("can't open '%s': %s - skipped\n",
+          log_info ("can't open '%s': %s - skipped\n",
                      hdr->name, gpg_strerror (err));
-          return err;
+          ++*skipped_open;
+          if (!*skipped_open) /* Protect against overflow.  */
+            --*skipped_open;
+          return 0;
         }
     }
   else
@@ -920,7 +990,9 @@
   err = write_record (stream, record);
   if (err)
     goto leave;
-  global_header_count++;
+  global_written_files++;
+  if (!(global_written_files % 100))
+    write_progress (1, global_written_files, global_total_files);
 
   if (hdr->typeflag == TF_REGULAR)
     {
@@ -946,6 +1018,9 @@
           err = write_record (stream, record);
           if (err)
             goto leave;
+          global_written_data += nbytes;
+          if (!((global_written_data/nbytes) % (2048*100)))
+            write_progress (0, global_written_data, global_total_data);
         }
       nread = es_fread (record, 1, 1, infp);
       if (nread)
@@ -995,6 +1070,7 @@
   estream_t outstream = NULL;
   int eof_seen = 0;
   pid_t pid = (pid_t)(-1);
+  unsigned int skipped_open = 0;
 
   memset (scanctrl, 0, sizeof *scanctrl);
   scanctrl->flist_tail = &scanctrl->flist;
@@ -1137,10 +1213,22 @@
   if (files_from_stream && files_from_stream != es_stdin)
     es_fclose (files_from_stream);
 
+  global_total_files = global_total_data = 0;
+  global_written_files = global_written_data = 0;
+  for (hdr = scanctrl->flist; hdr; hdr = hdr->next)
+    {
+      global_total_files++;
+      global_total_data += hdr->size;
+    }
+  write_progress (1, 0, global_total_files);
+  write_progress (0, 0, global_total_data);
+
+
   if (encrypt || sign)
     {
       strlist_t arg;
       ccparray_t ccp;
+      int except2 = { -1, -1 };
       const char **argv;
 
       /* '--encrypt' may be combined with '--symmetric', but 'encrypt'
@@ -1164,6 +1252,7 @@
 
           snprintf (tmpbuf, sizeof tmpbuf, "--status-fd=%d", opt.status_fd);
           ccparray_put (&ccp, tmpbuf);
+          except0 = opt.status_fd;
         }
 
       ccparray_put (&ccp, "--output");
@@ -1184,6 +1273,8 @@
           ccparray_put (&ccp, "--recipient");
           ccparray_put (&ccp, arg->d);
         }
+      if (opt.no_compress)
+        ccparray_put (&ccp, "-z0");
       for (arg = opt.gpg_arguments; arg; arg = arg->next)
         ccparray_put (&ccp, arg->d);
 
@@ -1195,7 +1286,8 @@
           goto leave;
         }
 
-      err = gnupg_spawn_process (opt.gpg_program, argv, NULL, NULL,
+      err = gnupg_spawn_process (opt.gpg_program, argv,
+                                 except0 == -1? NULL : except,
                                  (GNUPG_SPAWN_KEEP_STDOUT
                                   | GNUPG_SPAWN_KEEP_STDERR),
                                  &outstream, NULL, NULL, &pid);
@@ -1225,17 +1317,20 @@
       es_set_binary (outstream);
     }
 
-
+  skipped_open = 0;
   for (hdr = scanctrl->flist; hdr; hdr = hdr->next)
     {
-      err = write_file (outstream, hdr);
+      err = write_file (outstream, hdr, &skipped_open);
       if (err)
         goto leave;
     }
+
   err = write_eof_mark (outstream);
   if (err)
     goto leave;
 
+  write_progress (1, global_written_files, global_total_files);
+  write_progress (0, global_written_data, global_total_data);
 
   if (pid != (pid_t)(-1))
     {
@@ -1256,6 +1351,12 @@
         }
     }
 
+  if (skipped_open)
+    {
+      log_info ("number of skipped files: %u\n", skipped_open);
+      log_error ("exiting with failure status due to previous errors\n");
+    }
+
  leave:
   if (!err)
     {

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgtar-extract.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgtar-extract.c Changed

@@ -37,7 +37,7 @@
 #include "gpgtar.h"
 
 static gpg_error_t
-check_suspicious_name (const char *name)
+check_suspicious_name (const char *name, tarinfo_t info)
 {
 size_t n;
 
@@ -47,6 +47,7 @@
 {
 log_error ("filename '%s' contains a backslash - "
 "can't extract on this system\n", name);
+ info->skipped_badname++;
 return gpg_error (GPG_ERR_INV_NAME);
 }
 #endif /*HAVE_DOSISH_SYSTEM*/
@@ -59,6 +60,7 @@
 {
 log_error ("filename '%s' has suspicious parts - not extracting\n",
 name);
+ info->skipped_suspicious++;
 return gpg_error (GPG_ERR_INV_NAME);
 }
 
@@ -83,7 +85,7 @@
 if (sl->flags == 1)
 fname = sl->d;
 
- err = check_suspicious_name (fname);
+ err = check_suspicious_name (fname, info);
 if (err)
 goto leave;
 
@@ -131,8 +133,12 @@
 /* Fixme: Set permissions etc. */
 
 leave:
- if (!err && opt.verbose)
- log_info ("extracted '%s'\n", fname);
+ if (!err)
+ {
+ if (opt.verbose)
+ log_info ("extracted '%s'\n", fname);
+ info->nextracted++;
+ }
 es_fclose (outfp);
 if (err && fname && outfp)
 {
@@ -146,7 +152,8 @@
 
 
 static gpg_error_t
-extract_directory (const char *dirname, tar_header_t hdr, strlist_t exthdr)
+extract_directory (const char *dirname, tarinfo_t info,
+ tar_header_t hdr, strlist_t exthdr)
 {
 gpg_error_t err;
 const char *name;
@@ -158,7 +165,7 @@
 if (sl->flags == 1)
 name = sl->d;
 
- err = check_suspicious_name (name);
+ err = check_suspicious_name (name, info);
 if (err)
 goto leave;
 
@@ -198,6 +205,8 @@
 {
 *p = 0;
 rc = gnupg_mkdir (fname, "-rwx------");
+ if (gpg_err_code (rc) == GPG_ERR_EEXIST)
+ rc = 0;
 *p = '/';
 if (rc)
 break;
@@ -228,13 +237,19 @@
 if (hdr->typeflag == TF_REGULAR || hdr->typeflag == TF_UNKNOWN)
 err = extract_regular (stream, dirname, info, hdr, exthdr);
 else if (hdr->typeflag == TF_DIRECTORY)
- err = extract_directory (dirname, hdr, exthdr);
+ err = extract_directory (dirname, info, hdr, exthdr);
 else
 {
 char recordRECORDSIZE;
 
 log_info ("unsupported file type %d for '%s' - skipped\n",
 (int)hdr->typeflag, hdr->name);
+ if (hdr->typeflag == TF_SYMLINK)
+ info->skipped_symlinks++;
+ else if (hdr->typeflag == TF_HARDLINK)
+ info->skipped_hardlinks++;
+ else
+ info->skipped_other++;
 for (err = 0, n=0; !err && n < hdr->nrecords; n++)
 {
 err = read_record (stream, record);
@@ -326,7 +341,7 @@
 tarinfo_t tarinfo = &tarinfo_buffer;
 pid_t pid = (pid_t)(-1);
 char *logfilename = NULL;
-
+ unsigned long long notextracted;
 
 memset (&tarinfo_buffer, 0, sizeof tarinfo_buffer);
 
@@ -369,6 +384,7 @@
 {
 strlist_t arg;
 ccparray_t ccp;
+ int except2 = { -1, -1 };
 const char **argv;
 
 ccparray_init (&ccp, 0);
@@ -382,6 +398,7 @@
 
 snprintf (tmpbuf, sizeof tmpbuf, "--status-fd=%d", opt.status_fd);
 ccparray_put (&ccp, tmpbuf);
+ except0 = opt.status_fd;
 }
 if (opt.with_log)
 {
@@ -408,7 +425,8 @@
 goto leave;
 }
 
- err = gnupg_spawn_process (opt.gpg_program, argv, NULL, NULL,
+ err = gnupg_spawn_process (opt.gpg_program, argv,
+ except0 == -1? NULL : except,
 ((filename? 0 : GNUPG_SPAWN_KEEP_STDIN)
 | GNUPG_SPAWN_KEEP_STDERR),
 NULL, &stream, NULL, &pid);
@@ -473,8 +491,37 @@
 }
 }
 
-
 leave:
+ notextracted = tarinfo->skipped_badname;
+ notextracted += tarinfo->skipped_suspicious;
+ notextracted += tarinfo->skipped_symlinks;
+ notextracted += tarinfo->skipped_hardlinks;
+ notextracted += tarinfo->skipped_other;
+ if (opt.status_stream)
+ es_fprintf (opt.status_stream, "GNUPG: GPGTAR_EXTRACT"
+ " %llu %llu %lu %lu %lu %lu %lu\n",
+ tarinfo->nextracted,
+ notextracted,
+ tarinfo->skipped_badname,
+ tarinfo->skipped_suspicious,
+ tarinfo->skipped_symlinks,
+ tarinfo->skipped_hardlinks,
+ tarinfo->skipped_other);
+ if (notextracted && !opt.quiet)
+ {
+ log_info ("Number of files not extracted: %llu\n", notextracted);
+ if (tarinfo->skipped_badname)
+ log_info (" invalid name: %lu\n", tarinfo->skipped_badname);
+ if (tarinfo->skipped_suspicious)
+ log_info (" suspicious name: %lu\n", tarinfo->skipped_suspicious);
+ if (tarinfo->skipped_symlinks)
+ log_info (" symlink: %lu\n", tarinfo->skipped_symlinks);
+ if (tarinfo->skipped_hardlinks)
+ log_info (" hardlink: %lu\n", tarinfo->skipped_hardlinks);
+ if (tarinfo->skipped_other)
+ log_info (" other reason: %lu\n", tarinfo->skipped_other);
+ }
+
 free_strlist (extheader);
 xfree (header);
 xfree (dirname);

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgtar-list.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgtar-list.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgtar.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgtar.c Changed

@@ -42,6 +42,7 @@
 #include "../common/openpgpdefs.h"
 #include "../common/init.h"
 #include "../common/strlist.h"
+#include "../common/comopt.h"
 
 #include "gpgtar.h"
 
@@ -75,6 +76,7 @@
     oSetFilename,
     oNull,
     oUtf8Strings,
+    oNoCompress,
 
     oBatch,
     oAnswerYes,
@@ -89,6 +91,7 @@
     oTarProgram,
 
     /* Debugging.  */
+    oDebug,
     oDryRun
   };
 
@@ -119,6 +122,7 @@
   ARGPARSE_s_s (oSetFilename, "set-filename", "@"),
   ARGPARSE_s_n (oOpenPGP, "openpgp", "@"),
   ARGPARSE_s_n (oCMS, "cms", "@"),
+  ARGPARSE_s_n (oNoCompress,   "no-compress", "@"),
 
   ARGPARSE_s_n (oBatch, "batch", "@"),
   ARGPARSE_s_n (oAnswerYes, "yes", "@"),
@@ -145,6 +149,8 @@
   ARGPARSE_s_s (oTarArgs, "tar-args", "@"),
   ARGPARSE_s_s (oTarProgram, "tar", "@"),
 
+  ARGPARSE_s_s (oDebug, "debug", "@"),
+
   ARGPARSE_end ()
 };
 
@@ -166,7 +172,7 @@
 static int skip_crypto = 0;
 static const char *files_from = NULL;
 static int null_names = 0;
-
+static int any_debug;
 
 
 &#xc;
@@ -346,6 +352,7 @@
         case oFilesFrom: files_from = pargs->r.ret_str; break;
         case oNull: null_names = 1; break;
         case oUtf8Strings: opt.utf8strings = 1; break;
+        case oNoCompress:  opt.no_compress = 1; break;
 
 	case aList:
         case aDecrypt:
@@ -438,6 +445,10 @@
           }
           break;
 
+        case oDebug:
+          any_debug = 1;
+          break;
+
         case oDryRun:
           opt.dry_run = 1;
           break;
@@ -459,7 +470,7 @@
 
   gnupg_reopen_std (GPGTAR_NAME);
   gpgrt_set_strusage (my_strusage);
-  log_set_prefix (GPGTAR_NAME, GPGRT_LOG_WITH_PREFIX);
+  log_set_prefix (GPGTAR_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init();
@@ -471,6 +482,10 @@
   /* Set default options */
   opt.status_fd = -1;
 
+  /* The configuraton directories for use by gpgrt_argparser.  */
+  gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
+  gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
+
   /* Parse the command line. */
   pargs.argc  = &argc;
   pargs.argv  = &argv;
@@ -481,6 +496,10 @@
   if (log_get_errorcount (0))
     exit (2);
 
+  /* Get a log file from common.conf.  */
+  if (!parse_comopt (GNUPG_MODULE_NAME_GPGTAR, any_debug) && comopt.logfile)
+    log_set_file (comopt.logfile);
+
   /* Print a warning if an argument looks like an option.  */
   if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
     {
@@ -491,6 +510,36 @@
           log_info (_("NOTE: '%s' is not considered an option\n"), argvi);
     }
 
+  /* Set status stream for our own use of --status-fd.  The original
+   * status fd is passed verbatim to gpg.  */
+  if (opt.status_fd != -1)
+    {
+      int fd = translate_sys2libc_fd_int (opt.status_fd, 1);
+
+      if (!gnupg_fd_valid (fd))
+        log_fatal ("status-fd is invalid: %s\n", strerror (errno));
+
+      if (fd == 1)
+        {
+          opt.status_stream = es_stdout;
+          if (!skip_crypto)
+            log_fatal ("using stdout for the status-fd is not possible\n");
+        }
+      else if (fd == 2)
+        opt.status_stream = es_stderr;
+      else
+        {
+          opt.status_stream = es_fdopen (fd, "w");
+          if (opt.status_stream)
+            es_setvbuf (opt.status_stream, NULL, _IOLBF, 0);
+        }
+      if (!opt.status_stream)
+        {
+          log_fatal ("can't open fd %d for status output: %s\n",
+                     fd, strerror (errno));
+        }
+    }
+
   if (! opt.gpg_program)
     opt.gpg_program = gnupg_module_name (GNUPG_MODULE_NAME_GPG);
 
@@ -499,17 +548,27 @@
 
   switch (cmd)
     {
+    case aDecrypt:
     case aList:
       if (argc > 1)
         gpgrt_usage (1);
-      fname = argc ? *argv : NULL;
+      fname = (argc && strcmp (*argv, "-"))? *argv : NULL;
       if (opt.filename)
         log_info ("note: ignoring option --set-filename\n");
       if (files_from)
         log_info ("note: ignoring option --files-from\n");
-      err = gpgtar_list (fname, !skip_crypto);
-      if (err && log_get_errorcount (0) == 0)
-        log_error ("listing archive failed: %s\n", gpg_strerror (err));
+      if (cmd == aDecrypt)
+        {
+          err = gpgtar_extract (fname, !skip_crypto);
+          if (err && !log_get_errorcount (0))
+            log_error ("extracting archive failed: %s\n", gpg_strerror (err));
+        }
+      else
+        {
+          err = gpgtar_list (fname, !skip_crypto);
+          if (err && !log_get_errorcount (0))
+            log_error ("listing archive failed: %s\n", gpg_strerror (err));
+        }
       break;
 
     case aEncrypt:
@@ -530,24 +589,21 @@
         log_error ("creating archive failed: %s\n", gpg_strerror (err));
       break;
 
-    case aDecrypt:
-      if (argc != 1)
-        gpgrt_usage (1);
-      if (opt.outfile)
-        log_info ("note: ignoring option --output\n");
-      if (files_from)
-        log_info ("note: ignoring option --files-from\n");
-      fname = argc ? *argv : NULL;
-      err = gpgtar_extract (fname, !skip_crypto);
-      if (err && log_get_errorcount (0) == 0)
-        log_error ("extracting archive failed: %s\n", gpg_strerror (err));
-      break;
-
     default:
       log_error (_("invalid command (there is no implicit command)\n"));
+      err = 0;
       break;
     }
 
+  if (opt.status_stream)
+    {
+      if (err || log_get_errorcount (0))
+        es_fprintf (opt.status_stream, "GNUPG: FAILURE - %u\n",
+                    err? err : gpg_error (GPG_ERR_GENERAL));
+      else
+        es_fprintf (opt.status_stream, "GNUPG: SUCCESS\n");
+    }
+
   return log_get_errorcount (0)? 1:0;
 }

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgtar.h -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgtar.h Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/gpgtar.w32-manifest.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/gpgtar.w32-manifest.in Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/send-mail.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/send-mail.c Changed

_service:tar_scm:gnupg-2.3.6.tar.bz2/tools/wks-util.c -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tools/wks-util.c Changed

@@ -101,7 +101,8 @@
 * updated. C-style escaping is removed from UID. On error ERRNO is
 * set and NULL returned. */
 static uidinfo_list_t
-append_to_uidinfo_list (uidinfo_list_t *list, const char *uid, time_t created)
+append_to_uidinfo_list (uidinfo_list_t *list, const char *uid, time_t created,
+ int expired, int revoked)
 {
 uidinfo_list_t r, sl;
 char *plainuid;
@@ -119,7 +120,10 @@
 
 strcpy (sl->uid, plainuid);
 sl->created = created;
+ sl->flags = 0;
 sl->mbox = mailbox_from_userid (plainuid, 0);
+ sl->expired = !!expired;
+ sl->revoked = !!revoked;
 sl->next = NULL;
 if (!*list)
 *list = sl;
@@ -149,6 +153,21 @@
 }
 
 
+static void
+debug_gpg_invocation (const char *func, const char **argv)
+{
+ int i;
+
+ if (!(opt.debug & DBG_EXTPROG_VALUE))
+ return;
+
+ log_debug ("%s: exec '%s' with", func, opt.gpg_program);
+ for (i=0; argvi; i++)
+ log_printf (" '%s'", argvi);
+ log_printf ("\n");
+}
+
+
 &#xc;
 struct get_key_status_parm_s
 {
@@ -163,7 +182,8 @@
 {
 struct get_key_status_parm_s *parm = opaque;
 
- /*log_debug ("%s: %s\n", keyword, args);*/
+ if (DBG_CRYPTO)
+ log_debug ("%s: %s\n", keyword, args);
 if (!strcmp (keyword, "EXPORTED"))
 {
 parm->count++;
@@ -176,10 +196,11 @@
 * mail address ADDRSPEC is included in the key. If EXACT is set the
 * returned user id must match Addrspec exactly and not just in the
 * addr-spec (mailbox) part. The key is returned as a new memory
- * stream at R_KEY. */
+ * stream at R_KEY. If BINARY is set the returned key is
+ * non-armored. */
 gpg_error_t
 wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec,
- int exact)
+ int exact, int binary)
 {
 gpg_error_t err;
 ccparray_t ccp;
@@ -201,8 +222,9 @@
 }
 
 /* Prefix the key with the MIME content type. */
- es_fputs ("Content-Type: application/pgp-keys\n"
- "\n", key);
+ if (!binary)
+ es_fputs ("Content-Type: application/pgp-keys\n"
+ "\n", key);
 
 filterexp = es_bsprintf ("keep-uid=%s= %s", exact? "uid":"mbox", addrspec);
 if (!filterexp)
@@ -215,15 +237,16 @@
 ccparray_init (&ccp, 0);
 
 ccparray_put (&ccp, "--no-options");
- if (!opt.verbose)
+ if (opt.verbose < 2)
 ccparray_put (&ccp, "--quiet");
- else if (opt.verbose > 1)
+ else
 ccparray_put (&ccp, "--verbose");
 ccparray_put (&ccp, "--batch");
 ccparray_put (&ccp, "--status-fd=2");
 ccparray_put (&ccp, "--always-trust");
- ccparray_put (&ccp, "--armor");
- ccparray_put (&ccp, "--export-options=export-minimal");
+ if (!binary)
+ ccparray_put (&ccp, "--armor");
+ ccparray_put (&ccp, "--export-options=export-clean");
 ccparray_put (&ccp, "--export-filter");
 ccparray_put (&ccp, filterexp);
 ccparray_put (&ccp, "--export");
@@ -238,6 +261,7 @@
 goto leave;
 }
 parm.fpr = fingerprint;
+ debug_gpg_invocation (__func__, argv);
 err = gnupg_exec_tool_stream (opt.gpg_program, argv, NULL,
 NULL, key,
 get_key_status_cb, &parm);
@@ -275,6 +299,22 @@
 }
 
 
+/* Parse field 1 and set revoked and expired on return. */
+static void
+set_expired_revoked (const char *string, int *expired, int *revoked)
+{
+ *expired = *revoked = 0;
+ /* Look at letters and stop at the first digit. */
+ for ( ;*string && !digitp (string); string++)
+ {
+ if (*string == 'e')
+ *expired = 1;
+ else if (*string == 'r')
+ *revoked = 1;
+ }
+}
+
+
 /* Run gpg on KEY and store the primary fingerprint at R_FPR and the
 * list of mailboxes at R_MBOXES. Returns 0 on success; on error NULL
 * is stored at R_FPR and R_MBOXES and an error code is returned.
@@ -295,6 +335,7 @@
 int lnr;
 char *fpr = NULL;
 uidinfo_list_t mboxes = NULL;
+ int expired, revoked;
 
 if (r_fpr)
 *r_fpr = NULL;
@@ -312,9 +353,9 @@
 ccparray_init (&ccp, 0);
 
 ccparray_put (&ccp, "--no-options");
- if (!opt.verbose)
+ if (opt.verbose < 2)
 ccparray_put (&ccp, "--quiet");
- else if (opt.verbose > 1)
+ else
 ccparray_put (&ccp, "--verbose");
 ccparray_put (&ccp, "--batch");
 ccparray_put (&ccp, "--status-fd=2");
@@ -331,6 +372,7 @@
 err = gpg_error_from_syserror ();
 goto leave;
 }
+ debug_gpg_invocation (__func__, argv);
 err = gnupg_exec_tool_stream (opt.gpg_program, argv, key,
 NULL, listing,
 key_status_cb, NULL);
@@ -342,6 +384,7 @@
 
 es_rewind (listing);
 lnr = 0;
+ expired = revoked = 0;
 maxlen = 2048; /* Set limit. */
 while ((len = es_read_line (listing, &line, &length_of_line, &maxlen)) > 0)
 {
@@ -386,12 +429,20 @@
 err = gpg_error (GPG_ERR_INV_ENGINE);
 goto leave;
 }
- if (lnr > 1 && !strcmp (fields0, "pub"))
+ if (!strcmp (fields0, "pub"))
 {
- /* More than one public key. */
- err = gpg_error (GPG_ERR_TOO_MANY);
- goto leave;
+ if (lnr > 1)
+ {
+ /* More than one public key. */
+ err = gpg_error (GPG_ERR_TOO_MANY);
+ goto leave;
+ }
+ if (nfields > 1)
+ set_expired_revoked (fields1, &expired, &revoked);
+ else
+ expired = revoked = 0;
 }
+
 if (!strcmp (fields0, "sub") || !strcmp (fields0, "ssb"))
 break; /* We can stop parsing here. */
 
@@ -406,8 +457,13 @@
 }
 else if (!strcmp (fields0, "uid") && nfields > 9)
 {
+ int uidexpired, uidrevoked;
+
+ set_expired_revoked (fields1, &uidexpired, &uidrevoked);
 if (!append_to_uidinfo_list (&mboxes, fields9,
- parse_timestamp (fields5, NULL)))
+ parse_timestamp (fields5, NULL),
+ expired || uidexpired,
+ revoked || uidrevoked))
 {
 err = gpg_error_from_syserror ();
 goto leave;
@@ -488,9 +544,9 @@
 ccparray_init (&ccp, 0);
 
 ccparray_put (&ccp, "--no-options");
- if (!opt.verbose)
+ if (opt.verbose < 2)
 ccparray_put (&ccp, "--quiet");
- else if (opt.verbose > 1)
+ else
 ccparray_put (&ccp, "--verbose");
 ccparray_put (&ccp, "--batch");
 ccparray_put (&ccp, "--status-fd=2");
@@ -509,6 +565,7 @@
 err = gpg_error_from_syserror ();
 goto leave;
 }
+ debug_gpg_invocation (__func__, argv);
 err = gnupg_exec_tool_stream (opt.gpg_program, argv, key,
 NULL, newkey,
 key_status_cb, NULL);
@@ -530,6 +587,124 @@
 }
 
 
+/* Put the ascii-armor around KEY and return that as a new estream
+ * object at R_NEWKEY. Caller must make sure that KEY has been seeked
+ * to the right position (usually by calling es_rewind). The
+ * resulting NEWKEY has already been rewound. If PREFIX is not NULL,
+ * its content is written to NEWKEY propr to the armor; this may be
+ * used for MIME headers. */
+gpg_error_t
+wks_armor_key (estream_t *r_newkey, estream_t key, const char *prefix)
+{
+ gpg_error_t err;
+ estream_t newkey;
+ struct b64state b64state;
+ char buffer4096;
+ size_t nread;
+
+ *r_newkey = NULL;
+
+ newkey = es_fopenmem (0, "w+b");
+ if (!newkey)
+ {
+ err = gpg_error_from_syserror ();
+ return err;
+ }
+
+ if (prefix)
+ es_fputs (prefix, newkey);
+
+ err = b64enc_start_es (&b64state, newkey, "PGP PUBLIC KEY BLOCK");
+ if (err)
+ goto leave;
+
+ do
+ {
+ nread = es_fread (buffer, 1, sizeof buffer, key);
+ if (!nread)
+	break;
+ err = b64enc_write (&b64state, buffer, nread);
+ if (err)
+ goto leave;
+ }
+ while (!es_feof (key) && !es_ferror (key));
+ if (!es_feof (key) || es_ferror (key))
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+
+ err = b64enc_finish (&b64state);
+ if (err)
+ goto leave;
+
+ es_rewind (newkey);
+ *r_newkey = newkey;
+ newkey = NULL;
+
+ leave:
+ es_fclose (newkey);
+ return err;
+}
+
+
+/* Run gpg to export the revocation certificates for ADDRSPEC. Add
+ * them to KEY which is expected to be non-armored keyblock. */
+gpg_error_t
+wks_find_add_revocs (estream_t key, const char *addrspec)
+{
+ gpg_error_t err;
+ ccparray_t ccp;
+ const char **argv = NULL;
+ char *filterexp = NULL;
+
+ filterexp = es_bsprintf ("select=mbox= %s", addrspec);
+ if (!filterexp)
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("error allocating memory buffer: %s\n", gpg_strerror (err));
+ goto leave;
+ }
+
+ ccparray_init (&ccp, 0);
+
+ ccparray_put (&ccp, "--no-options");
+ if (opt.verbose < 2)
+ ccparray_put (&ccp, "--quiet");
+ else
+ ccparray_put (&ccp, "--verbose");
+ ccparray_put (&ccp, "--batch");
+ ccparray_put (&ccp, "--status-fd=2");
+ ccparray_put (&ccp, "--export-options=export-revocs");
+ ccparray_put (&ccp, "--export-filter");
+ ccparray_put (&ccp, filterexp);
+ ccparray_put (&ccp, "--export");
+ ccparray_put (&ccp, addrspec);
+
+ ccparray_put (&ccp, NULL);
+ argv = ccparray_get (&ccp, NULL);
+ if (!argv)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ debug_gpg_invocation (__func__, argv);
+ err = gnupg_exec_tool_stream (opt.gpg_program, argv, NULL,
+ NULL, key,
+ key_status_cb, NULL);
+ if (err)
+ {
+ log_error ("exporting revocs failed: %s\n", gpg_strerror (err));
+ goto leave;
+ }
+
+ leave:
+ xfree (filterexp);
+ xfree (argv);
+ return err;
+}
+
+
 /* Helper to write mail to the output(s). */
 gpg_error_t
 wks_send_mime (mime_maker_t mime)
@@ -717,18 +892,27 @@
 }
 
 
-/* Write the content of SRC to the new file FNAME. */
-static gpg_error_t
-write_to_file (estream_t src, const char *fname)
+/* Write the content of SRC to the new file FNAME. If FNAME is NULL
+ * SRC is written to stdout. */
+gpg_error_t
+wks_write_to_file (estream_t src, const char *fname)
 {
 gpg_error_t err;
 estream_t dst;
 char buffer4096;
 size_t nread, written;
 
- dst = es_fopen (fname, "wb");
- if (!dst)
- return gpg_error_from_syserror ();
+ if (!fname)
+ {
+ dst = es_stdout;
+ es_set_binary (es_stdout);
+ }
+ else
+ {
+ dst = es_fopen (fname, "wb");
+ if (!dst)
+ return gpg_error_from_syserror ();
+ }
 
 do
 {
@@ -743,12 +927,15 @@
 if (!es_feof (src) || es_ferror (src) || es_ferror (dst))
 {
 err = gpg_error_from_syserror ();
- es_fclose (dst);
- gnupg_remove (fname);
+ if (dst != es_stdout)
+ {
+ es_fclose (dst);
+ gnupg_remove (fname);
+ }
 return err;
 }
 
- if (es_fclose (dst))
+ if (dst != es_stdout && es_fclose (dst))
 {
 err = gpg_error_from_syserror ();
 log_error ("error closing '%s': %s\n", fname, gpg_strerror (err));
@@ -790,6 +977,12 @@
 domain = strchr (addrspec, '@');
 log_assert (domain);
 domain++;
+ if (strchr (domain, '/') || strchr (domain, '\\'))
+ {
+ log_info ("invalid domain detected ('%s')\n", domain);
+ err = gpg_error (GPG_ERR_NOT_FOUND);
+ goto leave;
+ }
 
 /* Hash user ID and create filename. */
 s = strchr (addrspec, '@');
@@ -845,6 +1038,11 @@
 if (!domain || !domain1 || domain == addrspec)
 return gpg_error (GPG_ERR_INV_ARG);
 domain++;
+ if (strchr (domain, '/') || strchr (domain, '\\'))
+ {
+ log_info ("invalid domain detected ('%s')\n", domain);
+ return gpg_error (GPG_ERR_NOT_FOUND);
+ }
 
 gcry_md_hash_buffer (GCRY_MD_SHA1, sha1buf, addrspec, domain - addrspec - 1);
 hash = zb32_encode (sha1buf, 8*20);
@@ -893,6 +1091,11 @@
 if (!domain || !domain1 || domain == addrspec)
 return gpg_error (GPG_ERR_INV_ARG);
 domain++;
+ if (strchr (domain, '/') || strchr (domain, '\\'))
+ {
+ log_info ("invalid domain detected ('%s')\n", domain);
+ return gpg_error (GPG_ERR_NOT_FOUND);
+ }
 
 /* Create the filename. */
 fname = make_filename_try (opt.directory, domain, "policy", NULL);
@@ -1015,6 +1218,43 @@
 }
 
 
+/* The core of the code to install a key as a file. */
+gpg_error_t
+wks_install_key_core (estream_t key, const char *addrspec)
+{
+ gpg_error_t err;
+ char *huname = NULL;
+
+ /* Hash user ID and create filename. */
+ err = wks_compute_hu_fname (&huname, addrspec);
+ if (err)
+ goto leave;
+
+ /* Now that wks_compute_hu_fname has created missing directories we
+ * can create a policy file if it does not exist. */
+ err = ensure_policy_file (addrspec);
+ if (err)
+ goto leave;
+
+ /* Publish. */
+ err = wks_write_to_file (key, huname);
+ if (err)
+ {
+ log_error ("copying key to '%s' failed: %s\n", huname,gpg_strerror (err));
+ goto leave;
+ }
+
+ /* Make sure it is world readable. */
+ 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()));
+
+ leave:
+ xfree (huname);
+ return err;
+}
+
+
 /* Install a single key into the WKD by reading FNAME and extracting
 * USERID. If USERID is NULL FNAME is expected to be a list of fpr
 * mbox lines and for each line the respective key will be
@@ -1030,7 +1270,6 @@
 uidinfo_list_t uidlist = NULL;
 uidinfo_list_t uid, thisuid;
 time_t thistime;
- char *huname = NULL;
 int any;
 
 if (!userid)
@@ -1049,7 +1288,7 @@
 {
 /* FNAME looks like a fingerprint. Get the key from the
 * standard keyring. */
- err = wks_get_key (&fp, fname, addrspec, 0);
+ err = wks_get_key (&fp, fname, addrspec, 0, 1);
 if (err)
 {
 log_error ("error getting key '%s' (uid='%s'): %s\n",
@@ -1086,6 +1325,12 @@
 continue; /* Should not happen anyway. */
 if (ascii_strcasecmp (uid->mbox, addrspec))
 continue; /* Not the requested addrspec. */
+ if (uid->expired)
+ {
+ if (opt.verbose)
+ log_info ("ignoring expired user id '%s'\n", uid->uid);
+ continue;
+ }
 any = 1;
 if (uid->created > thistime)
 {
@@ -1121,36 +1366,30 @@
 fp = fp2;
 }
 
- /* Hash user ID and create filename. */
- err = wks_compute_hu_fname (&huname, addrspec);
- if (err)
- goto leave;
-
- /* Now that wks_compute_hu_fname has created missing directories we
- * can create a policy file if it does not exist. */
- err = ensure_policy_file (addrspec);
- if (err)
- goto leave;
-
- /* Publish. */
- err = write_to_file (fp, huname);
- if (err)
+ if (opt.add_revocs)
 {
- log_error ("copying key to '%s' failed: %s\n", huname,gpg_strerror (err));
- goto leave;
+ if (es_fseek (fp, 0, SEEK_END))
+ {
+ err = gpg_error_from_syserror ();
+ log_error ("error seeking stream: %s\n", gpg_strerror (err));
+ goto leave;
+ }
+ err = wks_find_add_revocs (fp, addrspec);
+ if (err)
+ {
+ log_error ("error finding revocations for '%s': %s\n",
+ addrspec, gpg_strerror (err));
+ goto leave;
+ }
+ es_rewind (fp);
 }
 
- /* Make sure it is world readable. */
- 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()));
-
+ err = wks_install_key_core (fp, addrspec);
 if (!opt.quiet)
 log_info ("key %s published for '%s'\n", fpr, addrspec);
 
 
 leave:
- xfree (huname);
 free_uidinfo_list (uidlist);
 xfree (fpr);
 xfree (addrspec);

_service:tar_scm:gnupg-2.3.6.tar.bz2/tpm2d/Makefile.in -> _service:tar_scm:gnupg-2.4.3.tar.bz2/tpm2d/Makefile.in Changed